diff options
22 files changed, 11 insertions, 42 deletions
diff --git a/tests/autodiff/diff-ptr-type-call.slang b/tests/autodiff/diff-ptr-type-call.slang index de7595ef7..258a4477b 100644 --- a/tests/autodiff/diff-ptr-type-call.slang +++ b/tests/autodiff/diff-ptr-type-call.slang @@ -1,6 +1,5 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/autodiff/diff-ptr-type-loop.slang b/tests/autodiff/diff-ptr-type-loop.slang index a0ec27128..a57c69b76 100644 --- a/tests/autodiff/diff-ptr-type-loop.slang +++ b/tests/autodiff/diff-ptr-type-loop.slang @@ -1,6 +1,5 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj -output-using-type //TEST(compute, vulkan):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/autodiff/diff-ptr-type-smoke.slang b/tests/autodiff/diff-ptr-type-smoke.slang index 4bc62f5dd..e7e03c5e3 100644 --- a/tests/autodiff/diff-ptr-type-smoke.slang +++ b/tests/autodiff/diff-ptr-type-smoke.slang @@ -1,6 +1,5 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/bugs/frexp.slang b/tests/bugs/frexp.slang index 38b4b3933..60912297c 100644 --- a/tests/bugs/frexp.slang +++ b/tests/bugs/frexp.slang @@ -5,7 +5,6 @@ //TEST(smoke,compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-vk -emit-spirv-directly -output-using-type //TEST(smoke,compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-cuda -output-using-type //TEST(smoke,compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-slang -shaderobj -mtl -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu // BUF: type: int32_t // BUF-NEXT: 1 diff --git a/tests/bugs/gh-2959.slang b/tests/bugs/gh-2959.slang index 3d2e24bc6..056900b95 100644 --- a/tests/bugs/gh-2959.slang +++ b/tests/bugs/gh-2959.slang @@ -1,6 +1,5 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF): -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-slang -shaderobj -mtl -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer RWStructuredBuffer<uint> outputBuffer; diff --git a/tests/bugs/gh-471.slang b/tests/bugs/gh-471.slang index 3d70a38c5..e7b09760b 100644 --- a/tests/bugs/gh-471.slang +++ b/tests/bugs/gh-471.slang @@ -1,6 +1,5 @@ //TEST(compute):COMPARE_COMPUTE: -shaderobj //TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):out,name outputBuffer -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu // Test that "operator comma" works as expected diff --git a/tests/bugs/gh-566.slang b/tests/bugs/gh-566.slang index e7db85ee0..f1e53ba9a 100644 --- a/tests/bugs/gh-566.slang +++ b/tests/bugs/gh-566.slang @@ -3,7 +3,6 @@ //TEST(compute):COMPARE_COMPUTE: -shaderobj //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer //TEST_INPUT:ubuffer(data=[4 3 2 1], stride=4):name inputBuffer -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu RWStructuredBuffer<uint> outputBuffer; diff --git a/tests/bugs/obfuscate-specialization-naming.slang b/tests/bugs/obfuscate-specialization-naming.slang index 28dc91eb6..2511adbea 100644 --- a/tests/bugs/obfuscate-specialization-naming.slang +++ b/tests/bugs/obfuscate-specialization-naming.slang @@ -1,6 +1,5 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -compile-arg -obfuscate -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -compile-arg -obfuscate -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu //TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):name a RWStructuredBuffer<int> a; diff --git a/tests/bugs/specialize-function-array-args.slang b/tests/bugs/specialize-function-array-args.slang index 83dd20863..8a572eda4 100644 --- a/tests/bugs/specialize-function-array-args.slang +++ b/tests/bugs/specialize-function-array-args.slang @@ -1,6 +1,5 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -shaderobj //TEST(compute,vulkan):COMPARE_COMPUTE_EX:-vk -slang -compute -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu // When a function is passed a parameter that contains an array, it specialized it as a performance // improvement for VK. If the struct contained a structured buffer, though it meant that the diff --git a/tests/compute/constant-buffer-memory-packing.slang b/tests/compute/constant-buffer-memory-packing.slang index fb7a78fc1..edcc0babd 100644 --- a/tests/compute/constant-buffer-memory-packing.slang +++ b/tests/compute/constant-buffer-memory-packing.slang @@ -9,6 +9,8 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-vk -compute //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-mtl -compute +//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu + // CPP/CUDA due to natural layout rules will recieve the following ROW matrix: // {1,2,3} // {0,4,5} diff --git a/tests/compute/func-cbuffer-param.slang b/tests/compute/func-cbuffer-param.slang index ec9543334..a5ff181ad 100644 --- a/tests/compute/func-cbuffer-param.slang +++ b/tests/compute/func-cbuffer-param.slang @@ -10,6 +10,8 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-cpu -compute -shaderobj +//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu + struct Data { int4 val[4]; diff --git a/tests/compute/func-param-legalize.slang b/tests/compute/func-param-legalize.slang index 51c00254b..2d7c57e9f 100644 --- a/tests/compute/func-param-legalize.slang +++ b/tests/compute/func-param-legalize.slang @@ -1,5 +1,4 @@ //TEST(compute):COMPARE_COMPUTE: -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu struct Param { diff --git a/tests/compute/matrix-layout.hlsl b/tests/compute/matrix-layout.hlsl index 4a2d3f014..f9272c676 100644 --- a/tests/compute/matrix-layout.hlsl +++ b/tests/compute/matrix-layout.hlsl @@ -10,6 +10,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -xslang -matrix-layout-row-major -shaderobj //TEST(compute,compatibility-issue):COMPARE_COMPUTE_EX:-slang -compute -dx12 -use-dxil -xslang -matrix-layout-row-major -shaderobj //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu // Not testing on Vulkan because of lack of support // for integer matrices in GLSL. Slang needs to diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt index 645f526c9..a7d0b6909 100644 --- a/tests/expected-failure-github.txt +++ b/tests/expected-failure-github.txt @@ -6,69 +6,48 @@ tests/language-feature/saturated-cooperation/fuse.slang (vk) tests/bugs/byte-address-buffer-interlocked-add-f32.slang (vk) tests/serialization/obfuscated-serialized-module-test.slang.2 syn (mtl) tests/autodiff/custom-intrinsic.slang.2 syn (wgpu) -tests/autodiff/diff-ptr-type-call.slang.2 syn (wgpu) -tests/autodiff/diff-ptr-type-loop.slang.2 syn (wgpu) -tests/autodiff/diff-ptr-type-smoke.slang.2 syn (wgpu) tests/autodiff/existential-1.slang.2 syn (wgpu) tests/autodiff/existential-2.slang.2 syn (wgpu) tests/autodiff/material/diff-bwd-falcor-material-system.slang.2 syn (wgpu) tests/autodiff/material2/diff-bwd-falcor-material-system.slang.2 syn (wgpu) -tests/autodiff/matrix-arithmetic-fwd.slang.2 syn (wgpu) tests/bugs/atomic-coerce.slang.3 syn (wgpu) tests/bugs/buffer-swizzle-store.slang.3 syn (wgpu) tests/bugs/dxbc-double-problem.slang.6 syn (wgpu) tests/bugs/frexp-double.slang.7 syn (wgpu) -tests/bugs/frexp.slang.7 syn (wgpu) -tests/bugs/gh-2959.slang.2 syn (wgpu) tests/bugs/gh-3980.slang.7 syn (wgpu) -tests/bugs/gh-471.slang.1 syn (wgpu) tests/bugs/gh-518.slang.2 syn (wgpu) -tests/bugs/gh-566.slang.1 syn (wgpu) -tests/bugs/obfuscate-specialization-naming.slang.2 syn (wgpu) tests/bugs/op-assignment-unify-mat.slang.4 syn (wgpu) tests/bugs/shadowed-lookup.slang.1 syn (wgpu) -tests/bugs/specialize-function-array-args.slang.2 syn (wgpu) -tests/bugs/texture2d-gather.hlsl.2 syn (wgpu) tests/bugs/user-attribute-lookup.slang.2 syn (wgpu) tests/compute/atomics (wgpu) tests/compute/atomics-buffer (wgpu) tests/compute/atomics-groupshared (wgpu) tests/compute/buffer-type-splitting (wgpu) -tests/compute/byte-address-buffer (wgpu) tests/compute/compile-time-loop.slang.2 syn (wgpu) +tests/compute/constant-buffer-memory-packing.slang.6 syn (wgpu) tests/compute/constexpr.slang.2 syn (wgpu) tests/compute/discard-stmt.slang.2 syn (wgpu) -tests/compute/func-param-legalize.slang.1 syn (wgpu) +tests/compute/func-cbuffer-param.slang.4 syn (wgpu) tests/compute/interface-shader-param-in-struct.slang.4 syn (wgpu) tests/compute/interface-shader-param.slang.5 syn (wgpu) tests/compute/loop-unroll.slang.7 syn (wgpu) +tests/compute/matrix-layout.hlsl.3 syn (wgpu) tests/compute/texture-get-dimensions (wgpu) tests/compute/texture-sampling (wgpu) tests/compute/texture-simple (wgpu) -tests/compute/texture-simpler (wgpu) tests/compute/transcendental-double (wgpu) -tests/compute/constant-buffer-memory-packing.slang.6 syn (wgpu) -tests/compute/func-cbuffer-param.slang.4 syn (wgpu) -tests/compute/matrix-layout.hlsl.3 syn (wgpu) -tests/hlsl/packoffset.slang.5 syn (wgpu) tests/hlsl-intrinsic/byte-address-buffer/byte-address-struct.slang.5 syn (wgpu) tests/hlsl-intrinsic/classify-double.slang.6 syn (wgpu) tests/hlsl-intrinsic/classify-float.slang.5 syn (wgpu) tests/hlsl-intrinsic/matrix-float.slang.6 syn (wgpu) tests/hlsl-intrinsic/matrix-int.slang.6 syn (wgpu) tests/hlsl-intrinsic/scalar-double-simple.slang.7 syn (wgpu) +tests/hlsl/packoffset.slang.5 syn (wgpu) tests/language-feature/constants/static-const-in-generic-interface.slang.1 syn (wgpu) -tests/language-feature/enums/nested-enum.slang.1 syn (wgpu) tests/language-feature/enums/strongly-typed-id.slang.1 syn (wgpu) -tests/language-feature/generics/irwarray.slang.2 syn (wgpu) tests/language-feature/generics/tuple.slang.1 syn (wgpu) tests/language-feature/generics/variadic-0.slang.4 syn (wgpu) -tests/language-feature/generics/variadic-void.slang.3 syn (wgpu) -tests/language-feature/higher-order-functions/simple.slang.4 syn (wgpu) tests/language-feature/shader-params/interface-shader-param-ordinary.slang.4 syn (wgpu) tests/language-feature/swizzles/matrix-swizzle-write-array.slang.3 syn (wgpu) -tests/language-feature/swizzles/matrix-swizzle-write-single.slang.3 syn (wgpu) tests/language-feature/swizzles/matrix-swizzle-write-swizzle.slang.3 syn (wgpu) -tests/language-feature/swizzles/matrix-swizzle-write.slang.3 syn (wgpu) tests/optimization/func-resource-result/func-resource-result-complex.slang.2 syn (wgpu) -tests/pipeline/compute/compute-system-values.slang.3 syn (wgpu) diff --git a/tests/hlsl/packoffset.slang b/tests/hlsl/packoffset.slang index 2acbb5ff8..1f654cf7a 100644 --- a/tests/hlsl/packoffset.slang +++ b/tests/hlsl/packoffset.slang @@ -6,6 +6,8 @@ // Metal does not support custom data layout. //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu + //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/language-feature/enums/nested-enum.slang b/tests/language-feature/enums/nested-enum.slang index e96f3a7a6..5b45abae7 100644 --- a/tests/language-feature/enums/nested-enum.slang +++ b/tests/language-feature/enums/nested-enum.slang @@ -3,7 +3,6 @@ // Test enums defined nested in a struct work as expected. //TEST(compute):COMPARE_COMPUTE: -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu struct Outer { diff --git a/tests/language-feature/generics/irwarray.slang b/tests/language-feature/generics/irwarray.slang index 423b503ea..47109f7b0 100644 --- a/tests/language-feature/generics/irwarray.slang +++ b/tests/language-feature/generics/irwarray.slang @@ -1,6 +1,5 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu void writeToArray<U, T : IRWArray<U>>(inout T array, int index, U value) { array[index] = value; } void writeToBuffer<U, T : IRWArray<U>>(T array, int index, U value) { array[index] = value; } diff --git a/tests/language-feature/generics/variadic-void.slang b/tests/language-feature/generics/variadic-void.slang index 213a65fb5..976c104f8 100644 --- a/tests/language-feature/generics/variadic-void.slang +++ b/tests/language-feature/generics/variadic-void.slang @@ -1,7 +1,6 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -vk -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -cpu -shaderobj -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<float> outputBuffer; diff --git a/tests/language-feature/higher-order-functions/simple.slang b/tests/language-feature/higher-order-functions/simple.slang index 161a12c3c..13fc16aa5 100644 --- a/tests/language-feature/higher-order-functions/simple.slang +++ b/tests/language-feature/higher-order-functions/simple.slang @@ -2,7 +2,6 @@ //TEST(compute):COMPARE_COMPUTE_EX():-slang -compute -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<uint> outputBuffer; diff --git a/tests/language-feature/swizzles/matrix-swizzle-write-single.slang b/tests/language-feature/swizzles/matrix-swizzle-write-single.slang index bd34928c3..34d54ac55 100644 --- a/tests/language-feature/swizzles/matrix-swizzle-write-single.slang +++ b/tests/language-feature/swizzles/matrix-swizzle-write-single.slang @@ -1,7 +1,6 @@ //TEST(compute):COMPARE_COMPUTE: -compute -shaderobj -output-using-type //TEST(compute, vulkan):COMPARE_COMPUTE: -vk -compute -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu // Test that writes to single matrix elements with swizzles work diff --git a/tests/language-feature/swizzles/matrix-swizzle-write.slang b/tests/language-feature/swizzles/matrix-swizzle-write.slang index a31fdb14d..6ccb4c29c 100644 --- a/tests/language-feature/swizzles/matrix-swizzle-write.slang +++ b/tests/language-feature/swizzles/matrix-swizzle-write.slang @@ -1,7 +1,6 @@ //TEST(compute):COMPARE_COMPUTE: -compute -shaderobj -output-using-type //TEST(compute, vulkan):COMPARE_COMPUTE: -vk -compute -shaderobj -output-using-type //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -output-using-type -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu // Test that matrix swizzle writes work correctly // Matrix swizzles can either be one or zero indexed diff --git a/tests/pipeline/compute/compute-system-values.slang b/tests/pipeline/compute/compute-system-values.slang index e95b547cb..912827557 100644 --- a/tests/pipeline/compute/compute-system-values.slang +++ b/tests/pipeline/compute/compute-system-values.slang @@ -3,7 +3,6 @@ //TEST(compute):COMPARE_COMPUTE: -shaderobj //TEST(compute):COMPARE_COMPUTE: -cpu -shaderobj //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -//DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name=outputBuffer RWStructuredBuffer<int> outputBuffer; |