Remove old code paths from render-test (#1760)

* Remove old code paths from render-test

Historically, the `render-test` tool was using three different code paths:

* One based on `gfx` and manual (non-reflection-based) parameter setting, used for OpenGL, D3D11, D3D12, and Vulkan
* One for CPU that used reflection-based parameter setting but shared no code with the first
* One for CUDA that used reflection-based parameter setting and shared some, but not all, code with the CPU path

Recently we've updated `render-test` to include a fourth option:

* Using `gfx` and the "shader object" system it exposes for a unified reflection-based parameter-setting system taht works across OpenGL, D3D11, D3D12, Vulkan, CUDA, and CPU

This change removes the first three options and leaves only the single unified path. A sa result, a bunch of code in `render-test` is no longer needed, and the codebase no longer relies on things like the `IDescriptorSet`-related APIs in `gfx`.

Several existing tests had to be disabled to make this change possible. Those tests will need to be audited and either re-enabled once we fix issues in the shader object system, or permanently removed if they don't test stuff we intend to support in the long run (e.g., global-scope type parameters, which aren't a clear necessity).

* fixup: CUDA detection logic

33 files changed, 111 insertions, 67 deletions

diff --git a/tests/compute/dynamic-dispatch-12.slang b/tests/compute/dynamic-dispatch-12.slang
index 91dac501a..906a5da0e 100644
--- a/tests/compute/dynamic-dispatch-12.slang
+++ b/tests/compute/dynamic-dispatch-12.slang
@@ -5,10 +5,10 @@
 // doesn't work right on the shader object path for a bunch
 // of complicated reasons.
 
-//TEST(compute):COMPARE_COMPUTE:-dx11
-//TEST(compute):COMPARE_COMPUTE:-cpu
-//TEST(compute):COMPARE_COMPUTE:-vk
-//TEST(compute):COMPARE_COMPUTE:-cuda
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-dx11
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-vk
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-cuda
 
 [anyValueSize(8)]
 interface IInterface
diff --git a/tests/compute/dynamic-dispatch-13.slang b/tests/compute/dynamic-dispatch-13.slang
index b88ad2636..5acc981e1 100644
--- a/tests/compute/dynamic-dispatch-13.slang
+++ b/tests/compute/dynamic-dispatch-13.slang
@@ -1,9 +1,9 @@
 // Test using interface typed shader parameters wrapped inside a `StructuredBuffer`.
 
-//TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
-//TEST(compute):COMPARE_COMPUTE:-dx11
-//TEST(compute):COMPARE_COMPUTE:-vk
-//TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-dx11
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-vk
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
 
 [anyValueSize(8)]
 interface IInterface
diff --git a/tests/compute/dynamic-dispatch-14.slang b/tests/compute/dynamic-dispatch-14.slang
index 354006012..4dce1c2ed 100644
--- a/tests/compute/dynamic-dispatch-14.slang
+++ b/tests/compute/dynamic-dispatch-14.slang
@@ -1,9 +1,9 @@
 // Test using interface typed shader parameters with associated types.
 
-//TEST(compute):COMPARE_COMPUTE:-dx11
-//TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
-//TEST(compute):COMPARE_COMPUTE:-vk
-//TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-dx11
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-vk
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-cuda -shaderobj
 
 [anyValueSize(8)]
 interface IAssoc
diff --git a/tests/compute/dynamic-dispatch-bindless-texture.slang b/tests/compute/dynamic-dispatch-bindless-texture.slang
index d3d40b2c5..a4483c9e1 100644
--- a/tests/compute/dynamic-dispatch-bindless-texture.slang
+++ b/tests/compute/dynamic-dispatch-bindless-texture.slang
@@ -1,6 +1,6 @@
 // Test using interface typed shader parameters with texture typed fields.
-//TEST(compute):COMPARE_COMPUTE:-cpu
-//TEST(compute):COMPARE_COMPUTE:-cuda
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-cpu
+//DISABLED_TEST(compute):COMPARE_COMPUTE:-cuda
 
 [anyValueSize(16)]
 interface IInterface
