From d8cca36c78832a11f618e3e74ecbe5abf1ea658c Mon Sep 17 00:00:00 2001 From: Xavier Hallade Date: Tue, 27 Feb 2024 19:51:19 +0100 Subject: [PATCH] Build: Upgrade Intel Graphics Compiler to 1.0.15468 on Linux This corresponds the latest stable LTS release: https://dgpu-docs.intel.com/releases/LTS_803.29_20240131.html Graphics compiler upgrades require increasing the mininum required driver (compute-runtime) version to the corresponding one to guarantee compatibility, which is XX.XX.27642.38 in this release, so we bump this requirement accordingly. Fixes #118713 Pull Request: https://projects.blender.org/blender/blender/pulls/118814 --- .../build_environment/cmake/versions.cmake | 16 ++++++++-------- intern/cycles/blender/addon/properties.py | 2 +- intern/cycles/device/oneapi/device_impl.cpp | 2 +- intern/cycles/kernel/CMakeLists.txt | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build_files/build_environment/cmake/versions.cmake b/build_files/build_environment/cmake/versions.cmake index 8890a226db7..ec3d9b519ec 100644 --- a/build_files/build_environment/cmake/versions.cmake +++ b/build_files/build_environment/cmake/versions.cmake @@ -674,9 +674,9 @@ set(UNIFIED_RUNTIME_FILE unified-runtime-${UNIFIED_RUNTIME_VERSION}.tar.gz) # compiler, the versions used are taken from the following location # https://github.com/intel/intel-graphics-compiler/releases -set(IGC_VERSION 1.0.14828.26) +set(IGC_VERSION 1.0.15468.25) set(IGC_URI https://github.com/intel/intel-graphics-compiler/archive/refs/tags/igc-${IGC_VERSION}.tar.gz) -set(IGC_HASH acad90b3e149cf87875e6b9100152f9e7644d6cc79ed54eaf52698abdb42076c) +set(IGC_HASH c2c36af98ead4f4f6975633eaa53f45b84cb96ce48d9bfa879bebfaf12367b79) set(IGC_HASH_TYPE SHA256) set(IGC_FILE igc-${IGC_VERSION}.tar.gz) @@ -720,9 +720,9 @@ set(IGC_SPIRV_TOOLS_HASH 327b2dba4515646eee28c1a5fe1332891e81c8b6ff289363f52877f set(IGC_SPIRV_TOOLS_HASH_TYPE SHA256) set(IGC_SPIRV_TOOLS_FILE SPIR-V-Tools-${IGC_SPIRV_TOOLS_VERSION}.tar.gz) -set(IGC_SPIRV_TRANSLATOR_VERSION 23f398bf369093b1fd67459db8071ffcc6b92658) +set(IGC_SPIRV_TRANSLATOR_VERSION 7e332d0acc8ee57462d9fbedefaf411fc193fdd0) set(IGC_SPIRV_TRANSLATOR_URI https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz) -set(IGC_SPIRV_TRANSLATOR_HASH a96447656ff6b40d9ad286524e22f4e7319d439c54136026fe72550d1162cd35) +set(IGC_SPIRV_TRANSLATOR_HASH 29aadf5fd4e64ff1d4f86446eacd6a7439efeb280478988c36314c4441072c36) set(IGC_SPIRV_TRANSLATOR_HASH_TYPE SHA256) set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}.tar.gz) @@ -730,15 +730,15 @@ set(IGC_SPIRV_TRANSLATOR_FILE SPIR-V-Translator-${IGC_SPIRV_TRANSLATOR_VERSION}. ### Intel Graphics Compiler DEPS END ### ######################################## -set(GMMLIB_VERSION intel-gmmlib-22.3.0) +set(GMMLIB_VERSION intel-gmmlib-22.3.11) set(GMMLIB_URI https://github.com/intel/gmmlib/archive/refs/tags/${GMMLIB_VERSION}.tar.gz) -set(GMMLIB_HASH c1f33e1519edfc527127baeb0436b783430dfd256c643130169a3a71dc86aff9) +set(GMMLIB_HASH b97f4e501c1e902a559cbd6597c008a700f4ab8c495680bf1968db99c6547afe) set(GMMLIB_HASH_TYPE SHA256) set(GMMLIB_FILE ${GMMLIB_VERSION}.tar.gz) -set(OCLOC_VERSION 23.30.26918.47) +set(OCLOC_VERSION 23.43.27642.40) set(OCLOC_URI https://github.com/intel/compute-runtime/archive/refs/tags/${OCLOC_VERSION}.tar.gz) -set(OCLOC_HASH 9890f29cbf27ce7eb845f3f7711fe8f3b0c4ee2164b77871fe51102548553f8f) +set(OCLOC_HASH 67d0c6f3103ff12408a628e14f7170da3e0220313e10799693d576cea7821fe2) set(OCLOC_HASH_TYPE SHA256) set(OCLOC_FILE ocloc-${OCLOC_VERSION}.tar.gz) diff --git a/intern/cycles/blender/addon/properties.py b/intern/cycles/blender/addon/properties.py index 9fd9a8e9623..2a02d209687 100644 --- a/intern/cycles/blender/addon/properties.py +++ b/intern/cycles/blender/addon/properties.py @@ -1708,7 +1708,7 @@ class CyclesPreferences(bpy.types.AddonPreferences): col.label(text=iface_("and Windows driver version %s or newer") % driver_version, icon='BLANK1', translate=False) elif sys.platform.startswith("linux"): - driver_version = "1.3.25812" + driver_version = "XX.XX.27642.38" col.label(text="Requires Intel GPU with Xe-HPG architecture and", icon='BLANK1') col.label(text=iface_(" - intel-level-zero-gpu version %s or newer") % driver_version, icon='BLANK1', translate=False) diff --git a/intern/cycles/device/oneapi/device_impl.cpp b/intern/cycles/device/oneapi/device_impl.cpp index be5ccd6e366..c743b9cc8cd 100644 --- a/intern/cycles/device/oneapi/device_impl.cpp +++ b/intern/cycles/device/oneapi/device_impl.cpp @@ -764,7 +764,7 @@ static const int lowest_supported_driver_version_win = 1014824; * This information is returned by `ocloc query OCL_DRIVER_VERSION`.*/ static const int lowest_supported_driver_version_neo = 26957; # else -static const int lowest_supported_driver_version_neo = 26918; +static const int lowest_supported_driver_version_neo = 27642; # endif int OneapiDevice::parse_driver_build_version(const sycl::device &device) diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 0b5c6fd99c5..4b3c11e97db 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -864,7 +864,7 @@ if(WITH_CYCLES_DEVICE_ONEAPI) # Set defaults for spir64 and spir64_gen options if(NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64) - set(CYCLES_ONEAPI_SYCL_OPTIONS_spir64 "-options '-ze-opt-regular-grf-kernel integrator_intersect -ze-opt-large-grf-kernel shade -ze-opt-no-local-to-generic'") + set(CYCLES_ONEAPI_SYCL_OPTIONS_spir64 "-options '-ze-opt-large-register-file -ze-opt-regular-grf-kernel integrator_intersect -ze-opt-large-grf-kernel shade -ze-opt-no-local-to-generic'") endif() if(NOT DEFINED CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen) set(CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "${CYCLES_ONEAPI_SYCL_OPTIONS_spir64}" CACHE STRING "Extra build options for spir64_gen target") -- 2.30.2