From 3e1dd65adff0873e0385040c5c0a003eda83de3b Mon Sep 17 00:00:00 2001 From: ArielG-NV <159081215+ArielG-NV@users.noreply.github.com> Date: Wed, 2 Jul 2025 14:18:21 -0700 Subject: [HLSL, SPIRV_1_3] Hoist OpSelect returning a composite into `if`/`else` (#7594) * emit var and hoist out OpSelect if Composite * cleanup comment * address review check for version in spv context use phi node instead of using var move inst's using a list (not in-place modification) * format code --------- Co-authored-by: slangbot <186143334+slangbot@users.noreply.github.com> --- tests/bugs/op-select-return-composite.slang | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 tests/bugs/op-select-return-composite.slang (limited to 'tests') diff --git a/tests/bugs/op-select-return-composite.slang b/tests/bugs/op-select-return-composite.slang new file mode 100644 index 000000000..eb453d457 --- /dev/null +++ b/tests/bugs/op-select-return-composite.slang @@ -0,0 +1,34 @@ +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-d3d12 -output-using-type -use-dxil +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-vk -output-using-type +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-vk -output-using-type -profile spirv_1_3 + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer +RWStructuredBuffer outputBuffer; + +struct CompositeType +{ + __init(int dataIn) + { + data1 = dataIn; + data2 = dataIn; + } + int data1; + float data2; +} + +[numthreads(1,1,1)] +void computeMain(){ + + CompositeType composite = CompositeType(-1); + if (outputBuffer[0] == 0) + { + composite = outputBuffer[1] > -1 ? CompositeType(1) : CompositeType(-1); + } + outputBuffer[2] = composite.data1; + outputBuffer[3] = (int)composite.data2; +} + +//BUF: 0 +//BUF: 0 +//BUF: 1 +//BUF: 1 -- cgit v1.2.3