diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2017-04-07 18:30:28 +0200 |
|---|---|---|
| committer | Juan A. Suarez Romero <jasuarez@igalia.com> | 2017-05-31 22:32:04 +0200 |
| commit | c5b1b05e1c28c24ef23dc393b601a5fc3f423994 (patch) | |
| tree | 122ba11074b60b41df858b83ac309fc7d1700b68 /src/gallium | |
| parent | cfa6a8bb50ac8de86f9123e3a57a277107119dd6 (diff) | |
radeonsi/gfx9: compile shaders with +xnack
so that LLVM doesn't allocate SGPRs where XNACK is.
Cc: 17.1 <mesa-stable@lists.freedesktop.org>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
(cherry picked from commit 2beb31bd7c186641a2bb9abf6d2e13d42e43d944)
Signed-off-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index b1724272284..836844e4b71 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -33,9 +33,6 @@ #include "vl/vl_decoder.h" #include "../ddebug/dd_util.h" -#define SI_LLVM_DEFAULT_FEATURES \ - "+DumpCode,+vgpr-spilling,-fp32-denormals,-xnack" - /* * pipe_context */ @@ -126,12 +123,16 @@ static LLVMTargetMachineRef si_create_llvm_target_machine(struct si_screen *sscreen) { const char *triple = "amdgcn--"; + char features[256]; + + snprintf(features, sizeof(features), + "+DumpCode,+vgpr-spilling,-fp32-denormals,+fp64-denormals%s%s", + sscreen->b.chip_class >= GFX9 ? ",+xnack" : ",-xnack", + sscreen->b.debug_flags & DBG_SI_SCHED ? ",+si-scheduler" : ""); return LLVMCreateTargetMachine(si_llvm_get_amdgpu_target(triple), triple, r600_get_llvm_processor_name(sscreen->b.family), - sscreen->b.debug_flags & DBG_SI_SCHED ? - SI_LLVM_DEFAULT_FEATURES ",+si-scheduler" : - SI_LLVM_DEFAULT_FEATURES, + features, LLVMCodeGenLevelDefault, LLVMRelocDefault, LLVMCodeModelDefault); |