Hash :
baca10b7
Author :
Date :
2021-05-29T16:26:57
CL: Remove object cache and fix multi-threading All CL front end objects used to be cached to be able to determine if an object has been created by the front end to check its validity. The validity is now checked with the existence of an intrinsic value (the dispatch table pointer), which is consistent with the patterns found in Mesa and clvk (though clvk uses a magic value). This allows the removal of all cached objects. The cached objects were stored with std::unique_ptr. These are now gone and all remaining pointers are now custom intrinsic reference count pointers. Also remove global lock which causes deadlocks, e.g. when CL API is called from a separate thread to unlock a blocking call with a user event. Most of the front end is constant and already thread-safe. The ref count is also thread-safe now (atomic). A few remaining locks will follow. Without the global lock it was now possible to make the API reentrant, and to remove the workaround with the Khronos ICD loader to skip ANGLE's OpenCL library. Bug: angleproject:6001 Change-Id: I7d3b52db9011a02cb7ea9ebdeb6e22c4c702ef5b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2927395 Commit-Queue: John Plate <jplate@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111
//
// 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.
//
// angle_cl.h: Includes all necessary CL headers and definitions for ANGLE.
#ifndef ANGLECL_H_
#define ANGLECL_H_
#define CL_TARGET_OPENCL_VERSION 300
#define CL_USE_DEPRECATED_OPENCL_1_0_APIS
#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
#define CL_USE_DEPRECATED_OPENCL_2_1_APIS
#define CL_USE_DEPRECATED_OPENCL_2_2_APIS
#include "CL/cl_icd.h"
#include <cstddef>
#include <type_traits>
namespace cl
{
using ContextErrorCB = void(CL_CALLBACK *)(const char *errinfo,
const void *private_info,
size_t cb,
void *user_data);
using EventCB = void(CL_CALLBACK *)(cl_event event, cl_int event_command_status, void *user_data);
template <typename T = void>
struct Dispatch
{
Dispatch() : mDispatch(sDispatch) {}
const cl_icd_dispatch &getDispatch() const { return *mDispatch; }
bool isValid() const { return mDispatch == sDispatch; }
static bool IsValid(const Dispatch *p) { return p != nullptr && p->isValid(); }
static const cl_icd_dispatch *sDispatch;
protected:
// This has to be the first member to be OpenCL ICD compatible
const cl_icd_dispatch *const mDispatch;
};
template <typename T>
const cl_icd_dispatch *Dispatch<T>::sDispatch = nullptr;
template <typename NativeObjectType>
struct NativeObject : public Dispatch<>
{
NativeObject()
{
static_assert(std::is_standard_layout<NativeObjectType>::value &&
offsetof(NativeObjectType, mDispatch) == 0u,
"Not ICD compatible");
}
template <typename T>
T &cast()
{
return static_cast<T &>(*this);
}
template <typename T>
const T &cast() const
{
return static_cast<const T &>(*this);
}
NativeObjectType *getNative() { return static_cast<NativeObjectType *>(this); }
static NativeObjectType *CastNative(NativeObjectType *p) { return p; }
};
} // namespace cl
struct _cl_platform_id : public cl::NativeObject<_cl_platform_id>
{};
struct _cl_device_id : public cl::NativeObject<_cl_device_id>
{};
struct _cl_context : public cl::NativeObject<_cl_context>
{};
struct _cl_command_queue : public cl::NativeObject<_cl_command_queue>
{};
struct _cl_mem : public cl::NativeObject<_cl_mem>
{};
struct _cl_program : public cl::NativeObject<_cl_program>
{};
struct _cl_kernel : public cl::NativeObject<_cl_kernel>
{};
struct _cl_event : public cl::NativeObject<_cl_event>
{};
struct _cl_sampler : public cl::NativeObject<_cl_sampler>
{};
#endif // ANGLECL_H_