Skip to content

[SYCL-TLA] Enable SYCL-TLA build #2030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[SYCL-TLA] Enable SYCL-TLA build #2030

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e93059
enable sycltla build and add xpu flash_attn as build dir
LuFinch Oct 20, 2025
498e12b
fix lint
LuFinch Oct 21, 2025
cccd39d
fix lint
LuFinch Oct 21, 2025
2e8becc
fix comments
LuFinch Oct 22, 2025
f249c3f
update tag and include path
LuFinch Oct 26, 2025
84296da
update sycl-tla tag to v0.6
LuFinch Nov 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ include(${TORCH_XPU_OPS_ROOT}/cmake/SYCL.cmake)
include(${TORCH_XPU_OPS_ROOT}/cmake/ONEMKL.cmake)
include(${TORCH_XPU_OPS_ROOT}/cmake/BuildFlags.cmake)

set_build_flags()

# -- [ Re-generate the macros file for https://github.com/pytorch/pytorch/pull/147161
macro(update_caffe2_macros_file)
configure_file(
Expand All @@ -56,6 +58,16 @@ if(USE_XCCL)
endif()
endif()

set(USE_SYCLTLA ON)
if(WIN32 OR NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU" OR ${CMAKE_CXX_COMPILER_VERSION} VERSION_LESS 13.0)
set(USE_SYCLTLA OFF)
message(WARNING "SYCL-TLA is not build as it only supports GCC >= 13.0 as CXX Compiler on Linux Platform!")
endif()

if(USE_SYCLTLA)
include(${TORCH_XPU_OPS_ROOT}/cmake/SYCLTLA.cmake)
endif()

if(BUILD_TEST)
add_subdirectory(${TORCH_XPU_OPS_ROOT}/test/sycl ${CMAKE_BINARY_DIR}/test_sycl)
endif()
Expand Down
274 changes: 147 additions & 127 deletions cmake/BuildFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,141 +22,161 @@ function(CHECK_SYCL_FLAG FLAG VARIABLE_NAME)
file(REMOVE_RECURSE ${TEMP_DIR})
endfunction()

# Support GCC on Linux and MSVC on Windows at the moment.
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
# # -- Host flags (SYCL_CXX_FLAGS)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
list(APPEND SYCL_HOST_FLAGS /std:c++17)
list(APPEND SYCL_HOST_FLAGS /MD)
list(APPEND SYCL_HOST_FLAGS /EHsc) # exception handling
# SYCL headers warnings
list(APPEND SYCL_HOST_FLAGS /wd4996) # allow usage of deprecated functions
list(APPEND SYCL_HOST_FLAGS /wd4018) # allow signed and unsigned comparison
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
list(APPEND SYCL_HOST_FLAGS -fPIC)
list(APPEND SYCL_HOST_FLAGS -std=c++17)
list(APPEND SYCL_HOST_FLAGS -Wunused-variable)
# Some versions of DPC++ compiler pass paths to SYCL headers as user include paths (`-I`) rather
# than system paths (`-isystem`). This makes host compiler to report warnings encountered in the
# SYCL headers, such as deprecated warnings, even if warned API is not actually used in the program.
# We expect that this issue will be addressed in the later version of DPC++ compiler. To workaround
# the issue we wrap paths to SYCL headers in `-isystem`.
foreach(FLAGS IN LISTS SYCL_INCLUDE_DIR)
list(APPEND SYCL_HOST_FLAGS "-isystem ${FLAGS}")
endforeach()
# Excluding warnings which flood the compilation output
# TODO: fix warnings in the source code and then reenable them in compilation
list(APPEND SYCL_HOST_FLAGS -Wno-sign-compare)
endif()
macro(set_build_flags)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(SYCL_HOST_FLAGS)
set(SYCL_KERNEL_OPTIONS)
set(SYCL_COMPILE_FLAGS ${SYCL_FLAGS})
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_LINK_FLAGS})
set(SYCL_OFFLINE_COMPILER_AOT_OPTIONS)
set(SYCL_OFFLINE_COMPILER_CG_OPTIONS)
set(SYCL_OFFLINE_COMPILER_FLAGS)

