[SYCL][E2E] Remove FPGA support from E2E tests

sycl/test-e2e/AddressCast/dynamic_address_cast.cpp

@@ -7,8 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // Issue with OpenCL CPU runtime implementation of OpGenericCastToPtrExplicit
-// FPGA emulator affected by same issue as OpenCL CPU runtime
-// UNSUPPORTED: cpu, accelerator
+// UNSUPPORTED: cpu
 // RUN: %{build} -o %t.out
 // RUN: %{run} %t.out
 

sycl/test-e2e/Assert/assert_in_kernels.cpp

@@ -7,16 +7,12 @@
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // CHECK:      {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: void kernelFunc2(int *, int): {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"

sycl/test-e2e/Assert/assert_in_kernels_win.cpp

@@ -1,7 +1,6 @@
 // REQUIRES: windows
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  One shouldn't see this message
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -10,8 +9,5 @@
 // CHECK-SAME: Assertion `Buf[wiID] == 0 && "from assert statement"` failed.
 // CHECK-NOT:  test aborts earlier, one shouldn't see this message
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_kernels.hpp:27: {{<unknown func>|\(null\)}}: {{.*}} [{{[0,2]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_kernels.hpp"

sycl/test-e2e/Assert/assert_in_multiple_tus.cpp

@@ -13,17 +13,13 @@
 // REQUIRES-INTEL-DRIVER: lin: 31294
 
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CUDA uses block/thread vs global/local id for SYCL, also it shows the
 // position of a thread within the block, not the absolute ID.
 // CHECK:      {{.*}}kernels_in_file2.cpp:15: int calculus(int): {{global id: \[5|block: \[1}},0,0], {{local id|thread}}: [1,0,0]
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: int calculus(int): global id: [5,0,0], local id: [1,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"

sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug.cpp

@@ -10,8 +10,7 @@
 // XFAIL-TRACKER: https://github.com/intel/llvm/issues/11364
 
 // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // CUDA uses block/thread vs global/local id for SYCL, also it shows the
@@ -20,6 +19,3 @@
 // CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:23: int checkFunction(): {{.*}}
-// CHECK-ACC: The test ended.

sycl/test-e2e/Assert/assert_in_multiple_tus_one_ndebug_win.cpp

@@ -1,7 +1,6 @@
 // REQUIRES: windows
 // RUN: %clangxx -DSYCL_FALLBACK_ASSERT=1 -fsycl %{sycl_target_opts} -DDEFINE_NDEBUG_INFILE2 -I %S/Inputs %S/assert_in_multiple_tus.cpp %S/Inputs/kernels_in_file2.cpp -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK-NOT:  this message from calculus
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
@@ -10,6 +9,3 @@
 // CHECK-SAME: {{.*}} [1,0,0] Assertion `X && "Nil in result"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_multiple_tus.hpp:23: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0],
-// CHECK-ACC: The test ended.

sycl/test-e2e/Assert/assert_in_multiple_tus_win.cpp

@@ -1,16 +1,12 @@
 // REQUIRES: windows
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -I %S/Inputs %S/Inputs/kernels_in_file2.cpp -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
 // CHECK-SAME: Assertion `X && "this message from calculus"` failed.
 // CHECK-NOT:  this message from file2
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}kernels_in_file2.cpp:15: {{<unknown func>|\(null\)}}: {{.*}} [5,0,0], {{.*}} [1,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_multiple_tus.hpp"

sycl/test-e2e/Assert/assert_in_one_kernel.cpp

@@ -8,13 +8,10 @@
 
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:12: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: void kernelFunc(int *, int): {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_one_kernel.hpp"

sycl/test-e2e/Assert/assert_in_one_kernel_win.cpp

@@ -1,15 +1,11 @@
 // REQUIRES: windows
 // RUN: %{build} -DSYCL_FALLBACK_ASSERT=1 -o %t.out
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
 // CHECK-SAME: Assertion `Buf[wiID] != 0 && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_one_kernel.hpp:12: {{<unknown func>|\(null\)}}: {{.*}} [{{[0-3]}},0,0], {{.*}} [0,0,0]
-// CHECK-ACC:  The test ended.
 
 #include "assert_in_one_kernel.hpp"

sycl/test-e2e/Assert/assert_in_simultaneous_kernels.cpp

@@ -17,13 +17,10 @@
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
 // Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:16: void assertFunc(): {{.*}}[9,7,0], {{.*}}[0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: void assertFunc(): {{.*}} [9,7,0], {{.*}} [0,0,0]
-// CHECK-ACC: The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"

sycl/test-e2e/Assert/assert_in_simultaneous_kernels_win.cpp

@@ -9,16 +9,12 @@
 //
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // FIXME Windows version prints '(null)' instead of '<unknown func>' once in a
 // while for some insane reason.
 // CHECK:      {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|\(null\)}}: global id: [9,7,0], local id: [0,0,0]
 // CHECK-SAME: Assertion `false && "from assert statement"` failed.
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{.*}}assert_in_simultaneous_kernels.hpp:16: {{<unknown func>|\(null\)}}: global id: [9,7,0], local id: [0,0,0]
-// CHECK-ACC:  The test ended.
 
 #include "assert_in_simultaneous_kernels.hpp"

sycl/test-e2e/Assert/assert_in_simultaneously_multiple_tus.cpp

@@ -16,14 +16,10 @@
 //
 // DEFINE: %{gpu_env} = env SYCL_PI_LEVEL_ZERO_TRACK_INDIRECT_ACCESS_MEMORY=1 SYCL_PI_SUPPRESS_ERROR_MESSAGE=1
 
-// Shouldn't fail on ACC as fallback assert isn't enqueued there
-// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt %if fpga %{ --check-prefix=CHECK-ACC %}
+// RUN: %if gpu %{ %{gpu_env} %} %{run} %t.out &> %t.txt ; FileCheck %s --input-file %t.txt
 //
 // CHECK:      {{this message from file1|this message from file2}}
 // CHECK-NOT:  The test ended.
-//
-// CHECK-ACC-NOT: {{this message from file1|this message from file2}}
-// CHECK-ACC: The test ended.
 
 #include "Inputs/kernels_in_file2.hpp"
 #include <cstdio>

sycl/test-e2e/Basic/aspects.cpp

@@ -30,9 +30,6 @@ int main() {
     } else if (plt.has(aspect::gpu)) {
       std::cout << "Platform #" << pltIdx
                 << " type: GPU supports:" << std::endl;
-    } else if (plt.has(aspect::accelerator)) {
-      std::cout << "Platform #" << pltIdx
-                << " type: Accelerator supports:" << std::endl;
     } else if (plt.has(aspect::custom)) {
       std::cout << "Platform #" << pltIdx
                 << " type: Custom supports:" << std::endl;

sycl/test-e2e/Basic/device-selectors.cpp

@@ -111,12 +111,6 @@ int main() {
            "Incorrect device. Expected CPU.");
   } catch (exception &e) {
   }
-  try {
-    queue acc_queue(accelerator_selector_v);
-    assert(acc_queue.get_device().is_accelerator() &&
-           "Incorrect device. Expected Accelerator.");
-  } catch (exception &e) {
-  }
 
   // ------ aspect_selectors --------
 
@@ -154,16 +148,6 @@ int main() {
   } catch (exception &e) {
   }
 
-  // Pass aspects in an allowlist and a denylist.
-  try {
-    device dev4 = device{aspect_selector(std::vector{aspect::accelerator},
-                                         std::vector{aspect::image})};
-    assert(dev4.is_accelerator() && "Incorrect device, expected accelerator.");
-    assert(!dev4.has(aspect::image) &&
-           "Device should NOT support aspect::image.");
-  } catch (exception &e) {
-  }
-
   // Validate errors.
   try {
     device dev5 = device{aspect_selector<aspect::cpu, aspect::gpu>()};

sycl/test-e2e/Basic/device.cpp

@@ -13,8 +13,6 @@ using namespace sycl;
 std::string get_type(const device &dev) {
   if (dev.is_gpu()) {
     return "OpenCL.GPU";
-  } else if (dev.is_accelerator()) {
-    return "OpenCL.ACC";
   } else {
     return "OpenCL.CPU";
   }
@@ -48,12 +46,6 @@ int main() {
     std::cout << "Device " << i++ << " is available: " << get_type(dev)
               << std::endl;
   }
-  i = 1;
-  std::cout << "Get OpenCL.ACC devices in the system" << std::endl;
-  for (const auto &dev : device::get_devices(info::device_type::accelerator)) {
-    std::cout << "Device " << i++ << " is available: " << get_type(dev)
-              << std::endl;
-  }
 
   auto devices = device::get_devices();
   device &deviceA = devices[0];

sycl/test-e2e/Basic/diagnostics/device-check.cpp

@@ -1,13 +1,10 @@
 // RUN: %{build} -o %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:cpu" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu" %{run-unfiltered-devices} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:fpga" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:CPU" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:GPU" %{run-unfiltered-devices} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:Fpga" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:Cpu" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:Gpu" %{run-unfiltered-devices} %t.out
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:FPGA" %{run-unfiltered-devices} %t.out
 // RUN: env ONEAPI_DEVICE_SELECTOR="*:XPU" %{run-unfiltered-devices} %t.out
 
 //==------------------- device-check.cpp --------------------------==//
@@ -32,7 +29,7 @@ int main() {
 
   catch (exception const &E) {
 
-    // Exception when cpu/gpu/fpga is not available on the system.
+    // Exception when cpu/gpu is not available on the system.
     if (E.code() == errc::runtime) {
       if (std::string(E.what()).find("No device of requested type") ==
           std::string::npos) {

sycl/test-e2e/Basic/get_backend.cpp

@@ -1,7 +1,5 @@
 // RUN: %{build} -o %t.out
-// FPGA RT returns random CL_INVALID_CONTEXT in some configurations, tracked
-// internally. Avoid FPGA devices until that is fixed.
-// RUN: env ONEAPI_DEVICE_SELECTOR="*:gpu;*:cpu" %{run-unfiltered-devices} %t.out
+// RUN: %{run-unfiltered-devices} %t.out
 //
 //==----------------- get_backend.cpp ------------------------==//
 // This is a test of get_backend().

sycl/test-e2e/Basic/info.cpp

@@ -51,8 +51,6 @@ template <> std::string info_to_string(info::device_type info) {
     return "cpu";
   case info::device_type::gpu:
     return "gpu";
-  case info::device_type::accelerator:
-    return "accelerator";
   case info::device_type::custom:
     return "custom";
   case info::device_type::automatic:

sycl/test-e2e/Basic/multi_ptr_legacy.hpp

@@ -127,12 +127,6 @@ template <typename T> void testMultPtr() {
             global_ptr<void> ptr_8 = global_ptr<void>(ptr_7);
             ext::intel::host_ptr<void> ptr_9((void *)RawPtr);
             global_ptr<void> ptr_10 = global_ptr<void>(ptr_9);
-            // TODO: need propagation of a7b763b26 patch to acl tool before
-            // testing these conversions - otherwise the test would fail on
-            // accelerator device during reversed translation from SPIR-V to
-            // LLVM IR device_ptr<T> ptr_11(accessorData_1); global_ptr<T>
-            // ptr_12 = global_ptr<T>(ptr_11);
-
             innerFunc<T>(wiID.get_local_id().get(0), ptr_1, ptr_2, local_ptr);
           });
     });