Hash :
9c67a505
Author :
Date :
2024-12-11T14:29:59
Vulkan: Rename CommandProcessor.* to CommandQueue.* Bug: angleproject:42262955 Change-Id: I5585309479d8c66e9ddfa41e12a757381ebb80bd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6089885 Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Roman Lavrov <romanl@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 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 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543
//
// Copyright 2020 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.
//
// CommandQueue.h:
// A class to process and submit Vulkan command buffers.
//
#ifndef LIBANGLE_RENDERER_VULKAN_COMMAND_Queue_H_
#define LIBANGLE_RENDERER_VULKAN_COMMAND_Queue_H_
#include <condition_variable>
#include <mutex>
#include <queue>
#include <thread>
#include "common/FixedQueue.h"
#include "common/SimpleMutex.h"
#include "common/vulkan/vk_headers.h"
#include "libANGLE/renderer/vulkan/PersistentCommandPool.h"
#include "libANGLE/renderer/vulkan/vk_helpers.h"
namespace rx
{
namespace vk
{
class ExternalFence;
using SharedExternalFence = std::shared_ptr<ExternalFence>;
constexpr size_t kInFlightCommandsLimit = 50u;
constexpr size_t kMaxFinishedCommandsLimit = 64u;
static_assert(kInFlightCommandsLimit <= kMaxFinishedCommandsLimit);
struct Error
{
VkResult errorCode;
const char *file;
const char *function;
uint32_t line;
};
class FenceRecycler
{
public:
FenceRecycler() {}
~FenceRecycler() {}
void destroy(Context *context);
void fetch(VkDevice device, Fence *fenceOut);
void recycle(Fence &&fence);
private:
angle::SimpleMutex mMutex;
Recycler<Fence> mRecycler;
};
class RecyclableFence final : angle::NonCopyable
{
public:
RecyclableFence();
~RecyclableFence();
VkResult init(VkDevice device, FenceRecycler *recycler);
// Returns fence back to the recycler if it is still attached, destroys the fence otherwise.
// Do NOT call directly when object is controlled by a shared pointer.
void destroy(VkDevice device);
void detachRecycler() { mRecycler = nullptr; }
bool valid() const { return mFence.valid(); }
const Fence &get() const { return mFence; }
private:
Fence mFence;
FenceRecycler *mRecycler;
};
using SharedFence = AtomicSharedPtr<RecyclableFence>;
class CommandPoolAccess;
class CommandBatch final : angle::NonCopyable
{
public:
CommandBatch();
~CommandBatch();
CommandBatch(CommandBatch &&other);
CommandBatch &operator=(CommandBatch &&other);
void destroy(VkDevice device);
angle::Result release(Context *context);
void setQueueSerial(const QueueSerial &serial);
void setProtectionType(ProtectionType protectionType);
void setPrimaryCommands(PrimaryCommandBuffer &&primaryCommands,
CommandPoolAccess *commandPoolAccess);
void setSecondaryCommands(SecondaryCommandBufferCollector &&secondaryCommands);
VkResult initFence(VkDevice device, FenceRecycler *recycler);
void setExternalFence(SharedExternalFence &&externalFence);
const QueueSerial &getQueueSerial() const;
const PrimaryCommandBuffer &getPrimaryCommands() const;
const SharedExternalFence &getExternalFence();
bool hasFence() const;
VkFence getFenceHandle() const;
VkResult getFenceStatus(VkDevice device) const;
VkResult waitFence(VkDevice device, uint64_t timeout) const;
VkResult waitFenceUnlocked(VkDevice device,
uint64_t timeout,
std::unique_lock<angle::SimpleMutex> *lock) const;
private:
QueueSerial mQueueSerial;
ProtectionType mProtectionType;
PrimaryCommandBuffer mPrimaryCommands;
CommandPoolAccess *mCommandPoolAccess; // reference to CommandPoolAccess that is responsible
// for deleting primaryCommands with a lock
SecondaryCommandBufferCollector mSecondaryCommands;
SharedFence mFence;
SharedExternalFence mExternalFence;
};
using CommandBatchQueue = angle::FixedQueue<CommandBatch>;
class DeviceQueueMap;
class QueueFamily final : angle::NonCopyable
{
public:
static const uint32_t kInvalidIndex = std::numeric_limits<uint32_t>::max();
static uint32_t FindIndex(const std::vector<VkQueueFamilyProperties> &queueFamilyProperties,
VkQueueFlags flags,
int32_t matchNumber, // 0 = first match, 1 = second match ...
uint32_t *matchCount);
static const uint32_t kQueueCount = static_cast<uint32_t>(egl::ContextPriority::EnumCount);
static const float kQueuePriorities[static_cast<uint32_t>(egl::ContextPriority::EnumCount)];
QueueFamily() : mProperties{}, mQueueFamilyIndex(kInvalidIndex) {}
~QueueFamily() {}
void initialize(const VkQueueFamilyProperties &queueFamilyProperties,
uint32_t queueFamilyIndex);
bool valid() const { return (mQueueFamilyIndex != kInvalidIndex); }
uint32_t getQueueFamilyIndex() const { return mQueueFamilyIndex; }
const VkQueueFamilyProperties *getProperties() const { return &mProperties; }
bool isGraphics() const { return ((mProperties.queueFlags & VK_QUEUE_GRAPHICS_BIT) > 0); }
bool isCompute() const { return ((mProperties.queueFlags & VK_QUEUE_COMPUTE_BIT) > 0); }
bool supportsProtected() const
{
return ((mProperties.queueFlags & VK_QUEUE_PROTECTED_BIT) > 0);
}
uint32_t getDeviceQueueCount() const { return mProperties.queueCount; }
private:
VkQueueFamilyProperties mProperties;
uint32_t mQueueFamilyIndex;
};
class DeviceQueueMap final
{
public:
DeviceQueueMap() : mQueueFamilyIndex(QueueFamily::kInvalidIndex), mIsProtected(false) {}
~DeviceQueueMap();
void initialize(VkDevice device,
const QueueFamily &queueFamily,
bool makeProtected,
uint32_t queueIndex,
uint32_t queueCount);
void destroy();
bool valid() const { return (mQueueFamilyIndex != QueueFamily::kInvalidIndex); }
uint32_t getQueueFamilyIndex() const { return mQueueFamilyIndex; }
bool isProtected() const { return mIsProtected; }
egl::ContextPriority getDevicePriority(egl::ContextPriority priority) const
{
return mQueueAndIndices[priority].devicePriority;
}
DeviceQueueIndex getDeviceQueueIndex(egl::ContextPriority priority) const
{
return DeviceQueueIndex(mQueueFamilyIndex, mQueueAndIndices[priority].index);
}
const VkQueue &getQueue(egl::ContextPriority priority) const
{
return mQueueAndIndices[priority].queue;
}
private:
uint32_t mQueueFamilyIndex;
bool mIsProtected;
struct QueueAndIndex
{
// The actual priority that used
egl::ContextPriority devicePriority;
VkQueue queue;
// The queueIndex used for VkGetDeviceQueue
uint32_t index;
};
angle::PackedEnumMap<egl::ContextPriority, QueueAndIndex> mQueueAndIndices;
};
class CommandPoolAccess : angle::NonCopyable
{
public:
CommandPoolAccess();
~CommandPoolAccess();
angle::Result initCommandPool(Context *context,
ProtectionType protectionType,
const uint32_t queueFamilyIndex);
void destroy(VkDevice device);
void destroyPrimaryCommandBuffer(VkDevice device, PrimaryCommandBuffer *primaryCommands) const;
angle::Result collectPrimaryCommandBuffer(Context *context,
const ProtectionType protectionType,
PrimaryCommandBuffer *primaryCommands);
angle::Result flushOutsideRPCommands(Context *context,
ProtectionType protectionType,
egl::ContextPriority priority,
OutsideRenderPassCommandBufferHelper **outsideRPCommands);
angle::Result flushRenderPassCommands(Context *context,
const ProtectionType &protectionType,
const egl::ContextPriority &priority,
const RenderPass &renderPass,
VkFramebuffer framebufferOverride,
RenderPassCommandBufferHelper **renderPassCommands);
void flushWaitSemaphores(ProtectionType protectionType,
egl::ContextPriority priority,
std::vector<VkSemaphore> &&waitSemaphores,
std::vector<VkPipelineStageFlags> &&waitSemaphoreStageMasks);
angle::Result getCommandsAndWaitSemaphores(
Context *context,
ProtectionType protectionType,
egl::ContextPriority priority,
CommandBatch *batchOut,
std::vector<VkSemaphore> *waitSemaphoresOut,
std::vector<VkPipelineStageFlags> *waitSemaphoreStageMasksOut);
private:
angle::Result ensurePrimaryCommandBufferValidLocked(Context *context,
const ProtectionType &protectionType,
const egl::ContextPriority &priority)
{
CommandsState &state = mCommandsStateMap[priority][protectionType];
if (state.primaryCommands.valid())
{
return angle::Result::Continue;
}
ANGLE_TRY(mPrimaryCommandPoolMap[protectionType].allocate(context, &state.primaryCommands));
VkCommandBufferBeginInfo beginInfo = {};
beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
beginInfo.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT;
beginInfo.pInheritanceInfo = nullptr;
ANGLE_VK_TRY(context, state.primaryCommands.begin(beginInfo));
return angle::Result::Continue;
}
// This mutex ensures vulkan command pool is externally synchronized.
// This means no two threads are operating on command buffers allocated from
// the same command pool at the same time. The operations that this mutex
// protect include:
// 1) recording commands on any command buffers allocated from the same command pool
// 2) allocate, free, reset command buffers from the same command pool.
// 3) any operations on the command pool itself
mutable angle::SimpleMutex mCmdPoolMutex;
using PrimaryCommandPoolMap = angle::PackedEnumMap<ProtectionType, PersistentCommandPool>;
using CommandsStateMap =
angle::PackedEnumMap<egl::ContextPriority,
angle::PackedEnumMap<ProtectionType, CommandsState>>;
CommandsStateMap mCommandsStateMap;
// Keeps a free list of reusable primary command buffers.
PrimaryCommandPoolMap mPrimaryCommandPoolMap;
};
// Note all public APIs of CommandQueue class must be thread safe.
class CommandQueue : angle::NonCopyable
{
public:
CommandQueue();
~CommandQueue();
angle::Result init(Context *context,
const QueueFamily &queueFamily,
bool enableProtectedContent,
uint32_t queueCount);
void destroy(Context *context);
void handleDeviceLost(Renderer *renderer);
// These public APIs are inherently thread safe. Thread unsafe methods must be protected methods
// that are only accessed via ThreadSafeCommandQueue API.
egl::ContextPriority getDriverPriority(egl::ContextPriority priority) const
{
return mQueueMap.getDevicePriority(priority);
}
DeviceQueueIndex getDeviceQueueIndex(egl::ContextPriority priority) const
{
return mQueueMap.getDeviceQueueIndex(priority);
}
VkQueue getQueue(egl::ContextPriority priority) const { return mQueueMap.getQueue(priority); }
Serial getLastSubmittedSerial(SerialIndex index) const { return mLastSubmittedSerials[index]; }
// The ResourceUse still have unfinished queue serial by ANGLE or vulkan.
bool hasResourceUseFinished(const ResourceUse &use) const
{
return use <= mLastCompletedSerials;
}
bool hasQueueSerialFinished(const QueueSerial &queueSerial) const
{
return queueSerial <= mLastCompletedSerials;
}
// The ResourceUse still have queue serial not yet submitted to vulkan.
bool hasResourceUseSubmitted(const ResourceUse &use) const
{
return use <= mLastSubmittedSerials;
}
bool hasQueueSerialSubmitted(const QueueSerial &queueSerial) const
{
return queueSerial <= mLastSubmittedSerials;
}
// Wait until the desired serial has been completed.
angle::Result finishResourceUse(Context *context, const ResourceUse &use, uint64_t timeout);
angle::Result finishQueueSerial(Context *context,
const QueueSerial &queueSerial,
uint64_t timeout);
angle::Result waitIdle(Context *context, uint64_t timeout);
angle::Result waitForResourceUseToFinishWithUserTimeout(Context *context,
const ResourceUse &use,
uint64_t timeout,
VkResult *result);
bool isBusy(Renderer *renderer) const;
angle::Result submitCommands(Context *context,
ProtectionType protectionType,
egl::ContextPriority priority,
VkSemaphore signalSemaphore,
SharedExternalFence &&externalFence,
const QueueSerial &submitQueueSerial);
angle::Result queueSubmitOneOff(Context *context,
ProtectionType protectionType,
egl::ContextPriority contextPriority,
VkCommandBuffer commandBufferHandle,
VkSemaphore waitSemaphore,
VkPipelineStageFlags waitSemaphoreStageMask,
const QueueSerial &submitQueueSerial);
// Note: Some errors from present are not fatal.
VkResult queuePresent(egl::ContextPriority contextPriority,
const VkPresentInfoKHR &presentInfo);
angle::Result checkCompletedCommands(Context *context)
{
std::lock_guard<angle::SimpleMutex> lock(mCmdCompleteMutex);
return checkCompletedCommandsLocked(context);
}
bool hasFinishedCommands() const { return !mFinishedCommandBatches.empty(); }
angle::Result checkAndCleanupCompletedCommands(Context *context)
{
ANGLE_TRY(checkCompletedCommands(context));
if (!mFinishedCommandBatches.empty())
{
ANGLE_TRY(releaseFinishedCommandsAndCleanupGarbage(context));
}
return angle::Result::Continue;
}
ANGLE_INLINE void flushWaitSemaphores(
ProtectionType protectionType,
egl::ContextPriority priority,
std::vector<VkSemaphore> &&waitSemaphores,
std::vector<VkPipelineStageFlags> &&waitSemaphoreStageMasks)
{
return mCommandPoolAccess.flushWaitSemaphores(protectionType, priority,
std::move(waitSemaphores),
std::move(waitSemaphoreStageMasks));
}
ANGLE_INLINE angle::Result flushOutsideRPCommands(
Context *context,
ProtectionType protectionType,
egl::ContextPriority priority,
OutsideRenderPassCommandBufferHelper **outsideRPCommands)
{
return mCommandPoolAccess.flushOutsideRPCommands(context, protectionType, priority,
outsideRPCommands);
}
ANGLE_INLINE angle::Result flushRenderPassCommands(
Context *context,
ProtectionType protectionType,
const egl::ContextPriority &priority,
const RenderPass &renderPass,
VkFramebuffer framebufferOverride,
RenderPassCommandBufferHelper **renderPassCommands)
{
return mCommandPoolAccess.flushRenderPassCommands(
context, protectionType, priority, renderPass, framebufferOverride, renderPassCommands);
}
const angle::VulkanPerfCounters getPerfCounters() const;
void resetPerFramePerfCounters();
// Release finished commands and clean up garbage immediately, or request async clean up if
// enabled.
angle::Result releaseFinishedCommandsAndCleanupGarbage(Context *context);
angle::Result releaseFinishedCommands(Context *context)
{
std::lock_guard<angle::SimpleMutex> lock(mCmdReleaseMutex);
return releaseFinishedCommandsLocked(context);
}
angle::Result postSubmitCheck(Context *context);
// Try to cleanup garbage and return if something was cleaned. Otherwise, wait for the
// mInFlightCommands and retry.
angle::Result cleanupSomeGarbage(Context *context,
size_t minInFlightBatchesToKeep,
bool *anyGarbageCleanedOut);
// All these private APIs are called with mutex locked, so we must not take lock again.
private:
// Check the first command buffer in mInFlightCommands and update mLastCompletedSerials if
// finished
angle::Result checkOneCommandBatchLocked(Context *context, bool *finished);
// Similar to checkOneCommandBatch, except we will wait for it to finish
angle::Result finishOneCommandBatchLocked(Context *context, uint64_t timeout);
void onCommandBatchFinishedLocked(CommandBatch &&batch);
// Walk mFinishedCommands, reset and recycle all command buffers.
angle::Result releaseFinishedCommandsLocked(Context *context);
// Walk mInFlightCommands, check and update mLastCompletedSerials for all commands that are
// finished
angle::Result checkCompletedCommandsLocked(Context *context);
angle::Result queueSubmitLocked(Context *context,
egl::ContextPriority contextPriority,
const VkSubmitInfo &submitInfo,
DeviceScoped<CommandBatch> &commandBatch,
const QueueSerial &submitQueueSerial);
void pushInFlightBatchLocked(CommandBatch &&batch);
void moveInFlightBatchToFinishedQueueLocked(CommandBatch &&batch);
void popFinishedBatchLocked();
void popInFlightBatchLocked();
CommandPoolAccess mCommandPoolAccess;
// Warning: Mutexes must be locked in the order as declared below.
// Protect multi-thread access to mInFlightCommands.push/back and ensure ordering of submission.
// Also protects mPerfCounters.
mutable angle::SimpleMutex mQueueSubmitMutex;
// Protect multi-thread access to mInFlightCommands.pop/front and
// mFinishedCommandBatches.push/back.
angle::SimpleMutex mCmdCompleteMutex;
// Protect multi-thread access to mFinishedCommandBatches.pop/front.
angle::SimpleMutex mCmdReleaseMutex;
CommandBatchQueue mInFlightCommands;
// Temporary storage for finished command batches that should be reset.
CommandBatchQueue mFinishedCommandBatches;
// Combined number of batches in mInFlightCommands and mFinishedCommandBatches queues.
// Used instead of calculating the sum because doing this is not thread safe and will require
// the mCmdCompleteMutex lock.
std::atomic_size_t mNumAllCommands;
// Queue serial management.
AtomicQueueSerialFixedArray mLastSubmittedSerials;
// This queue serial can be read/write from different threads, so we need to use atomic
// operations to access the underlying value. Since we only do load/store on this value, it
// should be just a normal uint64_t load/store on most platforms.
AtomicQueueSerialFixedArray mLastCompletedSerials;
// QueueMap
DeviceQueueMap mQueueMap;
FenceRecycler mFenceRecycler;
angle::VulkanPerfCounters mPerfCounters;
};
// A helper thread used to clean up garbage
class CleanUpThread : public Context
{
public:
CleanUpThread(Renderer *renderer, CommandQueue *commandQueue);
~CleanUpThread() override;
// Context
void handleError(VkResult result,
const char *file,
const char *function,
unsigned int line) override;
angle::Result init();
void destroy(Context *context);
void requestCleanUp();
std::thread::id getThreadId() const { return mTaskThread.get_id(); }
private:
bool hasPendingError() const
{
std::lock_guard<angle::SimpleMutex> queueLock(mErrorMutex);
return !mErrors.empty();
}
angle::Result checkAndPopPendingError(Context *errorHandlingContext);
// Entry point for clean up thread, calls processTasksImpl to do the
// work. called by Renderer::initializeDevice on main thread
void processTasks();
// Clean up thread, called by processTasks. The loop waits for work to
// be submitted from a separate thread.
angle::Result processTasksImpl(bool *exitThread);
CommandQueue *const mCommandQueue;
mutable angle::SimpleMutex mErrorMutex;
std::queue<Error> mErrors;
// Command queue worker thread.
std::thread mTaskThread;
bool mTaskThreadShouldExit;
std::mutex mMutex;
std::condition_variable mWorkAvailableCondition;
std::atomic<bool> mNeedCleanUp;
};
} // namespace vk
} // namespace rx
#endif // LIBANGLE_RENDERER_VULKAN_COMMAND_QUEUE_H_