SYCL: upgrade OCLOC

RenderKit · Nov 5, 2024 · d98d70d · d98d70d
1 parent 42ab364
commit d98d70d
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 26 deletions.
diff --git a/.github/workflows/gfx-windows-public.env b/.github/workflows/gfx-windows-public.env
@@ -1 +1 @@
-GFX_DRIVER_VERSION=windows-101.5768
+GFX_DRIVER_VERSION=windows-101.6083
diff --git a/.github/workflows/internal.ci.yml b/.github/workflows/internal.ci.yml
@@ -72,7 +72,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       cmd: |
         echo $env:ROCM_PATH
         where ocloc.exe
@@ -1174,7 +1174,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows
       artifact-path: build install
       cmd: python scripts/build.py install --full
@@ -1187,7 +1187,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows-static
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_STATIC_LIB=ON
@@ -1200,7 +1200,7 @@ jobs:
       project: oidn
       runs-on: '[ "Windows", "cuda", "hip" ]'
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows-debug
       artifact-path: build install
       cmd: >
@@ -1214,7 +1214,7 @@ jobs:
       project: oidn
       runs-on: '[ "Windows", "cuda", "hip" ]'
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows-namespace
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_LIBRARY_NAME=OIDN -D OIDN_API_NAMESPACE=myoidn
@@ -1226,7 +1226,7 @@ jobs:
       project: oidn
       runs-on: '[ "Windows", "cuda", "hip" ]'
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows-namespace-static
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_LIBRARY_NAME=OIDN -D OIDN_API_NAMESPACE=myoidn -D OIDN_STATIC_LIB=ON
@@ -1239,7 +1239,7 @@ jobs:
       runs-on: '[ "Windows", "build" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows-gta-aotjit
       artifact-path: oidn-gta-aotjit-win
       cmd: >
@@ -1256,7 +1256,7 @@ jobs:
       runs-on: '[ "Windows", "build" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows-gta-jit
       artifact-path: oidn-gta-jit-win
       cmd: >
@@ -1273,7 +1273,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/nightly-2023-10-26-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows-cudart
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_DEVICE_CUDA_API=RuntimeStatic
@@ -1286,7 +1286,7 @@ jobs:
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
       dpcpp-version: intel-llvm/sycl-rel_5_2_0-rk
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      ocloc-version: oneAPI/ocloc/2025.0
       artifact-out: build-windows-syclos
       artifact-path: build install
       cmd: python scripts/build.py install --full -D OIDN_DEVICE_SYCL_AOT=OFF
@@ -1298,8 +1298,7 @@ jobs:
       project: oidn
       runs-on: '[ "Windows", "cuda", "hip" ]'
       msvc-version: "2022"
-      dpcpp-version: oneAPI/compiler/2024.0
-      ocloc-version: 77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082
+      dpcpp-version: oneAPI/compiler/2025.0
       artifact-out: build-windows-icx
       artifact-path: build install
       cmd: python scripts/build.py install --compiler icx --full -D OIDN_DEVICE_SYCL_AOT=OFF # FIXME: enable AOT

diff --git a/devices/sycl/CMakeLists.txt b/devices/sycl/CMakeLists.txt
@@ -108,13 +108,16 @@ oidn_install_module(OpenImageDenoise_device_sycl)
 if(OIDN_DEVICE_SYCL_AOT)
   target_compile_definitions(OpenImageDenoise_device_sycl PRIVATE OIDN_DEVICE_SYCL_AOT)
 
-  set(OIDN_SYCL_AOT_TARGETS_XELP tgllp,rkl,adl-s,adl-p,adl-n,dg1,mtl-m,mtl-p)
-  set(OIDN_SYCL_AOT_TARGETS_XEHPG acm-g10,acm-g11,acm-g12)
-  set(OIDN_SYCL_AOT_TARGETS ${OIDN_SYCL_AOT_TARGETS_XELP},${OIDN_SYCL_AOT_TARGETS_XEHPG})
+  set(OIDN_SYCL_AOT_TARGETS_XELP tgllp,rkl,adl-s,adl-p,adl-n,dg1,mtl-u,mtl-h)
+  set(OIDN_SYCL_AOT_TARGETS_XEHPG acm-g10,acm-g11,acm-g12,arl-h)
+  set(OIDN_SYCL_AOT_TARGETS_XEHPC lnl-m)
   if(UNIX)