if(CMAKE_BUILD_TYPE MATCHES Debug)
list(APPEND SYCL_HOST_FLAGS -g -fno-omit-frame-pointer -O0)
elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
list(APPEND SYCL_HOST_FLAGS -g -O2)
endif()
if(USE_PER_OPERATOR_HEADERS)
list(APPEND SYCL_HOST_FLAGS -DAT_PER_OPERATOR_HEADERS)
endif()
list(APPEND SYCL_HOST_FLAGS -D__INTEL_LLVM_COMPILER_VERSION=${__INTEL_LLVM_COMPILER})
# -- Kernel flags (SYCL_KERNEL_OPTIONS)
# The fast-math will be enabled by default in SYCL compiler.
# Refer to [https://clang.llvm.org/docs/UsersManual.html#cmdoption-fno-fast-math]
# 1. We enable below flags here to be warn about NaN and Infinity,
# which will be hidden by fast-math by default.
# 2. The associative-math in fast-math allows floating point
# operations to be reassociated, which will lead to non-deterministic
# results compared with CUDA backend.
# 3. The approx-func allows certain math function calls (such as log, sqrt, pow, etc)
# to be replaced with an approximately equivalent set of instructions or
# alternative math function calls, which have great errors.
#
# PSEUDO of separate compilation with DPCPP compiler.
# 1. Kernel source compilation:
# icpx -fsycl -fsycl-target=${SYCL_TARGETS_OPTION} ${SYCL_FLAGS} -fsycl-host-compiler=gcc -fsycl-host-compiler-options='${CMAKE_HOST_FLAGS}' kernel.cpp -o kernel.o
# 2. Device code linkage:
# icpx -fsycl -fsycl-target=${SYCL_TARGETS_OPTION} -fsycl-link ${SYCL_DEVICE_LINK_FLAGS} -Xs '${SYCL_OFFLINE_COMPILER_FLAGS}' kernel.o -o device-code.o
# 3. Host only source compilation:
# gcc ${CMAKE_HOST_FLAGS} host.cpp -o host.o
# 4. Linkage:
# gcc -shared host.o kernel.o device-code.o -o libxxx.so
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fno-sycl-unnamed-lambda)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -sycl-std=2020)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} /fp:strict)
# Suppress warnings about dllexport.
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -Wno-ignored-attributes)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fhonor-nans)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fhonor-infinities)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fno-associative-math)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fno-approx-func)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -Wno-absolute-value)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -no-ftz)
endif()
if(REPLACE_FLAGS_FOR_SYCLTLA)
set(CPP_STD c++20)
else()
set(CPP_STD c++17)
endif()
# # -- Host flags (SYCL_CXX_FLAGS)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
list(APPEND SYCL_HOST_FLAGS /std:${CPP_STD})
list(APPEND SYCL_HOST_FLAGS /MD)
list(APPEND SYCL_HOST_FLAGS /EHsc) # exception handling
# SYCL headers warnings
list(APPEND SYCL_HOST_FLAGS /wd4996) # allow usage of deprecated functions
list(APPEND SYCL_HOST_FLAGS /wd4018) # allow signed and unsigned comparison
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
list(APPEND SYCL_HOST_FLAGS -fPIC)
list(APPEND SYCL_HOST_FLAGS -std=${CPP_STD})
list(APPEND SYCL_HOST_FLAGS -Wunused-variable)
# Some versions of DPC++ compiler pass paths to SYCL headers as user include paths (`-I`) rather
# than system paths (`-isystem`). This makes host compiler to report warnings encountered in the
# SYCL headers, such as deprecated warnings, even if warned API is not actually used in the program.
# We expect that this issue will be addressed in the later version of DPC++ compiler. To workaround
# the issue we wrap paths to SYCL headers in `-isystem`.
foreach(FLAGS IN LISTS SYCL_INCLUDE_DIR)
list(APPEND SYCL_HOST_FLAGS "-isystem ${FLAGS}")
endforeach()
# Excluding warnings which flood the compilation output
# TODO: fix warnings in the source code and then reenable them in compilation
list(APPEND SYCL_HOST_FLAGS -Wno-sign-compare)
endif()

