[SYCLomatic][NFC] refactor code by creating a separate util file for …

…groups (#1784) Signed-off-by: Wang, Yihan <[email protected]> Co-authored-by: Yihan Wang <[email protected]> Co-authored-by: Dan Hoeflinger <[email protected]>
oneapi-src · May 30, 2024 · b2e5588 · b2e5588
1 parent 9b163ab
commit b2e5588
Show file tree

Hide file tree

Showing 9 changed files with 548 additions and 514 deletions.
diff --git a/clang/lib/DPCT/CMakeLists.txt b/clang/lib/DPCT/CMakeLists.txt
@@ -22,6 +22,7 @@ set(RUNTIME_HEADERS
   ${CMAKE_SOURCE_DIR}/../clang/runtime/dpct-rt/include/dpct/sparse_utils.hpp
   ${CMAKE_SOURCE_DIR}/../clang/runtime/dpct-rt/include/dpct/fft_utils.hpp
   ${CMAKE_SOURCE_DIR}/../clang/runtime/dpct-rt/include/dpct/lapack_utils.hpp
+  ${CMAKE_SOURCE_DIR}/../clang/runtime/dpct-rt/include/dpct/group_utils.hpp
   ${CMAKE_SOURCE_DIR}/../clang/runtime/dpct-rt/include/dpct/dpl_extras/algorithm.h
   ${CMAKE_SOURCE_DIR}/../clang/runtime/dpct-rt/include/dpct/dpl_extras/functional.h
   ${CMAKE_SOURCE_DIR}/../clang/runtime/dpct-rt/include/dpct/dpl_extras/iterators.h
@@ -58,6 +59,7 @@ set(PROCESS_FILES_OUTPUT
   ${CMAKE_BINARY_DIR}/tools/clang/include/clang/DPCT/sparse_utils.hpp.inc
   ${CMAKE_BINARY_DIR}/tools/clang/include/clang/DPCT/fft_utils.hpp.inc
   ${CMAKE_BINARY_DIR}/tools/clang/include/clang/DPCT/lapack_utils.hpp.inc
+  ${CMAKE_BINARY_DIR}/tools/clang/include/clang/DPCT/group_utils.hpp.inc
 )
 
 add_custom_command(

diff --git a/clang/lib/DPCT/GenHelperFunction.cpp b/clang/lib/DPCT/GenHelperFunction.cpp
@@ -73,6 +73,9 @@ const std::string FftUtilsAllContentStr =
 const std::string LapackUtilsAllContentStr =
 #include "clang/DPCT/lapack_utils.hpp.inc"
     ;
+const std::string GroupUtilsAllContentStr =
+#include "clang/DPCT/group_utils.hpp.inc"
+    ;
 const std::string DplExtrasAlgorithmAllContentStr =
 #include "clang/DPCT/dpl_extras/algorithm.h.inc"
     ;
@@ -162,6 +165,7 @@ void genHelperFunction(const clang::tooling::UnifiedPath &OutRoot) {
   GENERATE_ALL_FILE_CONTENT(SparseUtils, ".", sparse_utils.hpp)
   GENERATE_ALL_FILE_CONTENT(FftUtils, ".", fft_utils.hpp)
   GENERATE_ALL_FILE_CONTENT(LapackUtils, ".", lapack_utils.hpp)
+  GENERATE_ALL_FILE_CONTENT(GroupUtils, ".", group_utils.hpp)
   GENERATE_ALL_FILE_CONTENT(CodePin, "codepin", codepin.hpp)
   GENERATE_ALL_FILE_CONTENT(CodePinSerializationBasic, "codepin/serialization",
                             basic.hpp)

diff --git a/clang/lib/DPCT/GenHelperFunction.h b/clang/lib/DPCT/GenHelperFunction.h
@@ -32,6 +32,7 @@ extern const std::string CclUtilsAllContentStr;
 extern const std::string SparseUtilsAllContentStr;
 extern const std::string FftUtilsAllContentStr;
 extern const std::string LapackUtilsAllContentStr;
+extern const std::string GroupUtilsAllContentStr;
 extern const std::string DplExtrasAlgorithmAllContentStr;
 extern const std::string DplExtrasFunctionalAllContentStr;
 extern const std::string DplExtrasIteratorsAllContentStr;

diff --git a/clang/lib/DPCT/HeaderTypes.inc b/clang/lib/DPCT/HeaderTypes.inc
@@ -65,6 +65,7 @@ DPCT_HEADER(CCL_Utils, "<dpct/ccl_utils.hpp>")
 DPCT_HEADER(BLAS_Utils, "<dpct/blas_utils.hpp>")
 DPCT_HEADER(DNNL_Utils, "<dpct/dnnl_utils.hpp>")
 DPCT_HEADER(LAPACK_Utils, "<dpct/lapack_utils.hpp>")
+DPCT_HEADER(GROUP_Utils, "<dpct/group_utils.hpp>")
 DPCT_HEADER(COMMON_Utils, "<dpct/lib_common_utils.hpp>")
 DPCT_HEADER(Atomic, "<dpct/atomic.hpp>")
 DPCT_HEADER(SPBLAS_Utils, "<dpct/sparse_utils.hpp>")

diff --git a/clang/runtime/dpct-rt/CMakeLists.txt b/clang/runtime/dpct-rt/CMakeLists.txt
@@ -17,6 +17,7 @@ set(dpct_rt_files
   include/dpct/sparse_utils.hpp
   include/dpct/fft_utils.hpp
   include/dpct/lapack_utils.hpp
+  include/dpct/group_utils.hpp
 )
 
 set(dpct_rt_dpstd_files