diff --git a/clang/lib/DPCT/DPCT.cpp b/clang/lib/DPCT/DPCT.cpp
index 9a12458357c4..69b8cf6a1185 100644
--- a/clang/lib/DPCT/DPCT.cpp
+++ b/clang/lib/DPCT/DPCT.cpp
@@ -871,6 +871,12 @@ int runDPCT(int argc, const char **argv) {
     }
 
     Tool.appendArgumentsAdjuster(getInsertArgumentAdjuster("-w"));
+#ifdef _WIN32 // Avoid some error on windows platform.
+    if (DpctGlobalInfo::getSDKVersion() <= CudaVersion::CUDA_100) {
+      Tool.appendArgumentsAdjuster(
+          getInsertArgumentAdjuster("-D_MSC_VER=1900"));
+    }
+#endif
     NoIncrementalMigration.setValue(true);
     StopOnParseErr.setValue(true);
     Tool.setPrintErrorMessage(false);
diff --git a/clang/test/dpct/query_api_mapping/Driver/test.cu b/clang/test/dpct/query_api_mapping/Driver/test.cu
index fbab39812384..b0ba3f85730e 100644
--- 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
index 0a0e932c97b4..56ea184a91dd 100644
--- 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
index b7ca1d2939ad..302deeba8b03 100644
--- 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
index f3ec9898e309..445b5191aa0e 100644
--- 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
index 895815b71648..29ae01bb0b2e 100644
--- 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
index 76182bb483c5..530474661d07 100644
--- 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
index bf23a4092601..e0d88393a92d 100644
--- 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
index aaba1633967b..257cbc174460 100644
--- 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
index e79fe3a7e71b..b3190f5701b3 100644
--- 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
index d1d9ce0b7664..f6c0ecc76dc7 100644
--- 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
index 8a2909654b74..5f0c21136d91 100644
--- 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
index f41331c44ee7..88c041e0eda3 100644
--- 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
index 886f40489418..2ab059d7927b 100644
--- 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
index af1fc676fbf4..e6541719554e 100644
--- 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
index ebe7aafe1053..4c5fc1f68a00 100644
--- 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/cuBLAS/blas_9_2.cu b/clang/test/dpct/query_api_mapping/cuBLAS/blas_9_2.cu
index f739719b51ce..ed34b83c1059 100644
--- 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
index 3271670b363a..3f60956a04b8 100644
--- 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
index 62b20aaeab81..85bbb574d3ab 100644
--- 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
index 10e1acb45cfd..bbe98f8ce5f2 100644
--- 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
index aab03c3f40f8..898988cdf192 100644
--- 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
index 1ac8093a6dd6..cb6702cb9cdb 100644
--- 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
index f6b97dfa694f..83e5153e5b5e 100644
--- 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
index 591f78e06da7..0a30bbf75899 100644
--- 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
index e2c64ec4b546..fc1fce1b5e1b 100644
--- 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
index 9b8bf7b8d224..4f366419d235 100644
--- 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
index 7dc76eb9c467..98649c687274 100644
--- 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
index ea905fb92def..0b6bb87071fa 100644
--- 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
index bca4a5e1cdf4..ab053ce0001c 100644
--- 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: