Mesa (master): anv: add hooks to call INTEL_MEASURE
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Feb 2 01:34:43 UTC 2021
Module: Mesa
Branch: master
Commit: cec1a9bbb92cc47dfb73771234002c1302e42e90
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=cec1a9bbb92cc47dfb73771234002c1302e42e90
Author: Mark Janes <markjanes at swizzler.org>
Date: Tue Jan 5 19:34:51 2021 -0800
anv: add hooks to call INTEL_MEASURE
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Acked-by: Kenneth Graunke <kenneth at whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7354>
---
src/intel/vulkan/anv_cmd_buffer.c | 6 ++++++
src/intel/vulkan/anv_device.c | 8 ++++++--
src/intel/vulkan/anv_queue.c | 2 ++
src/intel/vulkan/anv_wsi.c | 2 ++
src/intel/vulkan/genX_blorp_exec.c | 9 ++++++++-
src/intel/vulkan/genX_cmd_buffer.c | 39 ++++++++++++++++++++++++++++++++++++++
6 files changed, 63 insertions(+), 3 deletions(-)
diff --git a/src/intel/vulkan/anv_cmd_buffer.c b/src/intel/vulkan/anv_cmd_buffer.c
index 0c2a9d03837..01ab6bbc47c 100644
--- a/src/intel/vulkan/anv_cmd_buffer.c
+++ b/src/intel/vulkan/anv_cmd_buffer.c
@@ -28,6 +28,7 @@
#include <fcntl.h>
#include "anv_private.h"
+#include "anv_measure.h"
#include "vk_format_info.h"
#include "vk_util.h"
@@ -282,6 +283,8 @@ static VkResult anv_create_cmd_buffer(
list_addtail(&cmd_buffer->pool_link, &pool->cmd_buffers);
+ anv_measure_init(cmd_buffer);
+
*pCommandBuffer = anv_cmd_buffer_to_handle(cmd_buffer);
return VK_SUCCESS;
@@ -323,6 +326,8 @@ VkResult anv_AllocateCommandBuffers(
static void
anv_cmd_buffer_destroy(struct anv_cmd_buffer *cmd_buffer)
{
+ anv_measure_destroy(cmd_buffer);
+
list_del(&cmd_buffer->pool_link);
anv_cmd_buffer_fini_batch_bo_chain(cmd_buffer);
@@ -373,6 +378,7 @@ anv_cmd_buffer_reset(struct anv_cmd_buffer *cmd_buffer)
anv_state_stream_init(&cmd_buffer->general_state_stream,
&cmd_buffer->device->general_state_pool, 16384);
+ anv_measure_reset(cmd_buffer);
return VK_SUCCESS;
}
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index bb8513b82ab..0332471f56f 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -32,6 +32,7 @@
#include <xf86drm.h>
#include "anv_private.h"
+#include "anv_measure.h"
#include "util/debug.h"
#include "util/build_id.h"
#include "util/disk_cache.h"
@@ -377,8 +378,8 @@ anv_physical_device_try_create(struct anv_instance *instance,
}
struct anv_physical_device *device =
- vk_alloc(&instance->vk.alloc, sizeof(*device), 8,
- VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
+ vk_zalloc(&instance->vk.alloc, sizeof(*device), 8,
+ VK_SYSTEM_ALLOCATION_SCOPE_INSTANCE);
if (device == NULL) {
result = vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
goto fail_fd;
@@ -604,6 +605,8 @@ anv_physical_device_try_create(struct anv_instance *instance,
device->perf = anv_get_perf(&device->info, fd);
+ anv_measure_device_init(device);
+
anv_physical_device_get_supported_extensions(device,
&device->vk.supported_extensions);
@@ -634,6 +637,7 @@ static void
anv_physical_device_destroy(struct anv_physical_device *device)
{
anv_finish_wsi(device);
+ anv_measure_device_destroy(device);
free(device->engine_info);
anv_physical_device_free_disk_cache(device);
ralloc_free(device->compiler);
diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c
index c378cccd614..24a8c27b98d 100644
--- a/src/intel/vulkan/anv_queue.c
+++ b/src/intel/vulkan/anv_queue.c
@@ -32,6 +32,7 @@
#include "util/os_file.h"
#include "anv_private.h"
+#include "anv_measure.h"
#include "vk_util.h"
#include "genxml/gen7_pack.h"
@@ -1269,6 +1270,7 @@ VkResult anv_QueueSubmit(
pSubmits[i].pCommandBuffers[j]);
assert(cmd_buffer->level == VK_COMMAND_BUFFER_LEVEL_PRIMARY);
assert(!anv_batch_has_error(&cmd_buffer->batch));
+ anv_measure_submit(cmd_buffer);
/* Fence for this execbuf. NULL for all but the last one */
VkFence execbuf_fence =
diff --git a/src/intel/vulkan/anv_wsi.c b/src/intel/vulkan/anv_wsi.c
index eb229d4031b..39d2e5b0038 100644
--- a/src/intel/vulkan/anv_wsi.c
+++ b/src/intel/vulkan/anv_wsi.c
@@ -22,6 +22,7 @@
*/
#include "anv_private.h"
+#include "anv_measure.h"
#include "wsi_common.h"
#include "vk_format_info.h"
#include "vk_util.h"
@@ -280,6 +281,7 @@ VkResult anv_AcquireNextImage2KHR(
{
ANV_FROM_HANDLE(anv_device, device, _device);
+ anv_measure_acquire(device);
return wsi_common_acquire_next_image2(&device->physical->wsi_device,
_device, pAcquireInfo, pImageIndex);
}
diff --git a/src/intel/vulkan/genX_blorp_exec.c b/src/intel/vulkan/genX_blorp_exec.c
index 66dc0485eff..396e0c9b65b 100644
--- a/src/intel/vulkan/genX_blorp_exec.c
+++ b/src/intel/vulkan/genX_blorp_exec.c
@@ -24,6 +24,7 @@
#include <assert.h>
#include "anv_private.h"
+#include "anv_measure.h"
/* These are defined in anv_private.h and blorp_genX_exec.h */
#undef __gen_address_type
@@ -34,7 +35,13 @@
#include "blorp/blorp_genX_exec.h"
static void blorp_measure_start(struct blorp_batch *_batch,
- const struct blorp_params *params) { }
+ const struct blorp_params *params)
+{
+ struct anv_cmd_buffer *cmd_buffer = _batch->driver_batch;
+ anv_measure_snapshot(cmd_buffer,
+ params->snapshot_type,
+ NULL, 0);
+}
static void *
blorp_emit_dwords(struct blorp_batch *batch, unsigned n)
diff --git a/src/intel/vulkan/genX_cmd_buffer.c b/src/intel/vulkan/genX_cmd_buffer.c
index 02054a2cda1..f9cdb96977e 100644
--- a/src/intel/vulkan/genX_cmd_buffer.c
+++ b/src/intel/vulkan/genX_cmd_buffer.c
@@ -25,6 +25,7 @@
#include <stdbool.h>
#include "anv_private.h"
+#include "anv_measure.h"
#include "vk_format_info.h"
#include "vk_util.h"
#include "util/fast_idiv_by_const.h"
@@ -1767,6 +1768,8 @@ genX(EndCommandBuffer)(
if (anv_batch_has_error(&cmd_buffer->batch))
return cmd_buffer->batch.status;
+ anv_measure_endcommandbuffer(cmd_buffer);
+
/* We want every command buffer to start with the PMA fix in a known state,
* so we disable it at the end of the command buffer.
*/
@@ -3777,6 +3780,14 @@ void genX(CmdDraw)(
if (anv_batch_has_error(&cmd_buffer->batch))
return;
+ const uint32_t count = (vertexCount *
+ instanceCount *
+ (pipeline->use_primitive_replication ?
+ 1 : anv_subpass_view_count(cmd_buffer->state.subpass)));
+ anv_measure_snapshot(cmd_buffer,
+ INTEL_SNAPSHOT_DRAW,
+ "draw", count);
+
genX(cmd_buffer_flush_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled)
@@ -3828,6 +3839,15 @@ void genX(CmdDrawIndexed)(
if (anv_batch_has_error(&cmd_buffer->batch))
return;
+ const uint32_t count = (indexCount *
+ instanceCount *
+ (pipeline->use_primitive_replication ?
+ 1 : anv_subpass_view_count(cmd_buffer->state.subpass)));
+ anv_measure_snapshot(cmd_buffer,
+ INTEL_SNAPSHOT_DRAW,
+ "draw indexed",
+ count);
+
genX(cmd_buffer_flush_state)(cmd_buffer);
if (cmd_buffer->state.conditional_render_enabled)
@@ -3893,6 +3913,11 @@ void genX(CmdDrawIndirectByteCountEXT)(
if (anv_batch_has_error(&cmd_buffer->batch))
return;
+ anv_measure_snapshot(cmd_buffer,
+ INTEL_SNAPSHOT_DRAW,
+ "draw indirect byte count",
+ instanceCount);
+
genX(cmd_buffer_flush_state)(cmd_buffer);
if (vs_prog_data->uses_firstvertex ||
@@ -4658,6 +4683,13 @@ void genX(CmdDispatchBase)(
if (anv_batch_has_error(&cmd_buffer->batch))
return;
+ anv_measure_snapshot(cmd_buffer,
+ INTEL_SNAPSHOT_COMPUTE,
+ "compute",
+ groupCountX * groupCountY * groupCountZ *
+ prog_data->local_size[0] * prog_data->local_size[1] *
+ prog_data->local_size[2]);
+
if (prog_data->uses_num_work_groups) {
struct anv_state state =
anv_cmd_buffer_alloc_dynamic_state(cmd_buffer, 12, 4);
@@ -4710,6 +4742,11 @@ void genX(CmdDispatchIndirect)(
return;
#endif
+ anv_measure_snapshot(cmd_buffer,
+ INTEL_SNAPSHOT_COMPUTE,
+ "compute indirect",
+ 0);
+
if (prog_data->uses_num_work_groups) {
cmd_buffer->state.compute.num_workgroups = addr;
@@ -6085,6 +6122,8 @@ void genX(CmdBeginRenderPass)(
cmd_buffer->state.pass = pass;
cmd_buffer->state.render_area = pRenderPassBegin->renderArea;
+ anv_measure_beginrenderpass(cmd_buffer);
+
result = genX(cmd_buffer_setup_attachments)(cmd_buffer, pass,
framebuffer,
pRenderPassBegin);
More information about the mesa-commit
mailing list