[SYCL] address Alexey's comments

Signed-off-by: Sergey V Maslov <[email protected]>

Author: smaslov-intel

sycl/include/CL/sycl/detail/aligned_allocator.hpp

@@ -113,7 +113,7 @@ class device_impl_pi : public device_impl {
   ~device_impl_pi() {
     if (!m_isRootDevice) {
       // TODO catch an exception and put it to list of asynchronous exceptions
-      PI_CALL(RT::piDeviceRelease(m_device));
+      CHECK_OCL_CODE_NO_EXC(RT::piDeviceRelease(m_device));
     }
   }
 
@@ -151,7 +151,7 @@ class device_impl_pi : public device_impl {
     PI_CALL(RT::piDeviceGetInfo(
       m_device, PI_DEVICE_INFO_PLATFORM, sizeof(plt), &plt, 0));
 
-    // TODO: thisi possibly will violate common reference semantics,
+    // TODO: this possibly will violate common reference semantics,
     // particularly, equality comparison may fail for two consecutive
     // get_platform() on the same device, as it compares impl objects.
     return createSyclObjFromImpl<platform>(
@@ -169,13 +169,13 @@ class device_impl_pi : public device_impl {
                      size_t SubDevicesCount) const;
 
   vector_class<device>
-  create_sub_devices(size_t ComputeUnits) const;
+  create_sub_devices(size_t ComputeUnits) const override;
 
   vector_class<device>
-  create_sub_devices(const vector_class<size_t> &Counts) const;
+  create_sub_devices(const vector_class<size_t> &Counts) const override;
 
   vector_class<device>
-  create_sub_devices(info::partition_affinity_domain AffinityDomain) const;
+  create_sub_devices(info::partition_affinity_domain AffinityDomain) const override;
 
 private:
   RT::pi_device m_device = 0;
@@ -214,21 +214,21 @@ class device_host : public device_impl {
     return false;
   }
 
-  vector_class<device> create_sub_devices(size_t nbSubDev) const {
+  vector_class<device> create_sub_devices(size_t nbSubDev) const override {
     // TODO: implement host device partitioning
     throw runtime_error(
         "Partitioning to subdevices of the host device is not implemented yet");
   }
 
   vector_class<device>
-  create_sub_devices(const vector_class<size_t> &counts) const {
+  create_sub_devices(const vector_class<size_t> &counts) const override {
     // TODO: implement host device partitioning
     throw runtime_error(
         "Partitioning to subdevices of the host device is not implemented yet");
   }
 
   vector_class<device>
-  create_sub_devices(info::partition_affinity_domain affinityDomain) const {
+  create_sub_devices(info::partition_affinity_domain affinityDomain) const override {
     // TODO: implement host device partitioning
     throw runtime_error(
         "Partitioning to subdevices of the host device is not implemented yet");

sycl/include/CL/sycl/detail/device_impl.hpp

@@ -258,13 +258,6 @@ struct get_device_info<info::partition_property,
     return info::partition_property(arrayResult[0]);
   }
 };
-/*
-// Specialization for parent device
-template <>
-struct get_device_info<device, info::device::parent_device> {
-  static device _(RT::pi_device dev);
-};
-*/
 // Specialization for supported subgroup sizes
 template <>
 struct get_device_info<vector_class<size_t>,

sycl/include/CL/sycl/detail/device_info.hpp

@@ -279,7 +279,7 @@ class image_impl : public SYCLMemObjT {
 
   // TODO: Implement this function.
   void *allocateMem(ContextImplPtr Context, bool InitFromUserData,
-                    cnri_event &OutEventToWait) override {
+                    cl_event &OutEventToWait) override {
     if (true)
       throw cl::sycl::feature_not_supported(
           "MemoryAllocation Function Not Implemented for image class");

sycl/include/CL/sycl/detail/image_impl.hpp

@@ -15,6 +15,14 @@
 #ifndef _PI_H_
 #define _PI_H_
 
+// Every single change in PI API should be accamponied with the minor
+// version increase (+1). In the cases where backward compatibility is not
+// maintained there should be a (+1) change to the major version in
+// addition to the increase of the minor.
+//
+#define _PI_H_VERSION_MAJOR 1
+#define _PI_H_VERSION_MINOR 1
+
 // TODO: we need a mapping of PI to OpenCL somewhere, and this can be done
 // elsewhere, e.g. in the pi_opencl, but constants/enums mapping is now
 // done here, for efficiency and simplicity.
@@ -229,7 +237,7 @@ pi_program piclProgramCreateWithSource( // TODO:  change to return pi_result
 //
 // TODO: describe interfaces in Doxygen format
 
-/// Selects the most appropriate device ninary based on runtime information
+/// Selects the most appropriate device binary based on runtime information
 /// and the IR characteristics.
 ///
 pi_result piextDeviceSelectBinary(

sycl/include/CL/sycl/detail/pi.h

@@ -1,3 +1,10 @@
+//==---------- pi_opencl.hpp - OpenCL Plugin for SYCL RT -------------------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
 #pragma once
 
 #include <CL/opencl.h>

sycl/include/CL/sycl/detail/pi_opencl.hpp

@@ -1,4 +1,4 @@
-//==----------------- device_impl.hpp - SYCL device ------------------------==//
+//==----------------- device_impl.cpp - SYCL device ------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.

sycl/include/CL/sycl/device.hpp

@@ -40,10 +40,6 @@ device get_device_info<device, info::device::parent_device>::_(
     std::make_shared<device_impl_pi>(result));
 }
 
-//template struct get_device_info<device, info::device::parent_device>;
-
-void get_device_info_BAD() {}
-
 vector_class<info::fp_config> read_fp_bitfield(cl_device_fp_config bits) {
   vector_class<info::fp_config> result;
   if (bits & CL_FP_DENORM)

sycl/include/CL/sycl/platform.hpp

@@ -1,3 +1,10 @@
+//==---------- pi.cpp - Plugin Interface for SYCL RT -----------------------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
 #include <CL/sycl/detail/pi.hpp>
 #include <cstdarg>
 #include <iostream>

sycl/source/detail/device_impl.cpp

@@ -1,3 +1,10 @@
+//==---------- pi_opencl.cpp - OpenCL Plugin -------------------------------==//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
 #include <CL/sycl/detail/pi.hpp>
 #include "CL/opencl.h"
 

sycl/source/detail/device_info.cpp

@@ -1,4 +1,4 @@
-//==----------- platform_host.cpp -----------------------------------------------==//
+//==----------- platform_impl.cpp ------------------------------------------==//
 //
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
@@ -59,9 +59,9 @@ platform_impl_pi::get_devices(info::device_type deviceType) const {
 
   // TODO: remove this check when switched to PI as it would just return
   // zero in num_devices.
-  if (err == CL_DEVICE_NOT_FOUND) {
+  if (err == CL_DEVICE_NOT_FOUND)
     return res;
-  }
+
   // TODO catch an exception and put it to list of asynchronous exceptions
   // TODO: remove dependency on CHECK_OCL_CODE
   CHECK_OCL_CODE(err);