-    set(OIDN_SYCL_AOT_TARGETS_XEHPC pvc-sdv,pvc)
-    set(OIDN_SYCL_AOT_TARGETS ${OIDN_SYCL_AOT_TARGETS},${OIDN_SYCL_AOT_TARGETS_XEHPC})
+    set(OIDN_SYCL_AOT_TARGETS_XELP ${OIDN_SYCL_AOT_TARGETS_XELP},pvc-vg)
+    set(OIDN_SYCL_AOT_TARGETS_XEHPC ${OIDN_SYCL_AOT_TARGETS_XEHPC},pvc-sdv,pvc)
   endif()
+  set(OIDN_SYCL_AOT_TARGETS
+    ${OIDN_SYCL_AOT_TARGETS_XELP},${OIDN_SYCL_AOT_TARGETS_XEHPG},${OIDN_SYCL_AOT_TARGETS_XEHPC}
+  )
 
   macro(oidn_set_sycl_aot_options sources options)
     set(_final_options ${options})
@@ -128,9 +131,7 @@ if(OIDN_DEVICE_SYCL_AOT)
   oidn_set_sycl_aot_options(sycl_conv_xelp.cpp "-device ${OIDN_SYCL_AOT_TARGETS_XELP}")
   oidn_set_sycl_aot_options(sycl_conv_xehpg.cpp
     "-device ${OIDN_SYCL_AOT_TARGETS_XEHPG} -options '-doubleGRF'")
-  if(OIDN_SYCL_AOT_TARGETS_XEHPC)
-    oidn_set_sycl_aot_options(sycl_conv_xehpc.cpp "-device ${OIDN_SYCL_AOT_TARGETS_XEHPC}")
-  endif()
+  oidn_set_sycl_aot_options(sycl_conv_xehpc.cpp "-device ${OIDN_SYCL_AOT_TARGETS_XEHPC}")
 endif()
 
 if(OIDN_DEVICE_SYCL_JIT_CACHE)

diff --git a/devices/sycl/sycl_device_table.h b/devices/sycl/sycl_device_table.h
@@ -35,8 +35,8 @@ OIDN_NAMESPACE_BEGIN
     {
       SYCLArch::XeLPG,
       {
-        0x03118000, // mtl-m
-        0x0311c000, // mtl-p
+        0x03118000, // mtl-u
+        0x0311c000, // mtl-h
       }
     },
     {
@@ -63,7 +63,7 @@ OIDN_NAMESPACE_BEGIN
     {
       SYCLArch::XeHPC_NoDPAS,
       {
-        0x030f4000, // pvc-xt-c0-vg
+        0x030f4000, // pvc-vg
       }
     },
     #endif

diff --git a/doc/compilation.md b/doc/compilation.md
@@ -63,15 +63,15 @@ prerequisites are needed:
 
 -   Intel® Graphics Offline Compiler for OpenCL™ Code (OCLOC)
     -   Windows:
-        Version [31.0.101.5082](https://registrationcenter-download.intel.com/akdlm/IRC_NAS/77a13ae6-6100-4ddc-b069-0086ff44730c/ocloc_win_101.5082.zip)
+        Version [2025.0.0 / 32.0.101.6129](https://registrationcenter-download.intel.com/akdlm/IRC_NAS/7000f8d2-dda8-4dd6-8b63-3917e4476fa5/intel-ocloc-2025.0.0.257_offline.exe)
         or newer as a
         [standalone component of Intel® oneAPI Toolkits](https://www.intel.com/content/www/us/en/developer/articles/tool/oneapi-standalone-components.html),
         which must be extracted and its contents added to the `PATH`.
         Also included with
         [Intel® oneAPI Base Toolkit](https://www.intel.com/content/www/us/en/developer/tools/oneapi/toolkits.html#base-kit).
 
     -   Linux: Included with [Intel® software for General Purpose GPU capabilities](https://dgpu-docs.intel.com)
-        release [20231219](https://dgpu-docs.intel.com/releases/stable_775_20_20231219.html) or newer
+        release [2441.19](https://dgpu-docs.intel.com/releases/rolling-release-notes.html#release-2024-10-31) or newer
         (install at least `intel-opencl-icd` on Ubuntu, `intel-ocloc` on RHEL or SLES).
         Also available with
         [Intel® Graphics Compute Runtime for oneAPI Level Zero and OpenCL™ Driver](https://github.com/intel/compute-runtime).