-
Notifications
You must be signed in to change notification settings - Fork 2.2k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Vulkan: Implement basic integrated GPU profiling. #12262
Changes from 1 commit
653afeb
19a4438
78e849b
5fcac1a
06a71fd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,8 @@ | ||
#include <algorithm> | ||
#include <cstdint> | ||
|
||
#include <sstream> | ||
|
||
#include "Common/Log.h" | ||
#include "base/logging.h" | ||
|
||
|
@@ -131,6 +133,11 @@ VulkanRenderManager::VulkanRenderManager(VulkanContext *vulkan) : vulkan_(vulkan | |
res = vkAllocateCommandBuffers(vulkan_->GetDevice(), &cmd_alloc, &frameData_[i].mainCmd); | ||
assert(res == VK_SUCCESS); | ||
frameData_[i].fence = vulkan_->CreateFence(true); // So it can be instantly waited on | ||
|
||
VkQueryPoolCreateInfo query_ci{ VK_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO }; | ||
query_ci.queryCount = MAX_TIMESTAMP_QUERIES; | ||
query_ci.queryType = VK_QUERY_TYPE_TIMESTAMP; | ||
res = vkCreateQueryPool(vulkan_->GetDevice(), &query_ci, nullptr, &frameData_[i].timestampQueryPool_); | ||
} | ||
|
||
queueRunner_.CreateDeviceObjects(); | ||
|
@@ -289,6 +296,7 @@ VulkanRenderManager::~VulkanRenderManager() { | |
vkDestroyCommandPool(device, frameData_[i].cmdPoolInit, nullptr); | ||
vkDestroyCommandPool(device, frameData_[i].cmdPoolMain, nullptr); | ||
vkDestroyFence(device, frameData_[i].fence, nullptr); | ||
vkDestroyQueryPool(device, frameData_[i].timestampQueryPool_, nullptr); | ||
} | ||
queueRunner_.DestroyDeviceObjects(); | ||
} | ||
|
@@ -360,6 +368,38 @@ void VulkanRenderManager::BeginFrame() { | |
vkWaitForFences(device, 1, &frameData.fence, true, UINT64_MAX); | ||
vkResetFences(device, 1, &frameData.fence); | ||
|
||
uint64_t queryResults[MAX_TIMESTAMP_QUERIES]; | ||
if (gpuProfilingEnabled_) { | ||
// Pull the profiling results from last time and produce a summary! | ||
if (frameData.numQueries) { | ||
VkResult res = vkGetQueryPoolResults( | ||
vulkan_->GetDevice(), | ||
frameData.timestampQueryPool_, 0, frameData.numQueries, sizeof(uint64_t) * frameData.numQueries, &queryResults[0], sizeof(uint64_t), | ||
VK_QUERY_RESULT_64_BIT); | ||
if (res == VK_SUCCESS) { | ||
double timestampConversionFactor = (double)vulkan_->GetPhysicalDeviceProperties().properties.limits.timestampPeriod * (1.0 / 1000000.0); | ||
uint64_t timestampDiffMask = 0xFFFFFFFFFFFFFFFFULL; // TODO: Get from queue family | ||
std::stringstream str; | ||
|
||
char line[256]; | ||
snprintf(line, sizeof(line), "Total GPU time: %0.3f ms\n", ((double)((queryResults[frameData.numQueries - 1] - queryResults[0]) & timestampDiffMask) * timestampConversionFactor)); | ||
str << line; | ||
for (int i = 0; i < frameData.numQueries - 1; i++) { | ||
uint64_t diff = (queryResults[i + 1] - queryResults[i]) & timestampDiffMask; | ||
double milliseconds = (double)diff * timestampConversionFactor; | ||
snprintf(line, sizeof(line), "%s: %0.3f ms\n", frameData.timestampDescriptions[i + 1].c_str(), milliseconds); | ||
str << line; | ||
} | ||
frameData.profileSummary = str.str(); | ||
} else { | ||
frameData.profileSummary = "(error getting GPU profile - not ready?)"; | ||
} | ||
} | ||
else { | ||
frameData.profileSummary = "(no GPU profile data collected)"; | ||
} | ||
} | ||
|
||
// Must be after the fence - this performs deletes. | ||
VLOG("PUSH: BeginFrame %d", curFrame); | ||
if (!run_) { | ||
|
@@ -368,6 +408,20 @@ void VulkanRenderManager::BeginFrame() { | |
vulkan_->BeginFrame(); | ||
|
||
insideFrame_ = true; | ||
|
||
if (gpuProfilingEnabled_) { | ||
// For various reasons, we need to always use an init cmd buffer in this case to perform the vkCmdResetQueryPool, | ||
// unless we want to limit ourselves to only measure the main cmd buffer. | ||
// Reserve the first two queries for initCmd. | ||
frameData.numQueries = 2; | ||
frameData.timestampDescriptions.push_back("initCmd Begin"); | ||
frameData.timestampDescriptions.push_back("initCmd"); | ||
VkCommandBuffer initCmd = GetInitCmd(); | ||
vkCmdResetQueryPool(initCmd, frameData.timestampQueryPool_, 0, MAX_TIMESTAMP_QUERIES); | ||
vkCmdWriteTimestamp(initCmd, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, frameData.timestampQueryPool_, 0); | ||
} else { | ||
frameData.numQueries = 0; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hm, should we Actually, is there are scenario where we want -[Unknown] There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah definitely, embarrassing mistake. As for the separate variable, I had originally intended a description-less mode for a smaller performance hit but I don't think it's worth the trouble any more. |
||
} | ||
} | ||
|
||
VkCommandBuffer VulkanRenderManager::GetInitCmd() { | ||
|
@@ -884,6 +938,7 @@ void VulkanRenderManager::BeginSubmitFrame(int frame) { | |
VkCommandBufferBeginInfo begin{ VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO }; | ||
begin.flags = VK_COMMAND_BUFFER_USAGE_ONE_TIME_SUBMIT_BIT; | ||
res = vkBeginCommandBuffer(frameData.mainCmd, &begin); | ||
|
||
_assert_msg_(G3D, res == VK_SUCCESS, "vkBeginCommandBuffer failed! result=%s", VulkanResultToString(res)); | ||
|
||
queueRunner_.SetBackbuffer(framebuffers_[frameData.curSwapchainImage], swapchainImages_[frameData.curSwapchainImage].image); | ||
|
@@ -895,10 +950,20 @@ void VulkanRenderManager::BeginSubmitFrame(int frame) { | |
void VulkanRenderManager::Submit(int frame, bool triggerFence) { | ||
FrameData &frameData = frameData_[frame]; | ||
if (frameData.hasInitCommands) { | ||
if (gpuProfilingEnabled_ && triggerFence) { | ||
// Pre-allocated query ID 1. | ||
vkCmdWriteTimestamp(frameData.initCmd, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, frameData.timestampQueryPool_, 1); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hm, ought we check the initCmd timing for subsequent submits in the frame (triggerFence = false)? -[Unknown] There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yeah probably, and we should subtract the time spent between the submits and show that separately. Thought I'd leave that for later. |
||
} | ||
VkResult res = vkEndCommandBuffer(frameData.initCmd); | ||
_assert_msg_(G3D, res == VK_SUCCESS, "vkEndCommandBuffer failed (init)! result=%s", VulkanResultToString(res)); | ||
} | ||
|
||
if (gpuProfilingEnabled_) { | ||
vkCmdWriteTimestamp(frameData.mainCmd, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, frameData.timestampQueryPool_, frameData.numQueries); | ||
frameData.numQueries++; | ||
frameData.timestampDescriptions.push_back("mainCmd"); | ||
} | ||
|
||
VkResult res = vkEndCommandBuffer(frameData.mainCmd); | ||
_assert_msg_(G3D, res == VK_SUCCESS, "vkEndCommandBuffer failed (main)! result=%s", VulkanResultToString(res)); | ||
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Seems like Adreno typically has 48, and PowerVR typically has 0 (unfortunate.)
Technically
The command pool’s queue family must support a non-zero timestampValidBits
is required, so we ought to check for PowerVR, but it seems like we're allowed to call vkCreateQueryPool (I think) even if that's zero. So shame on someone if they enable the ini on PowerVR...-[Unknown]
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, not like we can do something about it anyway other than hide the option. Not gonna do the extra work for such crappy implementations...