Mesa (main): turnip: reduce maxComputeWorkGroupSize

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: ea7a42775bd6e4d02d5e7c99c03ed5b08da98b1b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ea7a42775bd6e4d02d5e7c99c03ed5b08da98b1b

Author: Danylo Piliaiev <dpiliaiev at igalia.com>
Date:   Thu Mar  4 16:33:54 2021 +0200

turnip: reduce maxComputeWorkGroupSize

Blob advertises { 1024, 1024, 64 }, but from tests they all
could be 1024.

Fixes tests:
 dEQP-VK.compute.basic.max_local_size_x
 dEQP-VK.compute.basic.max_local_size_y
 dEQP-VK.compute.basic.max_local_size_z

Signed-off-by: Danylo Piliaiev <dpiliaiev at igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9409>

---

 src/freedreno/ci/deqp-freedreno-a630-fails.txt | 4 ----
 src/freedreno/vulkan/tu_device.c               | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/freedreno/ci/deqp-freedreno-a630-fails.txt b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
index 0de08181475..3e5da282176 100644
--- a/src/freedreno/ci/deqp-freedreno-a630-fails.txt
+++ b/src/freedreno/ci/deqp-freedreno-a630-fails.txt
@@ -13,10 +13,6 @@ KHR-GL33.transform_feedback.query_vertex_separate_test,Fail
 # likely-looking fixes in later versions of the loader.
 dEQP-VK.api.device_init.create_instance_device_intentional_alloc_fail,Fail
 
-# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9409
-dEQP-VK.compute.basic.max_local_size_x,Crash
-dEQP-VK.compute.basic.max_local_size_y,Crash
-
 # https://gitlab.khronos.org/Tracker/vk-gl-cts/-/issues/3019
 # should be fixed by https://gerrit.khronos.org/c/vk-gl-cts/+/7745
 dEQP-VK.renderpass.dedicated_allocation.attachment_allocation.input_output.7,Fail
diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index 9b42f41de8b..4d8a2115866 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -824,7 +824,7 @@ tu_GetPhysicalDeviceProperties2(VkPhysicalDevice physicalDevice,
       .maxComputeSharedMemorySize = 32768,
       .maxComputeWorkGroupCount = { 65535, 65535, 65535 },
       .maxComputeWorkGroupInvocations = 2048,
-      .maxComputeWorkGroupSize = { 2048, 2048, 2048 },
+      .maxComputeWorkGroupSize = { 1024, 1024, 1024 },
       .subPixelPrecisionBits = 8,
       .subTexelPrecisionBits = 8,
       .mipmapPrecisionBits = 8,