Enable tests for CUDA (#7593)

Enable intrinsic tests for cuda. Most of these tests were either
disabled or just not enabled for cuda.

Fixes #7592

Co-authored-by: Ellie Hermaszewska <ellieh@nvidia.com>

46 files changed, 52 insertions, 13 deletions

diff --git a/tests/hlsl-intrinsic/active-mask/switch.slang b/tests/hlsl-intrinsic/active-mask/switch.slang
index 280388c68..3b6acc4b4 100644
--- a/tests/hlsl-intrinsic/active-mask/switch.slang
+++ b/tests/hlsl-intrinsic/active-mask/switch.slang
@@ -6,12 +6,7 @@
 //DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj
 //DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -xslang -DHACK -shaderobj
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -xslang -DHACK -shaderobj
-
-// Note: this test is currently disabled on the CUDA
-// target because we do not synthesize the active
-// mask value we want/expect to see.
-//
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0
+//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name buffer
 RWStructuredBuffer<int> buffer;
diff --git a/tests/hlsl-intrinsic/atomic/atomic-intrinsics.slang b/tests/hlsl-intrinsic/atomic/atomic-intrinsics.slang
index 390b66be2..063dd5112 100644
--- a/tests/hlsl-intrinsic/atomic/atomic-intrinsics.slang
+++ b/tests/hlsl-intrinsic/atomic/atomic-intrinsics.slang
@@ -3,7 +3,7 @@
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=VK):-vk -emit-spirv-directly -compute -shaderobj -output-using-type -render-feature hardware-device -xslang -DVK
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=VK):-vk -emit-spirv-via-glsl -compute -shaderobj -output-using-type -render-feature hardware-device -xslang -DVK -xslang -minimum-slang-optimization
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=VK):-vk -emit-spirv-via-glsl -compute -shaderobj -output-using-type -render-feature hardware-device -xslang -DVK
-//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CUDA):-cuda -compute -shaderobj -output-using-type
 
 
 //TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):name=uintBuffer
