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
//
// 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.
//
// CLKernelImpl.h: Defines the abstract rx::CLKernelImpl class.
#ifndef LIBANGLE_RENDERER_CLKERNELIMPL_H_
#define LIBANGLE_RENDERER_CLKERNELIMPL_H_
#include "libANGLE/renderer/CLtypes.h"
namespace rx
{
class CLKernelImpl : angle::NonCopyable
{
public:
using Ptr = std::unique_ptr<CLKernelImpl>;
using CreateFunc = std::function<Ptr(const cl::Kernel &)>;
using CreateFuncs = std::list<CreateFunc>;
struct WorkGroupInfo
{
WorkGroupInfo();
~WorkGroupInfo();
WorkGroupInfo(const WorkGroupInfo &) = delete;
WorkGroupInfo &operator=(const WorkGroupInfo &) = delete;
WorkGroupInfo(WorkGroupInfo &&);
WorkGroupInfo &operator=(WorkGroupInfo &&);
size_t mGlobalWorkSize[3] = {};
size_t mWorkGroupSize = 0u;
size_t mCompileWorkGroupSize[3] = {};
cl_ulong mLocalMemSize = 0u;
size_t mPrefWorkGroupSizeMultiple = 0u;
cl_ulong mPrivateMemSize = 0u;
};
struct ArgInfo
{
ArgInfo();
~ArgInfo();
ArgInfo(const ArgInfo &) = delete;
ArgInfo &operator=(const ArgInfo &) = delete;
ArgInfo(ArgInfo &&);
ArgInfo &operator=(ArgInfo &&);
bool isAvailable() const { return !mName.empty(); }
cl_kernel_arg_address_qualifier mAddressQualifier = 0u;
cl_kernel_arg_access_qualifier mAccessQualifier = 0u;
std::string mTypeName;
cl_kernel_arg_type_qualifier mTypeQualifier = 0u;
std::string mName;
};
struct Info
{
Info();
~Info();
Info(const Info &) = delete;
Info &operator=(const Info &) = delete;
Info(Info &&);
Info &operator=(Info &&);
bool isValid() const { return !mFunctionName.empty(); }
std::string mFunctionName;
cl_uint mNumArgs = 0u;
std::string mAttributes;
std::vector<WorkGroupInfo> mWorkGroups;
std::vector<ArgInfo> mArgs;
};
CLKernelImpl(const cl::Kernel &kernel);
virtual ~CLKernelImpl();
virtual Info createInfo(cl_int &errorCode) const = 0;
protected:
const cl::Kernel &mKernel;
};
} // namespace rx
#endif // LIBANGLE_RENDERER_CLKERNELIMPL_H_