From: Marek Olšák Date: Thu, 14 Jun 2018 05:27:10 +0000 (-0400) Subject: ac: set +auto-waitcnt-before-barrier when needed X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e9c57a7fefe2f6ddbc1434ad38829c0aebf82fb;p=mesa.git ac: set +auto-waitcnt-before-barrier when needed This removes useless s_waitcnt before barriers. Only radeonsi uses this function. --- diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c index be2d92b4c08..99cc677edce 100644 --- a/src/amd/common/ac_llvm_util.c +++ b/src/amd/common/ac_llvm_util.c @@ -133,13 +133,15 @@ LLVMTargetMachineRef ac_create_target_machine(enum radeon_family family, char features[256]; const char *triple = (tm_options & AC_TM_SUPPORTS_SPILL) ? "amdgcn-mesa-mesa3d" : "amdgcn--"; LLVMTargetRef target = ac_get_llvm_target(triple); + bool barrier_does_waitcnt = true; /* TODO: not for Vega20 */ snprintf(features, sizeof(features), - "+DumpCode,+vgpr-spilling,-fp32-denormals,+fp64-denormals%s%s%s%s", + "+DumpCode,+vgpr-spilling,-fp32-denormals,+fp64-denormals%s%s%s%s%s", tm_options & AC_TM_SISCHED ? ",+si-scheduler" : "", tm_options & AC_TM_FORCE_ENABLE_XNACK ? ",+xnack" : "", tm_options & AC_TM_FORCE_DISABLE_XNACK ? ",-xnack" : "", - tm_options & AC_TM_PROMOTE_ALLOCA_TO_SCRATCH ? ",-promote-alloca" : ""); + tm_options & AC_TM_PROMOTE_ALLOCA_TO_SCRATCH ? ",-promote-alloca" : "", + barrier_does_waitcnt ? ",+auto-waitcnt-before-barrier" : ""); LLVMTargetMachineRef tm = LLVMCreateTargetMachine( target,