From c4b49aa391925b6a781e336dc4cd43bf7c901fe8 Mon Sep 17 00:00:00 2001 From: Xavier Hallade Date: Thu, 21 Sep 2023 13:33:06 +0200 Subject: [PATCH] Cycles: oneAPI: rename target intel arch cmake setting CYCLES_ONEAPI_SPIR64_GEN_DEVICES -> CYCLES_ONEAPI_INTEL_BINARIES_ARCH so it's more aligned with the name for the other backends, such as CYCLES_CUDA_BINARIES_ARCH. --- CMakeLists.txt | 4 ++-- intern/cycles/kernel/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3dd55567b3a..f8470445c23 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -678,7 +678,7 @@ This option is only for debugging purposes." # https://www.intel.com/content/www/us/en/develop/documentation/oneapi-dpcpp-cpp-compiler-dev-guide-and-reference/top/compilation/ahead-of-time-compilation.html # acm-g10 is the target for the first Intel Arc Alchemist GPUs. - set(CYCLES_ONEAPI_SPIR64_GEN_DEVICES "acm-g10" CACHE STRING "\ + set(CYCLES_ONEAPI_INTEL_BINARIES_ARCH acm-g10 CACHE STRING "\ oneAPI Intel GPU architectures to build binaries for" ) set(CYCLES_ONEAPI_SYCL_TARGETS spir64 spir64_gen CACHE STRING "\ @@ -686,7 +686,7 @@ oneAPI targets to build AOT binaries for" ) mark_as_advanced(WITH_CYCLES_ONEAPI_HOST_TASK_EXECUTION) - mark_as_advanced(CYCLES_ONEAPI_SPIR64_GEN_DEVICES) + mark_as_advanced(CYCLES_ONEAPI_INTEL_BINARIES_ARCH) mark_as_advanced(CYCLES_ONEAPI_SYCL_TARGETS) endif() diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt index 32a6450a742..1a6a58be2c4 100644 --- a/intern/cycles/kernel/CMakeLists.txt +++ b/intern/cycles/kernel/CMakeLists.txt @@ -884,7 +884,7 @@ if(WITH_CYCLES_DEVICE_ONEAPI) endif() # Enable zebin, a graphics binary format with improved compatibility. string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "--format zebin ") - string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "-device ${CYCLES_ONEAPI_SPIR64_GEN_DEVICES} ") + string(PREPEND CYCLES_ONEAPI_SYCL_OPTIONS_spir64_gen "-device ${CYCLES_ONEAPI_INTEL_BINARIES_ARCH} ") # Host execution won't use GPU binaries, no need to compile them. if(WITH_CYCLES_ONEAPI_BINARIES AND NOT WITH_CYCLES_ONEAPI_HOST_TASK_EXECUTION)