From 856d4fd39f6af8ff9c6f8845c681221237a9ccfd Mon Sep 17 00:00:00 2001 From: chunhuanMeng <105194461+chunhuanMeng@users.noreply.github.com> Date: Thu, 15 May 2025 14:51:08 +0800 Subject: [PATCH 1/7] Update BuildFlags.cmake --- cmake/BuildFlags.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/BuildFlags.cmake b/cmake/BuildFlags.cmake index 181d737ac..354a0e804 100644 --- a/cmake/BuildFlags.cmake +++ b/cmake/BuildFlags.cmake @@ -84,6 +84,12 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -Wno-absolute-value) set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -no-ftz) endif() + + if(CMAKE_BUILD_TYPE MATCHES Debug) + set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -g) + set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -Rno-debug-disables-optimization) + endif(CMAKE_BUILD_TYPE MATCHES Debug) + set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -D__INTEL_LLVM_COMPILER_VERSION=${__INTEL_LLVM_COMPILER}) CHECK_SYCL_FLAG("-fsycl-fp64-conv-emu" SUPPORTS_FP64_CONV_EMU) From 1188d7af93329d83c50cfbbf037bdc9a70f8d422 Mon Sep 17 00:00:00 2001 From: chunhuanMeng <105194461+chunhuanMeng@users.noreply.github.com> Date: Fri, 16 May 2025 14:48:36 +0800 Subject: [PATCH 2/7] Update BuildFlags.cmake --- cmake/BuildFlags.cmake | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cmake/BuildFlags.cmake b/cmake/BuildFlags.cmake index 354a0e804..6d0b56352 100644 --- a/cmake/BuildFlags.cmake +++ b/cmake/BuildFlags.cmake @@ -43,10 +43,10 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" endif() if(CMAKE_BUILD_TYPE MATCHES Debug) - list(APPEND SYCL_HOST_FLAGS -g) - list(APPEND SYCL_HOST_FLAGS -O0) - endif(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() @@ -85,10 +85,11 @@ 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) + if(CMAKE_BUILD_TYPE MATCHES Debug) set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -g) - set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -Rno-debug-disables-optimization) - endif(CMAKE_BUILD_TYPE MATCHES Debug) + elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo) + set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -g -Rno-debug-disables-optimization) + endif() set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -D__INTEL_LLVM_COMPILER_VERSION=${__INTEL_LLVM_COMPILER}) From e0f146c8937b3e7b9ac76923a6698d1767b15d6a Mon Sep 17 00:00:00 2001 From: chunhuanMeng <105194461+chunhuanMeng@users.noreply.github.com> Date: Fri, 16 May 2025 14:56:31 +0800 Subject: [PATCH 3/7] fix lint error --- cmake/BuildFlags.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/BuildFlags.cmake b/cmake/BuildFlags.cmake index 6d0b56352..90330f52d 100644 --- a/cmake/BuildFlags.cmake +++ b/cmake/BuildFlags.cmake @@ -85,7 +85,7 @@ 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) + if(CMAKE_BUILD_TYPE MATCHES Debug) set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -g) elseif(CMAKE_BUILD_TYPE MATCHES RelWithDebInfo) set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -g -Rno-debug-disables-optimization) From 5e3ac8f2372b33e0c86f05202173c38950d9bbfa Mon Sep 17 00:00:00 2001 From: chunhuanMeng <105194461+chunhuanMeng@users.noreply.github.com> Date: Fri, 16 May 2025 16:02:58 +0800 Subject: [PATCH 4/7] Update BuildFlags.cmake --- cmake/BuildFlags.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/BuildFlags.cmake b/cmake/BuildFlags.cmake index 90330f52d..ec9aaccb2 100644 --- a/cmake/BuildFlags.cmake +++ b/cmake/BuildFlags.cmake @@ -86,9 +86,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" endif() if(CMAKE_BUILD_TYPE MATCHES Debug) - set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -g) + 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} -g -Rno-debug-disables-optimization) + set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -gline-tables-only -O2) endif() set(SYCL_KERNEL_OPTIONS ${SYCL_KERNEL_OPTIONS} -D__INTEL_LLVM_COMPILER_VERSION=${__INTEL_LLVM_COMPILER}) From fc934a15699d91d7087dfcac64f92c86094e90c4 Mon Sep 17 00:00:00 2001 From: chunhuanMeng <105194461+chunhuanMeng@users.noreply.github.com> Date: Tue, 20 May 2025 10:26:14 +0800 Subject: [PATCH 5/7] Update CMakeLists.txt --- CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 26c040ef2..942a8c628 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,6 +91,9 @@ 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(BUILD_SPLIT_KERNEL_LIB $ENV{BUILD_SPLIT_KERNEL_LIB}) add_subdirectory(${TORCH_XPU_OPS_ROOT}/src) From e3ae11f26672c7e59bf7a2d85e4545d87665d6bc Mon Sep 17 00:00:00 2001 From: chunhuanMeng <105194461+chunhuanMeng@users.noreply.github.com> Date: Tue, 20 May 2025 10:32:49 +0800 Subject: [PATCH 6/7] fix lint error --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 942a8c628..06156ab53 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,7 +91,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)") +if(CMAKE_BUILD_TYPE MATCHES "(Debug|RelWithDebInfo)") set(BUILD_SEPARATE_OPS TRUE) endif() set(BUILD_SPLIT_KERNEL_LIB $ENV{BUILD_SPLIT_KERNEL_LIB}) From ec0b13939583ffaccd5931dfc923d80f1f9ed1b1 Mon Sep 17 00:00:00 2001 From: Yutao Xu Date: Wed, 28 May 2025 13:35:09 +0800 Subject: [PATCH 7/7] Update skip_list_common.py --- test/xpu/skip_list_common.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/xpu/skip_list_common.py b/test/xpu/skip_list_common.py index 1dc2f7268..7bb33c4aa 100644 --- a/test/xpu/skip_list_common.py +++ b/test/xpu/skip_list_common.py @@ -2296,6 +2296,8 @@ # randomly fails "test_parity__foreach_div_fastpath_inplace_xpu_complex128", "test_parity__foreach_div_fastpath_outplace_xpu_complex128", + "test_parity__foreach_addcdiv_fastpath_inplace_xpu_complex128", + "test_parity__foreach_addcdiv_fastpath_outplace_xpu_complex128", ), "nn/test_convolution_xpu.py": ( # Summary: all of them are oneDNN related issues