[SYCLomatic] Update: Migrate macro __NVCC__ to SYCL_LANGUAGE_VERSION (#1923)

Signed-off-by: Jiang, Zhiwei <[email protected]>

Author: zhiweij1

clang/lib/DPCT/MapNames.cpp

@@ -3887,7 +3887,7 @@ const MapNames::MapTy MapNames::Dim3MemberNamesMap{
 
 const MapNames::MapTy MapNames::MacrosMap{
     {"__CUDA_ARCH__", "DPCT_COMPATIBILITY_TEMP"}, /**/
-    {"__NVCC__", "DPCT_COMPATIBILITY_TEMP"},      /**/
+    {"__NVCC__", "SYCL_LANGUAGE_VERSION"},
     {"__CUDACC__", "SYCL_LANGUAGE_VERSION"},
     {"__DRIVER_TYPES_H__", "__DPCT_HPP__"},
     {"__CUDA_RUNTIME_H__", "__DPCT_HPP__"},

clang/test/dpct/predefined_macro_check.cu

@@ -2,7 +2,7 @@
 // RUN: FileCheck --input-file %T/predefined_macro_check/predefined_macro_check.dp.cpp --match-full-lines %s
 // RUN: %if build_lit %{icpx -c -fsycl %T/predefined_macro_check/predefined_macro_check.dp.cpp -o %T/predefined_macro_check/predefined_macro_check.dp.o %}
 
-//CHECK:#ifdef DPCT_COMPATIBILITY_TEMP
+//CHECK:#ifdef SYCL_LANGUAGE_VERSION
 #ifdef __NVCC__
 void fun(){
  }

clang/test/dpct/predefined_macro_check_db.cu

@@ -16,7 +16,7 @@
 // RUN: cd ..
 // RUN: rm -rf ./predefined_macro_check_db
 
-// CHECK: #ifdef DPCT_COMPATIBILITY_TEMP
+// CHECK: #ifdef SYCL_LANGUAGE_VERSION
 #ifdef __NVCC__
 void fun() {}
 #else

clang/test/dpct/predefined_macro_replacement.cu

@@ -13,7 +13,7 @@ __device__ void hello() { printf("foo"); }
 __device__ void hello() { printf("other"); }
 #endif
 
-//CHECK: #ifndef DPCT_COMPATIBILITY_TEMP
+//CHECK: #ifndef SYCL_LANGUAGE_VERSION
 #ifndef __NVCC__
 __device__ void hello2() { printf("hello2"); }
 #endif
@@ -75,23 +75,23 @@ printf("<200, \n");
 
 
 int main() {
-//CHECK: #if defined(DPCT_COMPATIBILITY_TEMP)
+//CHECK: #if defined(SYCL_LANGUAGE_VERSION)
 //CHECK-NEXT:     q_ct1.parallel_for(
 #if defined(__NVCC__)
   hello8<<<1,1>>>();
 #else
   hello();
 #endif
 
-//CHECK: #ifdef DPCT_COMPATIBILITY_TEMP
+//CHECK: #ifdef SYCL_LANGUAGE_VERSION
 //CHECK-NEXT:     q_ct1.parallel_for(
   #ifdef __NVCC__
   hello8<<<1,1>>>();
 #else
   hello();
 #endif
 
-//CHECK: #if DPCT_COMPATIBILITY_TEMP
+//CHECK: #if SYCL_LANGUAGE_VERSION
 //CHECK-NEXT:     q_ct1.parallel_for(
   #if __NVCC__
   hello8<<<1,1>>>();
@@ -103,7 +103,7 @@ int main() {
 
 //CHECK: #define AAA DPCT_COMPATIBILITY_TEMP
 //CHECK-NEXT: #define BBB SYCL_LANGUAGE_VERSION
-//CHECK-NEXT: #define CCC DPCT_COMPATIBILITY_TEMP
+//CHECK-NEXT: #define CCC SYCL_LANGUAGE_VERSION
 #define AAA __CUDA_ARCH__
 #define BBB __CUDACC__
 #define CCC __NVCC__