OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vulkan/overlay: add queue present timing measurement

Browse Source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
This commit is contained in:
Lionel Landwerlin
2019-07-08 16:03:14 +03:00
parent f7f08b2d81
commit b3a96e69ac
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/vulkan/overlay-layer/overlay.cpp
View File

@@ -545,6 +545,7 @@ static const char *param_unit(enum overlay_param_enabled param)
switch (param) { switch (param) {
case OVERLAY_PARAM_ENABLED_frame_timing: case OVERLAY_PARAM_ENABLED_frame_timing:
case OVERLAY_PARAM_ENABLED_acquire_timing: case OVERLAY_PARAM_ENABLED_acquire_timing:
case OVERLAY_PARAM_ENABLED_present_timing:
return "(us)"; return "(us)";
case OVERLAY_PARAM_ENABLED_gpu_timing: case OVERLAY_PARAM_ENABLED_gpu_timing:
return "(ns)"; return "(ns)";
@@ -733,6 +734,7 @@ static void compute_swapchain_display(struct swapchain_data *data)
if (s == OVERLAY_PARAM_ENABLED_frame_timing || if (s == OVERLAY_PARAM_ENABLED_frame_timing ||
s == OVERLAY_PARAM_ENABLED_acquire_timing || s == OVERLAY_PARAM_ENABLED_acquire_timing ||
s == OVERLAY_PARAM_ENABLED_present_timing ||
s == OVERLAY_PARAM_ENABLED_gpu_timing) { s == OVERLAY_PARAM_ENABLED_gpu_timing) {
double min_time = data->stats_min.stats[s] / data->time_dividor; double min_time = data->stats_min.stats[s] / data->time_dividor;
double max_time = data->stats_max.stats[s] / data->time_dividor; double max_time = data->stats_max.stats[s] / data->time_dividor;
@@ -1633,8 +1635,16 @@ static VkResult overlay_QueuePresentKHR(
pPresentInfo->pWaitSemaphores, pPresentInfo->pWaitSemaphores,
pPresentInfo->waitSemaphoreCount, pPresentInfo->waitSemaphoreCount,
pPresentInfo->pImageIndices[i]); pPresentInfo->pImageIndices[i]);
VkPresentInfoKHR present_info = *pPresentInfo;
present_info.swapchainCount = 1;
present_info.pSwapchains = &swapchain;
uint64_t ts0 = os_time_get();
result = queue_data->device->vtable.QueuePresentKHR(queue, &present_info);
uint64_t ts1 = os_time_get();
swapchain_data->frame_stats.stats[OVERLAY_PARAM_ENABLED_present_timing] += ts1 - ts0;
} }
result = queue_data->device->vtable.QueuePresentKHR(queue, pPresentInfo);
} else { } else {
for (uint32_t i = 0; i < pPresentInfo->swapchainCount; i++) { for (uint32_t i = 0; i < pPresentInfo->swapchainCount; i++) {
VkSwapchainKHR swapchain = pPresentInfo->pSwapchains[i]; VkSwapchainKHR swapchain = pPresentInfo->pSwapchains[i];
@@ -1658,7 +1668,10 @@ static VkResult overlay_QueuePresentKHR(
present_info.pWaitSemaphores = &draw->semaphore; present_info.pWaitSemaphores = &draw->semaphore;
present_info.waitSemaphoreCount = 1; present_info.waitSemaphoreCount = 1;
uint64_t ts0 = os_time_get();
VkResult chain_result = queue_data->device->vtable.QueuePresentKHR(queue, &present_info); VkResult chain_result = queue_data->device->vtable.QueuePresentKHR(queue, &present_info);
uint64_t ts1 = os_time_get();
swapchain_data->frame_stats.stats[OVERLAY_PARAM_ENABLED_present_timing] += ts1 - ts0;
if (pPresentInfo->pResults) if (pPresentInfo->pResults)
pPresentInfo->pResults[i] = chain_result; pPresentInfo->pResults[i] = chain_result;
if (chain_result != VK_SUCCESS && result == VK_SUCCESS) if (chain_result != VK_SUCCESS && result == VK_SUCCESS)

1
src/vulkan/overlay-layer/overlay_params.h
View File

@@ -50,6 +50,7 @@ extern "C" {
OVERLAY_PARAM_BOOL(pipeline_raytracing) \ OVERLAY_PARAM_BOOL(pipeline_raytracing) \
OVERLAY_PARAM_BOOL(acquire) \ OVERLAY_PARAM_BOOL(acquire) \
OVERLAY_PARAM_BOOL(acquire_timing) \ OVERLAY_PARAM_BOOL(acquire_timing) \
OVERLAY_PARAM_BOOL(present_timing) \
OVERLAY_PARAM_BOOL(vertices) \ OVERLAY_PARAM_BOOL(vertices) \
OVERLAY_PARAM_BOOL(primitives) \ OVERLAY_PARAM_BOOL(primitives) \
OVERLAY_PARAM_BOOL(vert_invocations) \ OVERLAY_PARAM_BOOL(vert_invocations) \