[SYCLomatic] Support query mapping with older version header on windows.

Signed-off-by: Tang, Jiajun [email protected]
oneapi-src · May 14, 2024 · 32adeed · 32adeed
1 parent c8e02fb
commit 32adeed
Show file tree

Hide file tree

Showing 30 changed files with 41 additions and 52 deletions.
diff --git a/clang/lib/DPCT/DPCT.cpp b/clang/lib/DPCT/DPCT.cpp
@@ -804,6 +804,12 @@ int runDPCT(int argc, const char **argv) {
       dpctExit(MigrationSucceeded);
     }
     auto SourceCode = APIMapping::getAPISourceCode(QueryAPIMapping);
+    // #ifdef _WIN32
+    // static auto SourceCodeStr =
+    //     "#define _MSC_VER 1900\n#define _LIBCUDACXX_OBJECT_FORMAT_COFF 1\n" +
+    //     SourceCode.str();
+    // SourceCode = SourceCodeStr;
+    // #endif
     if (SourceCode.empty()) {
       ShowStatus(MigrationErrorNoAPIMapping);
       dpctExit(MigrationErrorNoAPIMapping);
@@ -871,6 +877,14 @@ int runDPCT(int argc, const char **argv) {
     }
 
     Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-w"));
+#ifdef _WIN32 // Avoid some error on windows platform.
+    Tool.appendArgumentsAdjuster(
+        getInsertArgumentAdjuster("-D_LIBCUDACXX_OBJECT_FORMAT_COFF=1"));
+    if (DpctGlobalInfo::getSDKVersion() <= CudaVersion::CUDA_100) {
+      Tool.appendArgumentsAdjuster(
+          getInsertArgumentAdjuster("-D_MSC_VER=1900"));
+    }
+#endif
     NoIncrementalMigration.setValue(true);
     StopOnParseErr.setValue(true);
     Tool.setPrintErrorMessage(false);
@@ -1175,8 +1189,28 @@ int runDPCT(int argc, const char **argv) {
             ShowStatus(MigrationErrorAPIMappingNoCUDAHeader, QueryAPIMapping);
             return MigrationErrorAPIMappingNoCUDAHeader;
           }
+          // int ErrorNum = ErrStr.count("error:");
+          // llvm::outs() << ErrorNum << " ";
+          // ErrorNum -= ErrStr.count("unsupported Microsoft Visual "
+          //                          "Studio version! Only the versions ");
+          // llvm::outs() << ErrorNum << " ";
+          // ErrorNum -=
+          //     ErrStr.count("requested alignment must be 8192 bytes or
+          //     smaller");
+          // llvm::outs() << ErrorNum << " ";
+          // ErrorNum -= ErrStr.count(
+          //     "object of type 'stored_head_type' (aka "
+          //     "'thrust::cuda_cub::transform_input_iterator_t<bool, "
+          //     "thrust::detail::normal_iterator<thrust::device_ptr<int>>, "
+          //     "thrust::detail::unary_negate<(lambda at
+          //     /tmp/temp.cu:32:13)>>') " "cannot be assigned because its copy
+          //     assignment operator is " "implicitly deleted");
+          // llvm::outs() << ErrorNum << " ";
+          llvm::outs() << Err << "\n";
+          // if (ErrorNum > 0) {
           ShowStatus(MigrationErrorNoAPIMapping);
-          dpctExit(MigrationErrorNoAPIMapping);
+          return MigrationErrorNoAPIMapping;
+          // }
         }
         ShowStatus(MigrationErrorFileParseError);
         return MigrationErrorFileParseError;

diff --git a/clang/test/dpct/query_api_mapping/Driver/test.cu b/clang/test/dpct/query_api_mapping/Driver/test.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Initialization
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cuInit | FileCheck %s -check-prefix=CUINIT

diff --git a/clang/test/dpct/query_api_mapping/Driver/test_memory_management.cu b/clang/test/dpct/query_api_mapping/Driver/test_memory_management.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Memory Management
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cuArrayDestroy | FileCheck %s -check-prefix=CUARRAYDESTROY

diff --git a/clang/test/dpct/query_api_mapping/Math/test-after9.cu b/clang/test/dpct/query_api_mapping/Math/test-after9.cu
@@ -1,5 +1,5 @@
 // UNSUPPORTED: cuda-8.0
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
+// UNSUPPORTED: v8.0
 
 /// Half Precision Conversion and Data Movement
 

