Skip to content

Commit bbc774e

Browse files
authored
[SYCLomatic] Fix 4 lit cases and all migration on windows with cuda-12.1 (#809)
Signed-off-by: Jiang, Zhiwei <[email protected]>
1 parent 4a03c23 commit bbc774e

File tree

5 files changed

+10
-9
lines changed

5 files changed

+10
-9
lines changed

clang/lib/DPCT/DPCT.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -830,7 +830,8 @@ int runDPCT(int argc, const char **argv) {
830830
(SDKVersionMajor == 11 && SDKVersionMinor == 6) ||
831831
(SDKVersionMajor == 11 && SDKVersionMinor == 7) ||
832832
(SDKVersionMajor == 11 && SDKVersionMinor == 8) ||
833-
(SDKVersionMajor == 12 && SDKVersionMinor == 0)) {
833+
(SDKVersionMajor == 12 && SDKVersionMinor == 0) ||
834+
(SDKVersionMajor == 12 && SDKVersionMinor == 1)) {
834835
Tool.appendArgumentsAdjuster(
835836
getInsertArgumentAdjuster("-fms-compatibility-version=19.21.27702.0",
836837
ArgumentInsertPosition::BEGIN));

clang/test/dpct/test_api_level/SparseUtils/api_test2.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0
2-
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0
1+
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0, cuda-12.1
2+
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0, v12.1
33
// RUN: dpct --format-range=none --use-custom-helper=api -out-root %T/SparseUtils/api_test2_out %s --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only
44
// RUN: grep "IsCalled" %T/SparseUtils/api_test2_out/MainSourceFiles.yaml | wc -l > %T/SparseUtils/api_test2_out/count.txt
55
// RUN: FileCheck --input-file %T/SparseUtils/api_test2_out/count.txt --match-full-lines %s

clang/test/dpct/test_api_level/SparseUtils/api_test3.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0
2-
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0
1+
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0, cuda-12.1
2+
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0, v12.1
33
// RUN: dpct --format-range=none --use-custom-helper=api -out-root %T/SparseUtils/api_test3_out %s --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only
44
// RUN: grep "IsCalled" %T/SparseUtils/api_test3_out/MainSourceFiles.yaml | wc -l > %T/SparseUtils/api_test3_out/count.txt
55
// RUN: FileCheck --input-file %T/SparseUtils/api_test3_out/count.txt --match-full-lines %s

clang/test/dpct/test_api_level/SparseUtils/api_test4.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0
2-
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0
1+
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0, cuda-12.1
2+
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0, v12.1
33
// RUN: dpct --format-range=none --use-custom-helper=api -out-root %T/SparseUtils/api_test4_out %s --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only
44
// RUN: grep "IsCalled" %T/SparseUtils/api_test4_out/MainSourceFiles.yaml | wc -l > %T/SparseUtils/api_test4_out/count.txt
55
// RUN: FileCheck --input-file %T/SparseUtils/api_test4_out/count.txt --match-full-lines %s

clang/test/dpct/test_api_level/SparseUtils/api_test5.cu

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0
2-
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0
1+
// UNSUPPORTED: cuda-11.0, cuda-11.1, cuda-11.2, cuda-11.3, cuda-11.4, cuda-11.5, cuda-11.6, cuda-11.7, cuda-11.8, cuda-12.0, cuda-12.1
2+
// UNSUPPORTED: v11.0, v11.1, v11.2, v11.3, v11.4, v11.5, v11.6, v11.7, v11.8, v12.0, v12.1
33
// RUN: dpct --format-range=none --use-custom-helper=api -out-root %T/SparseUtils/api_test5_out %s --cuda-include-path="%cuda-path/include" -- -x cuda --cuda-host-only
44
// RUN: grep "IsCalled" %T/SparseUtils/api_test5_out/MainSourceFiles.yaml | wc -l > %T/SparseUtils/api_test5_out/count.txt
55
// RUN: FileCheck --input-file %T/SparseUtils/api_test5_out/count.txt --match-full-lines %s

0 commit comments

Comments
 (0)