From bc8ccc5ddc0e3ded1b2c899fd0a62f53c12a8340 Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Thu, 4 Sep 2025 11:11:32 -0700 Subject: [PATCH 1/2] [SYCL-RTC] Fix MacOS post-commit build failure Failed after https://github.com/intel/llvm/pull/19924. `remangled-*` requiring `libspirv-builtins` on top of `libclc` is technically a separate issue but I realized it while working on fixing the CI, so can go in in the same PR. --- sycl-jit/jit-compiler/CMakeLists.txt | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/sycl-jit/jit-compiler/CMakeLists.txt b/sycl-jit/jit-compiler/CMakeLists.txt index 942a650e1c871..2dc29f9b336e1 100644 --- a/sycl-jit/jit-compiler/CMakeLists.txt +++ b/sycl-jit/jit-compiler/CMakeLists.txt @@ -9,15 +9,19 @@ else() set(SYCL_JIT_VIRTUAL_TOOLCHAIN_ROOT "/sycl-jit-toolchain/") endif() +# TODO: libdevice +set(SYCL_JIT_RESOURCE_DEPS sycl-headers clang ${CMAKE_CURRENT_SOURCE_DIR}/utils/generate.py) + +if ("libclc" IN_LIST LLVM_ENABLE_PROJECTS) + # Somehow just "libclc" doesn't build "remangled-*" (and maybe whatever else). + list(APPEND SYCL_JIT_RESOURCE_DEPS libclc libspirv-builtins) +endif() + add_custom_command( OUTPUT ${SYCL_JIT_RESOURCE_CPP} COMMAND ${Python3_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/utils/generate.py --toolchain-dir ${CMAKE_BINARY_DIR} --output ${SYCL_JIT_RESOURCE_CPP} --prefix ${SYCL_JIT_VIRTUAL_TOOLCHAIN_ROOT} DEPENDS - sycl-headers # include/sycl - libclc # lib/clc - clang # lib/clang - # TODO: libdevice - ${CMAKE_CURRENT_SOURCE_DIR}/utils/generate.py + ${SYCL_JIT_RESOURCE_DEPS} ) # We use C23/C++26's `#embed` to implement this resource creation, and "current" @@ -33,7 +37,14 @@ if (WIN32) endif() else() get_host_tool_path( clang CLANG clang_exe clang_target ) - set(SYCL_JIT_RESOURCE_CXX_FLAGS -O2 -Wno-c23-extensions -std=c++17 -fPIC -fvisibility=hidden) + set(SYCL_JIT_RESOURCE_CXX_FLAGS -O2 -Wno-c23-extensions -std=c++17 -fPIC -fvisibility=hidden -v) + + if (CMAKE_SYSTEM_NAME MATCHES "Darwin") + # Hack based on the information at + # https://cmake.org/cmake/help/latest/variable/CMAKE_OSX_SYSROOT.html + execute_process(COMMAND xcrun --sdk macosx --show-sdk-path OUTPUT_VARIABLE SYCL_JIT_OSX_SYSROOT) + list(APPEND SYCL_JIT_RESOURCE_CXX_FLAGS -isysroot ${SYCL_JIT_OSX_SYSROOT}) + endif() endif() add_custom_command( From 314e3c84519eac78ff45722bb289cb604a03be68 Mon Sep 17 00:00:00 2001 From: Andrei Elovikov Date: Thu, 4 Sep 2025 13:47:05 -0700 Subject: [PATCH 2/2] Update sycl-jit/jit-compiler/CMakeLists.txt --- sycl-jit/jit-compiler/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sycl-jit/jit-compiler/CMakeLists.txt b/sycl-jit/jit-compiler/CMakeLists.txt index 2dc29f9b336e1..b01964f493f10 100644 --- a/sycl-jit/jit-compiler/CMakeLists.txt +++ b/sycl-jit/jit-compiler/CMakeLists.txt @@ -37,7 +37,7 @@ if (WIN32) endif() else() get_host_tool_path( clang CLANG clang_exe clang_target ) - set(SYCL_JIT_RESOURCE_CXX_FLAGS -O2 -Wno-c23-extensions -std=c++17 -fPIC -fvisibility=hidden -v) + set(SYCL_JIT_RESOURCE_CXX_FLAGS -O2 -Wno-c23-extensions -std=c++17 -fPIC -fvisibility=hidden) if (CMAKE_SYSTEM_NAME MATCHES "Darwin") # Hack based on the information at