From a618b8c5e249b0f20e6c0c95f9da1b5cbfdbf08b Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 17 Oct 2024 20:14:22 -0700 Subject: Cleanup atomic intrinsics. (#5324) * Cleanup atomic intrinsics. * Fix. * Fix glsl. * Remove hacky intrinsic expansion logic for glsl image atomics. * Fix all tests. * Fix. * Add `InterlockedAddF16Emulated`. * Fix glsl intrinsic. * Fix. --- tests/compute/atomics-invalid-dest-type.slang | 5 +---- tests/compute/nonuniformres-atomic.slang | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'tests/compute') diff --git a/tests/compute/atomics-invalid-dest-type.slang b/tests/compute/atomics-invalid-dest-type.slang index 864debaee..5ae03a5c7 100644 --- a/tests/compute/atomics-invalid-dest-type.slang +++ b/tests/compute/atomics-invalid-dest-type.slang @@ -1,11 +1,8 @@ // atomics-buffer.slang -//TEST:SIMPLE(filecheck=CHECK): -target spirv -stage compute -entry computeMain -//TEST:SIMPLE(filecheck=CHECK): -target hlsl -stage compute -entry computeMain -//TEST:SIMPLE(filecheck=CHECK): -target glsl -stage compute -entry computeMain //TEST:SIMPLE(filecheck=CHECK): -target metal -stage compute -entry computeMain -//CHECK: Atomic must be applied to a scalar texture or non-texture +//CHECK: atomic operation on non-scalar texture RWBuffer outputBuffer; diff --git a/tests/compute/nonuniformres-atomic.slang b/tests/compute/nonuniformres-atomic.slang index 95ae502dc..10dd30cb0 100644 --- a/tests/compute/nonuniformres-atomic.slang +++ b/tests/compute/nonuniformres-atomic.slang @@ -9,7 +9,7 @@ RWTexture2D texArray[2]; void main( uint2 dispatchThreadID : SV_DispatchThreadID, uint2 groupThreadID : SV_GroupThreadID ) { - // CHECK0: imageAtomicAdd((texArray_{{.*}}[nonuniformEXT({{.*}})] + // CHECK0: {{.*}}imageAtomicAdd(texArray_{{.*}}[nonuniformEXT({{.*}})] // CHECK1: InterlockedAdd(texArray_{{.*}}[NonUniformResourceIndex({{.*}})] -- cgit v1.2.3