radv: remove RADV_DEBUG=nosisched and RADV_PERFTEST=sisched

They are no longer useful.

Signed-off-by: Samuel Pitoiset <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3789>

5 files changed, 32 insertions, 43 deletions

diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index 73833491b08..97bd0deb7fe 100644
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -41,38 +41,36 @@ enum {
 	RADV_DEBUG_VM_FAULTS         = 0x400,
 	RADV_DEBUG_ZERO_VRAM         = 0x800,
 	RADV_DEBUG_SYNC_SHADERS      = 0x1000,
-	RADV_DEBUG_NO_SISCHED        = 0x2000,
-	RADV_DEBUG_PREOPTIR          = 0x4000,
-	RADV_DEBUG_NO_DYNAMIC_BOUNDS = 0x8000,
-	RADV_DEBUG_NO_OUT_OF_ORDER   = 0x10000,
-	RADV_DEBUG_INFO              = 0x20000,
-	RADV_DEBUG_ERRORS            = 0x40000,
-	RADV_DEBUG_STARTUP           = 0x80000,
-	RADV_DEBUG_CHECKIR           = 0x100000,
-	RADV_DEBUG_NOTHREADLLVM      = 0x200000,
-	RADV_DEBUG_NOBINNING         = 0x400000,
-	RADV_DEBUG_NO_LOAD_STORE_OPT = 0x800000,
-	RADV_DEBUG_NO_NGG            = 0x1000000,
-	RADV_DEBUG_NO_SHADER_BALLOT  = 0x2000000,
-	RADV_DEBUG_ALL_ENTRYPOINTS   = 0x4000000,
-	RADV_DEBUG_DUMP_META_SHADERS = 0x8000000,
-	RADV_DEBUG_NO_MEMORY_CACHE   = 0x10000000,
-	RADV_DEBUG_NOOP              = 0x20000000,
+	RADV_DEBUG_PREOPTIR          = 0x2000,
+	RADV_DEBUG_NO_DYNAMIC_BOUNDS = 0x4000,
+	RADV_DEBUG_NO_OUT_OF_ORDER   = 0x8000,
+	RADV_DEBUG_INFO              = 0x10000,
+	RADV_DEBUG_ERRORS            = 0x20000,
+	RADV_DEBUG_STARTUP           = 0x40000,
+	RADV_DEBUG_CHECKIR           = 0x80000,
+	RADV_DEBUG_NOTHREADLLVM      = 0x100000,
+	RADV_DEBUG_NOBINNING         = 0x200000,
+	RADV_DEBUG_NO_LOAD_STORE_OPT = 0x400000,
+	RADV_DEBUG_NO_NGG            = 0x800000,
+	RADV_DEBUG_NO_SHADER_BALLOT  = 0x1000000,
+	RADV_DEBUG_ALL_ENTRYPOINTS   = 0x2000000,
+	RADV_DEBUG_DUMP_META_SHADERS = 0x4000000,
+	RADV_DEBUG_NO_MEMORY_CACHE   = 0x8000000,
+	RADV_DEBUG_NOOP              = 0x10000000,
 };
 
 enum {
 	RADV_PERFTEST_NO_BATCHCHAIN   =    0x1,
-	RADV_PERFTEST_SISCHED         =    0x2,
-	RADV_PERFTEST_LOCAL_BOS       =    0x4,
-	RADV_PERFTEST_DCC_MSAA        =    0x8,
-	RADV_PERFTEST_BO_LIST         =   0x10,
-	RADV_PERFTEST_SHADER_BALLOT   =   0x20,
-	RADV_PERFTEST_TC_COMPAT_CMASK =   0x40,
-	RADV_PERFTEST_CS_WAVE_32      =   0x80,
-	RADV_PERFTEST_PS_WAVE_32      =  0x100,
-	RADV_PERFTEST_GE_WAVE_32      =  0x200,
-	RADV_PERFTEST_DFSM            =  0x400,
-	RADV_PERFTEST_ACO             =  0x800,
+	RADV_PERFTEST_LOCAL_BOS       =    0x2,
+	RADV_PERFTEST_DCC_MSAA        =    0x4,
+	RADV_PERFTEST_BO_LIST         =    0x8,
+	RADV_PERFTEST_SHADER_BALLOT   =   0x10,
+	RADV_PERFTEST_TC_COMPAT_CMASK =   0x20,
+	RADV_PERFTEST_CS_WAVE_32      =   0x40,
+	RADV_PERFTEST_PS_WAVE_32      =   0x80,
+	RADV_PERFTEST_GE_WAVE_32      =  0x100,
+	RADV_PERFTEST_DFSM            =  0x200,
+	RADV_PERFTEST_ACO             =  0x400,
 };
 
 bool
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 2637a0edfc0..40742543e05 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -414,9 +414,7 @@ radv_physical_device_init(struct radv_physical_device *device,
 	}
 
 	/* These flags affect shader compilation. */