diff --git a/tests/compute/entry-point-uniform-params.slang b/tests/compute/entry-point-uniform-params.slang
index db43f4ab7..8d91deeef 100644
--- a/tests/compute/entry-point-uniform-params.slang
+++ b/tests/compute/entry-point-uniform-params.slang
@@ -5,10 +5,10 @@
 
 //DISABLE_TEST:CPU_REFLECTION: -profile cs_5_0 -entry computeMain -target cpp
 //TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cpu
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cpu
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
+//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
 
 struct Signs
 {
diff --git a/tests/compute/global-type-param-array.slang b/tests/compute/global-type-param-array.slang
index f763f49fd..5d36e79f1 100644
--- a/tests/compute/global-type-param-array.slang
+++ b/tests/compute/global-type-param-array.slang
@@ -1,4 +1,4 @@
-//TEST(compute):COMPARE_COMPUTE:
+//DISABLED_TEST(compute):COMPARE_COMPUTE:
 
 //TEST_INPUT: cbuffer(data=[1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0 1.0], stride=4):name impl
 //TEST_INPUT: ubuffer(data=[0], stride=4):out,name outputBuffer
diff --git a/tests/compute/global-type-param1.slang b/tests/compute/global-type-param1.slang
index b5560e9d9..dea611ca4 100644
--- a/tests/compute/global-type-param1.slang
+++ b/tests/compute/global-type-param1.slang
@@ -1,4 +1,4 @@
-//TEST(smoke,compute):COMPARE_COMPUTE:
+//DISABLED_TEST(smoke,compute):COMPARE_COMPUTE:
 
 
 //TEST_INPUT: ubuffer(data=[0], stride=4):out,name outputBufer
diff --git a/tests/compute/global-type-param2.slang b/tests/compute/global-type-param2.slang
index 39701f16f..aa5d72db7 100644
--- a/tests/compute/global-type-param2.slang
+++ b/tests/compute/global-type-param2.slang
@@ -1,4 +1,4 @@
-//TEST(smoke,compute):COMPARE_COMPUTE:
+//DISABLED_TEST(smoke,compute):COMPARE_COMPUTE:
 
 //TEST_INPUT: ubuffer(data=[0], stride=4):out,name outputBuffer
 //TEST_INPUT: cbuffer(data=[0.5 0 0 0], stride=4):name existingBuffer
diff --git a/tests/compute/interface-shader-param-in-struct.slang b/tests/compute/interface-shader-param-in-struct.slang
index 7c2b078db..1098b4077 100644
--- a/tests/compute/interface-shader-param-in-struct.slang
+++ b/tests/compute/interface-shader-param-in-struct.slang
@@ -3,10 +3,10 @@
 // This test puts interface-type shader parameters
 // inside of structure types to make sure that works
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
+//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
 
 // A lot of the setup is the same as for `interface-shader-param`,
 // so look there if you want the comments.
diff --git a/tests/compute/interface-shader-param-legalization.slang b/tests/compute/interface-shader-param-legalization.slang
index 0c285a60f..717e786e3 100644
--- a/tests/compute/interface-shader-param-legalization.slang
+++ b/tests/compute/interface-shader-param-legalization.slang
@@ -3,7 +3,7 @@
 // Test case where concrete type implementing
 // an interface has resource-type fields nested in it.
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
 
 interface IModifier
 {
diff --git a/tests/compute/interface-shader-param.slang b/tests/compute/interface-shader-param.slang
index d4bc1d7fa..e57ff1bc6 100644
--- a/tests/compute/interface-shader-param.slang
+++ b/tests/compute/interface-shader-param.slang
@@ -3,10 +3,10 @@
 // Test using interface tops as top-level shader parameters
 // (whether global, or on an entry point).
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
+//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
 //DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
 
 // First we will define some fake interfaces for testing.
diff --git a/tests/compute/interface-shader-param2.slang b/tests/compute/interface-shader-param2.slang
index 6b33b4302..6560807ee 100644
--- a/tests/compute/interface-shader-param2.slang
+++ b/tests/compute/interface-shader-param2.slang
@@ -4,10 +4,10 @@
 // concrete types that have data within them, instead of
 // just empty types.
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
+//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
 
 // A lot of the setup is the same as for `interface-shader-param`,
 // so look there if you want the comments.
diff --git a/tests/compute/interface-shader-param3.slang b/tests/compute/interface-shader-param3.slang
index 2811e9fed..49ac48281 100644
--- a/tests/compute/interface-shader-param3.slang
+++ b/tests/compute/interface-shader-param3.slang
@@ -4,10 +4,10 @@
 // interface types at more complicated places in the overall layout.
 //
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
+//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
 
 // A lot of the setup is the same as for `interface-shader-param`,
 // so look there if you want the comments.
diff --git a/tests/compute/interface-shader-param4.slang b/tests/compute/interface-shader-param4.slang
index fe8e6b374..173119e30 100644
--- a/tests/compute/interface-shader-param4.slang
+++ b/tests/compute/interface-shader-param4.slang
@@ -5,10 +5,10 @@
 // shader parameters.
 //
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
 
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil
+//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
 
 // A lot of the setup is the same as for `interface-shader-param`,
 // so look there if you want the comments.
diff --git a/tests/compute/parameter-block.slang b/tests/compute/parameter-block.slang
index a6424134c..331eebf7c 100644
--- a/tests/compute/parameter-block.slang
+++ b/tests/compute/parameter-block.slang
@@ -1,5 +1,5 @@
-//TEST(compute):COMPARE_COMPUTE:
-//TEST(compute):COMPARE_COMPUTE:-cpu
+//TEST_DISABLED(compute):COMPARE_COMPUTE:
+//TEST_DISABLED(compute):COMPARE_COMPUTE:-cpu
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=block0.buffer
 //TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):name=block1.buffer
diff --git a/tests/compute/performance-profile.slang b/tests/compute/performance-profile.slang
index 24b0d04bd..5a8c3ad77 100644
--- a/tests/compute/performance-profile.slang
+++ b/tests/compute/performance-profile.slang
@@ -1,5 +1,5 @@
 //TEST(compute):PERFORMANCE_PROFILE:-cpu -compute -compile-arg -O3 -compute-dispatch 256,1,1  -shaderobj
-//TEST(compute):PERFORMANCE_PROFILE:-cpu -compute -source-language cpp -compile-arg -O3 -compute-dispatch 256,1,1
+//TEST_DISABLED(compute):PERFORMANCE_PROFILE:-cpu -compute -source-language cpp -compile-arg -O3 -compute-dispatch 256,1,1
 //TEST(compute):PERFORMANCE_PROFILE:-slang -compute -compute-dispatch 256,1,1 -shaderobj
 //TEST(compute):PERFORMANCE_PROFILE:-slang -compute -dx12 -compute-dispatch 256,1,1 -shaderobj
 //TEST(compute, vulkan):PERFORMANCE_PROFILE:-vk -compute -compute-dispatch 256,1,1 -shaderobj
diff --git a/tests/compute/rewriter-parameter-block-complex.hlsl b/tests/compute/rewriter-parameter-block-complex.hlsl
index d61383276..934bc167d 100644
--- a/tests/compute/rewriter-parameter-block-complex.hlsl
+++ b/tests/compute/rewriter-parameter-block-complex.hlsl
@@ -1,4 +1,4 @@
-//TEST(compute):COMPARE_COMPUTE:
+//DISABLED_TEST(compute):COMPARE_COMPUTE:
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out, name=outputBuffer
 
diff --git a/tests/compute/rewriter-parameter-block.hlsl b/tests/compute/rewriter-parameter-block.hlsl
index 825d8ba6e..cd9a5a84d 100644
--- a/tests/compute/rewriter-parameter-block.hlsl
+++ b/tests/compute/rewriter-parameter-block.hlsl
@@ -1,4 +1,4 @@
-//TEST(compute):COMPARE_COMPUTE:
+//DISABLED_TEST(compute):COMPARE_COMPUTE:
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out
 
diff --git a/tests/compute/tagged-union.slang b/tests/compute/tagged-union.slang
index b5219c72a..91f0cd101 100644
--- a/tests/compute/tagged-union.slang
+++ b/tests/compute/tagged-union.slang
@@ -1,7 +1,7 @@
 // tagged-union.slang
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
-//TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
-//TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12
+//DISABLED_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute
 
 
 // The goal of this test is to show that we can generate
diff --git a/tests/compute/type-param-varying.slang b/tests/compute/type-param-varying.slang
index 09b97abd1..c4209d26c 100644
--- a/tests/compute/type-param-varying.slang
+++ b/tests/compute/type-param-varying.slang
@@ -1,4 +1,4 @@
-//TEST(compute):COMPARE_RENDER_COMPUTE:
+//DISABLED_TEST(compute):COMPARE_RENDER_COMPUTE:
 
 //TEST_INPUT: global_type AssembledVertex
 //TEST_INPUT: ubuffer(data=[0], stride=4):out
diff --git a/tests/compute/unbounded-array-of-array-syntax.slang b/tests/compute/unbounded-array-of-array-syntax.slang
index 08ed17106..887b95d07 100644
--- a/tests/compute/unbounded-array-of-array-syntax.slang
+++ b/tests/compute/unbounded-array-of-array-syntax.slang
@@ -1,8 +1,8 @@
 //IGNORE_TEST:CPU_REFLECTION: -profile cs_5_0 -entry computeMain -target cpp
-//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
 //TEST:CROSS_COMPILE:-target dxbc-assembly -entry computeMain -profile cs_5_1
 //TEST:CROSS_COMPILE:-target spirv-assembly -entry computeMain -profile cs_5_1
-//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/compute/unbounded-array-of-array.slang b/tests/compute/unbounded-array-of-array.slang
index d5071d876..5d5b41f5a 100644
--- a/tests/compute/unbounded-array-of-array.slang
+++ b/tests/compute/unbounded-array-of-array.slang
@@ -1,5 +1,5 @@
 //DISABLE_TEST:CPU_REFLECTION: -profile cs_5_0 -entry computeMain -target cpp 
-//TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
+//DISABLED_TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute
 
 struct IntAoa { RWStructuredBuffer<int> array[]; }
 
diff --git a/tests/disabled-tests.txt b/tests/disabled-tests.txt
new file mode 100644
index 000000000..5fa9d98b0
--- /dev/null
+++ b/tests/disabled-tests.txt
@@ -0,0 +1,44 @@
+Tests that were disabled for Reasons
+====================================
+
+This document is intended to track tests that have been disabled temporarily so that we can understand the cause and try to re-enable them when possible.
+
+Test that don't work with shader objects in render-test
+-------------------------------------------------------
+
+The following tests were disabled because they had been running on non `-shaderobj` code paths that have since been removed.
+These tests will need to be re-enabled together with changes to the shader object implementation, or removed entirely if they no longer test useful functionality.
+
+* compute/dynamic-dispatch-12.slang
+* compute/dynamic-dispatch-13.slang
+* compute/dynamic-dispatch-14.slang
+* compute/dynamic-dispatch-bindless-texture.slang
+* compute/entry-point-uniform-params.slang
+* compute/global-type-param2.slang
+* compute/global-type-param-array.slang
+* compute/global-type-param1.slang
+* compute/interface-shader-param-in-struct.slang
+* compute/interface-shader-param-legalization.slang
+* compute/interface-shader-param.slang
+* compute/parameter-block.slang
+* compute/performance-profile.slang
+* compute/rewriter-parameter-block-complex.hlsl
+* compute/unbounded-array-of-array-syntax.slang
+* compute/unbounded-array-of-array.slang
+* render/cross-compile-entry-point.slang
+* compute/interface-shader-param2.slang
+* compute/interface-shader-param3.slang
+* compute/interface-shader-param4.slang
+* compute/rewriter-parameter-block.hlsl
+* compute/tagged-union.slang
+* compute/type-param-varying.slang
+* language-feature/shader-params/global-uniform-params.slang
+* tests/serialization/serialized-module-entry-point-test.slang
+* serialization/library-entry-point/library-entry-point-test.slang
+* render/cross-compile-entry-point.slang
+* render/cross-compile0.hlsl
+* render/imported-parameters.hlsl
+* render/nointerpolation.hlsl
+* render/render0.hlsl
+* render/tess.hlsl
+* render/unused-discard.hlsl
diff --git a/tests/language-feature/shader-params/global-uniform-params.slang b/tests/language-feature/shader-params/global-uniform-params.slang
index 6b4e5a834..fff82136a 100644
--- a/tests/language-feature/shader-params/global-uniform-params.slang
+++ b/tests/language-feature/shader-params/global-uniform-params.slang
@@ -1,6 +1,6 @@
 // global-uniform-params.slang
 
-//TEST(compute):COMPARE_COMPUTE:
+//DISABLED_TEST(compute):COMPARE_COMPUTE:
 
 // Test that code can use uniform parameters
 // of "ordinary" type declared at the global scope
diff --git a/tests/render/cross-compile-entry-point.slang b/tests/render/cross-compile-entry-point.slang
index fa35833f0..24d3c711d 100644
--- a/tests/render/cross-compile-entry-point.slang
+++ b/tests/render/cross-compile-entry-point.slang
@@ -1,5 +1,5 @@
-//TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER:
-//TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER: -dx12
+//DISABLED_TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER:
+//DISABLED_TEST(render):COMPARE_HLSL_CROSS_COMPILE_RENDER: -dx12
 
 // This is a test to ensure that we can cross-compile a complete entry point.
 
diff --git a/tests/render/cross-compile0.hlsl b/tests/render/cross-compile0.hlsl
index 3d25c93e5..33eb8a460 100644
--- a/tests/render/cross-compile0.hlsl
+++ b/tests/render/cross-compile0.hlsl
@@ -1,5 +1,5 @@
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
 
 // This is a basic test case for cross-compilation behavior.
 //
diff --git a/tests/render/imported-parameters.hlsl b/tests/render/imported-parameters.hlsl
index 0bee75bf9..40ea18e2a 100644
--- a/tests/render/imported-parameters.hlsl
+++ b/tests/render/imported-parameters.hlsl
@@ -1,5 +1,5 @@
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
 
 // This test is trying to ensure that we can
 // correctly handle cases where top-level shader
diff --git a/tests/render/nointerpolation.hlsl b/tests/render/nointerpolation.hlsl
index 644692e36..0819849ac 100644
--- a/tests/render/nointerpolation.hlsl
+++ b/tests/render/nointerpolation.hlsl
@@ -1,5 +1,5 @@
-//TEST(smoke):COMPARE_HLSL_RENDER:
-//TEST(smoke):COMPARE_HLSL_RENDER: -dx12
+//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER:
+//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER: -dx12
 
 // Confirm that the `nointerpolation` modifier
 // makes it through Slang codegen with the
diff --git a/tests/render/render0.hlsl b/tests/render/render0.hlsl
index e6849fe60..967f23adb 100644
--- a/tests/render/render0.hlsl
+++ b/tests/render/render0.hlsl
@@ -1,4 +1,4 @@
-//TEST(smoke):COMPARE_HLSL_RENDER:
+//DISABLED_TEST(smoke):COMPARE_HLSL_RENDER:
 // Starting with a basic test for the ability to render stuff...
 
 cbuffer Uniforms
diff --git a/tests/render/tess.hlsl b/tests/render/tess.hlsl
index 873c0bc8c..3d3e87c34 100644
--- a/tests/render/tess.hlsl
+++ b/tests/render/tess.hlsl
@@ -1,4 +1,4 @@
-//TEST:COMPARE_HLSL: -profile sm_5_1 -entry HS -stage hull -entry DS -stage domain
+//DISABLED_TEST:COMPARE_HLSL: -profile sm_5_1 -entry HS -stage hull -entry DS -stage domain
 
 // tests/render/tess.hlsl
 
diff --git a/tests/render/unused-discard.hlsl b/tests/render/unused-discard.hlsl
index 2a99b77bb..e94391ec9 100644
--- a/tests/render/unused-discard.hlsl
+++ b/tests/render/unused-discard.hlsl
@@ -1,5 +1,5 @@
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
-//TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER:
+//DISABLED_TEST(smoke,render):COMPARE_HLSL_GLSL_RENDER: -dx12
 
 // This is a basic test case for cross-compilation behavior.
 //
diff --git a/tests/serialization/library-entry-point/library-entry-point-test.slang b/tests/serialization/library-entry-point/library-entry-point-test.slang
index 9953c48b9..17c3d4967 100644
--- a/tests/serialization/library-entry-point/library-entry-point-test.slang
+++ b/tests/serialization/library-entry-point/library-entry-point-test.slang
@@ -1,7 +1,7 @@
 // library-entry-point-test.slang
 
-//TEST:COMPILE: -module-name module -no-codegen -profile cs_5_0 -entry computeMain tests/serialization/library-entry-point/library-entry-point.slang -o tests/serialization/library-entry-point/library-entry-point.slang-lib
-//TEST:COMPARE_COMPUTE_EX: -no-default-entry-point -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/library-entry-point/library-entry-point.slang-lib
+//DISABLED_TEST:COMPILE: -module-name module -no-codegen -profile cs_5_0 -entry computeMain tests/serialization/library-entry-point/library-entry-point.slang -o tests/serialization/library-entry-point/library-entry-point.slang-lib
+//DISABLED_TEST:COMPARE_COMPUTE_EX: -no-default-entry-point -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/library-entry-point/library-entry-point.slang-lib
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 ], stride=4):out,name outputBuffer
 
