Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DNI: Separate slang-test from ci.yml #5032

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 0 additions & 51 deletions .github/workflows/benchmark.yml

This file was deleted.

94 changes: 52 additions & 42 deletions .github/workflows/ci.yml → .github/workflows/build-slang.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI
name: Build Slang

on:
push:
Expand All @@ -15,9 +15,11 @@ on:
- 'LICENCE'
- 'CONTRIBUTION.md'
- 'README.md'

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build:
strategy:
Expand Down Expand Up @@ -57,22 +59,21 @@ jobs:
# The runners don't have a GPU by default except for the self-hosted ones
- has-gpu: false
# Self-hosted aarch64 build
- os: linux
config: release
compiler: gcc
platform: aarch64
test-category: smoke
full-gpu-tests: false
runs-on: [self-hosted, Linux, ARM64]
has-gpu: true
#- os: linux
# config: release
# compiler: gcc
# platform: aarch64
# test-category: smoke
# full-gpu-tests: false
# runs-on: [self-hosted, Linux, ARM64]
# has-gpu: true
# Self-hosted full gpu build
- os: windows
config: release
compiler: cl
platform: x86_64
test-category: full
full-gpu-tests: true
runs-on: [Windows, self-hosted]
has-gpu: true
fail-fast: false
runs-on: ${{ matrix.runs-on }}
Expand Down Expand Up @@ -115,45 +116,54 @@ jobs:
-DCMAKE_COMPILE_WARNING_AS_ERROR=${{matrix.warnings-as-errors}}
cmake --workflow --preset "${{matrix.config}}"
fi
- name: Test Slang

- name: Generate testing command
run: |
export SLANG_RUN_SPIRV_VALIDATION=1
export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1
echo "export SLANG_RUN_SPIRV_VALIDATION=1" > build/test-slang.sh
echo "export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1" >> build/test-slang.sh
cp build/test-slang.sh build/test-slang-via-glsl.sh
if [[ "${{matrix.full-gpu-tests}}" == "true" ]]; then
"$bin_dir/slang-test" \
-use-test-server \
-server-count 8 \
-category ${{ matrix.test-category }} \
-api all-cpu
echo "\"$bin_dir/slang-test\"
-use-test-server
-server-count 8
-category ${{ matrix.test-category }}
-api all-cpu" >> build/test-slang.sh
echo "\"$bin_dir/slang-test\"
-use-test-server
-server-count 8
-category ${{ matrix.test-category }}
-emit-spirv-via-glsl
-api vk
-expected-failure-list tests/expected-failure.txt" >> build/test-slang-via-glsl.sh
elif [[ "${{matrix.has-gpu}}" == "true" ]]; then
"$bin_dir/slang-test" \
-use-test-server \
-category ${{ matrix.test-category }} \
-api all-dx12 \
-expected-failure-list tests/expected-failure-github.txt
echo "\"$bin_dir/slang-test\"
-use-test-server
-category ${{ matrix.test-category }}
-api all-dx12
-expected-failure-list tests/expected-failure-github.txt" >> build/test-slang.sh
else
"$bin_dir/slang-test" \
-use-test-server \
-category ${{ matrix.test-category }} \
-api all-dx12 \
-expected-failure-list tests/expected-failure-github.txt \
-expected-failure-list tests/expected-failure-record-replay-tests.txt
echo "\"$bin_dir/slang-test\"
-use-test-server
-category ${{ matrix.test-category }}
-api all-dx12
-expected-failure-list tests/expected-failure-github.txt
-expected-failure-list tests/expected-failure-record-replay-tests.txt" >> build/test-slang.sh
fi
- name: Test Slang via glsl
if: ${{matrix.full-gpu-tests}}
run: |
export SLANG_RUN_SPIRV_VALIDATION=1
export SLANG_USE_SPV_SOURCE_LANGUAGE_UNKNOWN=1
"$bin_dir/slang-test" \
-use-test-server \
-server-count 8 \
-category ${{ matrix.test-category }} \
-emit-spirv-via-glsl \
-api vk \
-expected-failure-list tests/expected-failure.txt
- uses: actions/upload-artifact@v3

- name: Upload Slang executables
uses: actions/upload-artifact@v4
with:
name: test-slang-${{matrix.os}}-${{matrix.platform}}-${{matrix.compiler}}-${{matrix.config}}
path: |
build/*/bin
build/test-slang.sh
build/test-slang-via-glsl.sh

- name: Upload slang-LLVM
uses: actions/upload-artifact@v4
if: ${{ ! matrix.full-gpu-tests }}
with:
name: slang-build-${{matrix.os}}-${{matrix.platform}}-${{matrix.compiler}}-${{matrix.config}}
# The install directory used in the packaging step
path: build/dist-${{matrix.config}}/**/ZIP/slang/*

67 changes: 0 additions & 67 deletions .github/workflows/compile-regression-test.yml

This file was deleted.

102 changes: 0 additions & 102 deletions .github/workflows/falcor-compiler-perf-test.yml

This file was deleted.

Loading
Loading