Implement CL device object for front end and passthrough

src/libANGLE/CLDevice.h

@@ -10,6 +10,7 @@
 #define LIBANGLE_CLDEVICE_H_
 
 #include "libANGLE/CLObject.h"
+#include "libANGLE/renderer/CLDeviceImpl.h"
 
 namespace cl
 {
@@ -17,10 +18,46 @@ namespace cl
 class Device final : public _cl_device_id, public Object
 {
   public:
-    Device(const cl_icd_dispatch &dispatch);
-    ~Device() = default;
+    using Ptr     = std::unique_ptr<Device>;
+    using PtrList = std::list<Ptr>;
+
+    ~Device();
+
+    Platform &getPlatform() const;
+
+    cl_int getInfoULong(DeviceInfo name, cl_ulong *value) const;
+
+    cl_int getInfo(DeviceInfo name, size_t valueSize, void *value, size_t *valueSizeRet);
+
+    static PtrList CreateDevices(Platform &platform, rx::CLDeviceImpl::InitList &&initList);
+
+    static bool IsValid(const Device *device);
+    static bool IsValidType(cl_device_type type);
+
+  private:
+    Device(Platform &platform, Device *parent, rx::CLDeviceImpl::InitData &initData);
+
+    Platform &mPlatform;
+    Device *const mParent;
+    const rx::CLDeviceImpl::Ptr mImpl;
+    const rx::CLDeviceImpl::Info mInfo;
 };
 
+inline Platform &Device::getPlatform() const
+{
+    return mPlatform;
+}
+
+inline cl_int Device::getInfoULong(DeviceInfo name, cl_ulong *value) const
+{
+    return mImpl->getInfoULong(name, value);
+}
+
+inline bool Device::IsValidType(cl_device_type type)
+{
+    return type <= CL_DEVICE_TYPE_CUSTOM || type == CL_DEVICE_TYPE_ALL;
+}
+
 }  // namespace cl
 
 #endif  // LIBANGLE_CLDEVICE_H_

src/libANGLE/CLPlatform.cpp

