diff options
| author | cheneym2 <acheney@nvidia.com> | 2024-11-05 13:39:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-05 13:39:14 -0500 |
| commit | fc7de92000aa378da32c830ad0999eb46729ad43 (patch) | |
| tree | 990c6ed4e657c818cb2d454ab6389a43f3106222 | |
| parent | b118451e301d734e3e783b3acdf871f3f6ea851c (diff) | |
Update slang-rhi and fix error handling (#5485)
Update slang-rhi to pick up a fix in webgpu compilation error handling.
In doRenderComparisonTestRun(), only return TestResult::Pass if the
shader is ran actually compiled.
A similar check is in place elsewhere in slang-test-main, but was
missed in doRenderComparisonTestRun().
Add two tests to the github CI skiplist, and use the skiplist in one
additional CI config that was running without it.
Closes 5291
| -rw-r--r-- | .github/workflows/ci.yml | 3 | ||||
| m--------- | external/slang-rhi | 0 | ||||
| -rw-r--r-- | tests/expected-failure-github.txt | 2 | ||||
| -rw-r--r-- | tools/slang-test/slang-test-main.cpp | 5 |
4 files changed, 9 insertions, 1 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 56e1df6b0..0491bbdc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -145,7 +145,8 @@ jobs: -use-test-server \ -server-count 8 \ -category ${{ matrix.test-category }} \ - -api all-cpu + -api all-cpu \ + -expected-failure-list tests/expected-failure-github.txt elif [[ "${{matrix.has-gpu}}" == "true" ]]; then "$bin_dir/slang-test" \ -use-test-server \ diff --git a/external/slang-rhi b/external/slang-rhi -Subproject 10ab9c69fb0f1e3f476c7fd66ca7f3bedffebe5 +Subproject db40464b1a84c671824472acbff83402959f9db diff --git a/tests/expected-failure-github.txt b/tests/expected-failure-github.txt index 3c318993a..9fe6d72f7 100644 --- a/tests/expected-failure-github.txt +++ b/tests/expected-failure-github.txt @@ -17,6 +17,7 @@ tests/autodiff/global-param-hoisting.slang.4 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/autodiff/no-diff-strip.slang.3 syn (wgpu) tests/autodiff/reverse-loop-checkpoint-test.slang.3 syn (wgpu) tests/bindings/nested-parameter-block-2.slang.4 syn (wgpu) tests/bindings/nested-parameter-block-3.slang.4 syn (wgpu) @@ -39,6 +40,7 @@ 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/static-var.slang.1 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) diff --git a/tools/slang-test/slang-test-main.cpp b/tools/slang-test/slang-test-main.cpp index fccba8fd8..bdc7a082b 100644 --- a/tools/slang-test/slang-test-main.cpp +++ b/tools/slang-test/slang-test-main.cpp @@ -3583,6 +3583,11 @@ TestResult doRenderComparisonTestRun( *outOutput = output; + // Always fail if the compilation produced a failure. + if (exeRes.resultCode != 0) + { + return TestResult::Fail; + } return TestResult::Pass; } |