Skip to content

Commit 60e711b

Browse files
steffenlarsenAlexeySachkov
authored andcommitted
[SYCL] Remove host run and dependencies from SYCL/Regression tests (intel#1223)
This commit removes the host run and any assumptions and operations related to the host device from the tests in SYCL/Regression. Co-authored-by: Sachkov, Alexey <[email protected]> Signed-off-by: Larsen, Steffen <[email protected]>
1 parent d9f5961 commit 60e711b

22 files changed

+2
-36
lines changed

SYCL/Regression/atomic_load.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/cache_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ int main() {
134134
std::vector<sycl::device> device_list;
135135
for (const auto &plt : sycl::platform::get_platforms()) {
136136
std::cout << "Platform " << pindex++ << " "
137-
<< ((plt.is_host()) ? "host" : "") << " ("
138-
<< plt.get_info<sycl::info::platform::name>() << ")" << std::endl;
137+
<< " (" << plt.get_info<sycl::info::platform::name>() << ")"
138+
<< std::endl;
139139
platform_list.push_back(plt);
140140

141141
int dindex = 1;

SYCL/Regression/complex_global_object.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/device_num.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ int GetPreferredDeviceIndex(const std::vector<device> &devices,
108108
// gpu L0, opencl
109109
// cpu
110110
// acc
111-
// host
112111
const std::map<info::device_type, int> scoreByType = {
113112
{info::device_type::cpu, 300},
114113
{info::device_type::gpu, 500},
@@ -213,17 +212,6 @@ int main() {
213212
assert(devices[targetDevIndex] == d &&
214213
"The selected device is not the target device specified.");
215214
}
216-
targetDevIndex = GetPreferredDeviceIndex(devices, info::device_type::host);
217-
assert((targetDevIndex >= 0 || deviceNum != 0) &&
218-
"Failed to find host device.");
219-
if (targetDevIndex >= 0) {
220-
host_selector hs;
221-
device d = hs.select_device();
222-
std::cout << "host_selector selected ";
223-
printDeviceType(d);
224-
assert(devices[targetDevIndex] == d &&
225-
"The selected device is not a host device.");
226-
}
227215

228216
return 0;
229217
}

SYCL/Regression/event_destruction.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// Temporarily disabled because the test is out of time
33
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
44
// RUN: %ACC_RUN_PLACEHOLDER %t.out
5-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
65
// RUN: %CPU_RUN_PLACEHOLDER %t.out
76
// RUN: %GPU_RUN_PLACEHOLDER %t.out
87

SYCL/Regression/fp16-with-unnamed-lambda.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-unnamed-lambda %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %GPU_RUN_PLACEHOLDER %t.out
43
// RUN: %CPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/get_subgroup_sizes.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %GPU_RUN_PLACEHOLDER %t.out
43
// RUN: %CPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/global_queue.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/group.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/image_access.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
43
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
54
// No execution of FPGA because it does not support images

SYCL/Regression/implicit_atomic_conversion.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/kernel_name_class.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out
65
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.ext.out -fsycl-unnamed-lambda
7-
// RUN: %HOST_RUN_PLACEHOLDER %t.ext.out
86
// RUN: %CPU_RUN_PLACEHOLDER %t.ext.out
97
// RUN: %GPU_RUN_PLACEHOLDER %t.ext.out
108
// RUN: %ACC_RUN_PLACEHOLDER %t.ext.out

SYCL/Regression/kernel_unnamed.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -fsycl-unnamed-lambda
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/local-arg-align.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
22
//
3-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
43
// RUN: %CPU_RUN_PLACEHOLDER %t.out
54
// RUN: %GPU_RUN_PLACEHOLDER %t.out
65
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/msvc_crt.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple /MD -o %t1.exe %s
2-
// RUN: %HOST_RUN_PLACEHOLDER %t1.exe
32
// RUN: %CPU_RUN_PLACEHOLDER %t1.exe
43
// RUN: %GPU_RUN_PLACEHOLDER %t1.exe
54
// RUN: %ACC_RUN_PLACEHOLDER %t1.exe
65
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple /MDd -o %t2.exe %s
7-
// RUN: %HOST_RUN_PLACEHOLDER %t2.exe
86
// RUN: %CPU_RUN_PLACEHOLDER %t2.exe
97
// RUN: %GPU_RUN_PLACEHOLDER %t2.exe
108
// RUN: %ACC_RUN_PLACEHOLDER %t2.exe

SYCL/Regression/nontrivial_device_copyable_value.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %GPU_RUN_PLACEHOLDER %t.out
43
// RUN: %CPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/private_array_init_test.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/same_unnamed_kernels.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl %s -o %t.out -fsycl-unnamed-lambda
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/static-buffer-dtor.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
// would start shutting down.
1111
//===----------------------------------------------------------------------===//
1212
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
13-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
1413
// RUN: %CPU_RUN_PLACEHOLDER %t.out
1514
// RUN: %GPU_RUN_PLACEHOLDER %t.out
1615
// RUN: %ACC_RUN_PLACEHOLDER %t.out

SYCL/Regression/unoptimized_stream.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -O0 -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54

SYCL/Regression/usm_malloc_shared.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43

54
// This test checks if users will successfully allocate 160, 0, and -16 bytes of

SYCL/Regression/zero_size_local_accessor.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
2-
// RUN: %HOST_RUN_PLACEHOLDER %t.out
32
// RUN: %CPU_RUN_PLACEHOLDER %t.out
43
// RUN: %GPU_RUN_PLACEHOLDER %t.out
54
// RUN: %ACC_RUN_PLACEHOLDER %t.out

0 commit comments

Comments
 (0)