@@ -10,15 +10,62 @@
 namespace cl
 {
 
+namespace
+{
+bool IsDeviceTypeMatch(cl_device_type select, cl_device_type type)
+{
+    // The type 'cl_device_type' is a bitfield, so masking out the selected bits indicates
+    // if a given type is a match. A custom device is an exception, which only matches
+    // if it was explicitely selected, as defined here:
+    // https://www.khronos.org/registry/OpenCL/specs/3.0-unified/html/OpenCL_API.html#clGetDeviceIDs
+    return type == CL_DEVICE_TYPE_CUSTOM ? select == CL_DEVICE_TYPE_CUSTOM : (type & select) != 0u;
+}
+}  // namespace
+
 Platform::~Platform() = default;
 
-void Platform::CreatePlatform(const cl_icd_dispatch &dispatch, rx::CLPlatformImpl::Ptr &&impl)
+void Platform::CreatePlatform(const cl_icd_dispatch &dispatch,
+                              rx::CLPlatformImpl::InitData &initData)
+{
+    rx::CLDeviceImpl::InitList deviceInitList = initData->getDevices();
+    if (!deviceInitList.empty())
+    {
+        GetList().emplace_back(new Platform(dispatch, initData, std::move(deviceInitList)));
+    }
+}
+
+cl_int Platform::getDeviceIDs(cl_device_type deviceType,
+                              cl_uint numEntries,
+                              Device **devices,
+                              cl_uint *numDevices) const
 {
-    GetList().emplace_back(new Platform(dispatch, std::move(impl)));
+    cl_uint found = 0u;
+    for (const Device::Ptr &device : mDevices)
+    {
+        cl_device_type type = 0u;
+        if (device->getInfoULong(DeviceInfo::Type, &type) == CL_SUCCESS &&
+            IsDeviceTypeMatch(deviceType, type))
+        {
+            if (devices != nullptr && found < numEntries)
+            {
+                devices[found] = device.get();
+            }
+            ++found;
+        }
+    }
+    if (numDevices != nullptr)
+    {
+        *numDevices = found;
+    }
+    return found == 0u ? CL_DEVICE_NOT_FOUND : CL_SUCCESS;
 }
 
-Platform::Platform(const cl_icd_dispatch &dispatch, rx::CLPlatformImpl::Ptr &&impl)
-    : _cl_platform_id(dispatch), mImpl(std::move(impl))
+Platform::Platform(const cl_icd_dispatch &dispatch,
+                   rx::CLPlatformImpl::InitData &initData,
+                   rx::CLDeviceImpl::InitList &&deviceInitList)
+    : _cl_platform_id(dispatch),
+      mImpl(std::move(initData)),
+      mDevices(Device::CreateDevices(*this, std::move(deviceInitList)))
 {}
 
 constexpr char Platform::kVendor[];

src/libANGLE/CLPlatform.h

@@ -9,22 +9,19 @@
 #ifndef LIBANGLE_CLPLATFORM_H_
 #define LIBANGLE_CLPLATFORM_H_
 
-#include "libANGLE/CLObject.h"
+#include "libANGLE/CLDevice.h"
 #include "libANGLE/renderer/CLPlatformImpl.h"
 
 #include "anglebase/no_destructor.h"
 
-#include <algorithm>
-#include <string>
-
 namespace cl
 {
 
 class Platform final : public _cl_platform_id, public Object
 {
   public:
-    using Ptr  = std::unique_ptr<Platform>;
-    using List = std::vector<Ptr>;
+    using Ptr     = std::unique_ptr<Platform>;
+    using PtrList = std::list<Ptr>;
 
     ~Platform();
 
@@ -33,21 +30,36 @@ class Platform final : public _cl_platform_id, public Object
     cl_version getVersion() const;
     const char *getName() const;
     const char *getExtensions() const;
-    const rx::CLPlatformImpl::ExtensionList &getExtensionsWithVersion() const;
+    const rx::NameVersionVector &getExtensionsWithVersion() const;
     cl_ulong getHostTimerResolution() const;
 
-    static void CreatePlatform(const cl_icd_dispatch &dispatch, rx::CLPlatformImpl::Ptr &&impl);
-    static const List &GetPlatforms();
+    bool hasDevice(const Device *device) const;
+    const Device::PtrList &getDevices() const;
+
+    cl_int getDeviceIDs(cl_device_type deviceType,
+                        cl_uint numEntries,
+                        Device **devices,
+                        cl_uint *numDevices) const;
+
+    static void CreatePlatform(const cl_icd_dispatch &dispatch,
+                               rx::CLPlatformImpl::InitData &initData);
+    static const PtrList &GetPlatforms();
+    static Platform *GetDefault();
     static bool IsValid(const Platform *platform);
+    static bool IsValidOrDefault(const Platform *platform);
+
     static constexpr const char *GetVendor();
     static constexpr const char *GetIcdSuffix();
 
   private:
-    Platform(const cl_icd_dispatch &dispatch, rx::CLPlatformImpl::Ptr &&impl);
+    Platform(const cl_icd_dispatch &dispatch,
+             rx::CLPlatformImpl::InitData &initData,
+             rx::CLDeviceImpl::InitList &&deviceInitList);
 
-    static List &GetList();
+    static PtrList &GetList();
 
     const rx::CLPlatformImpl::Ptr mImpl;
+    const Device::PtrList mDevices;
 
     static constexpr char kVendor[]    = "ANGLE";
     static constexpr char kIcdSuffix[] = "ANGLE";
@@ -78,7 +90,7 @@ inline const char *Platform::getExtensions() const
     return mImpl->getInfo().mExtensions.c_str();
 }
 
-inline const rx::CLPlatformImpl::ExtensionList &Platform::getExtensionsWithVersion() const
+inline const rx::NameVersionVector &Platform::getExtensionsWithVersion() const
 {
     return mImpl->getInfo().mExtensionList;
 }
@@ -88,24 +100,48 @@ inline cl_ulong Platform::getHostTimerResolution() const
     return mImpl->getInfo().mHostTimerRes;
 }
 
-inline Platform::List &Platform::GetList()
+inline bool Platform::hasDevice(const Device *device) const
+{
+    return std::find_if(mDevices.cbegin(), mDevices.cend(), [=](const Device::Ptr &ptr) {
+               return ptr.get() == device;
+           }) != mDevices.cend();
+}
+
+inline const Device::PtrList &Platform::getDevices() const
+{
+    return mDevices;
+}
+
+inline Platform::PtrList &Platform::GetList()
 {
-    static angle::base::NoDestructor<List> sList;
+    static angle::base::NoDestructor<PtrList> sList;
     return *sList;
 }
 
-inline const Platform::List &Platform::GetPlatforms()
+inline const Platform::PtrList &Platform::GetPlatforms()
 {
     return GetList();
 }
 
+inline Platform *Platform::GetDefault()
+{
+    return GetList().empty() ? nullptr : GetList().front().get();
+}
+
 inline bool Platform::IsValid(const Platform *platform)
 {
-    const List &platforms = GetPlatforms();
+    const PtrList &platforms = GetPlatforms();
     return std::find_if(platforms.cbegin(), platforms.cend(),
                         [=](const Ptr &ptr) { return ptr.get() == platform; }) != platforms.cend();
 }
 
+// Our CL implementation defines that a nullptr value chooses the platform that we provide as
+// default, so this function returns true for a nullptr value if a default platform exists.
+inline bool Platform::IsValidOrDefault(const Platform *platform)
+{
+    return platform != nullptr ? IsValid(platform) : GetDefault() != nullptr;
+}
+
 constexpr const char *Platform::GetVendor()
 {
     return kVendor;

src/libANGLE/CLtypes.h

@@ -12,8 +12,13 @@
 
 #include "common/PackedCLEnums_autogen.h"
 
+// Include frequently used standard headers
+#include <algorithm>
+#include <list>
 #include <memory>
+#include <string>
 #include <utility>
+#include <vector>
 
 namespace cl
 {

src/libANGLE/renderer/CLDeviceImpl.cpp

+//
+// Copyright 2021 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+// CLDeviceImpl.cpp: Implements the class methods for CLDeviceImpl.
+
+#include "libANGLE/renderer/CLDeviceImpl.h"
+
+namespace rx
+{
+
+CLDeviceImpl::Info::Info() = default;
+
+CLDeviceImpl::Info::~Info() = default;
+
+CLDeviceImpl::Info::Info(Info &&) = default;
+
+CLDeviceImpl::Info &CLDeviceImpl::Info::operator=(Info &&) = default;
+
+bool CLDeviceImpl::Info::isValid() const
+{
+    // From the OpenCL specification for info name CL_DEVICE_MAX_WORK_ITEM_SIZES:
+    // "The minimum value is (1, 1, 1) for devices that are not of type CL_DEVICE_TYPE_CUSTOM."
+    // https://www.khronos.org/registry/OpenCL/specs/3.0-unified/html/OpenCL_API.html#clGetDeviceInfo
+    // Custom devices are currently not supported by ANGLE back ends.
+    return mMaxWorkItemSizes.size() >= 3u && mMaxWorkItemSizes[0] >= 1u &&
+           mMaxWorkItemSizes[1] >= 1u && mMaxWorkItemSizes[2] >= 1u;
+}
+
+}  // namespace rx

src/libANGLE/renderer/CLDeviceImpl.h

@@ -3,7 +3,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-
 // CLDeviceImpl.h: Defines the abstract rx::CLDeviceImpl class.
 
 #ifndef LIBANGLE_RENDERER_CLDEVICEIMPL_H_
@@ -17,8 +16,47 @@ namespace rx
 class CLDeviceImpl : angle::NonCopyable
 {
   public:
-    CLDeviceImpl() {}
-    virtual ~CLDeviceImpl() {}
+    struct Info
+    {
+        Info();
+        ~Info();
+
+        Info(const Info &) = delete;
+        Info &operator=(const Info &) = delete;
+
+        Info(Info &&);
+        Info &operator=(Info &&);
+
+        bool isValid() const;
+
+        std::vector<size_t> mMaxWorkItemSizes;
+        NameVersionVector mILsWithVersion;
+        NameVersionVector mBuiltInKernelsWithVersion;
+        NameVersionVector mOpenCL_C_AllVersions;
+        NameVersionVector mOpenCL_C_Features;
+        NameVersionVector mExtensionsWithVersion;
+        std::vector<cl_device_partition_property> mPartitionProperties;
+        std::vector<cl_device_partition_property> mPartitionType;
+
+        bool mIsSupportedILsWithVersion            = false;
+        bool mIsSupportedBuiltInKernelsWithVersion = false;
+        bool mIsSupportedOpenCL_C_AllVersions      = false;
+        bool mIsSupportedOpenCL_C_Features         = false;
+        bool mIsSupportedExtensionsWithVersion     = false;
+    };
+
+    using Ptr      = std::unique_ptr<CLDeviceImpl>;
+    using InitData = std::pair<Ptr, Info>;
+    using InitList = std::list<InitData>;
+
+    CLDeviceImpl()          = default;
+    virtual ~CLDeviceImpl() = default;
+
+    virtual cl_int getInfoUInt(cl::DeviceInfo name, cl_uint *value) const             = 0;
+    virtual cl_int getInfoULong(cl::DeviceInfo name, cl_ulong *value) const           = 0;
+    virtual cl_int getInfoSizeT(cl::DeviceInfo name, size_t *value) const             = 0;
+    virtual cl_int getInfoStringLength(cl::DeviceInfo name, size_t *value) const      = 0;
+    virtual cl_int getInfoString(cl::DeviceInfo name, size_t size, char *value) const = 0;
 };
 
 }  // namespace rx

src/libANGLE/renderer/CLPlatformImpl.cpp

@@ -23,7 +23,7 @@ CLPlatformImpl::Info::Info(std::string &&profile,
                            cl_version version,
                            std::string &&name,
                            std::string &&extensions,
-                           rx::CLPlatformImpl::ExtensionList &&extensionList,
+                           NameVersionVector &&extensionList,
                            cl_ulong hostTimerRes)
     : mProfile(std::move(profile)),
       mVersionStr(std::move(versionStr)),

src/libANGLE/renderer/CLPlatformImpl.h

@@ -3,16 +3,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-
 // CLPlatformImpl.h: Defines the abstract rx::CLPlatformImpl class.
 
 #ifndef LIBANGLE_RENDERER_CLPLATFORMIMPL_H_
 #define LIBANGLE_RENDERER_CLPLATFORMIMPL_H_
 
-#include "libANGLE/renderer/CLtypes.h"
-
-#include <list>
-#include <vector>
+#include "libANGLE/renderer/CLDeviceImpl.h"
 
 namespace rx
 {
@@ -20,9 +16,9 @@ namespace rx
 class CLPlatformImpl : angle::NonCopyable
 {
   public:
-    using Ptr           = std::unique_ptr<CLPlatformImpl>;
-    using ImplList      = std::list<Ptr>;
-    using ExtensionList = std::vector<cl_name_version>;
+    using Ptr      = std::unique_ptr<CLPlatformImpl>;
+    using InitData = Ptr;
+    using InitList = std::list<InitData>;
 
     struct Info
     {
@@ -40,7 +36,7 @@ class CLPlatformImpl : angle::NonCopyable
              cl_version version,
              std::string &&name,
              std::string &&extensions,
-             rx::CLPlatformImpl::ExtensionList &&extensionList,
+             NameVersionVector &&extensionList,
              cl_ulong hostTimerRes);
 
         std::string mProfile;
@@ -48,7 +44,7 @@ class CLPlatformImpl : angle::NonCopyable
         cl_version mVersion;
         std::string mName;
         std::string mExtensions;
-        rx::CLPlatformImpl::ExtensionList mExtensionList;
+        NameVersionVector mExtensionList;
         cl_ulong mHostTimerRes;
     };
 
@@ -57,6 +53,8 @@ class CLPlatformImpl : angle::NonCopyable
 
     const Info &getInfo();
 
+    virtual CLDeviceImpl::InitList getDevices() = 0;
+
   protected:
     const Info mInfo;
 };

src/libANGLE/renderer/CLtypes.h

@@ -3,7 +3,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-
 // CLtypes.h: Defines common types for the OpenCL support in ANGLE.
 
 #ifndef LIBANGLE_RENDERER_CLTYPES_H_
@@ -15,9 +14,13 @@
 
 namespace rx
 {
+
 class CLContextImpl;
 class CLDeviceImpl;
 class CLPlatformImpl;
+
+using NameVersionVector = std::vector<cl_name_version>;
+
 }  // namespace rx
 
 #endif  // LIBANGLE_RENDERER_CLTYPES_H_

src/libANGLE/renderer/cl/CLDeviceCL.cpp

@@ -3,17 +3,142 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// CLDeviceCL.cpp:
-//    Implements the class methods for CLDeviceCL.
-//
+// CLDeviceCL.cpp: Implements the class methods for CLDeviceCL.
 
 #include "libANGLE/renderer/cl/CLDeviceCL.h"
 
+#include "libANGLE/Debug.h"
+
 namespace rx
 {
 
-CLDeviceCL::CLDeviceCL() {}
+CLDeviceCL::CLDeviceCL(cl_device_id device) : mDevice(device) {}
+
+CLDeviceCL::~CLDeviceCL() = default;
+
+cl_int CLDeviceCL::getInfoUInt(cl::DeviceInfo name, cl_uint *value) const
+{
+    return mDevice->getDispatch().clGetDeviceInfo(mDevice, cl::ToCLenum(name), sizeof(*value),
+                                                  value, nullptr);
+}
+
+cl_int CLDeviceCL::getInfoULong(cl::DeviceInfo name, cl_ulong *value) const
+{
+    return mDevice->getDispatch().clGetDeviceInfo(mDevice, cl::ToCLenum(name), sizeof(*value),
+                                                  value, nullptr);
+}
+
+cl_int CLDeviceCL::getInfoSizeT(cl::DeviceInfo name, size_t *value) const
+{
+    return mDevice->getDispatch().clGetDeviceInfo(mDevice, cl::ToCLenum(name), sizeof(*value),
+                                                  value, nullptr);
+}
+
+cl_int CLDeviceCL::getInfoStringLength(cl::DeviceInfo name, size_t *value) const
+{
+    return mDevice->getDispatch().clGetDeviceInfo(mDevice, cl::ToCLenum(name), 0u, nullptr, value);
+}
+
+cl_int CLDeviceCL::getInfoString(cl::DeviceInfo name, size_t size, char *value) const
+{
+    return mDevice->getDispatch().clGetDeviceInfo(mDevice, cl::ToCLenum(name), size, value,
+                                                  nullptr);
+}
+
+#define ANGLE_GET_INFO_SIZE(name, size_ret) \
+    device->getDispatch().clGetDeviceInfo(device, name, 0u, nullptr, size_ret)
+
+#define ANGLE_GET_INFO(name, size, param) \
+    device->getDispatch().clGetDeviceInfo(device, name, size, param, nullptr)
+
+#define ANGLE_GET_INFO_RET(name, size, param)                       \
+    do                                                              \
+    {                                                               \
+        if (ANGLE_GET_INFO(name, size, param) != CL_SUCCESS)        \
+        {                                                           \
+            ERR() << "Failed to query CL device info for " << name; \
+            return Info{};                                          \
+        }                                                           \
+    } while (0)
+
+CLDeviceImpl::Info CLDeviceCL::GetInfo(cl_device_id device)
+{
+    Info info;
+    size_t valueSize = 0u;
+
+    if (ANGLE_GET_INFO_SIZE(CL_DEVICE_ILS_WITH_VERSION, &valueSize) == CL_SUCCESS &&
+        (valueSize % sizeof(decltype(info.mILsWithVersion)::value_type)) == 0u)
+    {
+        info.mILsWithVersion.resize(valueSize / sizeof(decltype(info.mILsWithVersion)::value_type));
+        ANGLE_GET_INFO_RET(CL_DEVICE_ILS_WITH_VERSION, valueSize, info.mILsWithVersion.data());
+        info.mIsSupportedILsWithVersion = true;
+    }
+
+    if (ANGLE_GET_INFO_SIZE(CL_DEVICE_BUILT_IN_KERNELS_WITH_VERSION, &valueSize) == CL_SUCCESS &&
+        (valueSize % sizeof(decltype(info.mBuiltInKernelsWithVersion)::value_type)) == 0u)
+    {
+        info.mBuiltInKernelsWithVersion.resize(
+            valueSize / sizeof(decltype(info.mBuiltInKernelsWithVersion)::value_type));
+        ANGLE_GET_INFO_RET(CL_DEVICE_BUILT_IN_KERNELS_WITH_VERSION, valueSize,
+                           info.mBuiltInKernelsWithVersion.data());
+        info.mIsSupportedBuiltInKernelsWithVersion = true;
+    }
+
+    if (ANGLE_GET_INFO_SIZE(CL_DEVICE_OPENCL_C_ALL_VERSIONS, &valueSize) == CL_SUCCESS &&
+        (valueSize % sizeof(decltype(info.mOpenCL_C_AllVersions)::value_type)) == 0u)
+    {
+        info.mOpenCL_C_AllVersions.resize(valueSize /
+                                          sizeof(decltype(info.mOpenCL_C_AllVersions)::value_type));
+        ANGLE_GET_INFO_RET(CL_DEVICE_OPENCL_C_ALL_VERSIONS, valueSize,
+                           info.mOpenCL_C_AllVersions.data());
+        info.mIsSupportedOpenCL_C_AllVersions = true;
+    }
+
+    if (ANGLE_GET_INFO_SIZE(CL_DEVICE_OPENCL_C_FEATURES, &valueSize) == CL_SUCCESS &&
+        (valueSize % sizeof(decltype(info.mOpenCL_C_Features)::value_type)) == 0u)
+    {
+        info.mOpenCL_C_Features.resize(valueSize /
+                                       sizeof(decltype(info.mOpenCL_C_Features)::value_type));
+        ANGLE_GET_INFO_RET(CL_DEVICE_OPENCL_C_FEATURES, valueSize, info.mOpenCL_C_Features.data());
+        info.mIsSupportedOpenCL_C_Features = true;
+    }
+
+    if (ANGLE_GET_INFO_SIZE(CL_DEVICE_EXTENSIONS_WITH_VERSION, &valueSize) == CL_SUCCESS &&
+        (valueSize % sizeof(decltype(info.mExtensionsWithVersion)::value_type)) == 0u)
+    {
+        info.mExtensionsWithVersion.resize(
+            valueSize / sizeof(decltype(info.mExtensionsWithVersion)::value_type));
+        ANGLE_GET_INFO_RET(CL_DEVICE_EXTENSIONS_WITH_VERSION, valueSize,
+                           info.mExtensionsWithVersion.data());
+        info.mIsSupportedExtensionsWithVersion = true;
+    }
+
+    if (ANGLE_GET_INFO_SIZE(CL_DEVICE_PARTITION_PROPERTIES, &valueSize) == CL_SUCCESS &&
+        (valueSize % sizeof(decltype(info.mPartitionProperties)::value_type)) == 0u)
+    {
+        info.mPartitionProperties.resize(valueSize /
+                                         sizeof(decltype(info.mPartitionProperties)::value_type));
+        ANGLE_GET_INFO_RET(CL_DEVICE_PARTITION_PROPERTIES, valueSize,
+                           info.mPartitionProperties.data());
+    }
+
+    if (ANGLE_GET_INFO_SIZE(CL_DEVICE_PARTITION_TYPE, &valueSize) == CL_SUCCESS &&
+        (valueSize % sizeof(decltype(info.mPartitionType)::value_type)) == 0u)
+    {
+        info.mPartitionType.resize(valueSize / sizeof(decltype(info.mPartitionType)::value_type));
+        ANGLE_GET_INFO_RET(CL_DEVICE_PARTITION_TYPE, valueSize, info.mPartitionType.data());
+    }
+
+    // Get this last, so the info is invalid if anything before fails
+    cl_uint maxWorkItemDims = 0u;
+    ANGLE_GET_INFO_RET(CL_DEVICE_MAX_WORK_ITEM_DIMENSIONS, sizeof(maxWorkItemDims),
+                       &maxWorkItemDims);
+    info.mMaxWorkItemSizes.resize(maxWorkItemDims, 0u);
+    ANGLE_GET_INFO_RET(CL_DEVICE_MAX_WORK_ITEM_SIZES,
+                       maxWorkItemDims * sizeof(decltype(info.mMaxWorkItemSizes)::value_type),
+                       info.mMaxWorkItemSizes.data());
 
-CLDeviceCL::~CLDeviceCL() {}
+    return info;
+}
 
 }  // namespace rx

src/libANGLE/renderer/cl/CLDeviceCL.h

@@ -3,9 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// CLDeviceCL.h:
-//    Defines the class interface for CLDeviceCL, implementing CLDeviceImpl.
-//
+// CLDeviceCL.h: Defines the class interface for CLDeviceCL, implementing CLDeviceImpl.
 
 #ifndef LIBANGLE_RENDERER_CL_CLDEVICECL_H_
 #define LIBANGLE_RENDERER_CL_CLDEVICECL_H_
@@ -18,10 +16,28 @@ namespace rx
 class CLDeviceCL : public CLDeviceImpl
 {
   public:
-    CLDeviceCL();
+    explicit CLDeviceCL(cl_device_id device);
     ~CLDeviceCL() override;
+
+    cl_device_id getNative();
+
+    cl_int getInfoUInt(cl::DeviceInfo name, cl_uint *value) const override;
+    cl_int getInfoULong(cl::DeviceInfo name, cl_ulong *value) const override;
+    cl_int getInfoSizeT(cl::DeviceInfo name, size_t *value) const override;
+    cl_int getInfoStringLength(cl::DeviceInfo name, size_t *value) const override;
+    cl_int getInfoString(cl::DeviceInfo name, size_t size, char *value) const override;
+
+    static Info GetInfo(cl_device_id device);
+
+  private:
+    const cl_device_id mDevice;
 };
 
+inline cl_device_id CLDeviceCL::getNative()
+{
+    return mDevice;
+}
+
 }  // namespace rx
 
 #endif  // LIBANGLE_RENDERER_CL_CLDEVICECL_H_

src/libANGLE/renderer/cl/CLPlatformCL.cpp

@@ -3,12 +3,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// CLPlatformCL.cpp:
-//    Implements the class methods for CLPlatformCL.
-//
+// CLPlatformCL.cpp: Implements the class methods for CLPlatformCL.
 
 #include "libANGLE/renderer/cl/CLPlatformCL.h"
 
+#include "libANGLE/renderer/cl/CLDeviceCL.h"
+
 #include "libANGLE/CLPlatform.h"
 #include "libANGLE/Debug.h"
 
@@ -21,7 +21,6 @@ extern "C" {
 
 #include <cstdlib>
 #include <unordered_set>
-#include <vector>
 
 namespace rx
 {
@@ -40,7 +39,44 @@ const ExtensionSet &GetSupportedExtensions()
 
 CLPlatformCL::~CLPlatformCL() = default;
 
-CLPlatformCL::ImplList CLPlatformCL::GetPlatforms(bool isIcd)
+CLDeviceImpl::InitList CLPlatformCL::getDevices()
+{
+    CLDeviceImpl::InitList initList;
+
+    // Fetch all regular devices. This does not include CL_DEVICE_TYPE_CUSTOM, which are not
+    // supported by the CL pass-through back end because they have no standard feature set.
+    // This makes them unreliable for the purpose of this back end.
+    cl_uint numDevices = 0u;
+    if (mPlatform->getDispatch().clGetDeviceIDs(mPlatform, CL_DEVICE_TYPE_ALL, 0u, nullptr,
+                                                &numDevices) == CL_SUCCESS)
+    {
+        std::vector<cl_device_id> devices(numDevices, nullptr);
+        if (mPlatform->getDispatch().clGetDeviceIDs(mPlatform, CL_DEVICE_TYPE_ALL, numDevices,
+                                                    devices.data(), nullptr) == CL_SUCCESS)
+        {
+            for (cl_device_id device : devices)
+            {
+                CLDeviceImpl::Info info = CLDeviceCL::GetInfo(device);
+                if (info.isValid())
+                {
+                    initList.emplace_back(new CLDeviceCL(device), std::move(info));
+                }
+            }
+        }
+        else
+        {
+            ERR() << "Failed to query CL devices";
+        }
+    }
+    else
+    {
+        ERR() << "Failed to query CL devices";
+    }
+
+    return initList;
+}
+
+CLPlatformCL::InitList CLPlatformCL::GetPlatforms(bool isIcd)
 {
     // Using khrIcdInitialize() of the third party Khronos OpenCL ICD Loader to enumerate the
     // available OpenCL implementations on the system. They will be stored in the singly linked
@@ -66,7 +102,7 @@ CLPlatformCL::ImplList CLPlatformCL::GetPlatforms(bool isIcd)
 
     // Iterating through the singly linked list khrIcdVendors to create an ANGLE CL pass-through
     // platform for each found ICD platform. Skipping our dummy entry that has an invalid platform.
-    ImplList implList;
+    InitList initList;
     for (KHRicdVendor *vendorIt = khrIcdVendors; vendorIt != nullptr; vendorIt = vendorIt->next)
     {
         if (vendorIt->platform != nullptr)
@@ -74,11 +110,11 @@ CLPlatformCL::ImplList CLPlatformCL::GetPlatforms(bool isIcd)
             rx::CLPlatformImpl::Ptr impl = Create(vendorIt->platform);
             if (impl)
             {
-                implList.emplace_back(std::move(impl));
+                initList.emplace_back(std::move(impl));
             }
         }
     }
-    return implList;
+    return initList;
 }
 
 CLPlatformCL::CLPlatformCL(cl_platform_id platform, Info &&info)
@@ -106,6 +142,12 @@ std::unique_ptr<CLPlatformCL> CLPlatformCL::Create(cl_platform_id platform)
     std::vector<std::string::value_type> param;
     CLPlatformImpl::Info info;
 
+    // Verify that the platform is valid
+    ASSERT(platform != nullptr);
+    ASSERT(platform->getDispatch().clGetPlatformInfo != nullptr);
+    ASSERT(platform->getDispatch().clGetDeviceIDs != nullptr);
+    ASSERT(platform->getDispatch().clGetDeviceInfo != nullptr);
+
     // Skip ANGLE CL implementation to prevent passthrough loop
     ANGLE_TRY_GET_INFO(CL_PLATFORM_VENDOR, 0u, nullptr, &paramSize);
     param.resize(paramSize, '\0');
@@ -214,8 +256,8 @@ std::unique_ptr<CLPlatformCL> CLPlatformCL::Create(cl_platform_id platform)
                            info.mExtensionList.data(), nullptr);
 
         // Filter out extensions which are not (yet) supported to be passed through
-        const ExtensionSet &supported       = GetSupportedExtensions();
-        ExtensionList::const_iterator extIt = info.mExtensionList.cbegin();
+        const ExtensionSet &supported           = GetSupportedExtensions();
+        NameVersionVector::const_iterator extIt = info.mExtensionList.cbegin();
         while (extIt != info.mExtensionList.cend())
         {
             if (supported.find(extIt->name) != supported.cend())

src/libANGLE/renderer/cl/CLPlatformCL.h

@@ -3,17 +3,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// CLPlatformCL.h:
-//    Defines the class interface for CLPlatformCL, implementing CLPlatformImpl.
-//
+// CLPlatformCL.h: Defines the class interface for CLPlatformCL, implementing CLPlatformImpl.
 
 #ifndef LIBANGLE_RENDERER_CL_CLPLATFORMCL_H_
 #define LIBANGLE_RENDERER_CL_CLPLATFORMCL_H_
 
 #include "libANGLE/renderer/CLPlatformImpl.h"
 
-#include <string>
-
 namespace rx
 {
 
@@ -24,7 +20,9 @@ class CLPlatformCL : public CLPlatformImpl
 
     cl_platform_id getNative();
 
-    static ImplList GetPlatforms(bool isIcd);
+    CLDeviceImpl::InitList getDevices() override;
+
+    static InitList GetPlatforms(bool isIcd);
 
   private:
     CLPlatformCL(cl_platform_id platform, Info &&info);

src/libANGLE/renderer/vulkan/CLDeviceVk.cpp

@@ -3,17 +3,46 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// CLDeviceVk.cpp:
-//    Implements the class methods for CLDeviceVk.
-//
+// CLDeviceVk.cpp: Implements the class methods for CLDeviceVk.
 
 #include "libANGLE/renderer/vulkan/CLDeviceVk.h"
 
 namespace rx
 {
 
-CLDeviceVk::CLDeviceVk() {}
+CLDeviceVk::CLDeviceVk() = default;
 
 CLDeviceVk::~CLDeviceVk() = default;
 
+cl_int CLDeviceVk::getInfoUInt(cl::DeviceInfo name, cl_uint *value) const
+{
+    return CL_INVALID_VALUE;
+}
+
+cl_int CLDeviceVk::getInfoULong(cl::DeviceInfo name, cl_ulong *value) const
+{
+    return CL_INVALID_VALUE;
+}
+
+cl_int CLDeviceVk::getInfoSizeT(cl::DeviceInfo name, size_t *value) const
+{
+    return CL_INVALID_VALUE;
+}
+
+cl_int CLDeviceVk::getInfoStringLength(cl::DeviceInfo name, size_t *value) const
+{
+    return CL_INVALID_VALUE;
+}
+
+cl_int CLDeviceVk::getInfoString(cl::DeviceInfo name, size_t size, char *value) const
+{
+    return CL_INVALID_VALUE;
+}
+
+CLDeviceImpl::Info CLDeviceVk::GetInfo()
+{
+    CLDeviceImpl::Info info;
+    return info;
+}
+
 }  // namespace rx

src/libANGLE/renderer/vulkan/CLDeviceVk.h

@@ -3,9 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// CLDeviceVk.h:
-//    Defines the class interface for CLDeviceVk, implementing CLDeviceImpl.
-//
+// CLDeviceVk.h: Defines the class interface for CLDeviceVk, implementing CLDeviceImpl.
 
 #ifndef LIBANGLE_RENDERER_VULKAN_CLDEVICEVK_H_
 #define LIBANGLE_RENDERER_VULKAN_CLDEVICEVK_H_
@@ -20,6 +18,14 @@ class CLDeviceVk : public CLDeviceImpl
   public:
     CLDeviceVk();
     ~CLDeviceVk() override;
+
+    cl_int getInfoUInt(cl::DeviceInfo name, cl_uint *value) const override;
+    cl_int getInfoULong(cl::DeviceInfo name, cl_ulong *value) const override;
+    cl_int getInfoSizeT(cl::DeviceInfo name, size_t *value) const override;
+    cl_int getInfoStringLength(cl::DeviceInfo name, size_t *value) const override;
+    cl_int getInfoString(cl::DeviceInfo name, size_t size, char *value) const override;
+
+    static Info GetInfo();
 };
 
 }  // namespace rx

src/libANGLE/renderer/vulkan/CLPlatformVk.cpp

@@ -3,23 +3,21 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// CLPlatformVk.cpp:
-//    Implements the class methods for CLPlatformVk.
-//
+// CLPlatformVk.cpp: Implements the class methods for CLPlatformVk.
 
 #include "libANGLE/renderer/vulkan/CLPlatformVk.h"
 
+#include "libANGLE/renderer/vulkan/CLDeviceVk.h"
+
 #include "anglebase/no_destructor.h"
 #include "common/angle_version.h"
 
-#include <algorithm>
-
 namespace rx
 {
 
 namespace
 {
-std::string CreateExtensionString(const CLPlatformImpl::ExtensionList &extList)
+std::string CreateExtensionString(const NameVersionVector &extList)
 {
     std::string extensions;
     for (const cl_name_version &ext : extList)
@@ -39,9 +37,20 @@ CLPlatformVk::CLPlatformVk(Info &&info) : CLPlatformImpl(std::move(info)) {}
 
 CLPlatformVk::~CLPlatformVk() = default;
 
-CLPlatformVk::ImplList CLPlatformVk::GetPlatforms()
+CLDeviceImpl::InitList CLPlatformVk::getDevices()
+{
+    CLDeviceImpl::InitList initList;
+    CLDeviceImpl::Info info = CLDeviceVk::GetInfo();
+    if (info.isValid())
+    {
+        initList.emplace_back(new CLDeviceVk(), std::move(info));
+    }
+    return initList;
+}
+
+CLPlatformVk::InitList CLPlatformVk::GetPlatforms()
 {
-    ExtensionList extList = {
+    NameVersionVector extList = {
         cl_name_version{CL_MAKE_VERSION(1, 0, 0), "cl_khr_icd"},
         cl_name_version{CL_MAKE_VERSION(1, 0, 0), "cl_khr_extended_versioning"}};
     std::string extensions = CreateExtensionString(extList);
@@ -49,9 +58,9 @@ CLPlatformVk::ImplList CLPlatformVk::GetPlatforms()
     Info info("FULL_PROFILE", std::string(GetVersionString()), GetVersion(), "ANGLE Vulkan",
               std::move(extensions), std::move(extList), 0u);
 
-    ImplList implList;
-    implList.emplace_back(new CLPlatformVk(std::move(info)));
-    return implList;
+    InitList initList;
+    initList.emplace_back(new CLPlatformVk(std::move(info)));
+    return initList;
 }
 
 const std::string &CLPlatformVk::GetVersionString()

src/libANGLE/renderer/vulkan/CLPlatformVk.h

@@ -3,9 +3,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// CLPlatformVk.h:
-//    Defines the class interface for CLPlatformVk, implementing CLPlatformImpl.
-//
+// CLPlatformVk.h: Defines the class interface for CLPlatformVk, implementing CLPlatformImpl.
 
 #ifndef LIBANGLE_RENDERER_VULKAN_CLPLATFORMVK_H_
 #define LIBANGLE_RENDERER_VULKAN_CLPLATFORMVK_H_
@@ -22,7 +20,9 @@ class CLPlatformVk : public CLPlatformImpl
   public:
     ~CLPlatformVk() override;
 
-    static ImplList GetPlatforms();
+    CLDeviceImpl::InitList getDevices() override;
+
+    static InitList GetPlatforms();
     static constexpr cl_version GetVersion();
     static const std::string &GetVersionString();
 

src/libANGLE/validationCL.cpp

@@ -3,7 +3,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-
 // validationCL.cpp: Validation functions for generic CL entry point parameters
 
 #include "libANGLE/validationCL_autogen.h"
@@ -12,28 +11,28 @@ namespace cl
 {
 // CL 1.0
 cl_int ValidateGetPlatformIDs(cl_uint num_entries,
-                              Platform *const *platformsPacked,
+                              Platform *const *platforms,
                               const cl_uint *num_platforms)
 {
-    if ((num_entries == 0u && platformsPacked != nullptr) ||
-        (platformsPacked == nullptr && num_platforms == nullptr))
+    if ((num_entries == 0u && platforms != nullptr) ||
+        (platforms == nullptr && num_platforms == nullptr))
     {
         return CL_INVALID_VALUE;
     }
     return CL_SUCCESS;
 }
 
-cl_int ValidateGetPlatformInfo(const Platform *platformPacked,
-                               PlatformInfo param_namePacked,
+cl_int ValidateGetPlatformInfo(const Platform *platform,
+                               PlatformInfo param_name,
                                size_t param_value_size,
                                const void *param_value,
                                const size_t *param_value_size_ret)
 {
-    if (!Platform::IsValid(platformPacked))
+    if (!Platform::IsValid(platform))
     {
         return CL_INVALID_PLATFORM;
     }
-    if (param_namePacked == PlatformInfo::InvalidEnum ||
+    if (param_name == PlatformInfo::InvalidEnum ||
         (param_value_size == 0u && param_value != nullptr))
     {
         return CL_INVALID_VALUE;
@@ -41,21 +40,41 @@ cl_int ValidateGetPlatformInfo(const Platform *platformPacked,
     return CL_SUCCESS;
 }
 
-cl_int ValidateGetDeviceIDs(const Platform *platformPacked,
+cl_int ValidateGetDeviceIDs(const Platform *platform,
                             cl_device_type device_type,
                             cl_uint num_entries,
-                            Device *const *devicesPacked,
+                            Device *const *devices,
                             const cl_uint *num_devices)
 {
+    if (!Platform::IsValidOrDefault(platform))
+    {
+        return CL_INVALID_PLATFORM;
+    }
+    if (!Device::IsValidType(device_type))
+    {
+        return CL_INVALID_DEVICE_TYPE;
+    }
+    if ((num_entries == 0u && devices != nullptr) || (devices == nullptr && num_devices == nullptr))
+    {
+        return CL_INVALID_VALUE;
+    }
     return CL_SUCCESS;
 }
 
-cl_int ValidateGetDeviceInfo(const Device *devicePacked,
-                             DeviceInfo param_namePacked,
+cl_int ValidateGetDeviceInfo(const Device *device,
+                             DeviceInfo param_name,
                              size_t param_value_size,
                              const void *param_value,
                              const size_t *param_value_size_ret)
 {
+    if (!Device::IsValid(device))
+    {
+        return CL_INVALID_DEVICE;
+    }
+    if (param_name == DeviceInfo::InvalidEnum || (param_value_size == 0u && param_value != nullptr))
+    {
+        return CL_INVALID_VALUE;
+    }
     return CL_SUCCESS;
 }
 

src/libGLESv2.gni

@@ -482,6 +482,7 @@ libangle_cl_sources = [
   "src/libANGLE/CLPlatform.cpp",
   "src/libANGLE/CLProgram.cpp",
   "src/libANGLE/CLSampler.cpp",
+  "src/libANGLE/renderer/CLDeviceImpl.cpp",
   "src/libANGLE/renderer/CLPlatformImpl.cpp",
   "src/libANGLE/validationCL.cpp",
 ]

src/libGLESv2/cl_stubs.cpp

@@ -7,6 +7,7 @@
 
 #include "libGLESv2/cl_stubs_autogen.h"
 
+#include "libANGLE/CLDevice.h"
 #include "libANGLE/CLPlatform.h"
 #include "libGLESv2/cl_dispatch_table.h"
 #include "libGLESv2/proc_table_cl.h"
@@ -39,7 +40,7 @@ namespace cl
 namespace
 {
 
-const Platform::List &InitializePlatforms(bool isIcd)
+const Platform::PtrList &InitializePlatforms(bool isIcd)
 {
     static bool initialized = false;
     if (!initialized)
@@ -47,20 +48,20 @@ const Platform::List &InitializePlatforms(bool isIcd)
         initialized = true;
 
 #ifdef ANGLE_ENABLE_CL_PASSTHROUGH
-        rx::CLPlatformImpl::ImplList implListCL = rx::CLPlatformCL::GetPlatforms(isIcd);
-        while (!implListCL.empty())
+        rx::CLPlatformImpl::InitList initListCL = rx::CLPlatformCL::GetPlatforms(isIcd);
+        while (!initListCL.empty())
         {
-            Platform::CreatePlatform(gCLIcdDispatchTable, std::move(implListCL.front()));
-            implListCL.pop_front();
+            Platform::CreatePlatform(gCLIcdDispatchTable, initListCL.front());
+            initListCL.pop_front();
         }
 #endif
 
 #ifdef ANGLE_ENABLE_VULKAN
-        rx::CLPlatformImpl::ImplList implListVk = rx::CLPlatformVk::GetPlatforms();
-        while (!implListVk.empty())
+        rx::CLPlatformImpl::InitList initListVk = rx::CLPlatformVk::GetPlatforms();
+        while (!initListVk.empty())
         {
-            Platform::CreatePlatform(gCLIcdDispatchTable, std::move(implListVk.front()));
-            implListVk.pop_front();
+            Platform::CreatePlatform(gCLIcdDispatchTable, initListVk.front());
+            initListVk.pop_front();
         }
 #endif
     }
@@ -69,7 +70,7 @@ const Platform::List &InitializePlatforms(bool isIcd)
 
 cl_int GetPlatforms(cl_uint num_entries, Platform **platforms, cl_uint *num_platforms, bool isIcd)
 {
-    const Platform::List &platformList = InitializePlatforms(isIcd);
+    const Platform::PtrList &platformList = InitializePlatforms(isIcd);
     if (num_platforms != nullptr)
     {
         *num_platforms = static_cast<cl_uint>(platformList.size());
@@ -179,8 +180,8 @@ cl_int GetDeviceIDs(Platform *platform,
                     Device **devices,
                     cl_uint *num_devices)
 {
-    WARN_NOT_SUPPORTED(GetDeviceIDs);
-    return 0;
+    return (platform != nullptr ? platform : Platform::GetDefault())
+        ->getDeviceIDs(device_type, num_entries, devices, num_devices);
 }
 
 cl_int GetDeviceInfo(Device *device,
@@ -189,8 +190,7 @@ cl_int GetDeviceInfo(Device *device,
                      void *param_value,
                      size_t *param_value_size_ret)
 {
-    WARN_NOT_SUPPORTED(GetDeviceInfo);
-    return 0;
+    return device->getInfo(param_name, param_value_size, param_value, param_value_size_ret);
 }
 
 cl_int CreateSubDevices(Device *in_device,