2 files changed, 64 insertions, 10 deletions
diff --git a/tests/expected-failure.txt b/tests/expected-failure.txt
index 9a685b5c7..3e158e2d1 100644
--- a/tests/expected-failure.txt
+++ b/tests/expected-failure.txt
@@ -1,24 +1,14 @@
 tests/autodiff/global-param-hoisting.slang.1 (vk)
-tests/bugs/atomic-coerce.slang.1 (vk)
 tests/bugs/buffer-swizzle-store.slang.1 (vk)
-tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk)
 tests/bugs/gh-3075.slang.2 (vk)
 tests/bugs/ray-query-in-generic.slang.1 (vk)
-tests/compute/buffer-layout.slang.2 (vk)
 tests/compute/half-rw-texture-convert.slang.4 (vk)
 tests/compute/half-rw-texture-convert2.slang.4 (vk)
-tests/compute/loop-unroll.slang.5 (vk)
 tests/compute/ray-tracing-inline.slang.1 (vk)
 tests/compute/rw-texture-simple.slang.4 (vk)
 tests/compute/texture-sample-grad-offset-clamp.slang (vk)
 tests/compute/texture-simple.slang.4 (vk)
 tests/compute/texture-simpler.slang (vk)
-tests/hlsl/glsl-matrix-layout.slang (vk)
 tests/language-feature/constants/constexpr-loop.slang.1 (vk)
 tests/optimization/func-resource-result/func-resource-result-complex.slang.1 (vk)
-tests/slang-extension/atomic-float-byte-address-buffer.slang.2 (vk)
-tests/slang-extension/atomic-int64-byte-address-buffer.slang.4 (vk)
-tests/slang-extension/atomic-min-max-u64-byte-address-buffer.slang.4 (vk)
-tests/slang-extension/cas-int64-byte-address-buffer.slang.4 (vk)
-tests/slang-extension/exchange-int64-byte-address-buffer.slang.4 (vk)
 tests/type/texture-sampler/texture-sampler-2d.slang (vk)
diff --git a/tests/hlsl-intrinsic/byte-address-buffer-atomics.slang b/tests/hlsl-intrinsic/byte-address-buffer-atomics.slang
new file mode 100644
index 000000000..f133bb372
--- /dev/null
+++ b/tests/hlsl-intrinsic/byte-address-buffer-atomics.slang
@@ -0,0 +1,64 @@
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -dx12 -use-dxil -output-using-type
+//TEST(compute, vulkan):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk -output-using-type
+//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cuda -output-using-type
+
+//TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0 0 0 0 0], stride=4):out,name outputBuffer
+RWStructuredBuffer<int> outputBuffer;
+
+//TEST_INPUT:set bbuffer = ubuffer(data=[0 0 0 0])
+RWByteAddressBuffer bbuffer;
+
+[numthreads(1, 1, 1)]
+void computeMain(uint3 dispatchThreadID : SV_DispatchThreadID)
+{
+    uint originalValue;
+    bbuffer.InterlockedAdd(0, 1);
+
+    bbuffer.InterlockedAdd(0, 1, originalValue);
+    outputBuffer[4] = originalValue;
+
+    bbuffer.InterlockedMax(0, 3);
+    bbuffer.InterlockedMax(0, 4, originalValue);
+    outputBuffer[5] = originalValue;
+
+    bbuffer.InterlockedMin(0, 2);
+    bbuffer.InterlockedMin(0, 2, originalValue);
+    outputBuffer[6] = originalValue;
+
+    bbuffer.InterlockedOr(0, 1);
+    bbuffer.InterlockedOr(0, 1, originalValue);
+    outputBuffer[7] = originalValue;
+
+    bbuffer.InterlockedXor(0, 4);
+    bbuffer.InterlockedXor(0, 4, originalValue);
+    outputBuffer[8] = originalValue;
+
+    bbuffer.InterlockedAnd(0, 7);
+    bbuffer.InterlockedAnd(0, 7, originalValue);
+    outputBuffer[9] = originalValue;
+
+    bbuffer.InterlockedCompareExchange(4, 0, 1, originalValue);
+    outputBuffer[10] = originalValue;
+
+    bbuffer.InterlockedExchange(8, 3, originalValue);
+    outputBuffer[11] = originalValue;
+
+    bbuffer.InterlockedCompareStore(12, 0, 3);
+
+    // CHECK: 3
+    // CHECK: 1
+    // CHECK: 3
+    // CHECK: 3
+    outputBuffer[0] = bbuffer.Load(0);
+    outputBuffer[1] = bbuffer.Load(4);
+    outputBuffer[2] = bbuffer.Load(8);
+    outputBuffer[3] = bbuffer.Load(12);
+    // CHECK: 1
+    // CHECK: 3
+    // CHECK: 2
+    // CHECK: 3
+    // CHECK: 7
+    // CHECK: 3
+    // CHECK: 0
+    // CHECK: 0
+}
+\ No newline at end of file