From 083a490f8b49e072ebd95bf4fa84243265aa8622 Mon Sep 17 00:00:00 2001
From: Alexander Flegontov <alexander.flegontov@intel.com>
Date: Fri, 12 Mar 2021 18:59:31 +0300
Subject: [PATCH] [SYCL] logical revert of the patch: "Fix get() method for
 non-opencl backends"

Signed-off-by: Alexander Flegontov <alexander.flegontov@intel.com>
---
 sycl/source/detail/context_impl.cpp  | 2 +-
 sycl/source/detail/device_impl.cpp   | 2 +-
 sycl/source/detail/event_impl.cpp    | 3 +--
 sycl/source/detail/kernel_impl.hpp   | 2 +-
 sycl/source/detail/platform_impl.hpp | 2 +-
 sycl/source/detail/program_impl.cpp  | 2 +-
 sycl/source/detail/queue_impl.hpp    | 2 +-
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/sycl/source/detail/context_impl.cpp b/sycl/source/detail/context_impl.cpp
index f8a561a788ef5..1ef5929adb766 100644
--- a/sycl/source/detail/context_impl.cpp
+++ b/sycl/source/detail/context_impl.cpp
@@ -107,7 +107,7 @@ context_impl::context_impl(RT::PiContext PiContext, async_handler AsyncHandler,
 }
 
 cl_context context_impl::get() const {
-  if (MHostContext || getPlugin().getBackend() != cl::sycl::backend::opencl) {
+  if (MHostContext) {
     throw invalid_object_error(
         "This instance of context doesn't support OpenCL interoperability.",
         PI_INVALID_CONTEXT);
diff --git a/sycl/source/detail/device_impl.cpp b/sycl/source/detail/device_impl.cpp
index 5e4c0c4b9d42e..85305d397987d 100644
--- a/sycl/source/detail/device_impl.cpp
+++ b/sycl/source/detail/device_impl.cpp
@@ -89,7 +89,7 @@ bool device_impl::is_affinity_supported(
 }
 
 cl_device_id device_impl::get() const {
-  if (MIsHostDevice || getPlugin().getBackend() != cl::sycl::backend::opencl) {
+  if (MIsHostDevice) {
     throw invalid_object_error(
         "This instance of device doesn't support OpenCL interoperability.",
         PI_INVALID_DEVICE);
diff --git a/sycl/source/detail/event_impl.cpp b/sycl/source/detail/event_impl.cpp
index 2f6ebadb68c05..6689c779eefff 100644
--- a/sycl/source/detail/event_impl.cpp
+++ b/sycl/source/detail/event_impl.cpp
@@ -35,8 +35,7 @@ extern xpti::trace_event_data_t *GSYCLGraphEvent;
 bool event_impl::is_host() const { return MHostEvent || !MOpenCLInterop; }
 
 cl_event event_impl::get() const {
-  if (!MOpenCLInterop ||
-      getPlugin().getBackend() != cl::sycl::backend::opencl) {
+  if (!MOpenCLInterop) {
     throw invalid_object_error(
         "This instance of event doesn't support OpenCL interoperability.",
         PI_INVALID_EVENT);
diff --git a/sycl/source/detail/kernel_impl.hpp b/sycl/source/detail/kernel_impl.hpp
index f97df51963262..0109eb12fe70d 100644
--- a/sycl/source/detail/kernel_impl.hpp
+++ b/sycl/source/detail/kernel_impl.hpp
@@ -80,7 +80,7 @@ class kernel_impl {
   ///
   /// \return a valid cl_kernel instance
   cl_kernel get() const {
-    if (is_host() || getPlugin().getBackend() != cl::sycl::backend::opencl) {
+    if (is_host()) {
       throw invalid_object_error(
           "This instance of kernel doesn't support OpenCL interoperability.",
           PI_INVALID_KERNEL);
diff --git a/sycl/source/detail/platform_impl.hpp b/sycl/source/detail/platform_impl.hpp
index 2dea8751da14d..8af8874413a94 100644
--- a/sycl/source/detail/platform_impl.hpp
+++ b/sycl/source/detail/platform_impl.hpp
@@ -76,7 +76,7 @@ class platform_impl {
 
   /// \return an instance of OpenCL cl_platform_id.
   cl_platform_id get() const {
-    if (is_host() || getPlugin().getBackend() != cl::sycl::backend::opencl) {
+    if (is_host()) {
       throw invalid_object_error(
           "This instance of platform doesn't support OpenCL interoperability.",
           PI_INVALID_PLATFORM);
diff --git a/sycl/source/detail/program_impl.cpp b/sycl/source/detail/program_impl.cpp
index 634ce6e9d2d91..9afefe8cc648c 100644
--- a/sycl/source/detail/program_impl.cpp
+++ b/sycl/source/detail/program_impl.cpp
@@ -210,7 +210,7 @@ program_impl::~program_impl() {
 
 cl_program program_impl::get() const {
   throw_if_state_is(program_state::none);
-  if (is_host() || getPlugin().getBackend() != cl::sycl::backend::opencl) {
+  if (is_host()) {
     throw invalid_object_error(
         "This instance of program doesn't support OpenCL interoperability.",
         PI_INVALID_PROGRAM);
diff --git a/sycl/source/detail/queue_impl.hpp b/sycl/source/detail/queue_impl.hpp
index 65efe7ddd4e6d..aaa8b21501db7 100644
--- a/sycl/source/detail/queue_impl.hpp
+++ b/sycl/source/detail/queue_impl.hpp
@@ -126,7 +126,7 @@ class queue_impl {
 
   /// \return an OpenCL interoperability queue handle.
   cl_command_queue get() {
-    if (MHostQueue || getPlugin().getBackend() != cl::sycl::backend::opencl) {
+    if (MHostQueue) {
       throw invalid_object_error(
           "This instance of queue doesn't support OpenCL interoperability",
           PI_INVALID_QUEUE);