@@ -279,4 +279,8 @@ void computeMain(uint groupIndex : SV_GroupIndex, int3 dispatchThreadID: SV_Disp
 // VK: 184
 // VK: 207
 // VK: 230
-// VK: 253
\ No newline at end of file
+// VK: 253
+// CUDA: 184
+// CUDA: 207
+// CUDA: 230
+// CUDA: 253
\ No newline at end of file
diff --git a/tests/hlsl-intrinsic/matrix-cast-to-vector.slang b/tests/hlsl-intrinsic/matrix-cast-to-vector.slang
index 1ae064f26..522f3ce11 100644
--- a/tests/hlsl-intrinsic/matrix-cast-to-vector.slang
+++ b/tests/hlsl-intrinsic/matrix-cast-to-vector.slang
@@ -2,6 +2,7 @@
 //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-slang -compute -dx12 -use-dxil -shaderobj -xslang -matrix-layout-column-major
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -shaderobj -xslang -matrix-layout-row-major
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -shaderobj -xslang -matrix-layout-column-major
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-cuda -compute -shaderobj
 
 //TEST_INPUT:ubuffer(data=[0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-abs.slang b/tests/hlsl-intrinsic/scalar-double-abs.slang
index c4b7e65ed..12c53c258 100644
--- a/tests/hlsl-intrinsic/scalar-double-abs.slang
+++ b/tests/hlsl-intrinsic/scalar-double-abs.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-acos.slang b/tests/hlsl-intrinsic/scalar-double-acos.slang
index da875f895..96d0ed070 100644
--- a/tests/hlsl-intrinsic/scalar-double-acos.slang
+++ b/tests/hlsl-intrinsic/scalar-double-acos.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-asdouble.slang b/tests/hlsl-intrinsic/scalar-double-asdouble.slang
index 1aca3867a..889c8e9fc 100644
--- a/tests/hlsl-intrinsic/scalar-double-asdouble.slang
+++ b/tests/hlsl-intrinsic/scalar-double-asdouble.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-asin.slang b/tests/hlsl-intrinsic/scalar-double-asin.slang
index 37a493fac..890d54085 100644
--- a/tests/hlsl-intrinsic/scalar-double-asin.slang
+++ b/tests/hlsl-intrinsic/scalar-double-asin.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-asuint.slang b/tests/hlsl-intrinsic/scalar-double-asuint.slang
index b2fab7c7d..89a1919a3 100644
--- a/tests/hlsl-intrinsic/scalar-double-asuint.slang
+++ b/tests/hlsl-intrinsic/scalar-double-asuint.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-atan.slang b/tests/hlsl-intrinsic/scalar-double-atan.slang
index 02af3f7ea..4ad208040 100644
--- a/tests/hlsl-intrinsic/scalar-double-atan.slang
+++ b/tests/hlsl-intrinsic/scalar-double-atan.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-atan2.slang b/tests/hlsl-intrinsic/scalar-double-atan2.slang
index f806ef8d2..6394453fa 100644
--- a/tests/hlsl-intrinsic/scalar-double-atan2.slang
+++ b/tests/hlsl-intrinsic/scalar-double-atan2.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-ceil.slang b/tests/hlsl-intrinsic/scalar-double-ceil.slang
index 73f7862cf..195b80df6 100644
--- a/tests/hlsl-intrinsic/scalar-double-ceil.slang
+++ b/tests/hlsl-intrinsic/scalar-double-ceil.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-clamp.slang b/tests/hlsl-intrinsic/scalar-double-clamp.slang
index f123c52b4..ea8c67bb8 100644
--- a/tests/hlsl-intrinsic/scalar-double-clamp.slang
+++ b/tests/hlsl-intrinsic/scalar-double-clamp.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-cos.slang b/tests/hlsl-intrinsic/scalar-double-cos.slang
index c7f0abe25..ee34af4bf 100644
--- a/tests/hlsl-intrinsic/scalar-double-cos.slang
+++ b/tests/hlsl-intrinsic/scalar-double-cos.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-d3d-intrinsic.slang b/tests/hlsl-intrinsic/scalar-double-d3d-intrinsic.slang
index 5df6dce91..02c63a540 100644
--- a/tests/hlsl-intrinsic/scalar-double-d3d-intrinsic.slang
+++ b/tests/hlsl-intrinsic/scalar-double-d3d-intrinsic.slang
@@ -42,4 +42,4 @@ void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
     }
     
     outputBuffer[idx] = ft;
