diff options
| author | Marek Olšák <[email protected]> | 2018-08-15 21:14:47 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-08-21 20:50:37 -0400 |
| commit | a4a104fc81e93555899050efac23c3cd6ba762ab (patch) | |
| tree | 2d440eff5c96059aa556f672a9f10da7d4efc337 /src/amd/common | |
| parent | 2383ddace12c3f5c23d8cc20a7768b0a6cb915f6 (diff) | |
ac: completely remove +auto-waitcnt-before-barrier
it causes corruption on several different GPU generations.
Cc: 18.2 <[email protected]>
Reviewed-by: Samuel Pitoiset <[email protected]>
Diffstat (limited to 'src/amd/common')
| -rw-r--r-- | src/amd/common/ac_llvm_util.c | 7 | ||||
| -rw-r--r-- | src/amd/common/ac_llvm_util.h | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c index 42bc538b4d7..cd3525187a0 100644 --- a/src/amd/common/ac_llvm_util.c +++ b/src/amd/common/ac_llvm_util.c @@ -149,16 +149,13 @@ static 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 = (tm_options & AC_TM_AUTO_WAITCNT_BEFORE_BARRIER) && - family != CHIP_VEGA20; snprintf(features, sizeof(features), - "+DumpCode,+vgpr-spilling,-fp32-denormals,+fp64-denormals%s%s%s%s%s", + "+DumpCode,+vgpr-spilling,-fp32-denormals,+fp64-denormals%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" : "", - barrier_does_waitcnt ? ",+auto-waitcnt-before-barrier" : ""); + tm_options & AC_TM_PROMOTE_ALLOCA_TO_SCRATCH ? ",-promote-alloca" : ""); LLVMTargetMachineRef tm = LLVMCreateTargetMachine( target, diff --git a/src/amd/common/ac_llvm_util.h b/src/amd/common/ac_llvm_util.h index e252bed3bb6..eaf5f21876b 100644 --- a/src/amd/common/ac_llvm_util.h +++ b/src/amd/common/ac_llvm_util.h @@ -65,7 +65,6 @@ enum ac_target_machine_options { AC_TM_CHECK_IR = (1 << 5), AC_TM_ENABLE_GLOBAL_ISEL = (1 << 6), AC_TM_CREATE_LOW_OPT = (1 << 7), - AC_TM_AUTO_WAITCNT_BEFORE_BARRIER = (1 << 8), }; enum ac_float_mode { |