Mesa (main): ir3,tu: Enable subgroup shuffles and relative shuffles

[GitLab Mirror]

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

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Tue Jan  4 15:48:42 2022 +0100

ir3,tu: Enable subgroup shuffles and relative shuffles

We still don't use the fast path for relative shuffles, that's left for
future work.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14412>

---

 src/freedreno/ir3/ir3_nir.c      | 2 ++
 src/freedreno/vulkan/tu_device.c | 4 +++-
 src/freedreno/vulkan/tu_shader.c | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/ir3/ir3_nir.c b/src/freedreno/ir3/ir3_nir.c
index d6c30a2df87..331576db804 100644
--- a/src/freedreno/ir3/ir3_nir.c
+++ b/src/freedreno/ir3/ir3_nir.c
@@ -458,6 +458,8 @@ ir3_nir_post_finalize(struct ir3_shader *shader)
              .lower_vote_eq = true,
              .lower_subgroup_masks = true,
              .lower_read_invocation_to_cond = true,
+             .lower_shuffle = true,
+             .lower_relative_shuffle = true,
           });
    }
 
diff --git a/src/freedreno/vulkan/tu_device.c b/src/freedreno/vulkan/tu_device.c
index d87f6d9fd26..cac9ca4495a 100644
--- a/src/freedreno/vulkan/tu_device.c
+++ b/src/freedreno/vulkan/tu_device.c
@@ -831,7 +831,9 @@ tu_get_physical_device_properties_1_1(struct tu_physical_device *pdevice,
    p->subgroupSupportedStages = VK_SHADER_STAGE_COMPUTE_BIT;
    p->subgroupSupportedOperations = VK_SUBGROUP_FEATURE_BASIC_BIT |
                                     VK_SUBGROUP_FEATURE_VOTE_BIT |
-                                    VK_SUBGROUP_FEATURE_BALLOT_BIT;
+                                    VK_SUBGROUP_FEATURE_BALLOT_BIT |
+                                    VK_SUBGROUP_FEATURE_SHUFFLE_BIT |
+                                    VK_SUBGROUP_FEATURE_SHUFFLE_RELATIVE_BIT;
    if (pdevice->info->a6xx.has_getfiberid) {
       p->subgroupSupportedStages |= VK_SHADER_STAGE_ALL_GRAPHICS;
       p->subgroupSupportedOperations |= VK_SUBGROUP_FEATURE_QUAD_BIT;
diff --git a/src/freedreno/vulkan/tu_shader.c b/src/freedreno/vulkan/tu_shader.c
index b0105ebb0f4..82e94da573f 100644
--- a/src/freedreno/vulkan/tu_shader.c
+++ b/src/freedreno/vulkan/tu_shader.c
@@ -82,6 +82,7 @@ tu_spirv_to_nir(struct tu_device *dev,
          .subgroup_ballot = true,
          .subgroup_vote = true,
          .subgroup_quad = true,
+         .subgroup_shuffle = true,
          .physical_storage_buffer_address = true,
       },
    };