From 68ece74dfb1b8d57288d2a8fbfe1f7da65e02449 Mon Sep 17 00:00:00 2001 From: Krzysztof Raszkowski Date: Fri, 21 Nov 2025 08:20:20 -0600 Subject: [PATCH 1/2] ci: switch to intel-llvm/v6.2.0 SYCL compiler --- .github/workflows/continuous.yml | 34 +--------------- .github/workflows/dpcpp-sycl-nightly.env | 2 +- .github/workflows/nightly.yml | 52 +----------------------- .github/workflows/release.yml | 26 ++---------- 4 files changed, 8 insertions(+), 106 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 58fb48e237..860e4579e7 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -17,39 +17,7 @@ jobs: ######################################## # Linux DG2 ######################################## - #TODO: enable internal driver tests again - #linux-DG2-JIT-INTERNAL-build: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - # with: - # image: embree/ubuntu:24.04 - # runs-on: '[ "Linux", "docker", "build" ]' - # project: embree - # dpcpp-version: intel-llvm/sycl-rel_5_2_0-rk - # artifact-out: linux-DG2-JIT-INTERNAL-build - # artifact-path: ./build/*.tar.gz - # cmd: | - # module load cmake/3.25.3 - # cmake --preset linux-DG2-JIT-INTERNAL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - # cmake --build build --config Release --target build - - #linux-DG2-JIT-INTERNAL-test: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - # needs: ["linux-DG2-JIT-INTERNAL-build"] - # with: - # image: embree/ubuntu:24.04 - # options: --device=/dev/dri:/dev/dri - # runs-on: '[ "Linux", "docker", "dg2" ]' - # project: embree - # env-from-files: ./.github/workflows/gfx-ubuntu24-internal.env - # dpcpp-version: intel-llvm/sycl-rel_5_2_0-rk - # artifact-in: linux-DG2-JIT-INTERNAL-build - # cmd: | - # module load cmake/3.25.3 - # cmake --preset linux-DG2-JIT-INTERNAL -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - # cmake --build build --config Release --target test_package - + linux-GPU-JIT-build: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main diff --git a/.github/workflows/dpcpp-sycl-nightly.env b/.github/workflows/dpcpp-sycl-nightly.env index d3274f10f7..674ff1ce36 100644 --- a/.github/workflows/dpcpp-sycl-nightly.env +++ b/.github/workflows/dpcpp-sycl-nightly.env @@ -1 +1 @@ -DPCPP_VERSION=intel-llvm/nightly-2024-09-04 \ No newline at end of file +DPCPP_VERSION=intel-llvm/v6.2.0 \ No newline at end of file diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 71e7cc5c75..1b619b7df7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -132,54 +132,6 @@ jobs: cmake --preset nightly-linux-PVC-JIT -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=4 cmake --build build --config Release --target test_package - # linux-ATSM-JIT-SYCL-RC-build: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - # with: - # image: embree/ubuntu:22.04 - # runs-on: '[ "Linux", "docker", "build" ]' - # project: embree - # dpcpp-version: intel-llvm/sycl-rel_5_2_0-rk - # artifact-out: linux-ATSM-JIT-SYCL-RC-build - # artifact-path: ./build/*.tar.gz - # cmd: | - # module load cmake/3.25.3 - # cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - # cmake --build build --config Release --target build - # TODO: END Reenable after patch - - # linux-ATSM-JIT-PUBLIC-SYCL-RC-test: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - # needs: ["linux-ATSM-JIT-SYCL-RC-build"] - # with: - # image: embree/ubuntu:22.04 - # options: --device=/dev/dri:/dev/dri - # runs-on: '[ "Linux", "docker", "atsm" ]' - # project: embree - # env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu22-public.env - # artifact-in: linux-ATSM-JIT-SYCL-RC-build - # cmd: | - # module load cmake/3.25.3 - # cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - # cmake --build build --config Release --target test_package - - # linux-ATSM-JIT-INTERNAL-SYCL-RC-test: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - # needs: ["linux-ATSM-JIT-SYCL-RC-build"] - # with: - # image: embree/ubuntu:22.04 - # options: --device=/dev/dri:/dev/dri - # runs-on: '[ "Linux", "docker", "atsm" ]' - # project: embree - # env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu22-internal.env - # artifact-in: linux-ATSM-JIT-SYCL-RC-build - # cmd: | - # module load cmake/3.25.3 - # cmake --preset linux-DG2-JIT-PUBLIC -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - # cmake --build build --config Release --target test_package - ######################################## # Windows ######################################## @@ -204,7 +156,7 @@ jobs: runs-on: '[ "Windows", "NAS", "dg2" ]' project: embree env-from-files: ./.github/workflows/gfx-windows-public.env - dpcpp-version: intel-llvm/nightly-2024-09-04 + dpcpp-version: intel-llvm/v6.2.0 artifact-out: nightly-windows-DG2-JIT-NIGHTLY-RK-bulid artifact-path: ./build/*.zip cmd: | @@ -219,7 +171,7 @@ jobs: runs-on: '[ "Windows", "NAS", "dg2" ]' project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env - dpcpp-version: intel-llvm/nightly-2024-09-04 + dpcpp-version: intel-llvm/v6.2.0 artifact-in: nightly-windows-DG2-JIT-NIGHTLY-RK-bulid cmd: | cmake --preset nightly-windows-DG2-JIT-NIGHTLY -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d137f21365..6e8626297b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,7 +22,7 @@ jobs: runs-on: '[ "Windows", "NAS", "build", "avx512" ]' artifact-out: release-windows artifact-path: ./build/embree-*.zip - dpcpp-version: intel-llvm/v6.0.0-rk + dpcpp-version: intel-llvm/v6.2.0 shell: cmd cmd: | cmake --preset release-windows -DCMAKE_BUILD_TYPE=Release @@ -95,7 +95,7 @@ jobs: runs-on: '[ "Linux", "docker", "avx512" ]' artifact-out: release-linux artifact-path: ./build/*.tar.gz - dpcpp-version: intel-llvm/v6.0.0-rk + dpcpp-version: intel-llvm/v6.2.0 pre-cmd: | yum -y install epel-release dnf makecache --refresh @@ -119,7 +119,7 @@ jobs: runs-on: '[ "Windows", "NAS", "dg2" ]' project: embree env-from-files: ./.github/workflows/gfx-windows-internal.env - dpcpp-version: intel-llvm/v6.0.0-rk + dpcpp-version: intel-llvm/v6.2.0 artifact-out: release-windows-sycl artifact-path: ./build/*.zip shell: cmd @@ -135,7 +135,7 @@ jobs: image: rockylinux:8.7 runs-on: '[ "Linux", "docker", "build" ]' project: embree - dpcpp-version: intel-llvm/v6.0.0-rk + dpcpp-version: intel-llvm/v6.2.0 artifact-out: release-linux-sycl artifact-path: ./build/*.tar.gz pre-cmd: | @@ -165,24 +165,6 @@ jobs: cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx cmake --build build --target test_package - #release-linux-sycl-pvc-test: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main - # needs: ["release-linux-sycl"] - # with: - # image: embree/ubuntu:22.04 - # options: --device=/dev/dri:/dev/dri - # runs-on: '[ "Linux", "docker", "pvc" ]' - # project: embree - # env-from-files: ./.github/workflows/gfx-ubuntu22-public.env - # dpcpp-version: intel-llvm/nightly-2023-10-26-rk - # artifact-in: release-linux-sycl - # cmd: | - # module load cmake/3.25.3 - # export ZE_FLAT_DEVICE_HIERARCHY=COMPOSITE - # cmake --preset integrate-sycl-linux-dpcpp -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTEGRATION_PRESET=test-linux-icx - # cmake --build build --target test_package - ##################################################################### # Release binaries scans ##################################################################### From 2a402d4e2e4dbd113b81ba7f600939eff8b3f9ce Mon Sep 17 00:00:00 2001 From: Krzysztof Raszkowski Date: Fri, 21 Nov 2025 08:20:56 -0600 Subject: [PATCH 2/2] ci: add more GPU tests (BMG, LNL) & cleanup --- .github/workflows/continuous.yml | 114 +++++++++++------------------- .github/workflows/integrate.yml | 3 +- .github/workflows/nightly.yml | 2 +- .github/workflows/performance.yml | 7 +- .github/workflows/release.yml | 2 +- 5 files changed, 46 insertions(+), 82 deletions(-) diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml index 860e4579e7..914adafada 100644 --- a/.github/workflows/continuous.yml +++ b/.github/workflows/continuous.yml @@ -24,7 +24,6 @@ jobs: with: image: embree/ubuntu:24.04 runs-on: '[ "Linux", "docker", "build" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: linux-GPU-JIT-build artifact-path: ./build/*.tar.gz @@ -40,7 +39,6 @@ jobs: image: embree/ubuntu:24.04 options: --device=/dev/dri:/dev/dri runs-on: '[ "Linux", "docker", "dg2" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env artifact-in: linux-GPU-JIT-build cmd: | @@ -55,7 +53,6 @@ jobs: image: embree/ubuntu:24.04 options: --device=/dev/dri:/dev/dri runs-on: '[ "Linux", "docker", "pvc" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-ubuntu24-public.env artifact-in: linux-GPU-JIT-build cmd: | @@ -68,7 +65,6 @@ jobs: with: image: embree/ubuntu:24.04 runs-on: '[ "Linux", "docker", "build" ]' - project: embree dpcpp-version: intel/2025.2 artifact-out: linux-DG2-JIT-PUBLIC-ICX-build artifact-path: ./build/*.tar.gz @@ -84,7 +80,6 @@ jobs: image: embree/ubuntu:24.04 options: --device=/dev/dri:/dev/dri runs-on: '[ "Linux", "docker", "dg2" ]' - project: embree env-from-files: ./.github/workflows/gfx-ubuntu24-public.env dpcpp-version: intel/2025.2 artifact-in: linux-DG2-JIT-PUBLIC-ICX-build @@ -99,7 +94,6 @@ jobs: with: image: embree/ubuntu:24.04 runs-on: '[ "Linux", "docker", "build" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env artifact-out: linux-DG2-JIT-PUBLIC-debug-build artifact-path: ./build/*.tar.gz @@ -111,56 +105,63 @@ jobs: # Windows DG2 ######################################## - windows-DG2-JIT-build: + windows-JIT-build: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: force-delete: true runs-on: '[ "Windows", "NAS", "build" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env - artifact-out: windows-DG2-JIT-build + artifact-out: windows-JIT-build artifact-path: ./build/*.zip cmd: | cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 cmake --build build --config Release --target build - # TODO: enable internal driver tests again - #windows-DG2-JIT-INTERNAL-test: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - # needs: ["windows-DG2-JIT-build"] - # with: - # runs-on: '[ "Windows", "NAS", "dg2" ]' - # project: embree - # env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env - # artifact-in: windows-DG2-JIT-build - # cmd: | - # cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 - # cmake --build build --config Release --target test_package + windows-DG2-JIT-test: + secrets: inherit + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main + needs: ["windows-JIT-build"] + with: + runs-on: '[ "Windows", "dg2" ]' + env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env + artifact-in: windows-JIT-build + cmd: | + cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 + cmake --build build --config Release --target test_package - windows-DG2-JIT-PUBLIC-test: + windows-BMG-JIT-test: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - needs: ["windows-DG2-JIT-build"] + needs: ["windows-JIT-build"] with: - runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree + runs-on: '[ "Windows", "bmg" ]' env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env - artifact-in: windows-DG2-JIT-build + artifact-in: windows-JIT-build cmd: | cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 cmake --build build --config Release --target test_package + windows-LNL-JIT-test: + secrets: inherit + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main + needs: ["windows-JIT-build"] + with: + runs-on: '[ "Windows", "lnl" ]' + env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-public.env + artifact-in: windows-JIT-build + cmd: | + cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 + cmake --build build --config Release --target test_package + windows-DG2-JIT-INTERNAL-test: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - needs: ["windows-DG2-JIT-build"] + needs: ["windows-JIT-build"] with: runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env ./.github/workflows/gfx-windows-internal.env - artifact-in: windows-DG2-JIT-build + artifact-in: windows-JIT-build cmd: | cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 cmake --build build --config Release --target test_package @@ -170,7 +171,6 @@ jobs: uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main with: runs-on: '[ "Windows", "NAS", "dg2" ]' - project: embree dpcpp-version: intel/2025.2 env-from-files: ./.github/workflows/gfx-windows-public.env artifact-out: windows-DG2-JIT-ICX-build @@ -179,17 +179,16 @@ jobs: cmake --preset nightly-windows-DG2-JIT-ICX -DCMAKE_BUILD_TYPE=Release -DEMBREE_TESTING_INTENSITY=3 cmake --build build --config Release --target build - # windows-DG2-JIT-debug-build: - # secrets: inherit - # uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main - # with: - # force-delete: true - # runs-on: '[ "Windows", "NAS", "build" ]' - # project: embree - # env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env - # cmd: | - # cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS-debug -DCMAKE_BUILD_TYPE=Debug -DEMBREE_TESTING_INTENSITY=3 - # cmake --build build --config Debug --target build + windows-DG2-JIT-debug-build: + secrets: inherit + uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main + with: + force-delete: true + runs-on: '[ "Windows", "NAS", "build" ]' + env-from-files: ./.github/workflows/dpcpp-sycl-nightly.env + cmd: | + cmake --preset windows-DG2-JIT-INTERNAL-L0RTAS-debug -DCMAKE_BUILD_TYPE=Debug -DEMBREE_TESTING_INTENSITY=3 + cmake --build build --config Debug --target build # ################################################################################ # ################################################################################ @@ -350,7 +349,7 @@ jobs: cmake --build build --config RelWithDebInfo --target test_package ######################################## - # Coverity + # Static code analysis jobs ######################################## static-analysis-lin: @@ -364,32 +363,3 @@ jobs: export NAS_LINUX=$STORAGE_PATH/packages/apps && cmake --preset linux-coverity build: sh scripts/coverity.sh - - success: - runs-on: ubuntu-latest - needs: - - linux-DG2-JIT-PUBLIC-test - - linux-DG2-JIT-PUBLIC-ICX-test - - linux-DG2-JIT-PUBLIC-debug-build - - windows-DG2-JIT-PUBLIC-test - - windows-DG2-JIT-INTERNAL-test - - linux-fedora29-CLANG4 - - linux-fedora29-CLANG5-INT-ADDRSANITIZER - - linux-fedora29-ICX - - linux-fedora32-ICX - - linux-ubuntu20_04-GCC-NAMESPACE - - linux-ubuntu20_04-ICX - - windows-V142 - - macosx-ARM-CLANG-NEON-AVX2 - - macosx-ARM-CLANG-NEON - - macosx-x64-CLANG - - macosx-ARM-CLANG-NEON-AVX2-universal-binaries - - static-analysis-lin - - - if: failure() || cancelled() - steps: - - name: Failure - run: | - echo "::notice title=Success::Workflow failed" - exit 1 \ No newline at end of file diff --git a/.github/workflows/integrate.yml b/.github/workflows/integrate.yml index ac3465ad31..be24dcb8f9 100644 --- a/.github/workflows/integrate.yml +++ b/.github/workflows/integrate.yml @@ -5,10 +5,9 @@ name: integrate permissions: read-all -# same as nightly... on: schedule: - - cron: '00 00 * * *' + - cron: '01 00 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1b619b7df7..5a53a519e7 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -7,7 +7,7 @@ permissions: read-all on: schedule: - - cron: '00 00 * * *' + - cron: '01 00 * * *' workflow_dispatch: jobs: diff --git a/.github/workflows/performance.yml b/.github/workflows/performance.yml index 34e1a3d86b..54ee0c143a 100644 --- a/.github/workflows/performance.yml +++ b/.github/workflows/performance.yml @@ -7,7 +7,7 @@ permissions: read-all on: schedule: - - cron: '00 01 * * *' + - cron: '02 00 * * *' workflow_dispatch: jobs: @@ -72,11 +72,6 @@ jobs: source ../embree-vars.sh $GITHUB_WORKSPACE/scripts/run-perf.sh gpu - - - - - perf-linux-x86-ICX-ISPC-build: secrets: inherit uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e8626297b..91691ecd13 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ permissions: read-all on: schedule: - - cron: '00 00 * * *' + - cron: '01 00 * * *' workflow_dispatch: jobs: