From 40a4022670c9b6a53c31ba4841eaf744d6402bf2 Mon Sep 17 00:00:00 2001 From: Ellie Hermaszewska Date: Fri, 5 Jul 2024 15:05:52 +0800 Subject: Add specializations for 1 vectors in functions using the $N glsl intrinsic placement (#4534) Closes #4533 Fixes part of #4531 --- source/slang/hlsl.meta.slang | 10 ++++++++++ tests/bugs/gh-4533.slang | 20 ++++++++++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 tests/bugs/gh-4533.slang diff --git a/source/slang/hlsl.meta.slang b/source/slang/hlsl.meta.slang index d83059b00..b282dca2a 100644 --- a/source/slang/hlsl.meta.slang +++ b/source/slang/hlsl.meta.slang @@ -5575,6 +5575,8 @@ __generic [require(cpp_cuda_glsl_hlsl_metal_spirv)] bool all(vector x) { + if(N == 1) + return all(x[0]); __target_switch { case hlsl: @@ -5710,6 +5712,8 @@ __generic [require(cpp_cuda_glsl_hlsl_metal_spirv)] bool any(vector x) { + if(N == 1) + return any(x[0]); __target_switch { case hlsl: @@ -6066,6 +6070,8 @@ __generic [require(cpp_cuda_glsl_hlsl_metal_spirv, shader5_sm_4_0)] vector asint(vector x) { + if(N == 1) + return vector(asint(x[0])); __target_switch { case glsl: __intrinsic_asm "ivec$N0($0)"; @@ -6207,6 +6213,8 @@ __generic [require(cpp_cuda_glsl_hlsl_metal_spirv, shader5_sm_4_0)] vector asuint(vector x) { + if(N == 1) + return vector(asuint(x[0])); __target_switch { case glsl: __intrinsic_asm "uvec$N0($0)"; @@ -12054,6 +12062,8 @@ __generic [__readNone] vector sign(vector x) { + if(N == 1) + return vector(sign(x[0])); __target_switch { case hlsl: __intrinsic_asm "sign"; diff --git a/tests/bugs/gh-4533.slang b/tests/bugs/gh-4533.slang new file mode 100644 index 000000000..3ee27996b --- /dev/null +++ b/tests/bugs/gh-4533.slang @@ -0,0 +1,20 @@ +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-dx12 -use-dxil +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-vk +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-mtl +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cpu +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK):-cuda + +// CHECK: 0 +// CHECK-NEXT: 1 +// CHECK-NEXT: 1 +// CHECK-NEXT: 1 + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +[numthreads(4, 1, 1)] +void computeMain(uint tid : SV_GroupIndex) +{ + vector k = float1(tid); + outputBuffer[tid] = all(k) && any(k) && bool(asint(k)) && bool(asuint(k)); +} -- cgit v1.2.3