if(CMAKE_BUILD_TYPE MATCHES Debug)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -g -O0 -Rno-debug-disables-optimization)
elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -gline-tables-only -O2)
endif()
if(CMAKE_BUILD_TYPE MATCHES Debug)
list(APPEND SYCL_HOST_FLAGS -g -fno-omit-frame-pointer -O0)
elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
list(APPEND SYCL_HOST_FLAGS -g -O2)
endif()
if(USE_PER_OPERATOR_HEADERS)
list(APPEND SYCL_HOST_FLAGS -DAT_PER_OPERATOR_HEADERS)
endif()
# -- Kernel flags (SYCL_KERNEL_OPTIONS)
# The fast-math will be enabled by default in SYCL compiler.
# Refer to [https://clang.llvm.org/docs/UsersManual.html#cmdoption-fno-fast-math]
# 1. We enable below flags here to be warn about NaN and Infinity,
# which will be hidden by fast-math by default.
# 2. The associative-math in fast-math allows floating point
# operations to be reassociated, which will lead to non-deterministic
# results compared with CUDA backend.
# 3. The approx-func allows certain math function calls (such as log, sqrt, pow, etc)
# to be replaced with an approximately equivalent set of instructions or
# alternative math function calls, which have great errors.
#
# PSEUDO of separate compilation with DPCPP compiler.
# 1. Kernel source compilation:
# icpx -fsycl -fsycl-target=${SYCL_TARGETS_OPTION} ${SYCL_KERNEL_OPTIONS} -fsycl-host-compiler=gcc -fsycl-host-compiler-options='${CMAKE_HOST_FLAGS}' kernel.cpp -o kernel.o
# 2. Device code linkage:
# icpx -fsycl -fsycl-target=${SYCL_TARGETS_OPTION} -fsycl-link ${SYCL_DEVICE_LINK_FLAGS} -Xs '${SYCL_OFFLINE_COMPILER_FLAGS}' kernel.o -o device-code.o
# 3. Host only source compilation:
# gcc ${CMAKE_HOST_FLAGS} host.cpp -o host.o
# 4. Linkage:
# gcc -shared host.o kernel.o device-code.o -o libxxx.so
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fno-sycl-unnamed-lambda)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -sycl-std=2020)
if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} /fp:strict)
# Suppress warnings about dllexport.
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -Wno-ignored-attributes)
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fhonor-nans)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fhonor-infinities)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fno-associative-math)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fno-approx-func)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -Wno-absolute-value)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -no-ftz)
endif()

CHECK_SYCL_FLAG("-fsycl-fp64-conv-emu" SUPPORTS_FP64_CONV_EMU)
if(NOT SUPPORTS_FP64_CONV_EMU)
message(WARNING "The compiler does not support the '-fsycl-fp64-conv-emu' flag, \
will disable it. On some platforms that don't support FP64, \
running operations with the FP64 datatype will raise a Runtime error: Required aspect fp64 is not supported on the device \
or a Native API failed error.")
endif()
if(CMAKE_BUILD_TYPE MATCHES Debug)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -g -O0 -Rno-debug-disables-optimization)
elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -gline-tables-only -O2)
endif()

CHECK_SYCL_FLAG("-fsycl-fp64-conv-emu" SUPPORTS_FP64_CONV_EMU)
if(NOT SUPPORTS_FP64_CONV_EMU)
message(WARNING "The compiler does not support the '-fsycl-fp64-conv-emu' flag, \
will disable it. On some platforms that don't support FP64, \
running operations with the FP64 datatype will raise a Runtime error: Required aspect fp64 is not supported on the device \
or a Native API failed error.")
endif()

set(TORCH_XPU_OPS_FLAGS ${SYCL_HOST_FLAGS})
set(TORCH_XPU_OPS_FLAGS ${SYCL_HOST_FLAGS})

# -- SYCL device object linkage flags
include(ProcessorCount)
ProcessorCount(proc_cnt)
if((DEFINED ENV{MAX_JOBS}) AND ("$ENV{MAX_JOBS}" LESS_EQUAL ${proc_cnt}))
set(SYCL_MAX_PARALLEL_LINK_JOBS $ENV{MAX_JOBS})
else()
set(SYCL_MAX_PARALLEL_LINK_JOBS ${proc_cnt})
endif()
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_DEVICE_LINK_FLAGS} -fsycl-max-parallel-link-jobs=${SYCL_MAX_PARALLEL_LINK_JOBS})
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_DEVICE_LINK_FLAGS} --offload-compress)
# -- SYCL device object linkage flags
include(ProcessorCount)
ProcessorCount(proc_cnt)
if((DEFINED ENV{MAX_JOBS}) AND ("$ENV{MAX_JOBS}" LESS_EQUAL ${proc_cnt}))
set(SYCL_MAX_PARALLEL_LINK_JOBS $ENV{MAX_JOBS})
else()
set(SYCL_MAX_PARALLEL_LINK_JOBS ${proc_cnt})
endif()
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_DEVICE_LINK_FLAGS} -fsycl-max-parallel-link-jobs=${SYCL_MAX_PARALLEL_LINK_JOBS})
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_DEVICE_LINK_FLAGS} --offload-compress)