-	uint64_t shader_env_flags =
-		(device->instance->perftest_flags & RADV_PERFTEST_SISCHED ? 0x1 : 0) |
-		(device->use_aco ? 0x2 : 0);
+	uint64_t shader_env_flags = (device->use_aco ? 0x2 : 0);
 
 	/* The gpu id is already embedded in the uuid so we just pass "radv"
 	 * when creating the cache.
@@ -547,7 +545,6 @@ static const struct debug_control radv_debug_options[] = {
 	{"vmfaults", RADV_DEBUG_VM_FAULTS},
 	{"zerovram", RADV_DEBUG_ZERO_VRAM},
 	{"syncshaders", RADV_DEBUG_SYNC_SHADERS},
-	{"nosisched", RADV_DEBUG_NO_SISCHED},
 	{"preoptir", RADV_DEBUG_PREOPTIR},
 	{"nodynamicbounds", RADV_DEBUG_NO_DYNAMIC_BOUNDS},
 	{"nooutoforder", RADV_DEBUG_NO_OUT_OF_ORDER},
@@ -576,7 +573,6 @@ radv_get_debug_option_name(int id)
 
 static const struct debug_control radv_perftest_options[] = {
 	{"nobatchchain", RADV_PERFTEST_NO_BATCHCHAIN},
-	{"sisched", RADV_PERFTEST_SISCHED},
 	{"localbos", RADV_PERFTEST_LOCAL_BOS},
 	{"dccmsaa", RADV_PERFTEST_DCC_MSAA},
 	{"bolist", RADV_PERFTEST_BO_LIST},
diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index c3c69b34015..8055ee95568 100644
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -218,8 +218,6 @@ static uint32_t get_hash_flags(struct radv_device *device)
 
 	if (device->instance->debug_flags & RADV_DEBUG_NO_NGG)
 		hash_flags |= RADV_HASH_SHADER_NO_NGG;
-	if (device->instance->perftest_flags & RADV_PERFTEST_SISCHED)
-		hash_flags |= RADV_HASH_SHADER_SISCHED;
 	if (device->physical_device->cs_wave_size == 32)
 		hash_flags |= RADV_HASH_SHADER_CS_WAVE32;
 	if (device->physical_device->ps_wave_size == 32)
diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index af2f05859a1..1c3b16d9b45 100644
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -1538,12 +1538,11 @@ struct radv_event {
 struct radv_shader_module;
 
 #define RADV_HASH_SHADER_IS_GEOM_COPY_SHADER (1 << 0)
-#define RADV_HASH_SHADER_SISCHED             (1 << 1)
-#define RADV_HASH_SHADER_NO_NGG              (1 << 2)
-#define RADV_HASH_SHADER_CS_WAVE32           (1 << 3)
-#define RADV_HASH_SHADER_PS_WAVE32           (1 << 4)
-#define RADV_HASH_SHADER_GE_WAVE32           (1 << 5)
-#define RADV_HASH_SHADER_ACO                 (1 << 6)
+#define RADV_HASH_SHADER_NO_NGG              (1 << 1)
+#define RADV_HASH_SHADER_CS_WAVE32           (1 << 2)
+#define RADV_HASH_SHADER_PS_WAVE32           (1 << 3)
+#define RADV_HASH_SHADER_GE_WAVE32           (1 << 4)
+#define RADV_HASH_SHADER_ACO                 (1 << 5)
 
 void
 radv_hash_shaders(unsigned char *hash,
diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
index f20a8849c8a..cad95f830aa 100644
--- a/src/amd/vulkan/radv_shader.c
+++ b/src/amd/vulkan/radv_shader.c
@@ -1122,8 +1122,6 @@ shader_variant_compile(struct radv_device *device,
 		bool thread_compiler;
 
 		tm_options |= AC_TM_SUPPORTS_SPILL;
-		if (device->instance->perftest_flags & RADV_PERFTEST_SISCHED)
-			tm_options |= AC_TM_SISCHED;
 		if (options->check_ir)
 			tm_options |= AC_TM_CHECK_IR;
 		if (device->instance->debug_flags & RADV_DEBUG_NO_LOAD_STORE_OPT)