diff options
| author | Anders Leino <aleino@nvidia.com> | 2024-11-21 09:37:28 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-21 09:37:28 +0200 |
| commit | 93f5d13fc90c518ef2829dc16c28f0403e230337 (patch) | |
| tree | bbbb2ecc5ce45ddcf59ede1d82872a0ea96751d0 /tests/compute | |
| parent | e9caf5de9c0ae137c31c32ea27bc17d7735689a3 (diff) | |
Refresh of disabled WGPU tests (#5614)
Some tests are now passing and are enabled.
Other tests are still failing, but are given comments categorizing the failures.
Tests in the 'Not supported in WGSL' category are also removed from the expected failures
list. (Though they are still kept disabled for WebGPU, of course.)
This closes #5519.
Diffstat (limited to 'tests/compute')
| -rw-r--r-- | tests/compute/atomics-buffer.slang | 1 | ||||
| -rw-r--r-- | tests/compute/atomics-groupshared.slang | 1 | ||||
| -rw-r--r-- | tests/compute/atomics.slang | 1 | ||||
| -rw-r--r-- | tests/compute/buffer-type-splitting.slang | 1 | ||||
| -rw-r--r-- | tests/compute/constant-buffer-memory-packing.slang | 1 | ||||
| -rw-r--r-- | tests/compute/constexpr.slang | 1 | ||||
| -rw-r--r-- | tests/compute/func-cbuffer-param.slang | 1 | ||||
| -rw-r--r-- | tests/compute/interface-shader-param-in-struct.slang | 1 | ||||
| -rw-r--r-- | tests/compute/interface-shader-param.slang | 1 | ||||
| -rw-r--r-- | tests/compute/loop-unroll.slang | 1 | ||||
| -rw-r--r-- | tests/compute/matrix-layout.hlsl | 1 | ||||
| -rw-r--r-- | tests/compute/texture-get-dimensions.slang | 1 | ||||
| -rw-r--r-- | tests/compute/texture-sampling.slang | 1 | ||||
| -rw-r--r-- | tests/compute/texture-simple.slang | 1 | ||||
| -rw-r--r-- | tests/compute/transcendental-double.slang | 1 |
15 files changed, 11 insertions, 4 deletions
diff --git a/tests/compute/atomics-buffer.slang b/tests/compute/atomics-buffer.slang index ca609635e..802276040 100644 --- a/tests/compute/atomics-buffer.slang +++ b/tests/compute/atomics-buffer.slang @@ -12,6 +12,7 @@ // RWBuffer does not work with the GFX backend as expected with Metal //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl //TEST:SIMPLE(filecheck=METALLIB): -target metallib -stage compute -entry computeMain +// Not supported in WGSL: Use of traditional atomics intrinsics (InterlockedXXX functions) //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu //METALLIB: @computeMain diff --git a/tests/compute/atomics-groupshared.slang b/tests/compute/atomics-groupshared.slang index 9d153d9e3..22b2add3d 100644 --- a/tests/compute/atomics-groupshared.slang +++ b/tests/compute/atomics-groupshared.slang @@ -5,6 +5,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -vk -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cuda -shaderobj //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +// Not supported in WGSL: Use of traditional atomics intrinsics (InterlockedXXX functions) //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name outputBuffer diff --git a/tests/compute/atomics.slang b/tests/compute/atomics.slang index da08b0cb7..8d05d2704 100644 --- a/tests/compute/atomics.slang +++ b/tests/compute/atomics.slang @@ -5,6 +5,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -vk -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -cuda -shaderobj //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +// Not supported in WGSL: Use of traditional atomics intrinsics (InterlockedXXX functions) //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out, name outputBuffer diff --git a/tests/compute/buffer-type-splitting.slang b/tests/compute/buffer-type-splitting.slang index dbbe9789f..b96084ba6 100644 --- a/tests/compute/buffer-type-splitting.slang +++ b/tests/compute/buffer-type-splitting.slang @@ -1,6 +1,7 @@ //TEST(compute):COMPARE_COMPUTE:-cpu //TEST(compute):COMPARE_COMPUTE: -shaderobj //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +// Not supported in WGSL: Arrays of textures or buffers //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer diff --git a/tests/compute/constant-buffer-memory-packing.slang b/tests/compute/constant-buffer-memory-packing.slang index edcc0babd..207ec2769 100644 --- a/tests/compute/constant-buffer-memory-packing.slang +++ b/tests/compute/constant-buffer-memory-packing.slang @@ -9,7 +9,6 @@ //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} diff --git a/tests/compute/constexpr.slang b/tests/compute/constexpr.slang index 84adc48dd..9c7c9d131 100644 --- a/tests/compute/constexpr.slang +++ b/tests/compute/constexpr.slang @@ -2,7 +2,6 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -gcompute -shaderobj //DISABLED://TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -gcompute -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-mtl -gcompute -shaderobj -//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu //TEST_INPUT: Texture2D(size=4, content = one):name tex //TEST_INPUT: Sampler:name samp diff --git a/tests/compute/func-cbuffer-param.slang b/tests/compute/func-cbuffer-param.slang index a5ff181ad..cfbbd6af9 100644 --- a/tests/compute/func-cbuffer-param.slang +++ b/tests/compute/func-cbuffer-param.slang @@ -10,7 +10,6 @@ //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 { diff --git a/tests/compute/interface-shader-param-in-struct.slang b/tests/compute/interface-shader-param-in-struct.slang index 08b8d4550..a10d2dd5f 100644 --- a/tests/compute/interface-shader-param-in-struct.slang +++ b/tests/compute/interface-shader-param-in-struct.slang @@ -7,6 +7,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -profile sm_6_0 -use-dxil //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +// Passing, but: slang-test: Test context Slang session is leaking #5610 //DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu // A lot of the setup is the same as for `interface-shader-param`, diff --git a/tests/compute/interface-shader-param.slang b/tests/compute/interface-shader-param.slang index ec7bbffb8..7965253b2 100644 --- a/tests/compute/interface-shader-param.slang +++ b/tests/compute/interface-shader-param.slang @@ -9,6 +9,7 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute //TEST(compute):COMPARE_COMPUTE_EX:-cpu -compute //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +// Passing, but: slang-test: Test context Slang session is leaking #5610 //DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu // First we will define some fake interfaces for testing. diff --git a/tests/compute/loop-unroll.slang b/tests/compute/loop-unroll.slang index 9eacb2868..b6c3460b6 100644 --- a/tests/compute/loop-unroll.slang +++ b/tests/compute/loop-unroll.slang @@ -6,6 +6,7 @@ // Note VK output is not loop unrolled //TEST(compute):COMPARE_COMPUTE:-vk -shaderobj //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +// Not supported in WGSL: Arrays of textures or buffers //DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out, name buffers[0] diff --git a/tests/compute/matrix-layout.hlsl b/tests/compute/matrix-layout.hlsl index f9272c676..4a2d3f014 100644 --- a/tests/compute/matrix-layout.hlsl +++ b/tests/compute/matrix-layout.hlsl @@ -10,7 +10,6 @@ //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/compute/texture-get-dimensions.slang b/tests/compute/texture-get-dimensions.slang index 55eeb68f5..feb344583 100644 --- a/tests/compute/texture-get-dimensions.slang +++ b/tests/compute/texture-get-dimensions.slang @@ -6,6 +6,7 @@ //DISABLE_TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj // TODO(JS): Doesn't work on CUDA as there aren't any CUDA functions to get dimensions. //DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -shaderobj +// Not supported in WGSL: 1D array texture not supported in WGSL //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu //TEST_INPUT: Texture1D(size=4, content = one):name t1D diff --git a/tests/compute/texture-sampling.slang b/tests/compute/texture-sampling.slang index d8c5f4c4b..27cb3d027 100644 --- a/tests/compute/texture-sampling.slang +++ b/tests/compute/texture-sampling.slang @@ -13,6 +13,7 @@ //TEST_INPUT: Sampler:name=samplerState //TEST_INPUT: ubuffer(data=[0 0 0 0], stride=4):out,name=outputBuffer // There is no texture_1d_array type in WGSL https://github.com/shader-slang/slang/issues/5223 +// Not supported in WGSL: 1D array texture not supported in WGSL //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu Texture1D t1D; diff --git a/tests/compute/texture-simple.slang b/tests/compute/texture-simple.slang index c319d9d29..bdad52c2d 100644 --- a/tests/compute/texture-simple.slang +++ b/tests/compute/texture-simple.slang @@ -9,6 +9,7 @@ //DISABLE_TEST_INPUT: Texture1D(format=R_Float32, size=4, content = one, mipMaps=1):name tLoad1D //Texture1D<float> tLoad1D; +// Not supported in WGSL: 1D array texture not supported in WGSL //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu //TEST_INPUT: Texture1D(size=4, content = one):name t1D diff --git a/tests/compute/transcendental-double.slang b/tests/compute/transcendental-double.slang index 4b71e0bab..025262429 100644 --- a/tests/compute/transcendental-double.slang +++ b/tests/compute/transcendental-double.slang @@ -7,6 +7,7 @@ // When using double on vulkan the values are incorrect(!) //DISABLE_TEST(compute,vulkan):COMPARE_COMPUTE:-vk -output-using-type -shaderobj //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl +// Not supported in WGSL: Double and other unsupported scalar types //DISABLE_TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0 0 0 0 0], stride=4):out,name=outputBuffer |
