2 files changed, 8 insertions, 16 deletions
diff --git a/tests/cross-compile/barriers.slang b/tests/cross-compile/barriers.slang
index f6fb9ac3c..d8bc92fa0 100644
--- a/tests/cross-compile/barriers.slang
+++ b/tests/cross-compile/barriers.slang
@@ -1,10 +1,16 @@
-//TEST:CROSS_COMPILE:-target spirv-assembly -entry main -stage compute
-
+//TEST:SIMPLE(filecheck=SPIRV): -stage compute -target spirv -emit-spirv-directly -entry main
+//TEST:SIMPLE(filecheck=SPIRV): -stage compute -target spirv -entry main
 // Confirm that all HLSL barrier operations can be used when cross-compiling.
 
 [numthreads(1,1,1)]
 void main()
 {
+    // SPIRV: OpMemoryBarrier %uint_1 %uint_2376
+    // SPIRV: OpControlBarrier %uint_2 %uint_1 %uint_2376
+    // SPIRV: OpMemoryBarrier %uint_1 %uint_2120
+    // SPIRV: OpControlBarrier %uint_2 %uint_1 %uint_2120
+    // SPIRV: OpMemoryBarrier %uint_2 %uint_264
+    // SPIRV: OpControlBarrier %uint_2 %uint_2 %uint_264
 	AllMemoryBarrier();
 	AllMemoryBarrierWithGroupSync();
 	DeviceMemoryBarrier();
diff --git a/tests/cross-compile/barriers.slang.glsl b/tests/cross-compile/barriers.slang.glsl
deleted file mode 100644
index 281e684db..000000000
--- a/tests/cross-compile/barriers.slang.glsl
+++ /dev/null
@@ -1,14 +0,0 @@
-#version 450
-
-layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
-void main()
-{
-    (memoryBarrier(), groupMemoryBarrier(), memoryBarrierImage(), memoryBarrierBuffer());
-    (memoryBarrier(), groupMemoryBarrier(), memoryBarrierImage(), memoryBarrierBuffer(), barrier());
-    (memoryBarrier(), memoryBarrierImage(), memoryBarrierBuffer());
-    (memoryBarrier(), memoryBarrierImage(), memoryBarrierBuffer(), barrier());
-    groupMemoryBarrier();
-    (groupMemoryBarrier(), barrier());
-
-    return;
-}