diff --git a/tests/serialization/serialized-module-entry-point-test.slang b/tests/serialization/serialized-module-entry-point-test.slang
index b0b96c07a..7f20e0a43 100644
--- a/tests/serialization/serialized-module-entry-point-test.slang
+++ b/tests/serialization/serialized-module-entry-point-test.slang
@@ -1,7 +1,7 @@
 // serialized-module-entry-point-test.slang
 
-//TEST:COMPILE: -module-name module -target hlsl -profile cs_5_0 -entry computeMain tests/serialization/serialized-module-entry-point.slang -o tests/serialization/serialized-module-entry-point.slang-module
-//TEST:COMPILE: -module-name module tests/serialization/serialized-module.slang -o tests/serialization/serialized-module.slang-module -ir-compression none
-//TEST:COMPARE_COMPUTE_EX: -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/serialized-module-entry-point.slang-module -xslang -r -xslang tests/serialization/serialized-module.slang-module -no-default-entry-point
+//DISABLED_TEST:COMPILE: -module-name module -target hlsl -profile cs_5_0 -entry computeMain tests/serialization/serialized-module-entry-point.slang -o tests/serialization/serialized-module-entry-point.slang-module
+//DISABLED_TEST:COMPILE: -module-name module tests/serialization/serialized-module.slang -o tests/serialization/serialized-module.slang-module -ir-compression none
+//DISABLED_TEST:COMPARE_COMPUTE_EX: -xslang -module-name -xslang module -slang -compute -xslang -r -xslang tests/serialization/serialized-module-entry-point.slang-module -xslang -r -xslang tests/serialization/serialized-module.slang-module -no-default-entry-point
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 ], stride=4):out,name outputBuffer