From 3fed1b4a9e22f3c910ef0d4ac9664c9c5e9b2b41 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Fri, 14 Jul 2023 10:07:36 -0400 Subject: [PATCH] v3dv: Rely on nir_builder setting workgroup size Now the default. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Faith Ekstrand Part-of: --- src/broadcom/vulkan/v3dv_event.c | 8 -------- src/broadcom/vulkan/v3dv_query.c | 15 --------------- 2 files changed, 23 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_event.c b/src/broadcom/vulkan/v3dv_event.c index 9663924..5543888 100644 --- a/src/broadcom/vulkan/v3dv_event.c +++ b/src/broadcom/vulkan/v3dv_event.c @@ -33,10 +33,6 @@ get_set_event_cs() nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, options, "set event cs"); - b.shader->info.workgroup_size[0] = 1; - b.shader->info.workgroup_size[1] = 1; - b.shader->info.workgroup_size[2] = 1; - nir_ssa_def *buf = nir_vulkan_resource_index(&b, 2, 32, nir_imm_int(&b, 0), .desc_set = 0, @@ -62,10 +58,6 @@ get_wait_event_cs() nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, options, "wait event cs"); - b.shader->info.workgroup_size[0] = 1; - b.shader->info.workgroup_size[1] = 1; - b.shader->info.workgroup_size[2] = 1; - nir_ssa_def *buf = nir_vulkan_resource_index(&b, 2, 32, nir_imm_int(&b, 0), .desc_set = 0, diff --git a/src/broadcom/vulkan/v3dv_query.c b/src/broadcom/vulkan/v3dv_query.c index 3284c46..43b6efb 100644 --- a/src/broadcom/vulkan/v3dv_query.c +++ b/src/broadcom/vulkan/v3dv_query.c @@ -1372,11 +1372,6 @@ get_set_query_availability_cs() nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, options, "set query availability cs"); - /* We rely on supergroup packing to maximize SIMD lane occupancy */ - b.shader->info.workgroup_size[0] = 1; - b.shader->info.workgroup_size[1] = 1; - b.shader->info.workgroup_size[2] = 1; - nir_ssa_def *buf = nir_vulkan_resource_index(&b, 2, 32, nir_imm_int(&b, 0), .desc_set = 0, @@ -1441,11 +1436,6 @@ get_reset_occlusion_query_cs() nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, options, "reset occlusion query cs"); - /* We rely on supergroup packing to maximize SIMD lane occupancy */ - b.shader->info.workgroup_size[0] = 1; - b.shader->info.workgroup_size[1] = 1; - b.shader->info.workgroup_size[2] = 1; - nir_ssa_def *buf = nir_vulkan_resource_index(&b, 2, 32, nir_imm_int(&b, 0), .desc_set = 0, @@ -1504,11 +1494,6 @@ get_copy_query_results_cs(VkQueryResultFlags flags) nir_builder b = nir_builder_init_simple_shader(MESA_SHADER_COMPUTE, options, "copy query results cs"); - /* We rely on supergroup packing to maximize SIMD lane occupancy */ - b.shader->info.workgroup_size[0] = 1; - b.shader->info.workgroup_size[1] = 1; - b.shader->info.workgroup_size[2] = 1; - nir_ssa_def *buf = nir_vulkan_resource_index(&b, 2, 32, nir_imm_int(&b, 0), .desc_set = 0, -- 2.7.4