diff options
| author | Anders Leino <aleino@nvidia.com> | 2024-10-15 19:11:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-15 09:11:53 -0700 |
| commit | 9e3b0367cfd63f21a0519b61b6fd13e94dac1c51 (patch) | |
| tree | f35a6d53c25bb2b45cb295548361ca248e66e146 /tests/compute | |
| parent | be42eeed7d9e510fea93922c615f1801bc54f336 (diff) | |
Enable WebGPU tests in CI (#5239)
Diffstat (limited to 'tests/compute')
| -rw-r--r-- | tests/compute/cbuffer-legalize.slang | 1 | ||||
| -rw-r--r-- | tests/compute/compile-time-loop.slang | 1 | ||||
| -rw-r--r-- | tests/compute/constexpr.slang | 1 | ||||
| -rw-r--r-- | tests/compute/discard-stmt.slang | 1 | ||||
| -rw-r--r-- | tests/compute/func-param-legalize.slang | 1 | ||||
| -rw-r--r-- | tests/compute/func-resource-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/kernel-context-threading.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/non-square-column-major.slang | 1 | ||||
| -rw-r--r-- | tests/compute/non-square-row-major.slang | 1 | ||||
| -rw-r--r-- | tests/compute/parameter-block.slang | 1 | ||||
| -rw-r--r-- | tests/compute/row-major.slang | 1 |
15 files changed, 15 insertions, 0 deletions
diff --git a/tests/compute/cbuffer-legalize.slang b/tests/compute/cbuffer-legalize.slang index d0c0a8777..b77d9fdbf 100644 --- a/tests/compute/cbuffer-legalize.slang +++ b/tests/compute/cbuffer-legalize.slang @@ -1,5 +1,6 @@ //TEST(compute):COMPARE_COMPUTE:-cpu -shaderobj //TEST(compute):COMPARE_COMPUTE:-shaderobj +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu //TEST_INPUT: uniform(data=[1 2 3 4]):name=C.p.c //TEST_INPUT: Texture2D(size=4, content = one):name=C.p.t diff --git a/tests/compute/compile-time-loop.slang b/tests/compute/compile-time-loop.slang index 9035bde2a..840ffd145 100644 --- a/tests/compute/compile-time-loop.slang +++ b/tests/compute/compile-time-loop.slang @@ -1,5 +1,6 @@ //TEST(compute):COMPARE_RENDER_COMPUTE: -shaderobj //TEST(compute):COMPARE_RENDER_COMPUTE: -mtl -shaderobj +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu //TEST_INPUT: Texture2D(size=4, content = one):name t //TEST_INPUT: Sampler:name s diff --git a/tests/compute/constexpr.slang b/tests/compute/constexpr.slang index 9c7c9d131..84adc48dd 100644 --- a/tests/compute/constexpr.slang +++ b/tests/compute/constexpr.slang @@ -2,6 +2,7 @@ //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/discard-stmt.slang b/tests/compute/discard-stmt.slang index fa00c9ec3..b665a56a8 100644 --- a/tests/compute/discard-stmt.slang +++ b/tests/compute/discard-stmt.slang @@ -3,6 +3,7 @@ //TEST_INPUT: Texture2D(size=4, content = one):name tex //TEST_INPUT: Sampler:name samp //TEST_INPUT: ubuffer(data=[0 0], stride=4):out,name outputBuffer +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu Texture2D tex; diff --git a/tests/compute/func-param-legalize.slang b/tests/compute/func-param-legalize.slang index 2d7c57e9f..51c00254b 100644 --- a/tests/compute/func-param-legalize.slang +++ b/tests/compute/func-param-legalize.slang @@ -1,4 +1,5 @@ //TEST(compute):COMPARE_COMPUTE: -shaderobj +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu struct Param { diff --git a/tests/compute/func-resource-param.slang b/tests/compute/func-resource-param.slang index 4b67c909e..3689417e0 100644 --- a/tests/compute/func-resource-param.slang +++ b/tests/compute/func-resource-param.slang @@ -8,6 +8,7 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-dx12 -compute -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-cpu -compute -shaderobj +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu //NO_TEST:SIMPLE:-target glsl -entry computeMain -stage compute -validate-ir -dump-ir diff --git a/tests/compute/interface-shader-param-in-struct.slang b/tests/compute/interface-shader-param-in-struct.slang index 3cdbac8cf..08b8d4550 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 +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu // A lot of the setup is the same as for `interface-shader-param`, // so look there if you want the comments. diff --git a/tests/compute/interface-shader-param.slang b/tests/compute/interface-shader-param.slang index 8111ccba8..ec7bbffb8 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 +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu // First we will define some fake interfaces for testing. // Let's pretend we are doing some kind of random number diff --git a/tests/compute/kernel-context-threading.slang b/tests/compute/kernel-context-threading.slang index 5cfb171a3..8951d38be 100644 --- a/tests/compute/kernel-context-threading.slang +++ b/tests/compute/kernel-context-threading.slang @@ -10,6 +10,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -dx12 -xslang -matrix-layout-row-major -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu //TEST_INPUT:cbuffer(data=[1.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 1.0 0.0 10.0 20.0 30.0 1.0]):name matrixBuffer ConstantBuffer<float4x4> matrixBuffer; diff --git a/tests/compute/loop-unroll.slang b/tests/compute/loop-unroll.slang index f0d97dd59..9eacb2868 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 +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu //TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out, name buffers[0] //TEST_INPUT:ubuffer(data=[0 1 2 3], stride=4):name buffers[1] diff --git a/tests/compute/matrix-layout.hlsl b/tests/compute/matrix-layout.hlsl index 4a2d3f014..2e9b4389f 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:-wgpu // Not testing on Vulkan because of lack of support // for integer matrices in GLSL. Slang needs to diff --git a/tests/compute/non-square-column-major.slang b/tests/compute/non-square-column-major.slang index fd3ce6406..c5688da2e 100644 --- a/tests/compute/non-square-column-major.slang +++ b/tests/compute/non-square-column-major.slang @@ -9,6 +9,7 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -matrix-layout-column-major -shaderobj //DISABLE_TEST(compute):COMPARE_COMPUTE_EX:-cuda -compute -output-using-type -xslang -matrix-layout-column-major -shaderobj //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=METAL):-slang -output-using-type -shaderobj -mtl +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu // matrix<R, C> //TEST_INPUT:cbuffer(data=[1.0 0.0 10.0 0.0 0.0 1.0 20.0 0.0]):name matrixBuffer diff --git a/tests/compute/non-square-row-major.slang b/tests/compute/non-square-row-major.slang index 867231cd3..20f6ec139 100644 --- a/tests/compute/non-square-row-major.slang +++ b/tests/compute/non-square-row-major.slang @@ -9,6 +9,7 @@ //TEST(compute, vulkan):COMPARE_COMPUTE_EX(filecheck-buffer=ALIGNED):-vk -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj //TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=PACKED):-cuda -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=PACKED): -slang -output-using-type -shaderobj -mtl +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu // matrix<R, C> diff --git a/tests/compute/parameter-block.slang b/tests/compute/parameter-block.slang index 2922f0813..7a67868ef 100644 --- a/tests/compute/parameter-block.slang +++ b/tests/compute/parameter-block.slang @@ -3,6 +3,7 @@ //TEST(compute):COMPARE_COMPUTE:-vk -shaderobj //TEST(compute):COMPARE_COMPUTE:-shaderobj //TEST(compute):COMPARE_COMPUTE:-slang -shaderobj -mtl -render-features argument-buffer-tier-2 +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu // Ensure that Slang `ParameterBlock` type is lowered // to HLSL in the fashion that we expect. diff --git a/tests/compute/row-major.slang b/tests/compute/row-major.slang index d0e76475b..6114e6dab 100644 --- a/tests/compute/row-major.slang +++ b/tests/compute/row-major.slang @@ -4,6 +4,7 @@ //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj //TEST(compute):COMPARE_COMPUTE_EX:-slang -compute -dx12 -output-using-type -xslang -matrix-layout-row-major -shaderobj //TEST(compute, vulkan):COMPARE_COMPUTE_EX:-vk -compute -output-using-type -xslang -matrix-layout-row-major -shaderobj +//DISABLE_TEST(compute):COMPARE_COMPUTE:-wgpu //TEST_INPUT:cbuffer(data=[1.0 0.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 0.0 1.0 0.0 10.0 20.0 30.0 1.0]):name matrixBuffer ConstantBuffer<float4x4> matrixBuffer; |