set(SYCL_OFFLINE_COMPILER_CG_OPTIONS "${SYCL_OFFLINE_COMPILER_CG_OPTIONS} -options -cl-poison-unsupported-fp64-kernels")
set(SYCL_OFFLINE_COMPILER_CG_OPTIONS "${SYCL_OFFLINE_COMPILER_CG_OPTIONS} -options -cl-intel-enable-auto-large-GRF-mode")
set(SYCL_OFFLINE_COMPILER_CG_OPTIONS "${SYCL_OFFLINE_COMPILER_CG_OPTIONS} -options -cl-fp32-correctly-rounded-divide-sqrt")
set(SYCL_OFFLINE_COMPILER_CG_OPTIONS "${SYCL_OFFLINE_COMPILER_CG_OPTIONS} -options -cl-intel-greater-than-4GB-buffer-required")
set(SYCL_OFFLINE_COMPILER_CG_OPTIONS "${SYCL_OFFLINE_COMPILER_CG_OPTIONS} -options -cl-poison-unsupported-fp64-kernels")
set(SYCL_OFFLINE_COMPILER_CG_OPTIONS "${SYCL_OFFLINE_COMPILER_CG_OPTIONS} -options -cl-intel-enable-auto-large-GRF-mode")
set(SYCL_OFFLINE_COMPILER_CG_OPTIONS "${SYCL_OFFLINE_COMPILER_CG_OPTIONS} -options -cl-fp32-correctly-rounded-divide-sqrt")
set(SYCL_OFFLINE_COMPILER_CG_OPTIONS "${SYCL_OFFLINE_COMPILER_CG_OPTIONS} -options -cl-intel-greater-than-4GB-buffer-required")

if(WIN32)
set(AOT_TARGETS "mtl,mtl-h,bmg,dg2,arl-h,lnl-m")
else()
set(AOT_TARGETS "pvc,bmg,dg2,arl-h,mtl-h,lnl-m")
endif()
if(TORCH_XPU_ARCH_LIST)
set(AOT_TARGETS "${TORCH_XPU_ARCH_LIST}")
endif()
if(AOT_TARGETS STREQUAL "none")
set(TORCH_XPU_ARCH_LIST "" PARENT_SCOPE)
else()
# Enable FP64 conversion emulation for DG2 / ATS-M targets
if(SUPPORTS_FP64_CONV_EMU)
string(FIND "${AOT_TARGETS}" "dg2" _dg2_index)
string(FIND "${AOT_TARGETS}" "ats-m" _atsm_index)
if(_dg2_index GREATER_EQUAL 0 OR _atsm_index GREATER_EQUAL 0)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fsycl-fp64-conv-emu)
if(REPLACE_FLAGS_FOR_SYCLTLA)
set(SYCL_TARGETS_OPTION -fsycl-targets=spir64_gen)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} ${SYCL_TARGETS_OPTION})
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_DEVICE_LINK_FLAGS} ${SYCL_TARGETS_OPTION})
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_DEVICE_LINK_FLAGS} "-Xspirv-translator;-spirv-ext=+SPV_INTEL_split_barrier,+SPV_INTEL_2d_block_io,+SPV_INTEL_subgroup_matrix_multiply_accumulate")
set(SYCL_OFFLINE_COMPILER_AOT_OPTIONS "-device pvc,bmg")
else()
if(WIN32)
set(AOT_TARGETS "mtl,mtl-h,bmg,dg2,arl-h,lnl-m")
else()
set(AOT_TARGETS "pvc,bmg,dg2,arl-h,mtl-h,lnl-m")
endif()
if(TORCH_XPU_ARCH_LIST)
set(AOT_TARGETS "${TORCH_XPU_ARCH_LIST}")
endif()
if(AOT_TARGETS STREQUAL "none")
set(TORCH_XPU_ARCH_LIST "" PARENT_SCOPE)
else()
if(SUPPORTS_FP64_CONV_EMU)
string(FIND "${AOT_TARGETS}" "dg2" _dg2_index)
string(FIND "${AOT_TARGETS}" "ats-m" _atsm_index)
if(_dg2_index GREATER_EQUAL 0 OR _atsm_index GREATER_EQUAL 0)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -fsycl-fp64-conv-emu)
endif()
endif()
set(SYCL_TARGETS_OPTION -fsycl-targets=spir64_gen,spir64)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} ${SYCL_TARGETS_OPTION})
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_DEVICE_LINK_FLAGS} ${SYCL_TARGETS_OPTION})
set(SYCL_OFFLINE_COMPILER_AOT_OPTIONS "-device ${AOT_TARGETS}")
set(TORCH_XPU_ARCH_LIST ${AOT_TARGETS} PARENT_SCOPE)
endif()
message(STATUS "Compile Intel GPU AOT Targets for ${AOT_TARGETS}")
endif()
set(SYCL_TARGETS_OPTION -fsycl-targets=spir64_gen,spir64)
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} ${SYCL_TARGETS_OPTION})
set(SYCL_DEVICE_LINK_FLAGS ${SYCL_DEVICE_LINK_FLAGS} ${SYCL_TARGETS_OPTION})
set(SYCL_OFFLINE_COMPILER_AOT_OPTIONS "-device ${AOT_TARGETS}")
set(TORCH_XPU_ARCH_LIST ${AOT_TARGETS} PARENT_SCOPE)
endif()
message(STATUS "Compile Intel GPU AOT Targets for ${AOT_TARGETS}")

