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

[SYCL] Remove host run and dependencies from SYCL/Regression tests #1223

Merged
merged 2 commits into from
Sep 9, 2022
Merged

[SYCL] Remove host run and dependencies from SYCL/Regression tests #1223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c34a21c
[SYCL] Remove host run and dependencies from SYCL/Regression tests
steffenlarsen Sep 2, 2022
933c5b4
Reintroduce host to the map. Can be removed after host device removal.
steffenlarsen Sep 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion SYCL/Regression/atomic_load.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
4 changes: 2 additions & 2 deletions SYCL/Regression/cache_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ int main() {
std::vector<sycl::device> device_list;
for (const auto &plt : sycl::platform::get_platforms()) {
std::cout << "Platform " << pindex++ << " "
<< ((plt.is_host()) ? "host" : "") << " ("
<< plt.get_info<sycl::info::platform::name>() << ")" << std::endl;
<< " (" << plt.get_info<sycl::info::platform::name>() << ")"
<< std::endl;
platform_list.push_back(plt);

int dindex = 1;
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/complex_global_object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
12 changes: 0 additions & 12 deletions SYCL/Regression/device_num.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ int GetPreferredDeviceIndex(const std::vector<device> &devices,
// gpu L0, opencl
// cpu
// acc
// host
const std::map<info::device_type, int> scoreByType = {
{info::device_type::cpu, 300},
{info::device_type::gpu, 500},
Expand Down Expand Up @@ -213,17 +212,6 @@ int main() {
assert(devices[targetDevIndex] == d &&
"The selected device is not the target device specified.");
}
targetDevIndex = GetPreferredDeviceIndex(devices, info::device_type::host);
assert((targetDevIndex >= 0 || deviceNum != 0) &&
"Failed to find host device.");
if (targetDevIndex >= 0) {
host_selector hs;
device d = hs.select_device();
std::cout << "host_selector selected ";
printDeviceType(d);
assert(devices[targetDevIndex] == d &&
"The selected device is not a host device.");
}

return 0;
}
1 change: 0 additions & 1 deletion SYCL/Regression/event_destruction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
// Temporarily disabled because the test is out of time
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out

Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/fp16-with-unnamed-lambda.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple -fsycl-unnamed-lambda %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/get_subgroup_sizes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/global_queue.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/group.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/image_access.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: env SYCL_PI_TRACE=2 %CPU_RUN_PLACEHOLDER %t.out 2>&1 %CPU_CHECK_PLACEHOLDER
// RUN: env SYCL_PI_TRACE=2 %GPU_RUN_PLACEHOLDER %t.out 2>&1 %GPU_CHECK_PLACEHOLDER
// No execution of FPGA because it does not support images
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/implicit_atomic_conversion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
2 changes: 0 additions & 2 deletions SYCL/Regression/kernel_name_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.ext.out -fsycl-unnamed-lambda
// RUN: %HOST_RUN_PLACEHOLDER %t.ext.out
// RUN: %CPU_RUN_PLACEHOLDER %t.ext.out
// RUN: %GPU_RUN_PLACEHOLDER %t.ext.out
// RUN: %ACC_RUN_PLACEHOLDER %t.ext.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/kernel_unnamed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out -fsycl-unnamed-lambda
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/local-arg-align.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
//
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
2 changes: 0 additions & 2 deletions SYCL/Regression/msvc_crt.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple /MD -o %t1.exe %s
// RUN: %HOST_RUN_PLACEHOLDER %t1.exe
// RUN: %CPU_RUN_PLACEHOLDER %t1.exe
// RUN: %GPU_RUN_PLACEHOLDER %t1.exe
// RUN: %ACC_RUN_PLACEHOLDER %t1.exe
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple /MDd -o %t2.exe %s
// RUN: %HOST_RUN_PLACEHOLDER %t2.exe
// RUN: %CPU_RUN_PLACEHOLDER %t2.exe
// RUN: %GPU_RUN_PLACEHOLDER %t2.exe
// RUN: %ACC_RUN_PLACEHOLDER %t2.exe
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/nontrivial_device_copyable_value.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/private_array_init_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/same_unnamed_kernels.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl %s -o %t.out -fsycl-unnamed-lambda
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/static-buffer-dtor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
// would start shutting down.
//===----------------------------------------------------------------------===//
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/unoptimized_stream.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -O0 -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out

Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/usm_malloc_shared.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out

// This test checks if users will successfully allocate 160, 0, and -16 bytes of
Expand Down
1 change: 0 additions & 1 deletion SYCL/Regression/zero_size_local_accessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
// RUN: %clangxx -fsycl -fsycl-targets=%sycl_triple %s -o %t.out
// RUN: %HOST_RUN_PLACEHOLDER %t.out
// RUN: %CPU_RUN_PLACEHOLDER %t.out
// RUN: %GPU_RUN_PLACEHOLDER %t.out
// RUN: %ACC_RUN_PLACEHOLDER %t.out
Expand Down