radv: enable sisched toggle in perftest flags.

RADV_PERFTEST=sisched

to enable it.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/amd/common/ac_llvm_util.c b/src/amd/common/ac_llvm_util.c
index 84ed73f164e1d3f9553c8fc3cd5ce5b950c38dcb..d14057fa7680441e68a8f03f1d49db8a6c9fd83f 100644 (file)
--- a/src/amd/common/ac_llvm_util.c
+++ b/src/amd/common/ac_llvm_util.c
@@ -126,8 +126,9 @@ LLVMTargetMachineRef ac_create_target_machine(enum radeon_family family, enum ac
        LLVMTargetRef target = ac_get_llvm_target(triple);
 
        snprintf(features, sizeof(features),
-                "+DumpCode,+vgpr-spilling,-fp32-denormals%s",
-                family >= CHIP_VEGA10 ? ",+xnack" : ",-xnack");
+                "+DumpCode,+vgpr-spilling,-fp32-denormals%s%s",
+                family >= CHIP_VEGA10 ? ",+xnack" : ",-xnack",
+                tm_options & AC_TM_SISCHED ? ",+si-scheduler" : "");
        
        LLVMTargetMachineRef tm = LLVMCreateTargetMachine(
                                     target,

diff --git a/src/amd/common/ac_llvm_util.h b/src/amd/common/ac_llvm_util.h
index 06208a41ce85758840183ce450191c30c10b3878..21f3e8377476fd8741a5be143a9e5b9e750951be 100644 (file)
--- a/src/amd/common/ac_llvm_util.h
+++ b/src/amd/common/ac_llvm_util.h
@@ -56,6 +56,7 @@ enum ac_func_attr {
 
 enum ac_target_machine_options {
        AC_TM_SUPPORTS_SPILL = (1 << 0),
+       AC_TM_SISCHED = (1 << 1),
 };
 LLVMTargetMachineRef ac_create_target_machine(enum radeon_family family, enum ac_target_machine_options tm_options);
 

diff --git a/src/amd/vulkan/radv_debug.h b/src/amd/vulkan/radv_debug.h
index c986c7bc9d7b8883e126bce6e2a1b0d84c04913a..c345d040c5d1e0bf5189c6745f89559f22e7ad23 100644 (file)
--- a/src/amd/vulkan/radv_debug.h
+++ b/src/amd/vulkan/radv_debug.h
@@ -39,5 +39,6 @@ enum {
 
 enum {
        RADV_PERFTEST_BATCHCHAIN     =   0x1,
+       RADV_PERFTEST_SISCHED        =   0x2,
 };
 #endif

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 8cf544276346fe8b494015813d523cf8ff02c779..d1c519a1b7afce07cd3458b097daaefbb48985c3 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -370,6 +370,7 @@ static const struct debug_control radv_debug_options[] = {
 
 static const struct debug_control radv_perftest_options[] = {
        {"batchchain", RADV_PERFTEST_BATCHCHAIN},
+       {"sisched", RADV_PERFTEST_SISCHED},
        {NULL, 0}
 };
 

diff --git a/src/amd/vulkan/radv_pipeline.c b/src/amd/vulkan/radv_pipeline.c
index 71a5cce4e9c30219dd24515aafbec90fb62049eb..90cd716047a4a4627a30040690b6638ec3c38351 100644 (file)
--- a/src/amd/vulkan/radv_pipeline.c
+++ b/src/amd/vulkan/radv_pipeline.c
@@ -467,6 +467,8 @@ static struct radv_shader_variant *radv_shader_variant_create(struct radv_device
        options.supports_spill = device->llvm_supports_spill;
        if (options.supports_spill)
                tm_options |= AC_TM_SUPPORTS_SPILL;
+       if (device->instance->perftest_flags & RADV_PERFTEST_SISCHED)
+               tm_options |= AC_TM_SISCHED;
        tm = ac_create_target_machine(chip_family, tm_options);
        ac_compile_nir_shader(tm, &binary, &variant->config,
                              &variant->info, shader, &options, dump);
@@ -508,6 +510,8 @@ radv_pipeline_create_gs_copy_shader(struct radv_pipeline *pipeline,
        options.chip_class = pipeline->device->physical_device->rad_info.chip_class;
        if (options.supports_spill)
                tm_options |= AC_TM_SUPPORTS_SPILL;
+       if (pipeline->device->instance->perftest_flags & RADV_PERFTEST_SISCHED)
+               tm_options |= AC_TM_SISCHED;
        tm = ac_create_target_machine(chip_family, tm_options);
        ac_create_gs_copy_shader(tm, nir, &binary, &variant->config, &variant->info, &options, dump_shader);
        LLVMDisposeTargetMachine(tm);