From c7fcd7f4d148b236399acbf1f9a53e0fe8a943d0 Mon Sep 17 00:00:00 2001
From: "Larsen, Steffen" <steffen.larsen@intel.com>
Date: Fri, 2 Sep 2022 04:23:03 -0700
Subject: [PATCH] [SYCL] Remove host run and dependencies from SYCL/SubGroup
 tests

This commit removes the host run and any assumptions and operations
related to the host device from the tests in SYCL/SubGroup.

Co-authored-by: Sachkov, Alexey <alexey.sachkov@intel.com>
Signed-off-by: Larsen, Steffen <steffen.larsen@intel.com>
---
 SYCL/SubGroup/barrier.cpp          | 4 ----
 SYCL/SubGroup/broadcast.cpp        | 4 ----
 SYCL/SubGroup/broadcast_fp16.cpp   | 4 ----
 SYCL/SubGroup/broadcast_fp64.cpp   | 4 ----
 SYCL/SubGroup/common.cpp           | 4 ----
 SYCL/SubGroup/generic-shuffle.cpp  | 4 ----
 SYCL/SubGroup/load_store.cpp       | 4 ----
 SYCL/SubGroup/shuffle.cpp          | 4 ----
 SYCL/SubGroup/shuffle_fp16.cpp     | 4 ----
 SYCL/SubGroup/shuffle_fp64.cpp     | 4 ----
 SYCL/SubGroup/sub_group_as_vec.cpp | 1 -
 11 files changed, 41 deletions(-)

diff --git a/SYCL/SubGroup/barrier.cpp b/SYCL/SubGroup/barrier.cpp
index 38e0fb1afe..050424b359 100644
--- a/SYCL/SubGroup/barrier.cpp
+++ b/SYCL/SubGroup/barrier.cpp
@@ -76,10 +76,6 @@ void check(queue &Queue, size_t G = 240, size_t L = 60) {
 }
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
   check<int>(Queue);
   check<unsigned int>(Queue);
   check<long>(Queue);
diff --git a/SYCL/SubGroup/broadcast.cpp b/SYCL/SubGroup/broadcast.cpp
index ce79c6a417..96125eefdf 100644
--- a/SYCL/SubGroup/broadcast.cpp
+++ b/SYCL/SubGroup/broadcast.cpp
@@ -15,10 +15,6 @@
 
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
   check<int>(Queue);
   check<unsigned int>(Queue);
   check<long>(Queue);
diff --git a/SYCL/SubGroup/broadcast_fp16.cpp b/SYCL/SubGroup/broadcast_fp16.cpp
index f94d4c14e5..cde8e94477 100644
--- a/SYCL/SubGroup/broadcast_fp16.cpp
+++ b/SYCL/SubGroup/broadcast_fp16.cpp
@@ -13,10 +13,6 @@
 
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
   check<sycl::half>(Queue);
   std::cout << "Test passed." << std::endl;
   return 0;
diff --git a/SYCL/SubGroup/broadcast_fp64.cpp b/SYCL/SubGroup/broadcast_fp64.cpp
index 43fea7165b..46af65d9e1 100644
--- a/SYCL/SubGroup/broadcast_fp64.cpp
+++ b/SYCL/SubGroup/broadcast_fp64.cpp
@@ -15,10 +15,6 @@
 
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
   check<double>(Queue);
   std::cout << "Test passed." << std::endl;
   return 0;
diff --git a/SYCL/SubGroup/common.cpp b/SYCL/SubGroup/common.cpp
index abfa385d74..362c0519dc 100644
--- a/SYCL/SubGroup/common.cpp
+++ b/SYCL/SubGroup/common.cpp
@@ -67,10 +67,6 @@ void check(queue &Queue, unsigned int G, unsigned int L) {
 }
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
 
   check(Queue, 240, 80);
   check(Queue, 8, 4);
diff --git a/SYCL/SubGroup/generic-shuffle.cpp b/SYCL/SubGroup/generic-shuffle.cpp
index 59b710f925..e979ddfa85 100644
--- a/SYCL/SubGroup/generic-shuffle.cpp
+++ b/SYCL/SubGroup/generic-shuffle.cpp
@@ -214,10 +214,6 @@ void check_struct(queue &Queue, Generator &Gen, size_t G = 256, size_t L = 64) {
 
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
 
   // Test shuffle of pointer types
   check_pointer<class KernelName_mNiN, int>(Queue);
diff --git a/SYCL/SubGroup/load_store.cpp b/SYCL/SubGroup/load_store.cpp
index 2f0fb9b7ea..9a1ea2a9f0 100644
--- a/SYCL/SubGroup/load_store.cpp
+++ b/SYCL/SubGroup/load_store.cpp
@@ -187,10 +187,6 @@ template <typename T> void check(queue &Queue) {
 
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
   std::string PlatformName =
       Queue.get_device().get_platform().get_info<info::platform::name>();
   auto Vec = Queue.get_device().get_info<info::device::extensions>();
diff --git a/SYCL/SubGroup/shuffle.cpp b/SYCL/SubGroup/shuffle.cpp
index dcb3ad5893..d9c7c8f368 100644
--- a/SYCL/SubGroup/shuffle.cpp
+++ b/SYCL/SubGroup/shuffle.cpp
@@ -20,10 +20,6 @@
 
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
   check<short>(Queue);
   check<unsigned short>(Queue);
   check<int>(Queue);
diff --git a/SYCL/SubGroup/shuffle_fp16.cpp b/SYCL/SubGroup/shuffle_fp16.cpp
index 9845c200c7..da52ed3336 100644
--- a/SYCL/SubGroup/shuffle_fp16.cpp
+++ b/SYCL/SubGroup/shuffle_fp16.cpp
@@ -22,10 +22,6 @@
 
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
   check<half>(Queue);
   std::cout << "Test passed." << std::endl;
   return 0;
diff --git a/SYCL/SubGroup/shuffle_fp64.cpp b/SYCL/SubGroup/shuffle_fp64.cpp
index 2ad6a49e7d..cc6baeb6e3 100644
--- a/SYCL/SubGroup/shuffle_fp64.cpp
+++ b/SYCL/SubGroup/shuffle_fp64.cpp
@@ -16,10 +16,6 @@
 
 int main() {
   queue Queue;
-  if (Queue.get_device().is_host()) {
-    std::cout << "Skipping test\n";
-    return 0;
-  }
   check<double>(Queue);
   std::cout << "Test passed." << std::endl;
   return 0;
diff --git a/SYCL/SubGroup/sub_group_as_vec.cpp b/SYCL/SubGroup/sub_group_as_vec.cpp
index 3f6cd3c901..316ea03dc6 100644
--- a/SYCL/SubGroup/sub_group_as_vec.cpp
+++ b/SYCL/SubGroup/sub_group_as_vec.cpp
@@ -10,7 +10,6 @@
 // RUN: %CPU_RUN_PLACEHOLDER %t.out
 // RUN: %ACC_RUN_PLACEHOLDER %t.out
 //
-//
 // Missing  __spirv_GenericCastToPtrExplicit_ToLocal,
 // __spirv_SubgroupLocalInvocationId, __spirv_GenericCastToPtrExplicit_ToGlobal,
 // __spirv_SubgroupBlockReadINTEL, __assert_fail,