Skip to content
This repository was archived by the owner on Mar 28, 2023. It is now read-only.

Commit 94d1a49

Browse files
author
Artem Gindinson
authored
[SYCL] Enable DAE explicitly for several tests (#575)
Until DAE is enabled by default in the compiler driver, make sure that it works properly with the specialization constant/kernel bundle APIs. Extend onto device code split tests Tests intel/llvm#4977. Signed-off-by: Artem Gindinson <[email protected]>
1 parent f78500c commit 94d1a49

File tree

11 files changed

+21
-11
lines changed

11 files changed

+21
-11
lines changed
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// REQUIRES: aoc, accelerator
22

3-
// RUN: %clangxx -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64_fpga -I %S/Inputs -o %t.out %S/split-per-source-main.cpp %S/Inputs/split-per-source-second-file.cpp
3+
// RUN: %clangxx -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64_fpga -I %S/Inputs -o %t.out %S/split-per-source-main.cpp %S/Inputs/split-per-source-second-file.cpp \
4+
// RUN: -fsycl-dead-args-optimization
45
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/DeviceCodeSplit/aot-cpu.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// REQUIRES: opencl-aot, cpu
22

3-
// RUN: %clangxx -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64_x86_64 -I %S/Inputs -o %t.out %S/split-per-source-main.cpp %S/Inputs/split-per-source-second-file.cpp
3+
// RUN: %clangxx -fsycl -fsycl-device-code-split=per_source -fsycl-targets=spir64_x86_64 -I %S/Inputs -o %t.out %S/split-per-source-main.cpp %S/Inputs/split-per-source-second-file.cpp \
4+
// RUN: -fsycl-dead-args-optimization
45
// RUN: %CPU_RUN_PLACEHOLDER %t.out

SYCL/DeviceCodeSplit/aot-gpu.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@
77
// RUN: -Xsycl-target-backend=spir64_gen \
88
// RUN: "-device *" -I %S/Inputs -o %t.out \
99
// RUN: %S/split-per-source-main.cpp \
10-
// RUN: %S/Inputs/split-per-source-second-file.cpp
10+
// RUN: %S/Inputs/split-per-source-second-file.cpp \
11+
// RUN: -fsycl-dead-args-optimization
1112
// RUN: %GPU_RUN_PLACEHOLDER %t.out

SYCL/DeviceCodeSplit/split-per-kernel.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel -o %t.out %s
1+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_kernel -o %t.out %s \
2+
// RUN: -fsycl-dead-args-optimization
23
// RUN: %CPU_RUN_PLACEHOLDER %t.out
34
// RUN: %GPU_RUN_PLACEHOLDER %t.out
45
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/DeviceCodeSplit/split-per-source-main.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_source -I %S/Inputs -o %t.out %s %S/Inputs/split-per-source-second-file.cpp
1+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-device-code-split=per_source -I %S/Inputs -o %t.out %s %S/Inputs/split-per-source-second-file.cpp \
2+
// RUN: -fsycl-dead-args-optimization
23
// RUN: %CPU_RUN_PLACEHOLDER %t.out
34
// RUN: %GPU_RUN_PLACEHOLDER %t.out
45
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/SpecConstants/2020/handler-api.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
// - test that specialization constant values can be set within command group
88
// scope and correctly retrieved within a kernel
99
//
10-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
10+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out \
11+
// RUN: -fsycl-dead-args-optimization
1112
// FIXME: SYCL 2020 specialization constants are not supported on host device
1213
// RUN: %CPU_RUN_PLACEHOLDER %t.out
1314
// RUN: %GPU_RUN_PLACEHOLDER %t.out

SYCL/SpecConstants/2020/host_apis.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
1+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out \
2+
// RUN: -fsycl-dead-args-optimization
23
// RUN: %t.out
34

45
// UNSUPPORTED: cuda

SYCL/SpecConstants/2020/kernel-bundle-api.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@
77
// - test that specialization constant values can be set through kernel_bundle
88
// API and correctly retrieved within a kernel
99
//
10-
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
10+
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out \
11+
// RUN: -fsycl-dead-args-optimization
1112
// FIXME: SYCL 2020 specialization constants are not supported on host device
1213
// RUN: %CPU_RUN_PLACEHOLDER %t.out
1314
// RUN: %GPU_RUN_PLACEHOLDER %t.out

SYCL/SpecConstants/2020/non_native/accelerator.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// REQUIRES: aoc, accelerator
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga %S/Inputs/common.cpp -o %t.out
3+
// RUN: %clangxx -fsycl -fsycl-targets=spir64_fpga %S/Inputs/common.cpp -o %t.out \
4+
// RUN: -fsycl-dead-args-optimization
45
// RUN: %ACC_RUN_PLACEHOLDER %t.out
56

67
// This test checks correctness of SYCL2020 non-native specialization constants

SYCL/SpecConstants/2020/non_native/cpu.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// REQUIRES: opencl-aot, cpu
22

3-
// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/common.cpp -o %t.out
3+
// RUN: %clangxx -fsycl -fsycl-targets=spir64_x86_64 %S/Inputs/common.cpp -o %t.out \
4+
// RUN: -fsycl-dead-args-optimization
45
// RUN: %CPU_RUN_PLACEHOLDER %t.out
56

67
// This test checks correctness of SYCL2020 non-native specialization constants

SYCL/SpecConstants/2020/non_native/gpu.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// UNSUPPORTED: hip
66
// HIP is not compatible with SPIR.
77

8-
// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device *" %S/Inputs/common.cpp -o %t.out
8+
// RUN: %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device *" %S/Inputs/common.cpp -o %t.out -fsycl-dead-args-optimization
99
// RUN: %GPU_RUN_PLACEHOLDER %t.out
1010

1111
// This test checks correctness of SYCL2020 non-native specialization constants

0 commit comments

Comments
 (0)