-}
\ No newline at end of file
+}
diff --git a/tests/hlsl-intrinsic/scalar-double-exp.slang b/tests/hlsl-intrinsic/scalar-double-exp.slang
index 6748bbcdd..da575ce59 100644
--- a/tests/hlsl-intrinsic/scalar-double-exp.slang
+++ b/tests/hlsl-intrinsic/scalar-double-exp.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-exp2.slang b/tests/hlsl-intrinsic/scalar-double-exp2.slang
index 2bf2d5db7..f94913f83 100644
--- a/tests/hlsl-intrinsic/scalar-double-exp2.slang
+++ b/tests/hlsl-intrinsic/scalar-double-exp2.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-floor.slang b/tests/hlsl-intrinsic/scalar-double-floor.slang
index 75f079284..5964a96a7 100644
--- a/tests/hlsl-intrinsic/scalar-double-floor.slang
+++ b/tests/hlsl-intrinsic/scalar-double-floor.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-frac.slang b/tests/hlsl-intrinsic/scalar-double-frac.slang
index 85aa81cb9..f79d9cf3d 100644
--- a/tests/hlsl-intrinsic/scalar-double-frac.slang
+++ b/tests/hlsl-intrinsic/scalar-double-frac.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-ldexp.slang b/tests/hlsl-intrinsic/scalar-double-ldexp.slang
index ebd1c9d6c..5d27b0ebd 100644
--- a/tests/hlsl-intrinsic/scalar-double-ldexp.slang
+++ b/tests/hlsl-intrinsic/scalar-double-ldexp.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-lerp.slang b/tests/hlsl-intrinsic/scalar-double-lerp.slang
index e304b4e67..9b1ee200c 100644
--- a/tests/hlsl-intrinsic/scalar-double-lerp.slang
+++ b/tests/hlsl-intrinsic/scalar-double-lerp.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-log.slang b/tests/hlsl-intrinsic/scalar-double-log.slang
index 8dbc01815..06edbad26 100644
--- a/tests/hlsl-intrinsic/scalar-double-log.slang
+++ b/tests/hlsl-intrinsic/scalar-double-log.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-log10.slang b/tests/hlsl-intrinsic/scalar-double-log10.slang
index e68088302..eeda6779c 100644
--- a/tests/hlsl-intrinsic/scalar-double-log10.slang
+++ b/tests/hlsl-intrinsic/scalar-double-log10.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-log2.slang b/tests/hlsl-intrinsic/scalar-double-log2.slang
index ca06ab05a..64ccc5272 100644
--- a/tests/hlsl-intrinsic/scalar-double-log2.slang
+++ b/tests/hlsl-intrinsic/scalar-double-log2.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-max.slang b/tests/hlsl-intrinsic/scalar-double-max.slang
index e5e1f3156..4ceedf222 100644
--- a/tests/hlsl-intrinsic/scalar-double-max.slang
+++ b/tests/hlsl-intrinsic/scalar-double-max.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-min.slang b/tests/hlsl-intrinsic/scalar-double-min.slang
index a90d11665..335856771 100644
--- a/tests/hlsl-intrinsic/scalar-double-min.slang
+++ b/tests/hlsl-intrinsic/scalar-double-min.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-pow.slang b/tests/hlsl-intrinsic/scalar-double-pow.slang
index 3c48c2dac..8e063092e 100644
--- a/tests/hlsl-intrinsic/scalar-double-pow.slang
+++ b/tests/hlsl-intrinsic/scalar-double-pow.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-rcp.slang b/tests/hlsl-intrinsic/scalar-double-rcp.slang
index c3a48bbac..72020c175 100644
--- a/tests/hlsl-intrinsic/scalar-double-rcp.slang
+++ b/tests/hlsl-intrinsic/scalar-double-rcp.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-rsqrt.slang b/tests/hlsl-intrinsic/scalar-double-rsqrt.slang
index ef17263d7..bff328d02 100644
--- a/tests/hlsl-intrinsic/scalar-double-rsqrt.slang
+++ b/tests/hlsl-intrinsic/scalar-double-rsqrt.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-saturate.slang b/tests/hlsl-intrinsic/scalar-double-saturate.slang
index ac4679f20..5214a2800 100644
--- a/tests/hlsl-intrinsic/scalar-double-saturate.slang
+++ b/tests/hlsl-intrinsic/scalar-double-saturate.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-sign.slang b/tests/hlsl-intrinsic/scalar-double-sign.slang
index 7db652fa2..57d80d7ac 100644
--- a/tests/hlsl-intrinsic/scalar-double-sign.slang
+++ b/tests/hlsl-intrinsic/scalar-double-sign.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-sin.slang b/tests/hlsl-intrinsic/scalar-double-sin.slang
index d580b1ff1..b6e2e414b 100644
--- a/tests/hlsl-intrinsic/scalar-double-sin.slang
+++ b/tests/hlsl-intrinsic/scalar-double-sin.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-sincos.slang b/tests/hlsl-intrinsic/scalar-double-sincos.slang
index 2afcf8f8b..9f1fb41ac 100644
--- a/tests/hlsl-intrinsic/scalar-double-sincos.slang
+++ b/tests/hlsl-intrinsic/scalar-double-sincos.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-smoothstep.slang b/tests/hlsl-intrinsic/scalar-double-smoothstep.slang
index c90d1dcd0..bbddcdc1d 100644
--- a/tests/hlsl-intrinsic/scalar-double-smoothstep.slang
+++ b/tests/hlsl-intrinsic/scalar-double-smoothstep.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-sqrt.slang b/tests/hlsl-intrinsic/scalar-double-sqrt.slang
index bff3a3d6f..f68e86e16 100644
--- a/tests/hlsl-intrinsic/scalar-double-sqrt.slang
+++ b/tests/hlsl-intrinsic/scalar-double-sqrt.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-step.slang b/tests/hlsl-intrinsic/scalar-double-step.slang
index b248a1c82..f52953de7 100644
--- a/tests/hlsl-intrinsic/scalar-double-step.slang
+++ b/tests/hlsl-intrinsic/scalar-double-step.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-tan.slang b/tests/hlsl-intrinsic/scalar-double-tan.slang
index 5c1c14e56..3c2565973 100644
--- a/tests/hlsl-intrinsic/scalar-double-tan.slang
+++ b/tests/hlsl-intrinsic/scalar-double-tan.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-double-trunc.slang b/tests/hlsl-intrinsic/scalar-double-trunc.slang
index 6b04bd6a5..d466df6a1 100644
--- a/tests/hlsl-intrinsic/scalar-double-trunc.slang
+++ b/tests/hlsl-intrinsic/scalar-double-trunc.slang
@@ -1,4 +1,5 @@
 //TEST(compute):COMPARE_COMPUTE:-cpu -output-using-type
+//TEST(compute):COMPARE_COMPUTE:-cuda -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/scalar-swizzling.slang b/tests/hlsl-intrinsic/scalar-swizzling.slang
index 9ca024755..385219dc7 100644
--- a/tests/hlsl-intrinsic/scalar-swizzling.slang
+++ b/tests/hlsl-intrinsic/scalar-swizzling.slang
@@ -1,4 +1,5 @@
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=CHK):-vk -compute -shaderobj -output-using-type
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=CHK):-cuda -compute -shaderobj -output-using-type
 
 //TEST_INPUT: ubuffer(data=[0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/wave-broadcast-lane-at.slang b/tests/hlsl-intrinsic/wave-broadcast-lane-at.slang
index a9ec340d2..b26923ff2 100644
--- a/tests/hlsl-intrinsic/wave-broadcast-lane-at.slang
+++ b/tests/hlsl-intrinsic/wave-broadcast-lane-at.slang
@@ -1,10 +1,10 @@
 //TEST_CATEGORY(wave, compute)
 //DISABLE_TEST:COMPARE_COMPUTE_EX:-cpu -compute -shaderobj
 //DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
-//TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
+TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
 // Disabled on VK because glsl can't do WaveReadLaneAt on matrix. 
 //DISABLE_TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
-//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
+TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0 -shaderobj
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/wave-mask/wave-get-active.slang b/tests/hlsl-intrinsic/wave-mask/wave-get-active.slang
index c05c7baa1..91debe999 100644
--- a/tests/hlsl-intrinsic/wave-mask/wave-get-active.slang
+++ b/tests/hlsl-intrinsic/wave-mask/wave-get-active.slang
@@ -3,7 +3,7 @@
 //DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -shaderobj
 //TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0 -shaderobj
 //TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj
-//DISABLE_TEST:COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
+//TEST:COMPARE_COMPUTE_EX:-cuda -compute -shaderobj
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl-intrinsic/wave-shuffle.slang b/tests/hlsl-intrinsic/wave-shuffle.slang
index 30f3db3c8..9cf83eed0 100644
--- a/tests/hlsl-intrinsic/wave-shuffle.slang
+++ b/tests/hlsl-intrinsic/wave-shuffle.slang
@@ -5,7 +5,7 @@
 //DISABLE_TEST:COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -profile cs_6_0
 // Disabled because vk doesn't currently support matrix types. See wave-shuffle-vk.slang
 //DISABLE_TEST(vulkan):COMPARE_COMPUTE_EX:-vk -compute
-//TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0
+TEST:COMPARE_COMPUTE_EX:-cuda -compute -render-features cuda_sm_7_0
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer
 RWStructuredBuffer<int> outputBuffer;
diff --git a/tests/hlsl/append-structured-buffer.slang b/tests/hlsl/append-structured-buffer.slang
index 6e8791b6f..06e79dac4 100644
--- a/tests/hlsl/append-structured-buffer.slang
+++ b/tests/hlsl/append-structured-buffer.slang
@@ -1,5 +1,6 @@
 //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-dx12 -use-dxil -compute -output-using-type
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -output-using-type
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-cuda -compute -output-using-type
 
 //TEST:SIMPLE(filecheck=CHECK): -target spirv -emit-spirv-directly
 
diff --git a/tests/hlsl/cbuffer-float3-offsets-aligned.slang b/tests/hlsl/cbuffer-float3-offsets-aligned.slang
index b1ae566b4..d0728eeb4 100644
--- a/tests/hlsl/cbuffer-float3-offsets-aligned.slang
+++ b/tests/hlsl/cbuffer-float3-offsets-aligned.slang
@@ -1,6 +1,7 @@
 //TEST:SIMPLE(filecheck=SPIRV): -target spirv -emit-spirv-directly -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout
 //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -dx12 -use-dxil -profile cs_6_2 -Xslang... -Xdxc -fvk-use-dx-layout -Xdxc -enable-16bit-types -X. -output-using-type
 //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -profile cs_6_2 -emit-spirv-directly -Xslang... -fvk-use-dx-layout -X. -output-using-type
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-cuda -compute -output-using-type
 //TEST:REFLECTION(filecheck=REFLECT):-stage compute -entry computeMain -target spirv -profile cs_6_2 -no-codegen -line-directive-mode none -fvk-use-dx-layout
 
 //TEST_INPUT:ubuffer(stride=4, count=17):out,name=outputBuffer
diff --git a/tests/hlsl/cbuffer-float3-offsets-unaligned.slang b/tests/hlsl/cbuffer-float3-offsets-unaligned.slang
index 920987343..0d7a5e93e 100644
--- a/tests/hlsl/cbuffer-float3-offsets-unaligned.slang
+++ b/tests/hlsl/cbuffer-float3-offsets-unaligned.slang
@@ -1,6 +1,7 @@
 //TEST:SIMPLE(filecheck=SPIRV): -target spirv -emit-spirv-directly -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout
 //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -dx12 -use-dxil -Xslang... -Xdxc -fvk-use-dx-layout -Xdxc -enable-16bit-types -X. -output-using-type
 //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -emit-spirv-directly -Xslang... -fvk-use-dx-layout -X. -output-using-type
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-cuda -compute -output-using-type
 //TEST:REFLECTION(filecheck=REFLECT):-stage compute -entry computeMain -target spirv -profile cs_6_2 -no-codegen -line-directive-mode none -fvk-use-dx-layout
 
 // dxc: -T cs_6_2 -E computeMain -spirv -fvk-use-dx-layout -enable-16bit-types
diff --git a/tests/hlsl/consume-structured-buffer.slang b/tests/hlsl/consume-structured-buffer.slang
index 352fd6dac..3d9317b3d 100644
--- a/tests/hlsl/consume-structured-buffer.slang
+++ b/tests/hlsl/consume-structured-buffer.slang
@@ -1,6 +1,7 @@
 //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-dx12 -use-dxil -compute -output-using-type
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -output-using-type
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute -output-using-type -emit-spirv-directly
+//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-cuda -compute -output-using-type
 
 //TEST_INPUT:ubuffer(data=[0 0 0 0 0], stride=4):out,name=outputBuffer
 RWStructuredBuffer<float> outputBuffer;
diff --git a/tests/hlsl/packoffset.slang b/tests/hlsl/packoffset.slang
index 93fcef7bc..c9d9803e8 100644
--- a/tests/hlsl/packoffset.slang
+++ b/tests/hlsl/packoffset.slang
@@ -2,6 +2,7 @@
 //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj -output-using-type
 //TEST:SIMPLE(filecheck=HLSL): -target hlsl -profile cs_5_0 -entry computeMain -line-directive-mode none
 //TEST:SIMPLE(filecheck=GLSL): -target glsl -profile glsl_450 -stage compute -entry computeMain -line-directive-mode none
+//TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj -output-using-type
 
 // Metal does not support custom data layout.
 //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl