Hash :
fbff065c
Author :
Date :
2023-05-03T22:19:07
Replace GetResourceFromHashSet with map lookup Function GetResourceFromHashSet had linear time complexity because it was sweeping through the set until a resource with a matching ID was found. This change replaces hash sets with hash maps to get constant time lookup. This solves, among other things, O(N^2) time complexity for rendering scenes containing a large number of surfaces. Function GetResourceFromHashSet was consuming over 50% of all CPU time on the main thread of Chrome's GPU process while running the MotionMark 1.2 Images test. With this change, the benchmark score increases by 70% on an M1 MacBook running a PGO official build of Chrome. Bug: chromium:1435066 Change-Id: I895ac0141a91d324c63adec2c0efb8e030d9675b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4505950 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Justin Novosad <junov@chromium.org> Reviewed-by: Igor Nazarov <i.nazarov@samsung.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 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463
//
// Copyright 2002 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.
//
// Display.h: Defines the egl::Display class, representing the abstract
// display on which graphics are drawn. Implements EGLDisplay.
// [EGL 1.4] section 2.1.2 page 3.
#ifndef LIBANGLE_DISPLAY_H_
#define LIBANGLE_DISPLAY_H_
#include <mutex>
#include <vector>
#include "common/WorkerThread.h"
#include "libANGLE/AttributeMap.h"
#include "libANGLE/BlobCache.h"
#include "libANGLE/Caps.h"
#include "libANGLE/Config.h"
#include "libANGLE/Context.h"
#include "libANGLE/Debug.h"
#include "libANGLE/Error.h"
#include "libANGLE/LoggingAnnotator.h"
#include "libANGLE/MemoryProgramCache.h"
#include "libANGLE/MemoryShaderCache.h"
#include "libANGLE/Observer.h"
#include "libANGLE/Version.h"
#include "platform/Feature.h"
#include "platform/FrontendFeatures_autogen.h"
namespace angle
{
class FrameCaptureShared;
} // namespace angle
namespace gl
{
class Context;
class TextureManager;
class SemaphoreManager;
} // namespace gl
namespace rx
{
class DisplayImpl;
class EGLImplFactory;
class ShareGroupImpl;
} // namespace rx
namespace egl
{
class Device;
class Image;
class Stream;
class Surface;
class Sync;
class Thread;
using ContextMap = angle::HashMap<GLuint, gl::Context *>;
using SurfaceMap = angle::HashMap<GLuint, Surface *>;
using ThreadSet = angle::HashSet<Thread *>;
struct DisplayState final : private angle::NonCopyable
{
DisplayState(EGLNativeDisplayType nativeDisplayId);
~DisplayState();
EGLLabelKHR label;
ContextMap contextMap;
SurfaceMap surfaceMap;
std::vector<std::string> featureOverridesEnabled;
std::vector<std::string> featureOverridesDisabled;
bool featuresAllDisabled;
EGLNativeDisplayType displayId;
};
class ShareGroup final : angle::NonCopyable
{
public:
ShareGroup(rx::EGLImplFactory *factory);
void addRef();
void release(const egl::Display *display);
rx::ShareGroupImpl *getImplementation() const { return mImplementation; }
rx::UniqueSerial generateFramebufferSerial() { return mFramebufferSerialFactory.generate(); }
angle::FrameCaptureShared *getFrameCaptureShared() { return mFrameCaptureShared.get(); }
void finishAllContexts();
const ContextMap &getContexts() const { return mContexts; }
void addSharedContext(gl::Context *context);
void removeSharedContext(gl::Context *context);
size_t getShareGroupContextCount() const { return mContexts.size(); }
protected:
~ShareGroup();
private:
size_t mRefCount;
rx::ShareGroupImpl *mImplementation;
rx::UniqueSerialFactory mFramebufferSerialFactory;
// Note: we use a raw pointer here so we can exclude frame capture sources from the build.
std::unique_ptr<angle::FrameCaptureShared> mFrameCaptureShared;
// The list of contexts within the share group
ContextMap mContexts;
};
// Constant coded here as a reasonable limit.
constexpr EGLAttrib kProgramCacheSizeAbsoluteMax = 0x4000000;
class Display final : public LabeledObject,
public angle::ObserverInterface,
public angle::NonCopyable
{
public:
~Display() override;
void setLabel(EGLLabelKHR label) override;
EGLLabelKHR getLabel() const override;
// Observer implementation.
void onSubjectStateChange(angle::SubjectIndex index, angle::SubjectMessage message) override;
Error initialize();
enum class TerminateReason
{
Api,
InternalCleanup,
NoActiveThreads,
InvalidEnum,
EnumCount = InvalidEnum,
};
Error terminate(Thread *thread, TerminateReason terminateReason);
// Called before all display state dependent EGL functions. Backends can set up, for example,
// thread-specific backend state through this function. Not called for functions that do not
// need the state.
Error prepareForCall();
// Called on eglReleaseThread. Backends can tear down thread-specific backend state through
// this function.
Error releaseThread();
// Helpers to maintain active thread set to assist with freeing invalid EGL objects.
void addActiveThread(Thread *thread);
void threadCleanup(Thread *thread);
static Display *GetDisplayFromDevice(Device *device, const AttributeMap &attribMap);
static Display *GetDisplayFromNativeDisplay(EGLenum platform,
EGLNativeDisplayType nativeDisplay,
const AttributeMap &attribMap);
static Display *GetExistingDisplayFromNativeDisplay(EGLNativeDisplayType nativeDisplay);
using EglDisplaySet = angle::HashSet<Display *>;
static EglDisplaySet GetEglDisplaySet();
static const ClientExtensions &GetClientExtensions();
static const std::string &GetClientExtensionString();
std::vector<const Config *> getConfigs(const AttributeMap &attribs) const;
std::vector<const Config *> chooseConfig(const AttributeMap &attribs) const;
Error createWindowSurface(const Config *configuration,
EGLNativeWindowType window,
const AttributeMap &attribs,
Surface **outSurface);
Error createPbufferSurface(const Config *configuration,
const AttributeMap &attribs,
Surface **outSurface);
Error createPbufferFromClientBuffer(const Config *configuration,
EGLenum buftype,
EGLClientBuffer clientBuffer,
const AttributeMap &attribs,
Surface **outSurface);
Error createPixmapSurface(const Config *configuration,
NativePixmapType nativePixmap,
const AttributeMap &attribs,
Surface **outSurface);
Error createImage(const gl::Context *context,
EGLenum target,
EGLClientBuffer buffer,
const AttributeMap &attribs,
Image **outImage);
Error createStream(const AttributeMap &attribs, Stream **outStream);
Error createContext(const Config *configuration,
gl::Context *shareContext,
const EGLenum clientType,
const AttributeMap &attribs,
gl::Context **outContext);
Error createSync(const gl::Context *currentContext,
EGLenum type,
const AttributeMap &attribs,
Sync **outSync);
Error makeCurrent(Thread *thread,
gl::Context *previousContext,
Surface *drawSurface,
Surface *readSurface,
gl::Context *context);
Error destroySurface(Surface *surface);
void destroyImage(Image *image);
void destroyStream(Stream *stream);
Error destroyContext(Thread *thread, gl::Context *context);
void destroySync(Sync *sync);
bool isInitialized() const;
bool isValidConfig(const Config *config) const;
bool isValidContext(gl::ContextID contextID) const;
bool isValidSurface(SurfaceID surfaceID) const;
bool isValidImage(ImageID imageID) const;
bool isValidStream(const Stream *stream) const;
bool isValidSync(SyncID sync) const;
bool isValidNativeWindow(EGLNativeWindowType window) const;
Error validateClientBuffer(const Config *configuration,
EGLenum buftype,
EGLClientBuffer clientBuffer,
const AttributeMap &attribs) const;
Error validateImageClientBuffer(const gl::Context *context,
EGLenum target,
EGLClientBuffer clientBuffer,
const egl::AttributeMap &attribs) const;
Error valdiatePixmap(const Config *config,
EGLNativePixmapType pixmap,
const AttributeMap &attributes) const;
static bool isValidDisplay(const Display *display);
static bool isValidNativeDisplay(EGLNativeDisplayType display);
static bool hasExistingWindowSurface(EGLNativeWindowType window);
bool isDeviceLost() const;
bool testDeviceLost();
void notifyDeviceLost();
void setBlobCacheFuncs(EGLSetBlobFuncANDROID set, EGLGetBlobFuncANDROID get);
bool areBlobCacheFuncsSet() const { return mBlobCache.areBlobCacheFuncsSet(); }
BlobCache &getBlobCache() { return mBlobCache; }
static EGLClientBuffer GetNativeClientBuffer(const struct AHardwareBuffer *buffer);
static Error CreateNativeClientBuffer(const egl::AttributeMap &attribMap,
EGLClientBuffer *eglClientBuffer);
Error waitClient(const gl::Context *context);
Error waitNative(const gl::Context *context, EGLint engine);
const Caps &getCaps() const;
const DisplayExtensions &getExtensions() const;
const std::string &getExtensionString() const;
const std::string &getVendorString() const;
const std::string &getVersionString() const;
const std::string &getClientAPIString() const;
std::string getBackendRendererDescription() const;
std::string getBackendVendorString() const;
std::string getBackendVersionString(bool includeFullVersion) const;
EGLint programCacheGetAttrib(EGLenum attrib) const;
Error programCacheQuery(EGLint index,
void *key,
EGLint *keysize,
void *binary,
EGLint *binarysize);
Error programCachePopulate(const void *key,
EGLint keysize,
const void *binary,
EGLint binarysize);
EGLint programCacheResize(EGLint limit, EGLenum mode);
const AttributeMap &getAttributeMap() const { return mAttributeMap; }
EGLNativeDisplayType getNativeDisplayId() const { return mState.displayId; }
rx::DisplayImpl *getImplementation() const { return mImplementation; }
Device *getDevice() const;
Surface *getWGLSurface() const;
EGLenum getPlatform() const { return mPlatform; }
gl::Version getMaxSupportedESVersion() const;
const DisplayState &getState() const { return mState; }
const angle::FrontendFeatures &getFrontendFeatures() { return mFrontendFeatures; }
void overrideFrontendFeatures(const std::vector<std::string> &featureNames, bool enabled);
const angle::FeatureList &getFeatures() const { return mFeatures; }
const char *queryStringi(const EGLint name, const EGLint index);
EGLAttrib queryAttrib(const EGLint attribute);
angle::ScratchBuffer requestScratchBuffer();
void returnScratchBuffer(angle::ScratchBuffer scratchBuffer);
angle::ScratchBuffer requestZeroFilledBuffer();
void returnZeroFilledBuffer(angle::ScratchBuffer zeroFilledBuffer);
egl::Error handleGPUSwitch();
egl::Error forceGPUSwitch(EGLint gpuIDHigh, EGLint gpuIDLow);
egl::Error waitUntilWorkScheduled();
std::mutex &getDisplayGlobalMutex() { return mDisplayGlobalMutex; }
std::mutex &getProgramCacheMutex() { return mProgramCacheMutex; }
gl::MemoryShaderCache *getMemoryShaderCache() { return &mMemoryShaderCache; }
// Installs LoggingAnnotator as the global DebugAnnotator, for back-ends that do not implement
// their own DebugAnnotator.
void setGlobalDebugAnnotator() { gl::InitializeDebugAnnotations(&mAnnotator); }
bool supportsDmaBufFormat(EGLint format) const;
Error queryDmaBufFormats(EGLint max_formats, EGLint *formats, EGLint *num_formats);
Error queryDmaBufModifiers(EGLint format,
EGLint max_modifiers,
EGLuint64KHR *modifiers,
EGLBoolean *external_only,
EGLint *num_modifiers);
std::shared_ptr<angle::WorkerThreadPool> getSingleThreadPool() const
{
return mSingleThreadPool;
}
std::shared_ptr<angle::WorkerThreadPool> getMultiThreadPool() const { return mMultiThreadPool; }
angle::ImageLoadContext getImageLoadContext() const;
const gl::Context *getContext(gl::ContextID contextID) const;
const egl::Surface *getSurface(egl::SurfaceID surfaceID) const;
const egl::Image *getImage(egl::ImageID imageID) const;
const egl::Sync *getSync(egl::SyncID syncID) const;
gl::Context *getContext(gl::ContextID contextID);
egl::Surface *getSurface(egl::SurfaceID surfaceID);
egl::Image *getImage(egl::ImageID imageID);
egl::Sync *getSync(egl::SyncID syncID);
// Initialize thread-local variables used by the Display and its backing implementations. This
// includes:
//
// - The unlocked tail call to be run at the end of the entry point.
// - Scratch space for an egl::Error used by the backends (this is not used by all backends, and
// access *must* be restricted to backends that use it).
//
static void InitTLS();
static angle::UnlockedTailCall *GetCurrentThreadUnlockedTailCall();
static Error *GetCurrentThreadErrorScratchSpace();
private:
Display(EGLenum platform, EGLNativeDisplayType displayId, Device *eglDevice);
void setAttributes(const AttributeMap &attribMap) { mAttributeMap = attribMap; }
void setupDisplayPlatform(rx::DisplayImpl *impl);
Error restoreLostDevice();
Error releaseContext(gl::Context *context, Thread *thread);
Error releaseContextImpl(gl::Context *context, ContextMap *contexts);
void initDisplayExtensions();
void initVendorString();
void initVersionString();
void initClientAPIString();
void initializeFrontendFeatures();
angle::ScratchBuffer requestScratchBufferImpl(std::vector<angle::ScratchBuffer> *bufferVector);
void returnScratchBufferImpl(angle::ScratchBuffer scratchBuffer,
std::vector<angle::ScratchBuffer> *bufferVector);
Error destroyInvalidEglObjects();
DisplayState mState;
rx::DisplayImpl *mImplementation;
angle::ObserverBinding mGPUSwitchedBinding;
AttributeMap mAttributeMap;
ConfigSet mConfigSet;
typedef angle::HashMap<GLuint, Image *> ImageMap;
ImageMap mImageMap;
typedef angle::HashSet<Stream *> StreamSet;
StreamSet mStreamSet;
typedef angle::HashMap<GLuint, Sync *> SyncMap;
SyncMap mSyncMap;
void destroyImageImpl(Image *image, ImageMap *images);
void destroyStreamImpl(Stream *stream, StreamSet *streams);
Error destroySurfaceImpl(Surface *surface, SurfaceMap *surfaces);
void destroySyncImpl(Sync *sync, SyncMap *syncs);
ContextMap mInvalidContextMap;
ImageMap mInvalidImageMap;
StreamSet mInvalidStreamSet;
SurfaceMap mInvalidSurfaceMap;
SyncMap mInvalidSyncMap;
bool mInitialized;
bool mDeviceLost;
Caps mCaps;
DisplayExtensions mDisplayExtensions;
std::string mDisplayExtensionString;
std::string mVendorString;
std::string mVersionString;
std::string mClientAPIString;
Device *mDevice;
Surface *mSurface;
EGLenum mPlatform;
angle::LoggingAnnotator mAnnotator;
gl::TextureManager *mTextureManager;
gl::SemaphoreManager *mSemaphoreManager;
BlobCache mBlobCache;
gl::MemoryProgramCache mMemoryProgramCache;
gl::MemoryShaderCache mMemoryShaderCache;
size_t mGlobalTextureShareGroupUsers;
size_t mGlobalSemaphoreShareGroupUsers;
gl::HandleAllocator mImageHandleAllocator;
gl::HandleAllocator mSurfaceHandleAllocator;
gl::HandleAllocator mSyncHandleAllocator;
angle::FrontendFeatures mFrontendFeatures;
angle::FeatureList mFeatures;
std::mutex mScratchBufferMutex;
std::vector<angle::ScratchBuffer> mScratchBuffers;
std::vector<angle::ScratchBuffer> mZeroFilledBuffers;
std::mutex mDisplayGlobalMutex;
std::mutex mProgramCacheMutex;
bool mTerminatedByApi;
ThreadSet mActiveThreads;
// Single-threaded and multithread pools for use by various parts of ANGLE, such as shader
// compilation. These pools are internally synchronized.
std::shared_ptr<angle::WorkerThreadPool> mSingleThreadPool;
std::shared_ptr<angle::WorkerThreadPool> mMultiThreadPool;
};
} // namespace egl
#endif // LIBANGLE_DISPLAY_H_