Skip to content

Commit 11fcc9d

Browse files
author
iclsrc
committed
Merge from 'sycl' to 'sycl-web'
2 parents d0192a0 + dbe5e32 commit 11fcc9d

File tree

16 files changed

+13
-35
lines changed

16 files changed

+13
-35
lines changed

‎clang/test/Driver/sycl-offload-with-split.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
/// The same phase graph will be used with -fsycl-use-bitcode
1515
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
1616
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-DEFAULT-MODE %s
17-
// RUN: %clang_cl -ccc-print-phases -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split=per_source -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
17+
// RUN: %clang_cl -ccc-print-phases --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split=per_source -fsycl-targets=spir64-unknown-unknown-sycldevice %s 2>&1 \
1818
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-CL-MODE %s
1919
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split=per_source -fno-sycl-use-bitcode %s 2>&1 \
2020
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-DEFAULT-MODE %s
21-
// RUN: %clang_cl -ccc-print-phases -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split=per_source -fno-sycl-use-bitcode %s 2>&1 \
21+
// RUN: %clang_cl -ccc-print-phases --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split=per_source -fno-sycl-use-bitcode %s 2>&1 \
2222
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-CL-MODE %s
2323
// RUN: %clang -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split=per_source -fsycl-use-bitcode %s 2>&1 \
2424
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-DEFAULT-MODE %s
25-
// RUN: %clang_cl -ccc-print-phases -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split=per_source -fsycl-use-bitcode %s 2>&1 \
25+
// RUN: %clang_cl -ccc-print-phases --target=x86_64-pc-windows-msvc -fsycl -fno-sycl-device-lib=all -fsycl-device-code-split=per_source -fsycl-use-bitcode %s 2>&1 \
2626
// RUN: | FileCheck -check-prefixes=CHK-PHASES,CHK-PHASES-CL-MODE %s
2727
// CHK-PHASES: 0: input, "[[INPUT:.+\.c]]", c++, (host-sycl)
2828
// CHK-PHASES: 1: preprocessor, {0}, c++-cpp-output, (host-sycl)

‎clang/test/Driver/sycl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
// HEADER_ORDER-NOT: clang{{.*}} "/usr/include"{{.*}} "-internal-isystem" "{{.*}}bin{{[/\\]+}}..{{[/\\]+}}include{{[/\\]+}}
7373

7474
/// Verify -fsycl-device-only phases
75-
// RUN: %clang -### -ccc-print-phases -fsycl-device-only %s 2>&1 | FileCheck %s --check-prefix=DEFAULT-PHASES
75+
// RUN: %clang -### -ccc-print-phases -target x86_64-unknown-linux-gnu -fsycl-device-only %s 2>&1 | FileCheck %s --check-prefix=DEFAULT-PHASES
7676
// DEFAULT-PHASES: 0: input, "{{.*}}", c++, (device-sycl)
7777
// DEFAULT-PHASES: 1: preprocessor, {0}, c++-cpp-output, (device-sycl)
7878
// DEFAULT-PHASES: 2: compiler, {1}, ir, (device-sycl)

‎sycl/test/on-device/group-algorithm/leader.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// UNSUPPORTED: cuda
2-
// OpenCL C 2.x alike work-group functions not yet supported by CUDA.
3-
//
41
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
52
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
63
// RUN: %CPU_RUN_PLACEHOLDER %t.out

‎sycl/test/on-device/sub_group/attributes.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// UNSUPPORTED: cuda
2-
// CUDA compilation and runtime do not yet support sub-groups.
3-
//
41
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
52
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
63
// RUN: %CPU_RUN_PLACEHOLDER %t.out

‎sycl/test/on-device/sub_group/broadcast.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: cuda
1+
// XFAIL: cuda
22
// CUDA compilation and runtime do not yet support sub-groups.
33

44
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out

‎sycl/test/on-device/sub_group/broadcast_fp16.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: cuda
1+
// XFAIL: cuda
22
// CUDA compilation and runtime do not yet support sub-groups.
33

44
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out

‎sycl/test/on-device/sub_group/broadcast_fp64.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// UNSUPPORTED: cuda
1+
// XFAIL: cuda
22
// CUDA compilation and runtime do not yet support sub-groups.
33

44
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out

‎sycl/test/on-device/sub_group/generic_reduce.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
2-
// UNSUPPORTED: cuda
3-
// CUDA compilation and runtime do not yet support sub-groups.
4-
//
51
// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -std=c++14 %s -o %t.out
62
// RUN: %clangxx -fsycl -fsycl-unnamed-lambda -fsycl-targets=%sycl_triple -std=c++14 -D SG_GPU %s -o %t_gpu.out
73
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out

‎sycl/test/on-device/sub_group/load_store.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11

2-
// UNSUPPORTED: cuda || cpu
2+
// XFAIL: cuda
3+
// UNSUPPORTED: cpu
34
// CUDA compilation and runtime do not yet support sub-groups.
45
// #2252 Disable until all variants of built-ins are available in OpenCL CPU
56
// runtime for every supported ISA

‎sycl/test/on-device/sub_group/reduce.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda || cpu
2-
// CUDA compilation and runtime do not yet support sub-groups.
1+
// UNSUPPORTED: cpu
32
// #2252 Disable until all variants of built-ins are available in OpenCL CPU
43
// runtime for every supported ISA
54
//

‎sycl/test/on-device/sub_group/reduce_fp16.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// UNSUPPORTED: cuda
2-
// CUDA compilation and runtime do not yet support sub-groups.
3-
//
41
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
52
// RUN: %GPU_RUN_PLACEHOLDER %t.out
63
///==---------------- reduce_fp16.cpp - SYCL sub_group reduce test ----*- C++ -*---==//

‎sycl/test/on-device/sub_group/reduce_fp64.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda || cpu
2-
// CUDA compilation and runtime do not yet support sub-groups.
1+
// UNSUPPORTED: cpu
32
// #2252 Disable until all variants of built-ins are available in OpenCL CPU
43
// runtime for every supported ISA
54
//

‎sycl/test/on-device/sub_group/scan.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda || cpu
2-
// CUDA compilation and runtime do not yet support sub-groups.
1+
// UNSUPPORTED: cpu
32
// #2252 Disable until all variants of built-ins are available in OpenCL CPU
43
// runtime for every supported ISA
54
//

‎sycl/test/on-device/sub_group/scan_fp16.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// UNSUPPORTED: cuda
2-
// CUDA compilation and runtime do not yet support sub-groups.
3-
//
41
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
52
// RUN: %GPU_RUN_PLACEHOLDER %t.out
63

‎sycl/test/on-device/sub_group/scan_fp64.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
// UNSUPPORTED: cuda || cpu
2-
// CUDA compilation and runtime do not yet support sub-groups.
1+
// UNSUPPORTED: cpu
32
// #2252 Disable until all variants of built-ins are available in OpenCL CPU
43
// runtime for every supported ISA
54
//

‎sycl/test/on-device/sub_group/vote.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
// UNSUPPORTED: cuda
2-
// CUDA compilation and runtime do not yet support sub-groups.
3-
//
41
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
52
// RUN: env SYCL_DEVICE_TYPE=HOST %t.out
63
// RUN: %CPU_RUN_PLACEHOLDER %t.out

0 commit comments

Comments
 (0)