diff --git a/clang/test/dpct/query_api_mapping/Math/test.cu b/clang/test/dpct/query_api_mapping/Math/test.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Double Precision Intrinsics
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=__dadd_rd | FileCheck %s -check-prefix=__DADD_RD

diff --git a/clang/test/dpct/query_api_mapping/Math/test_double_precision_mathematical_functions.cu b/clang/test/dpct/query_api_mapping/Math/test_double_precision_mathematical_functions.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Double Precision Mathematical Functions
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=acos | FileCheck %s -check-prefix=ACOS

diff --git a/clang/test/dpct/query_api_mapping/Math/test_half_precision_conversion_and_data_movement.cu b/clang/test/dpct/query_api_mapping/Math/test_half_precision_conversion_and_data_movement.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Half Precision Conversion and Data Movement
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=__float22half2_rn | FileCheck %s -check-prefix=__FLOAT22HALF2_RN

diff --git a/clang/test/dpct/query_api_mapping/Math/test_simd.cu b/clang/test/dpct/query_api_mapping/Math/test_simd.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// SIMD Intrinsics
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=__vabs2 | FileCheck %s -check-prefix=VABS2

diff --git a/clang/test/dpct/query_api_mapping/Math/test_single_precision_intrinsics.cu b/clang/test/dpct/query_api_mapping/Math/test_single_precision_intrinsics.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Single Precision Intrinsics
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=__cosf | FileCheck %s -check-prefix=__COSF

diff --git a/clang/test/dpct/query_api_mapping/Math/test_single_precision_mathematical_functions.cu b/clang/test/dpct/query_api_mapping/Math/test_single_precision_mathematical_functions.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Single Precision Mathematical Functions
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=acosf | FileCheck %s -check-prefix=ACOSF

diff --git a/clang/test/dpct/query_api_mapping/Math/test_type_casting_intrinsics.cu b/clang/test/dpct/query_api_mapping/Math/test_type_casting_intrinsics.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Type Casting Intrinsics
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=__double2float_rd | FileCheck %s -check-prefix=__DOUBLE2FLOAT_RD

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,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // 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 **/);

diff --git a/clang/test/dpct/query_api_mapping/NoLib/test.cu b/clang/test/dpct/query_api_mapping/NoLib/test.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=__assert_fail | FileCheck %s -check-prefix=__ASSERT_FAIL
 // __ASSERT_FAIL: CUDA API:
 // __ASSERT_FAIL-NEXT:   __assert_fail(msg /*const char **/, file /*const char **/, line /*unsigned*/,

diff --git a/clang/test/dpct/query_api_mapping/Runtime/test-after10.cu b/clang/test/dpct/query_api_mapping/Runtime/test-after10.cu
@@ -1,5 +1,5 @@
 // UNSUPPORTED: cuda-8.0, cuda-9.0, cuda-9.1, cuda-9.2
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
+// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2
 
 /// Stream Management
 

diff --git a/clang/test/dpct/query_api_mapping/Runtime/test.cu b/clang/test/dpct/query_api_mapping/Runtime/test.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Device Management
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cudaDeviceGetAttribute | FileCheck %s -check-prefix=CUDADEVICEGETATTRIBUTE

diff --git a/clang/test/dpct/query_api_mapping/Runtime/test_memory_management.cu b/clang/test/dpct/query_api_mapping/Runtime/test_memory_management.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 /// Memory Management
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cudaArrayGetInfo | FileCheck %s -check-prefix=CUDAARRAYGETINFO

