From fd1f8a363cd723d980795ac26e7c57f2486b59d9 Mon Sep 17 00:00:00 2001 From: "Larsen, Steffen" Date: Fri, 2 Sep 2022 04:21:03 -0700 Subject: [PATCH] [SYCL] Remove host run and dependencies from SYCL/Sampler tests This commit removes the host run and any assumptions and operations related to the host device from the tests in SYCL/Sampler. Co-authored-by: Sachkov, Alexey Signed-off-by: Larsen, Steffen --- SYCL/Sampler/basic-rw-float.cpp | 1 - SYCL/Sampler/basic-rw.cpp | 2 -- SYCL/Sampler/normalized-clamp-linear-float.cpp | 1 - SYCL/Sampler/normalized-clamp-nearest.cpp | 1 - SYCL/Sampler/normalized-clampedge-linear-float.cpp | 1 - SYCL/Sampler/normalized-clampedge-nearest.cpp | 1 - SYCL/Sampler/normalized-mirror-linear-float.cpp | 3 +-- SYCL/Sampler/normalized-mirror-nearest.cpp | 1 - SYCL/Sampler/normalized-none-linear-float.cpp | 3 +-- SYCL/Sampler/normalized-none-nearest.cpp | 1 - SYCL/Sampler/normalized-repeat-linear-float.cpp | 1 - SYCL/Sampler/normalized-repeat-nearest.cpp | 1 - SYCL/Sampler/unnormalized-clamp-linear-float.cpp | 3 +-- SYCL/Sampler/unnormalized-clamp-nearest.cpp | 1 - SYCL/Sampler/unnormalized-clampedge-linear-float.cpp | 1 - SYCL/Sampler/unnormalized-clampedge-nearest.cpp | 1 - SYCL/Sampler/unnormalized-none-linear-float.cpp | 3 +-- SYCL/Sampler/unnormalized-none-nearest.cpp | 1 - 18 files changed, 4 insertions(+), 23 deletions(-) diff --git a/SYCL/Sampler/basic-rw-float.cpp b/SYCL/Sampler/basic-rw-float.cpp index fc2f4e9a0c..55f31e8c71 100644 --- a/SYCL/Sampler/basic-rw-float.cpp +++ b/SYCL/Sampler/basic-rw-float.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 diff --git a/SYCL/Sampler/basic-rw.cpp b/SYCL/Sampler/basic-rw.cpp index 21704925c4..c7cd83d141 100644 --- a/SYCL/Sampler/basic-rw.cpp +++ b/SYCL/Sampler/basic-rw.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 @@ -16,7 +15,6 @@ SYCL_DEVICE_FILTER=level_zero:gpu ./binx.bin SYCL_DEVICE_FILTER=opencl:cpu ./binx.bin - SYCL_DEVICE_FILTER=opencl:host ./binx.bin SYCL_DEVICE_FILTER=opecl:acc ../binx.bin <-- does not support image operations at this time. diff --git a/SYCL/Sampler/normalized-clamp-linear-float.cpp b/SYCL/Sampler/normalized-clamp-linear-float.cpp index cef51c8279..9937c635a0 100644 --- a/SYCL/Sampler/normalized-clamp-linear-float.cpp +++ b/SYCL/Sampler/normalized-clamp-linear-float.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 diff --git a/SYCL/Sampler/normalized-clamp-nearest.cpp b/SYCL/Sampler/normalized-clamp-nearest.cpp index 0cbcdd56dd..58141abfd5 100644 --- a/SYCL/Sampler/normalized-clamp-nearest.cpp +++ b/SYCL/Sampler/normalized-clamp-nearest.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 diff --git a/SYCL/Sampler/normalized-clampedge-linear-float.cpp b/SYCL/Sampler/normalized-clampedge-linear-float.cpp index 6af08823aa..0aebfce7a1 100644 --- a/SYCL/Sampler/normalized-clampedge-linear-float.cpp +++ b/SYCL/Sampler/normalized-clampedge-linear-float.cpp @@ -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 // XFAIL: cuda || hip diff --git a/SYCL/Sampler/normalized-clampedge-nearest.cpp b/SYCL/Sampler/normalized-clampedge-nearest.cpp index 00fb2be5b9..06ad8a0353 100644 --- a/SYCL/Sampler/normalized-clampedge-nearest.cpp +++ b/SYCL/Sampler/normalized-clampedge-nearest.cpp @@ -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 // diff --git a/SYCL/Sampler/normalized-mirror-linear-float.cpp b/SYCL/Sampler/normalized-mirror-linear-float.cpp index 5d2cc4a7bd..c475c08f75 100644 --- a/SYCL/Sampler/normalized-mirror-linear-float.cpp +++ b/SYCL/Sampler/normalized-mirror-linear-float.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 @@ -174,4 +173,4 @@ int main() { } return 0; -} \ No newline at end of file +} diff --git a/SYCL/Sampler/normalized-mirror-nearest.cpp b/SYCL/Sampler/normalized-mirror-nearest.cpp index 84c9ad9c96..4cfa8417df 100644 --- a/SYCL/Sampler/normalized-mirror-nearest.cpp +++ b/SYCL/Sampler/normalized-mirror-nearest.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 // XFAIL: cuda diff --git a/SYCL/Sampler/normalized-none-linear-float.cpp b/SYCL/Sampler/normalized-none-linear-float.cpp index 9725f7b22b..f441686b91 100644 --- a/SYCL/Sampler/normalized-none-linear-float.cpp +++ b/SYCL/Sampler/normalized-none-linear-float.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 @@ -156,4 +155,4 @@ int main() { } return 0; -} \ No newline at end of file +} diff --git a/SYCL/Sampler/normalized-none-nearest.cpp b/SYCL/Sampler/normalized-none-nearest.cpp index eeaf0143e5..ddefd4b828 100644 --- a/SYCL/Sampler/normalized-none-nearest.cpp +++ b/SYCL/Sampler/normalized-none-nearest.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 diff --git a/SYCL/Sampler/normalized-repeat-linear-float.cpp b/SYCL/Sampler/normalized-repeat-linear-float.cpp index 75a6c9491d..0b726b4ded 100644 --- a/SYCL/Sampler/normalized-repeat-linear-float.cpp +++ b/SYCL/Sampler/normalized-repeat-linear-float.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 diff --git a/SYCL/Sampler/normalized-repeat-nearest.cpp b/SYCL/Sampler/normalized-repeat-nearest.cpp index 17140f206c..7c653c4830 100644 --- a/SYCL/Sampler/normalized-repeat-nearest.cpp +++ b/SYCL/Sampler/normalized-repeat-nearest.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 // XFAIL: cuda diff --git a/SYCL/Sampler/unnormalized-clamp-linear-float.cpp b/SYCL/Sampler/unnormalized-clamp-linear-float.cpp index d0a5fa639b..1070987565 100644 --- a/SYCL/Sampler/unnormalized-clamp-linear-float.cpp +++ b/SYCL/Sampler/unnormalized-clamp-linear-float.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 // XFAIL: cuda @@ -149,4 +148,4 @@ int main() { } return 0; -} \ No newline at end of file +} diff --git a/SYCL/Sampler/unnormalized-clamp-nearest.cpp b/SYCL/Sampler/unnormalized-clamp-nearest.cpp index b7337dc1fb..cb8821fb15 100644 --- a/SYCL/Sampler/unnormalized-clamp-nearest.cpp +++ b/SYCL/Sampler/unnormalized-clamp-nearest.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 diff --git a/SYCL/Sampler/unnormalized-clampedge-linear-float.cpp b/SYCL/Sampler/unnormalized-clampedge-linear-float.cpp index 04fbd45c3d..7eea445454 100644 --- a/SYCL/Sampler/unnormalized-clampedge-linear-float.cpp +++ b/SYCL/Sampler/unnormalized-clampedge-linear-float.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 // XFAIL: cuda diff --git a/SYCL/Sampler/unnormalized-clampedge-nearest.cpp b/SYCL/Sampler/unnormalized-clampedge-nearest.cpp index 767543567c..e06e90f102 100644 --- a/SYCL/Sampler/unnormalized-clampedge-nearest.cpp +++ b/SYCL/Sampler/unnormalized-clampedge-nearest.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 diff --git a/SYCL/Sampler/unnormalized-none-linear-float.cpp b/SYCL/Sampler/unnormalized-none-linear-float.cpp index 2dc1805ead..246a0b582f 100644 --- a/SYCL/Sampler/unnormalized-none-linear-float.cpp +++ b/SYCL/Sampler/unnormalized-none-linear-float.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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 @@ -195,4 +194,4 @@ int main() { } return 0; -} \ No newline at end of file +} diff --git a/SYCL/Sampler/unnormalized-none-nearest.cpp b/SYCL/Sampler/unnormalized-none-nearest.cpp index 285d9afaef..b635032fff 100644 --- a/SYCL/Sampler/unnormalized-none-nearest.cpp +++ b/SYCL/Sampler/unnormalized-none-nearest.cpp @@ -1,6 +1,5 @@ // UNSUPPORTED: hip // 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