Merge branch 'oneapi-src:SYCLomatic' into migrate_utils_groups

oneapi-src · May 27, 2024 · c7f3594 · c7f3594
2 parents ba14654 + e5795a8
commit c7f3594
Show file tree

Hide file tree

Showing 23 changed files with 261 additions and 66 deletions.
diff --git a/clang/examples/DPCT/NCCL/ncclCommGetAsyncError.cu b/clang/examples/DPCT/NCCL/ncclCommGetAsyncError.cu
@@ -0,0 +1,7 @@
+#include <nccl.h>
+
+void test(ncclComm_t comm, ncclResult_t *r) {
+  // Start
+  ncclCommGetAsyncError(comm /*ncclComm_t*/, r /*ncclResult_t **/);
+  // End
+}
diff --git a/clang/examples/DPCT/NCCL/ncclGetErrorString.cu b/clang/examples/DPCT/NCCL/ncclGetErrorString.cu
@@ -0,0 +1,7 @@
+#include <nccl.h>
+
+void test(ncclResult_t r) {
+  // Start
+  ncclGetErrorString(r /*ncclResult_t*/);
+  // End
+}
diff --git a/clang/examples/DPCT/NCCL/ncclGetLastError.cu b/clang/examples/DPCT/NCCL/ncclGetLastError.cu
@@ -0,0 +1,7 @@
+#include <nccl.h>
+
+void test(ncclComm_t comm) {
+  // Start
+  ncclGetLastError(comm /*ncclComm_t*/);
+  // End
+}
diff --git a/clang/examples/DPCT/NCCL/ncclRecv.cu b/clang/examples/DPCT/NCCL/ncclRecv.cu
@@ -0,0 +1,9 @@
+#include <nccl.h>
+
+void test(void *sendbuff, size_t count, ncclDataType_t datatype, int peer,
+          ncclComm_t comm, cudaStream_t stream) {
+  // Start
+  ncclRecv(sendbuff /*void **/, count /*size_t*/, datatype /*ncclDataType_t*/,
+           peer /*int*/, comm /*ncclComm_t*/, stream /*cudaStream_t*/);
+  // End
+}
diff --git a/clang/examples/DPCT/NCCL/ncclSend.cu b/clang/examples/DPCT/NCCL/ncclSend.cu
@@ -0,0 +1,10 @@
+#include <nccl.h>
+
+void test(const void *sendbuff, size_t count, ncclDataType_t datatype, int peer,
+          ncclComm_t comm, cudaStream_t stream) {
+  // Start
+  ncclSend(sendbuff /*const void **/, count /*size_t*/,
+           datatype /*ncclDataType_t*/, peer /*int*/, comm /*ncclComm_t*/,
+           stream /*cudaStream_t*/);
+  // End
+}
diff --git a/clang/lib/DPCT/PatternRewriter.cpp b/clang/lib/DPCT/PatternRewriter.cpp
@@ -318,6 +318,21 @@ static int parseCodeElement(const MatchPattern &Suffix,
     delimiters.
     */
 
+    if (SrcFileType == SourceFileType::SFT_CMakeScript) {
+      if (Index - 1 >= 0 && Character == '"' && Input[Index - 1] == '\\') {
+        Index++;
+        while (Index < Size &&
+               !(Input[Index - 1] == '\\' && Input[Index] == '"')) {
+          Index++;
+        }
+        if (Index >= Size) {
+          return -1;
+        }
+        Index++;
+        continue;
+      }
+    }
+
     if (Character == '\'') {
       Index++;
       while (Index < Size &&
@@ -467,7 +482,8 @@ static std::optional<MatchResult> findFullMatch(const MatchPattern &Pattern,
               !isWhitespace(Input[Index - PatternSize]) &&
               !isWhitespace(Input[Index + 1]) &&
               Input[Index - PatternSize] != '*' &&
-              Input[Index - PatternSize] != '"') {
+              Input[Index - PatternSize] != '"' &&
+              Input[Index - PatternSize] != ';' && Input[Index + 1] != '\\') {
             return {};
           }
         }

diff --git a/clang/test/dpct/cmake_migration/case_004/expected.txt b/clang/test/dpct/cmake_migration/case_004/expected.txt
@@ -15,11 +15,8 @@ target_link_libraries(${target} PRIVATE
 
          )
 
-target_link_libraries(${PROJECT_NAME}
-
-
-)
-target_link_libraries(nlm_cuda  ${OpenCV_LIBS} stdc++ stdc++fs)
+target_link_libraries(${PROJECT_NAME} )
+target_link_libraries(nlm_cuda ${OpenCV_LIBS} stdc++ stdc++fs)
 target_link_libraries(cublas-cudnn-test ${MKL_LIB} ${DNN_LIB})
 
-target_link_libraries(tsne  ${MKL_LIB} ${MKL_LIB} ${MKL_LIB})
+target_link_libraries(tsne ${MKL_LIB} ${MKL_LIB} ${MKL_LIB})
diff --git a/clang/test/dpct/cmake_migration/case_021/expected.txt b/clang/test/dpct/cmake_migration/case_021/expected.txt
@@ -10,3 +10,4 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 add_link_options("")
+list(APPEND PMEMD_NVCC_FLAGS --std c++17)
diff --git a/clang/test/dpct/cmake_migration/case_021/input.cmake b/clang/test/dpct/cmake_migration/case_021/input.cmake
@@ -10,3 +10,4 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
 add_link_options("--add-arch=sm_70")
+list(APPEND PMEMD_NVCC_FLAGS --std c++11)
diff --git a/clang/test/dpct/cmake_migration/case_024/expected.txt b/clang/test/dpct/cmake_migration/case_024/expected.txt
@@ -1 +1,3 @@
 set(SYCL_HAS_FP16 TRUE)
+file(WRITE ${output_file} "SET(SYCL_HAS_FP16\n TRUE)\n\n")
+file(WRITE ${output_file} "SET(SYCL_HAS_FP16 TRUE)\n\n")
diff --git a/clang/test/dpct/cmake_migration/case_024/input.cmake b/clang/test/dpct/cmake_migration/case_024/input.cmake
@@ -1 +1,3 @@
 set(CUDA_HAS_FP16 TRUE)
+file(WRITE ${output_file} "SET(CUDA_HAS_FP16\n TRUE)\n\n")
+file(WRITE ${output_file} "SET(CUDA_HAS_FP16 TRUE)\n\n")
diff --git a/clang/test/dpct/cmake_migration/case_027/expected.txt b/clang/test/dpct/cmake_migration/case_027/expected.txt
@@ -4,3 +4,11 @@ if (NOT SYCL_HOST_COMPILER STREQUAL "")
 endif()
 set(CMAKE_SYCL_ARCHITECTURES "")
 set(CMAKE_SYCL_FLAGS "")
+
+add_custom_command(
+    COMMAND ${CMAKE_COMMAND} -E echo \"\#endif // define ${HEADER_FILE_DEFINE}\" >> ${OUTPUT_HEADER_FILE}
+    DEPENDS ${spv_file} xxd
+    COMMENT "Converting to hpp: ${FILE_NAME} ${CMAKE_BINARY_DIR}/bin/$<CONFIG>/xxd"
+    )
+set(NVCC_CMD ${CMAKE_SYCL_COMPILER} .c)
+string(REGEX REPLACE "^.* version ([0-9.]*).*$" "\\1" CUDA_CCVER ${CUDA_CCFULLVER})
diff --git a/clang/test/dpct/cmake_migration/case_027/input.cmake b/clang/test/dpct/cmake_migration/case_027/input.cmake
@@ -4,3 +4,11 @@ if (NOT CMAKE_CUDA_HOST_COMPILER STREQUAL "")
 endif()
 set(CMAKE_CUDA_ARCHITECTURES "")
 set(CMAKE_CUDA_FLAGS "")
+
+add_custom_command(
+    COMMAND ${CMAKE_COMMAND} -E echo \"\#endif // define ${HEADER_FILE_DEFINE}\" >> ${OUTPUT_HEADER_FILE}
+    DEPENDS ${spv_file} xxd
+    COMMENT "Converting to hpp: ${FILE_NAME} ${CMAKE_BINARY_DIR}/bin/$<CONFIG>/xxd"
+    )
+set(NVCC_CMD ${CMAKE_CUDA_COMPILER} .c)
+string(REGEX REPLACE "^.* version ([0-9.]*).*$" "\\1" CUDA_CCVER ${CUDA_CCFULLVER})
diff --git a/clang/test/dpct/cmake_migration/case_031/expected.txt b/clang/test/dpct/cmake_migration/case_031/expected.txt
@@ -3,3 +3,4 @@ include_directories(${somePath} ../)
 include_directories("${SYCL_INCLUDE_DIR}")
 include_directories(" ${SYCL_INCLUDE_DIR}")
 include_directories(" ${SYCL_INCLUDE_DIR}" )
+string(APPEND var ";${SYCL_INCLUDE_DIR}")
diff --git a/clang/test/dpct/cmake_migration/case_031/input.cmake b/clang/test/dpct/cmake_migration/case_031/input.cmake
@@ -3,3 +3,4 @@ include_directories(${somePath} ../)
 include_directories("${CUDA_INCLUDE_DIRS}")
 include_directories(" ${CUDA_INCLUDE_DIRS}")
 include_directories(" ${CUDA_INCLUDE_DIRS}" )
+string(APPEND var ";${CUDA_INCLUDE_DIRS}")
diff --git a/clang/test/dpct/cmake_migration/case_032/expected.txt b/clang/test/dpct/cmake_migration/case_032/expected.txt
@@ -41,9 +41,7 @@ set(LIBS ${LIBS}
 
 )
 
-target_link_libraries(${target}
-
-    ${MKL_LIB}
+target_link_libraries(${target} ${MKL_LIB}
     ${MKL_LIB}
 
 
@@ -89,10 +87,7 @@ set(LIBS ${LIBS}
 
 )
 
-target_link_libraries(${target}
-
-
-
+target_link_libraries(${target} 
     ${MKL_LIB}
 
 

diff --git a/clang/test/dpct/cmake_migration/case_051/case_051_help_msg_hint.cpp b/clang/test/dpct/cmake_migration/case_051/case_051_help_msg_hint.cpp
@@ -4,11 +4,5 @@
 // RUN: cat %S/ref.txt > ./check.txt
 // RUN: cat migration1.log >> ./check.txt
 // RUN: FileCheck --match-full-lines --input-file check.txt check.txt
-// RUN: cat %S/foo.cu > ./foo.cu
-// RUN: cat %S/compile_commands.json > ./compile_commands.json
-// RUN: dpct -in-root ./ -out-root out --cuda-include-path="%cuda-path/include" -p ./ --migrate-build-script=CMake > migration2.log 2>&1
-// RUN: cat %S/ref.txt > ./check.txt
-// RUN: cat migration2.log >> ./check.txt
-// RUN: FileCheck --match-full-lines --input-file check.txt check.txt
 
 void foo() {}
diff --git a/clang/test/dpct/cmake_migration/case_051/compile_commands.json b/clang/test/dpct/cmake_migration/case_051/compile_commands.json
diff --git a/clang/test/dpct/cmake_migration/case_051/foo.cu b/clang/test/dpct/cmake_migration/case_051/foo.cu
diff --git a/clang/test/dpct/query_api_mapping/NCCL/lit_nccl.cu b/clang/test/dpct/query_api_mapping/NCCL/lit_nccl.cu
@@ -1,3 +1,20 @@
+/// Communicator Creation and Management Functions
+
+// RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclGetLastError | FileCheck %s -check-prefix=NCCLGETLASTERROR
+// NCCLGETLASTERROR: CUDA API:
+// NCCLGETLASTERROR-NEXT:   ncclGetLastError(comm /*ncclComm_t*/);
+// NCCLGETLASTERROR-NEXT: The API is Removed.
+// NCCLGETLASTERROR-EMPTY:
+
+// RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclGetErrorString | FileCheck %s -check-prefix=NCCLGETERRORSTRING
+// NCCLGETERRORSTRING: CUDA API:
+// NCCLGETERRORSTRING-NEXT:   ncclGetErrorString(r /*ncclResult_t*/);
+// NCCLGETERRORSTRING-NEXT: Is migrated to:
+// NCCLGETERRORSTRING-NEXT:   /*
+// NCCLGETERRORSTRING-NEXT:   DPCT1009:0: SYCL uses exceptions to report errors and does not use the error codes. The call was replaced by a placeholder string. You need to rewrite this code.
+// NCCLGETERRORSTRING-NEXT:   */
+// NCCLGETERRORSTRING-NEXT:   "<Placeholder string>";
+
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclGetVersion | FileCheck %s -check-prefix=ncclGetVersion
 // ncclGetVersion: CUDA API:
 // ncclGetVersion-NEXT:   ncclGetVersion(version /*int **/);
@@ -23,6 +40,12 @@
 // ncclCommDestroy-NEXT: Is migrated to:
 // ncclCommDestroy-NEXT:   delete comm;
 
+// RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclCommGetAsyncError | FileCheck %s -check-prefix=NCCLCOMMGETASYNCERROR
+// NCCLCOMMGETASYNCERROR: CUDA API:
+// NCCLCOMMGETASYNCERROR-NEXT:   ncclCommGetAsyncError(comm /*ncclComm_t*/, r /*ncclResult_t **/);
+// NCCLCOMMGETASYNCERROR-NEXT: The API is Removed.
+// NCCLCOMMGETASYNCERROR-EMPTY:
+
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclCommCount | FileCheck %s -check-prefix=ncclCommCount
 // ncclCommCount: CUDA API:
 // ncclCommCount-NEXT:    ncclCommCount(comm /*ncclComm_t*/, count /*int **/);
@@ -41,6 +64,8 @@
 // ncclCommUserRank-NEXT: Is migrated to:
 // ncclCommUserRank-NEXT:   *rank = comm->rank();
 
+/// Collective Communication Functions
+
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclAllReduce | FileCheck %s -check-prefix=ncclAllReduce
 // ncclAllReduce: CUDA API:
 // ncclAllReduce-NEXT:   ncclAllReduce(sendbuff /*void **/, recvbuff /*void **/, count /*size_t*/,
@@ -57,6 +82,13 @@
 // ncclBroadcast-NEXT: Is migrated to:
 // ncclBroadcast-NEXT:   comm->broadcast(sendbuff, recvbuff, count, datatype, root, stream);
 
+// RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclBcast | FileCheck %s -check-prefix=ncclBcast
+// ncclBcast: CUDA API:
+// ncclBcast-NEXT:   ncclBcast(buff /*void **/, count /*size_t*/, datatype /*ncclDataType_t*/,
+// ncclBcast-NEXT:                 root /*int*/, comm /*ncclComm_t*/, stream /*cudaStream_t*/);
+// ncclBcast-NEXT: Is migrated to:
+// ncclBcast-NEXT:   comm->broadcast(buff, buff, count, datatype, root, stream);
+
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclReduce | FileCheck %s -check-prefix=ncclReduce
 // ncclReduce: CUDA API:
 // ncclReduce-NEXT:   ncclReduce(sendbuff /*void **/, recvbuff /*void **/, count /*size_t*/,
@@ -74,9 +106,19 @@
 // ncclReduceScatter-NEXT: Is migrated to:
 // ncclReduceScatter-NEXT:   comm->reduce_scatter(sendbuff, recvbuff, recvcount, datatype, op, stream);
 
-// RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclBcast | FileCheck %s -check-prefix=ncclBcast
-// ncclBcast: CUDA API:
-// ncclBcast-NEXT:   ncclBcast(buff /*void **/, count /*size_t*/, datatype /*ncclDataType_t*/,
-// ncclBcast-NEXT:                 root /*int*/, comm /*ncclComm_t*/, stream /*cudaStream_t*/);
-// ncclBcast-NEXT: Is migrated to:
-// ncclBcast-NEXT:   comm->broadcast(buff, buff, count, datatype, root, stream);
+/// Point To Point Communication Functions
+
+// RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclSend | FileCheck %s -check-prefix=NCCLSEND
+// NCCLSEND: CUDA API:
+// NCCLSEND-NEXT:   ncclSend(sendbuff /*const void **/, count /*size_t*/,
+// NCCLSEND-NEXT:            datatype /*ncclDataType_t*/, peer /*int*/, comm /*ncclComm_t*/,
+// NCCLSEND-NEXT:            stream /*cudaStream_t*/);
+// NCCLSEND-NEXT: Is migrated to:
+// NCCLSEND-NEXT:   comm->send(sendbuff, count, datatype, peer, stream);
+
+// RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=ncclRecv | FileCheck %s -check-prefix=NCCLRECV
+// NCCLRECV: CUDA API:
+// NCCLRECV-NEXT:   ncclRecv(sendbuff /*void **/, count /*size_t*/, datatype /*ncclDataType_t*/,
+// NCCLRECV-NEXT:            peer /*int*/, comm /*ncclComm_t*/, stream /*cudaStream_t*/);
+// NCCLRECV-NEXT: Is migrated to:
+// NCCLRECV-NEXT:   comm->recv(sendbuff, count, datatype, peer, stream);
diff --git a/clang/test/dpct/query_api_mapping/test_all.cu b/clang/test/dpct/query_api_mapping/test_all.cu
@@ -1844,12 +1844,17 @@
 // CHECK-NEXT: ncclCommCount
 // CHECK-NEXT: ncclCommCuDevice
 // CHECK-NEXT: ncclCommDestroy
+// CHECK-NEXT: ncclCommGetAsyncError
 // CHECK-NEXT: ncclCommInitRank
 // CHECK-NEXT: ncclCommUserRank
+// CHECK-NEXT: ncclGetErrorString
+// CHECK-NEXT: ncclGetLastError
 // CHECK-NEXT: ncclGetUniqueId
 // CHECK-NEXT: ncclGetVersion
+// CHECK-NEXT: ncclRecv
 // CHECK-NEXT: ncclReduce
 // CHECK-NEXT: ncclReduceScatter
+// CHECK-NEXT: ncclSend
 // CHECK-NEXT: nearbyint
 // CHECK-NEXT: nearbyintf
 // CHECK-NEXT: nextafter