diff --git a/clang/test/dpct/query_api_mapping/Thrust/thrust_api_test.cu b/clang/test/dpct/query_api_mapping/Thrust/thrust_api_test.cu
@@ -1,4 +1,3 @@
-// UNSUPPORTED: system-windows
 // UNSUPPORTED: cuda-8.0
 // UNSUPPORTED: v8.0
 

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_9_2.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_9_2.cu
@@ -1,5 +1,5 @@
 // UNSUPPORTED: cuda-8.0, cuda-9.0, cuda-9.1
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
+// UNSUPPORTED: v8.0, v9.0, v9.1
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasCgemmBatched | FileCheck %s -check-prefix=cublasCgemmBatched
 // cublasCgemmBatched: CUDA API:

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_part1.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_part1.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasZdscal | FileCheck %s -check-prefix=cublasZdscal
 // cublasZdscal: CUDA API:
 // cublasZdscal-NEXT:   cublasZdscal(handle /*cublasHandle_t*/, n /*int*/, alpha /*const double **/,

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_part2.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_part2.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasDotEx | FileCheck %s -check-prefix=cublasDotEx
 // cublasDotEx: CUDA API:
 // cublasDotEx-NEXT:   cublasDotEx(handle /*cublasHandle_t*/, n /*int*/, x /*const void **/,

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_part3.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_part3.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasDgeam | FileCheck %s -check-prefix=cublasDgeam
 // cublasDgeam: CUDA API:
 // cublasDgeam-NEXT:   cublasDgeam(handle /*cublasHandle_t*/, transa /*cublasOperation_t*/,

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_part4.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_part4.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasZgerc | FileCheck %s -check-prefix=cublasZgerc
 // cublasZgerc: CUDA API:
 // cublasZgerc-NEXT:   cublasZgerc(handle /*cublasHandle_t*/, m /*int*/, n /*int*/,

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_part5.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_part5.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasDsyr | FileCheck %s -check-prefix=cublasDsyr
 // cublasDsyr: CUDA API:
 // cublasDsyr-NEXT:   cublasDsyr(handle /*cublasHandle_t*/, upper_lower /*cublasFillMode_t*/,

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_part6.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_part6.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasCsscal | FileCheck %s -check-prefix=cublasCsscal
 // cublasCsscal: CUDA API:
 // cublasCsscal-NEXT:   cublasCsscal(handle /*cublasHandle_t*/, n /*int*/, alpha /*const float **/,

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_part7.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_part7.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasZher2k | FileCheck %s -check-prefix=cublasZher2k
 // cublasZher2k: CUDA API:
 // cublasZher2k-NEXT:   cublasZher2k(handle /*cublasHandle_t*/, upper_lower /*cublasFillMode_t*/,

diff --git a/clang/test/dpct/query_api_mapping/cuBLAS/blas_part8.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_part8.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cublasSgemmStridedBatched | FileCheck %s -check-prefix=cublasSgemmStridedBatched
 // cublasSgemmStridedBatched: CUDA API:
 // cublasSgemmStridedBatched-NEXT:   cublasSgemmStridedBatched(

diff --git a/clang/test/dpct/query_api_mapping/cuFFT/lit_cuFFT.cu b/clang/test/dpct/query_api_mapping/cuFFT/lit_cuFFT.cu
@@ -1,5 +1,3 @@
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
-
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cufftExecZ2Z | FileCheck %s -check-prefix=cufftExecZ2Z
 // cufftExecZ2Z: CUDA API:
 // cufftExecZ2Z-NEXT:   cufftHandle plan;

diff --git a/clang/test/dpct/query_api_mapping/cuRAND/test.cu b/clang/test/dpct/query_api_mapping/cuRAND/test.cu
@@ -1,5 +1,5 @@
 // UNSUPPORTED: cuda-8.0
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
+// UNSUPPORTED: v8.0
 
 /// Host API
 

diff --git a/clang/test/dpct/query_api_mapping/cuSolver/lit_cuSolver_part1.cu b/clang/test/dpct/query_api_mapping/cuSolver/lit_cuSolver_part1.cu
@@ -1,5 +1,5 @@
 // UNSUPPORTED: cuda-8.0, cuda-9.0, cuda-9.1
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
+// UNSUPPORTED: v8.0, v9.0, v9.1
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cusolverDnSpotrsBatched | FileCheck %s -check-prefix=cusolverDnSpotrsBatched
 // cusolverDnSpotrsBatched: CUDA API:

diff --git a/clang/test/dpct/query_api_mapping/cuSolver/lit_cuSolver_part2.cu b/clang/test/dpct/query_api_mapping/cuSolver/lit_cuSolver_part2.cu
@@ -1,5 +1,5 @@
 // UNSUPPORTED: cuda-8.0, cuda-9.0, cuda-9.1
-// UNSUPPORTED: v8.0, v9.0, v9.1, v9.2, v10.0
+// UNSUPPORTED: v8.0, v9.0, v9.1
 
 // RUN: dpct --cuda-include-path="%cuda-path/include" --query-api-mapping=cusolverDnCunmtr | FileCheck %s -check-prefix=cusolverDnCunmtr
 // cusolverDnCunmtr: CUDA API: