CI updates and ICG WA

.github/deps/dpcpp-sycl-nightly.env

@@ -1 +1,2 @@
-DPCPP_VERSION=intel-llvm/v7.0.0
+DPCPP_VERSION=intel-llvm/v7.2.0
+MSVC_VERSION=2022

.github/deps/dpcpp-windows-icx.env

@@ -1 +1,2 @@
-DPCPP_VERSION=intel/2025.3
+DPCPP_VERSION=intel/2026.1
+MSVC_VERSION=2022

.github/workflows/external.ci.linux.yml

@@ -28,15 +28,15 @@ jobs:
         dnf group install "Development Tools" -y
 
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Build OpenVKL
       run: |
         export PATH=/usr/bin:$PATH # prefer newer cmake in /usr/bin instead of /usr/local/bin
         scl enable gcc-toolset-11 .github/scripts/build.sh
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: build-rocky-8
         path: build/install
@@ -54,7 +54,7 @@ jobs:
         dnf install libglvnd-glx libglvnd-opengl -y
 
     - name: Download Artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: build-rocky-8
 
@@ -84,13 +84,13 @@ jobs:
         apt-get install build-essential cmake ninja-build libglfw3-dev libgl1-mesa-dev git -y
 
     - name: Checkout Repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v7
 
     - name: Build OpenVKL
       run: .github/scripts/build.sh -G Ninja -D BUILD_GLFW=OFF
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v7
       with:
         name: build-ubuntu-2204
         path: build/install
@@ -110,7 +110,7 @@ jobs:
         apt-get install libglfw3 libopengl0 -y
 
     - name: Download Artifact
-      uses: actions/download-artifact@v4
+      uses: actions/download-artifact@v8
       with:
         name: build-ubuntu-2204
 

.github/workflows/internal.ci.linux.gpu.yml

@@ -62,7 +62,7 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       timeout-minutes: 45
-      image: ubuntu:22.04
+      image: ubuntu:24.04
       runs-on: '[ "Linux", "docker", "dg2" ]'
       artifact-in: build-gpu
       env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
@@ -77,7 +77,7 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       timeout-minutes: 45
-      image: ubuntu:22.04
+      image: ubuntu:24.04
       runs-on: '[ "Linux", "docker", "pvc" ]'
       artifact-in: build-gpu
       env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env .github/env/pvc-runtime-options.env
@@ -93,7 +93,7 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       timeout-minutes: 45
-      image: ubuntu:22.04
+      image: ubuntu:24.04
       runs-on: '[ "Linux", "docker", "pvc" ]'
       artifact-in: build-gpu
       artifact-out: test-examples-pvc
@@ -111,7 +111,7 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       timeout-minutes: 45
-      image: ubuntu:22.04
+      image: ubuntu:24.04
       runs-on: '[ "Linux", "docker", "dg2" ]'
       artifact-in: build-gpu
       env-from-files: .github/deps/dpcpp-sycl-nightly.env .github/deps/gfx-linux-public.env
@@ -127,7 +127,7 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       timeout-minutes: 45
-      image: ubuntu:22.04
+      image: ubuntu:24.04
       runs-on: '[ "Linux", "docker", "dg2" ]'
       artifact-in: build-gpu
       artifact-out: test-examples-dg2
@@ -145,7 +145,7 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/docker.yml@main
     with:
       timeout-minutes: 45
-      image: ubuntu:22.04
+      image: ubuntu:24.04
       runs-on: '[ "Linux", "docker", "pvc" ]'
       artifact-in: build-gpu
       artifact-out: test-examples-big-volume-pvc

.github/workflows/internal.ci.windows.gpu.icx.yml

@@ -21,7 +21,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
       env-from-files: .github/deps/dpcpp-windows-icx.env
-      msvc-version: 2022
       artifact-out: build-windows-gpu
       artifact-path: ./build
       artifact-on-failure: true
@@ -43,7 +42,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
       env-from-files: .github/deps/dpcpp-windows-icx.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       cmd: |
         cd ./build/install/bin
@@ -60,7 +58,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "dg2" ]'
       env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       cmd: |
         cd ./build/install/bin
@@ -77,7 +74,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "bmg" ]'
       env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       cmd: |
         cd ./build/install/bin
@@ -94,7 +90,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "lnl" ]'
       env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       cmd: |
         cd ./build/install/bin
@@ -111,7 +106,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "dg2" ]'
       env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       artifact-out: test-examples-dg2
       artifact-path: ./build/install/bin/*.pfm
@@ -129,7 +123,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "bmg" ]'
       env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       artifact-out: test-examples-bmg
       artifact-path: ./build/install/bin/*.pfm
@@ -147,7 +140,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "lnl" ]'
       env-from-files: .github/deps/dpcpp-windows-icx.env .github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       artifact-out: test-examples-lnl
       artifact-path: ./build/install/bin/*.pfm

.github/workflows/internal.ci.windows.gpu.yml

@@ -21,7 +21,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env
-      msvc-version: 2022
       artifact-out: build-windows-gpu
       artifact-path: ./build
       artifact-on-failure: true
@@ -43,7 +42,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       cmd: |
         cd ./build/install/bin
@@ -60,7 +58,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "dg2" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       cmd: |
         cd ./build/install/bin
@@ -77,7 +74,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "bmg" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       cmd: |
         cd ./build/install/bin
@@ -94,7 +90,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "lnl" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       cmd: |
         cd ./build/install/bin
@@ -111,7 +106,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "dg2" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       artifact-out: test-examples-dg2
       artifact-path: ./build/install/bin/*.pfm
@@ -129,7 +123,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "bmg" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       artifact-out: test-examples-bmg
       artifact-path: ./build/install/bin/*.pfm
@@ -147,7 +140,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "lnl" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: build-windows-gpu
       artifact-out: test-examples-lnl
       artifact-path: ./build/install/bin/*.pfm

.github/workflows/internal.ci.windows.yml

@@ -13,53 +13,49 @@ concurrency:
 permissions: read-all
 
 jobs:
-  build-windows-msvc16:
+  build-windows:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { vs: 16, msvc: 2019 }
+          - { vs: 17, msvc: 2022 }
+          - { vs: 18, msvc: 2026 }
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
     with:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
-      artifact-out: build-windows-msvc16
+      msvc-version: ${{ matrix.msvc }}
+      artifact-out: build-windows-msvc${{ matrix.vs }}
       artifact-path: ./build/install
-      cmd: .github\scripts\build.bat "Visual Studio 16 2019" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
-
-  test-windows-msvc16:
-    needs: build-windows-msvc16
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      runs-on: '[ "build", "x86_64" ]'
-      artifact-in: build-windows-msvc16
-      cmd: |
-        .github\scripts\run_tests.bat
-
-
-  build-windows-msvc17:
+      cmd: .github\scripts\build.bat "Visual Studio ${{ matrix.vs }} ${{ matrix.msvc }}" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
+
+  build-windows-source:
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - { vs: 17, msvc: 2022 }
+          - { vs: 18, msvc: 2026 }
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
     with:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
-      artifact-out: build-windows-msvc17
-      artifact-path: ./build/install
-      cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Release" '"-DBUILD_EMBREE_FROM_SOURCE=OFF"'
-
-  build-windows-msvc17-source:
+      msvc-version: ${{ matrix.msvc }}
+      cmd: .github\scripts\build.bat "Visual Studio ${{ matrix.vs }} ${{ matrix.msvc }}" "Release"
+
+  test-windows:
+    needs: build-windows
+    strategy:
+      fail-fast: false
+      matrix:
+        vs: [16, 17] # TODO 18 when fix of https://developercommunity.visualstudio.com/t/MSVC-x64-O1-miscompiles-size_t-loop-aft/11163646 is released
     secrets: inherit
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
     with:
-      force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
-      cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Release"
-
-  test-windows-msvc17:
-    needs: build-windows-msvc17
-    secrets: inherit
-    uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
-    with:
-      runs-on: '[ "build", "x86_64" ]'
-      artifact-in: build-windows-msvc17
+      artifact-in: build-windows-msvc${{ matrix.vs }}
       cmd: |
         .github\scripts\run_tests.bat
-
-# TODO add msvc18, but VC 2026 v18.9 miscompiles

.github/workflows/internal.nightly.windows.yml

@@ -20,6 +20,7 @@ jobs:
     with:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
+      msvc-version: 2022
       artifact-out: build-windows-msvc17-debug
       artifact-path: ./build/install
       cmd: .github\scripts\build.bat "Visual Studio 17 2022" "Debug"

.github/workflows/internal.release.yml

@@ -74,6 +74,7 @@ jobs:
       timeout-minutes: 60
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
+      msvc-version: 2022
       artifact-out: windows
       artifact-path: ./*.zip
       cmd: |
@@ -89,7 +90,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "build", "x86_64" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env
-      msvc-version: 2022
       artifact-out: windows_sycl
       artifact-path: ./*.zip
       cmd: |
@@ -155,6 +155,7 @@ jobs:
     uses: intel-innersource/libraries.devops.renderkit.workflows/.github/workflows/windows.yml@main
     with:
       runs-on: '[ "x86_64" ]'
+      msvc-version: 2022
       artifact-in: windows
       cmd: |
         $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2"
@@ -169,7 +170,6 @@ jobs:
       force-delete: true    # guarantees .gitattributes are respected in working dir
       runs-on: '[ "bmg" ]'
       env-from-files: ./.github/deps/dpcpp-sycl-nightly.env ./.github/deps/gfx-windows-public.env
-      msvc-version: 2022
       artifact-in: windows_sycl
       cmd: |
         $env:OPENVKL_RELEASE_PACKAGE_VERSION="2.0.2"

doc/compilation.md

@@ -74,7 +74,7 @@ Windows, you need the following additional prerequisites:
 -   [CMake](http://www.cmake.org) version 3.25.3 or higher
 
 -   Download the [oneAPI DPC++ Compiler
-    2023-10-26](https://github.com/intel/llvm/releases/tag/v7.0.0);
+    v7.2.0](https://github.com/intel/llvm/releases/tag/v7.2.0);
     please note this specific version has been validated and used in our
     releases.
 

examples/interactive/vklBenchmark.cpp

@@ -67,8 +67,13 @@ static bool rendererIsCompatibleWithDevice(const std::string &rendererType,
       std::cerr << "skipping benchmark capture: " << #FUNC << ", "             \
                 << #TEST_CASE_NAME << "\n\t" << errorString << std::endl;      \
     } else {                                                                   \
-      BENCHMARK_CAPTURE(                                                       \
-          FUNC, TEST_CASE_NAME, RENDERER_TYPE, WINDOW_SIZE, VOLUME_DIMENSION); \
+      /* not BENCHMARK_CAPTURE: its lambdas in main() get same mangled name */ \
+      /* with dpcpp 7.2, see https://github.com/intel/llvm/issues/23624     */ \
+      benchmark::RegisterBenchmark(#FUNC "/" #TEST_CASE_NAME,                  \
+                                   FUNC,                                       \
+                                   RENDERER_TYPE,                              \
+                                   WINDOW_SIZE,                                \
+                                   VOLUME_DIMENSION);                          \
     }                                                                          \
   }