From b24837a4562ac36fa2d88757e8d1293ad0bdd1d9 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Tue, 21 Oct 2025 13:59:42 -0500 Subject: [PATCH 1/2] Add NURI where it was missing This hopefully will fix issues on AMD and Intel devices. Fixes #376, Fixes #337 --- test/Feature/StructuredBuffer/inc_counter_array.test | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/test/Feature/StructuredBuffer/inc_counter_array.test b/test/Feature/StructuredBuffer/inc_counter_array.test index c9f7b736..bf72e52e 100644 --- a/test/Feature/StructuredBuffer/inc_counter_array.test +++ b/test/Feature/StructuredBuffer/inc_counter_array.test @@ -8,9 +8,9 @@ RWStructuredBuffer Out[4] : register(u0); [numthreads(4,1,1)] void main(uint GI : SV_GroupIndex) { for (int i = 0; i < GI; i++) - Out[GI].IncrementCounter(); - - Out[GI][0] = Out[GI].IncrementCounter(); + Out[NonUniformResourceIndex(GI)].IncrementCounter(); + + Out[NonUniformResourceIndex(GI)][0] = Out[NonUniformResourceIndex(GI)].IncrementCounter(); } //--- pipeline.yaml @@ -48,10 +48,6 @@ DescriptorSets: # Unimplemented https://github.com/llvm/offload-test-suite/issues/305 # XFAIL: Metal -# Intel has an issue with counters in resource arrays -# Bug https://github.com/llvm/offload-test-suite/issues/376 -# XFAIL: Intel - # RUN: split-file %s %t # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s %if DirectX %{ --check-prefixes=CHECK,DX-CHECK %} From 14964f0db1675f0f75d5e92dcce87db50158abed Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Tue, 21 Oct 2025 15:01:46 -0500 Subject: [PATCH 2/2] Add back intel XFAIL --- test/Feature/StructuredBuffer/inc_counter_array.test | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/Feature/StructuredBuffer/inc_counter_array.test b/test/Feature/StructuredBuffer/inc_counter_array.test index bf72e52e..200ee74f 100644 --- a/test/Feature/StructuredBuffer/inc_counter_array.test +++ b/test/Feature/StructuredBuffer/inc_counter_array.test @@ -48,6 +48,10 @@ DescriptorSets: # Unimplemented https://github.com/llvm/offload-test-suite/issues/305 # XFAIL: Metal +# Intel has an issue with counters in resource arrays +# Bug https://github.com/llvm/offload-test-suite/issues/376 +# XFAIL: Intel + # RUN: split-file %s %t # RUN: %dxc_target -T cs_6_0 -Fo %t.o %t/source.hlsl # RUN: %offloader %t/pipeline.yaml %t.o | FileCheck %s %if DirectX %{ --check-prefixes=CHECK,DX-CHECK %}