set(SYCL_FLAGS ${SYCL_FLAGS} ${SYCL_KERNEL_OPTIONS})
set(SYCL_COMPILE_FLAGS ${SYCL_COMPILE_FLAGS} ${SYCL_KERNEL_OPTIONS})

set(SYCL_OFFLINE_COMPILER_FLAGS "${SYCL_OFFLINE_COMPILER_AOT_OPTIONS}${SYCL_OFFLINE_COMPILER_CG_OPTIONS}")
else()
message("Not compiling with XPU. Currently only support GCC compiler on Linux and MSVC compiler on Windows as CXX compiler.")
return()
endif()
set(SYCL_OFFLINE_COMPILER_FLAGS "${SYCL_OFFLINE_COMPILER_AOT_OPTIONS}${SYCL_OFFLINE_COMPILER_CG_OPTIONS}")
else()
message("Not compiling with XPU. Currently only support GCC compiler on Linux and MSVC compiler on Windows as CXX compiler.")
return()
endif()
endmacro()
4 changes: 1 addition & 3 deletions cmake/Modules/FindSYCL.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# SYCL_COMPILER
# -- SYCL compiler's executable.
#
# SYCL_FLAGS
# SYCL_COMPILE_FLAGS
# -- SYCL compiler's compilation command line arguments.
#
# SYCL_HOST_FLAGS
Expand Down Expand Up @@ -212,7 +212,6 @@ endfunction()

macro(SYCL_WRAP_SRCS sycl_target generated_files)
# Optional arguments
set(SYCL_flags "")
set(generated_extension ${CMAKE_${SYCL_C_OR_CXX}_OUTPUT_EXTENSION})

set(SYCL_include_dirs "${SYCL_INCLUDE_DIR}")
Expand Down Expand Up @@ -383,7 +382,6 @@ macro(SYCL_LINK_DEVICE_OBJECTS output_file sycl_target)
set(SYCL_device_link_flags
${link_type_flag}
${important_host_flags}
${SYCL_FLAGS}
${SYCL_DEVICE_LINK_FLAGS})

file(RELATIVE_PATH output_file_relative_path "${CMAKE_BINARY_DIR}" "${output_file}")
Expand Down
8 changes: 4 additions & 4 deletions cmake/Modules/FindSYCL/run_sycl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set(SYCL_host_compiler "@SYCL_HOST_COMPILER@") # path
set(generated_file_path "@generated_file_path@") # path
set(generated_file_internal "@generated_file@") # path
set(SYCL_executable "@SYCL_EXECUTABLE@") # path
set(SYCL_flags @SYCL_FLAGS@) # list
set(SYCL_compile_flags @SYCL_COMPILE_FLAGS@) # list
set(SYCL_include_dirs [==[@SYCL_include_dirs@]==]) # list
set(SYCL_compile_definitions [==[@SYCL_compile_definitions@]==]) # list

Expand All @@ -47,10 +47,10 @@ foreach(dir ${SYCL_include_dirs})
endif()
endforeach()

# Clean up list of compile definitions, add -D flags, and append to SYCL_flags
# Clean up list of compile definitions, add -D flags, and append to SYCL_compile_flags
list(REMOVE_DUPLICATES SYCL_compile_definitions)
foreach(def ${SYCL_compile_definitions})
list(APPEND SYCL_flags "-D${def}")
list(APPEND SYCL_compile_flags "-D${def}")
endforeach()

# Choose host flags in FindSYCL.cmake
Expand Down Expand Up @@ -134,7 +134,7 @@ SYCL_execute_process(
${SYCL_include_args}
${SYCL_host_compiler}
${SYCL_host_compiler_flags}
${SYCL_flags}
${SYCL_compile_flags}
)

if(SYCL_result)
Expand Down
Loading
Loading