diff options
| author | Samuel Pitoiset <[email protected]> | 2017-03-15 00:59:13 +0100 |
|---|---|---|
| committer | Samuel Pitoiset <[email protected]> | 2017-03-15 14:24:40 +0100 |
| commit | 7751ed39e40e08e5aa0633d018c9f25ad17f9bb0 (patch) | |
| tree | fcefd10da51ffde6c5952e48386f2b8244376704 | |
| parent | 74265fd03cbd0fe7371010c2d7d46d5870948df8 (diff) | |
radeonsi: disable sinking common instructions down to the end block
Initially this was a workaround for a bug introduced in LLVM 4.0
in the SimplifyCFG pass that caused image instrinsics to disappear
(because they were badly sunk). Finally, this is a win because it
decreases SGPR spilling and increases the number of waves a bit.
Although, shader-db results are good I think we might want to
remove it in the future once the issue is fixed. For now, enable
it for LLVM >= 4.0.
This also fixes a rendering issue with the speedometer in Dirt Rally.
More information can be found here https://reviews.llvm.org/D26348.
Thanks to Dave Airlie for the patch.
v2: - add a FIXME comment
- use if (HAVE_LLVM >= 0x0400) instead
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99484
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97988
Signed-off-by: Samuel Pitoiset <[email protected]>
Cc: 17.0 <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c index 5c63b732b38..7965b461dce 100644 --- a/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c +++ b/src/gallium/drivers/radeonsi/si_shader_tgsi_setup.c @@ -40,6 +40,7 @@ #include <stdio.h> #include <llvm-c/Transforms/IPO.h> #include <llvm-c/Transforms/Scalar.h> +#include <llvm-c/Support.h> /* Data for if/else/endif and bgnloop/endloop control flow structures. */ @@ -124,6 +125,16 @@ static void init_amdgpu_target() LLVMInitializeAMDGPUTarget(); LLVMInitializeAMDGPUTargetMC(); LLVMInitializeAMDGPUAsmPrinter(); + + if (HAVE_LLVM >= 0x0400) { + /* + * Workaround for bug in llvm 4.0 that causes image intrinsics + * to disappear. + * https://reviews.llvm.org/D26348 + */ + const char *argv[2] = {"mesa", "-simplifycfg-sink-common=false"}; + LLVMParseCommandLineOptions(2, argv, NULL); + } } static once_flag init_amdgpu_target_once_flag = ONCE_FLAG_INIT; |