From 771f16cf6166a3911d374c3de6c19687605f1fef Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 5 Mar 2020 11:15:57 +0100 Subject: radeonsi: remove AMD_DEBUG=sisched option MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit sisched is not maintained anymore in LLVM. Reviewed-by: Marek Olšák Reviewed-by: Samuel Pitoiset Tested-by: Marge Bot Part-of: --- src/amd/llvm/ac_llvm_util.c | 3 +-- src/amd/llvm/ac_llvm_util.h | 17 ++++++++--------- 2 files changed, 9 insertions(+), 11 deletions(-) (limited to 'src/amd') diff --git a/src/amd/llvm/ac_llvm_util.c b/src/amd/llvm/ac_llvm_util.c index ddc8fee839b..5cdb51242b2 100644 --- a/src/amd/llvm/ac_llvm_util.c +++ b/src/amd/llvm/ac_llvm_util.c @@ -169,10 +169,9 @@ static LLVMTargetMachineRef ac_create_target_machine(enum radeon_family family, LLVMTargetRef target = ac_get_llvm_target(triple); snprintf(features, sizeof(features), - "+DumpCode,-fp32-denormals,+fp64-denormals%s%s%s%s%s%s", + "+DumpCode,-fp32-denormals,+fp64-denormals%s%s%s%s%s", family >= CHIP_NAVI10 && !(tm_options & AC_TM_WAVE32) ? ",+wavefrontsize64,-wavefrontsize32" : "", - 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" : "", diff --git a/src/amd/llvm/ac_llvm_util.h b/src/amd/llvm/ac_llvm_util.h index de4ccfb2b99..00372476d8e 100644 --- a/src/amd/llvm/ac_llvm_util.h +++ b/src/amd/llvm/ac_llvm_util.h @@ -58,15 +58,14 @@ enum ac_func_attr { enum ac_target_machine_options { AC_TM_SUPPORTS_SPILL = (1 << 0), - AC_TM_SISCHED = (1 << 1), - AC_TM_FORCE_ENABLE_XNACK = (1 << 2), - AC_TM_FORCE_DISABLE_XNACK = (1 << 3), - AC_TM_PROMOTE_ALLOCA_TO_SCRATCH = (1 << 4), - AC_TM_CHECK_IR = (1 << 5), - AC_TM_ENABLE_GLOBAL_ISEL = (1 << 6), - AC_TM_CREATE_LOW_OPT = (1 << 7), - AC_TM_NO_LOAD_STORE_OPT = (1 << 8), - AC_TM_WAVE32 = (1 << 9), + AC_TM_FORCE_ENABLE_XNACK = (1 << 1), + AC_TM_FORCE_DISABLE_XNACK = (1 << 2), + AC_TM_PROMOTE_ALLOCA_TO_SCRATCH = (1 << 3), + AC_TM_CHECK_IR = (1 << 4), + AC_TM_ENABLE_GLOBAL_ISEL = (1 << 5), + AC_TM_CREATE_LOW_OPT = (1 << 6), + AC_TM_NO_LOAD_STORE_OPT = (1 << 7), + AC_TM_WAVE32 = (1 << 8), }; enum ac_float_mode { -- cgit v1.2.3