From 2beb31bd7c186641a2bb9abf6d2e13d42e43d944 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 7 Apr 2017 18:30:28 +0200 Subject: [PATCH] radeonsi/gfx9: compile shaders with +xnack MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit so that LLVM doesn't allocate SGPRs where XNACK is. Cc: 17.1 Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_pipe.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index eaa3348bcb7..6f82e294bde 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 */ @@ -127,12 +124,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); -- 2.30.2