From 1ec9bcd84446c4bb06a1d74a21d72126d7222622 Mon Sep 17 00:00:00 2001 From: Felix DeGrood Date: Wed, 12 Apr 2023 00:11:00 +0000 Subject: [PATCH] anv: disable reset query pools using blorp opt on MTL This optimization causes some MTL tests to run forever. Not yet sure why. Disabling optimization until we have a fix. Reviewed-by: Mark Janes Reviewed-by: Lionel Landwerlin Part-of: (cherry picked from commit 0a52002a1cc8889d4d515a2cf90b7682f22f8273) --- .pick_status.json | 2 +- src/intel/vulkan/genX_query.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index f9bf77f8a32..a20f78bd8ed 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1012,7 +1012,7 @@ "description": "anv: disable reset query pools using blorp opt on MTL", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan/genX_query.c b/src/intel/vulkan/genX_query.c index fdfd1054dcd..21a55d63d01 100644 --- a/src/intel/vulkan/genX_query.c +++ b/src/intel/vulkan/genX_query.c @@ -784,7 +784,10 @@ void genX(CmdResetQueryPool)( ANV_FROM_HANDLE(anv_query_pool, pool, queryPool); struct anv_physical_device *pdevice = cmd_buffer->device->physical; + /* Temporarily disable on MTL until we understand why some tests hang. + */ if (queryCount >= pdevice->instance->query_clear_with_blorp_threshold && + !intel_device_info_is_mtl(cmd_buffer->device->info) && pool->type != VK_QUERY_TYPE_PERFORMANCE_QUERY_KHR) { anv_cmd_buffer_fill_area(cmd_buffer, anv_query_address(pool, firstQuery),