Skip to content

Enhance debug build[DRAFT] #1718

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Enhance debug build[DRAFT] #1718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
402e604
enhance debug build
chunhuanMeng Jun 4, 2025
2177c70
fix
chunhuanMeng Jun 4, 2025
c80e737
Merge branch 'main' into meng_enhance_debug
chunhuanMeng Jun 27, 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
4 changes: 1 addition & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ endif()

# Only for debugging. Save building time by shrinking translation unit scope.
set(BUILD_SEPARATE_OPS $ENV{BUILD_SEPARATE_OPS})
if(CMAKE_BUILD_TYPE MATCHES "(Debug|RelWithDebInfo)")
set(BUILD_SEPARATE_OPS TRUE)
endif()
set(DEBUG_XPU $ENV{DEBUG_XPU})
set(BUILD_SPLIT_KERNEL_LIB $ENV{BUILD_SPLIT_KERNEL_LIB})
add_subdirectory(${TORCH_XPU_OPS_ROOT}/src)

Expand Down
10 changes: 6 additions & 4 deletions cmake/BuildFlags.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,12 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC"
set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -no-ftz)
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)
if(DEBUG_XPU)
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()
endif()

set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -D__INTEL_LLVM_COMPILER_VERSION=${__INTEL_LLVM_COMPILER})
Expand Down
19 changes: 18 additions & 1 deletion src/BuildOnLinux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,24 @@ macro(setup_common_libraries)
list(APPEND TORCH_XPU_OPS_LIBRARIES torch_xpu_ops)
endmacro()

if(BUILD_SEPARATE_OPS)
if(DEBUG_XPU)
setup_common_libraries()
foreach(sycl_src ${ATen_XPU_SYCL_SRCS})
get_filename_component(name ${sycl_src} NAME_WLE REALPATH)
set(sycl_lib torch-xpu-ops-sycl-${name})
sycl_add_library(
${sycl_lib}
STATIC
SYCL_SOURCES ${sycl_src})
target_link_libraries(torch_xpu_ops PUBLIC ${sycl_lib})
target_link_options(torch_xpu_ops PUBLIC
"-Wl,--whole-archive"
$<TARGET_FILE:${sycl_lib}>
"-Wl,--no-whole-archive"
)
endforeach()
list(APPEND TORCH_XPU_OPS_LIBRARIES ${sycl_lib})
elseif(BUILD_SEPARATE_OPS)
setup_common_libraries()
foreach(sycl_src ${ATen_XPU_SYCL_SRCS})
get_filename_component(name ${sycl_src} NAME_WLE REALPATH)
Expand Down
29 changes: 28 additions & 1 deletion src/BuildOnWindows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,35 @@ macro(setup_common_libraries)
target_link_libraries(torch_xpu_ops_aten PUBLIC torch_cpu)
target_link_libraries(torch_xpu_ops_aten PUBLIC c10)
endmacro()
if(DEBUG_XPU)
add_library(
torch_xpu_ops
STATIC
${ATen_XPU_CPP_SRCS}
${ATen_XPU_MKL_SRCS}
${ATen_XPU_NATIVE_CPP_SRCS}
${ATen_XPU_GEN_SRCS})
target_compile_definitions(torch_xpu_ops PRIVATE TORCH_XPU_BUILD_MAIN_LIB)
foreach(sycl_src ${ATen_XPU_SYCL_SRCS})
get_filename_component(name ${sycl_src} NAME_WLE REALPATH)
set(sycl_lib torch-xpu-ops-sycl-${name})
sycl_add_library(
${sycl_lib}
STATIC
SYCL_SOURCES ${sycl_src})
target_compile_definitions(${sycl_lib} PRIVATE TORCH_XPU_BUILD_MAIN_LIB)
list(APPEND TORCH_XPU_OPS_LIBRARIES ${sycl_lib})

if(BUILD_SEPARATE_OPS)
target_link_libraries(torch_xpu_ops
PUBLIC
${sycl_lib}
)
target_link_options(torch_xpu_ops PUBLIC
"-WHOLEARCHIVE:$<TARGET_FILE:${sycl_lib}>"
)
endforeach()
list(APPEND TORCH_XPU_OPS_LIBRARIES torch_xpu_ops)
elseif(BUILD_SEPARATE_OPS)
setup_common_libraries()
foreach(sycl_src ${ATen_XPU_SYCL_SRCS})
get_filename_component(name ${sycl_src} NAME_WLE REALPATH)
Expand Down