From b234a722e635a39eeddbb04fc10d580c22e8d423 Mon Sep 17 00:00:00 2001 From: James Helferty Date: Tue, 10 Jun 2025 14:44:42 -0400 Subject: [PATCH] Address testing issue raised on PR#7282 Results of these tests had been marked ignored, because they failed on VK with the GLSL backend. This change removes them from the expected-failure.txt file and adds the correct commandline option to avoid using the GLSL target. --- tests/expected-failure.txt | 2 -- tests/hlsl/cbuffer-float3-offsets-aligned.slang | 4 ++-- tests/hlsl/cbuffer-float3-offsets-unaligned.slang | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/tests/expected-failure.txt b/tests/expected-failure.txt index 22142e31d36..7283c8d97c3 100644 --- a/tests/expected-failure.txt +++ b/tests/expected-failure.txt @@ -5,5 +5,3 @@ tests/language-feature/saturated-cooperation/fuse.slang (vk) tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk) tests/ir/loop-unroll-0.slang.1 (vk) tests/hlsl-intrinsic/texture/float-atomics.slang (vk) -tests/hlsl/cbuffer-float3-offsets-aligned.slang.2 (vk) -tests/hlsl/cbuffer-float3-offsets-unaligned.slang.2 (vk) diff --git a/tests/hlsl/cbuffer-float3-offsets-aligned.slang b/tests/hlsl/cbuffer-float3-offsets-aligned.slang index 7c548546a56..b1ae566b457 100644 --- a/tests/hlsl/cbuffer-float3-offsets-aligned.slang +++ b/tests/hlsl/cbuffer-float3-offsets-aligned.slang @@ -1,6 +1,6 @@ -//TEST:SIMPLE(filecheck=SPIRV): -target spirv -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout +//TEST:SIMPLE(filecheck=SPIRV): -target spirv -emit-spirv-directly -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -dx12 -use-dxil -profile cs_6_2 -Xslang... -Xdxc -fvk-use-dx-layout -Xdxc -enable-16bit-types -X. -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -profile cs_6_2 -Xslang... -fvk-use-dx-layout -X. -output-using-type +//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -profile cs_6_2 -emit-spirv-directly -Xslang... -fvk-use-dx-layout -X. -output-using-type //TEST:REFLECTION(filecheck=REFLECT):-stage compute -entry computeMain -target spirv -profile cs_6_2 -no-codegen -line-directive-mode none -fvk-use-dx-layout //TEST_INPUT:ubuffer(stride=4, count=17):out,name=outputBuffer diff --git a/tests/hlsl/cbuffer-float3-offsets-unaligned.slang b/tests/hlsl/cbuffer-float3-offsets-unaligned.slang index c3824d1a2fd..920987343a6 100644 --- a/tests/hlsl/cbuffer-float3-offsets-unaligned.slang +++ b/tests/hlsl/cbuffer-float3-offsets-unaligned.slang @@ -1,6 +1,6 @@ -//TEST:SIMPLE(filecheck=SPIRV): -target spirv -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout +//TEST:SIMPLE(filecheck=SPIRV): -target spirv -emit-spirv-directly -profile cs_6_2 -entry computeMain -line-directive-mode none -fvk-use-dx-layout //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -dx12 -use-dxil -Xslang... -Xdxc -fvk-use-dx-layout -Xdxc -enable-16bit-types -X. -output-using-type -//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -Xslang... -fvk-use-dx-layout -X. -output-using-type +//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUFFER):-slang -compute -vk -emit-spirv-directly -Xslang... -fvk-use-dx-layout -X. -output-using-type //TEST:REFLECTION(filecheck=REFLECT):-stage compute -entry computeMain -target spirv -profile cs_6_2 -no-codegen -line-directive-mode none -fvk-use-dx-layout // dxc: -T cs_6_2 -E computeMain -spirv -fvk-use-dx-layout -enable-16bit-types