Mesa (main): nir: Eliminate store_combined_output_pan BASE

[GitLab Mirror]

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

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Sat Jan  1 10:11:33 2022 -0500

nir: Eliminate store_combined_output_pan BASE

It's meaningless for this intrinsic and is just adding noise to the
lowering pass.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13714>

---

 src/compiler/nir/nir_intrinsics.py     | 2 +-
 src/panfrost/util/pan_lower_writeout.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index ffc1c97bfdf..bae6e1aeed1 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -1149,7 +1149,7 @@ intrinsic("shared_atomic_comp_swap_dxil", src_comp=[1, 1, 1], dest_comp=1)
 
 # src[] = { value }
 store("raw_output_pan", [], [])
-store("combined_output_pan", [1, 1, 1], [BASE, COMPONENT, SRC_TYPE])
+store("combined_output_pan", [1, 1, 1], [COMPONENT, SRC_TYPE])
 load("raw_output_pan", [1], [BASE], [CAN_ELIMINATE, CAN_REORDER])
 
 # Loads the sampler paramaters <min_lod, max_lod, lod_bias>
diff --git a/src/panfrost/util/pan_lower_writeout.c b/src/panfrost/util/pan_lower_writeout.c
index 7c298208515..7fed2c0e89e 100644
--- a/src/panfrost/util/pan_lower_writeout.c
+++ b/src/panfrost/util/pan_lower_writeout.c
@@ -115,7 +115,6 @@ pan_nir_lower_zs_store(nir_shader *nir)
 
                                 combined_store->num_components = intr->src[0].ssa->num_components;
 
-                                nir_intrinsic_set_base(combined_store, nir_intrinsic_base(intr));
                                 nir_intrinsic_set_src_type(combined_store, nir_intrinsic_src_type(intr));
 
                                 unsigned writeout = PAN_WRITEOUT_C;
@@ -167,12 +166,6 @@ pan_nir_lower_zs_store(nir_shader *nir)
 
                         combined_store->num_components = 4;
 
-                        unsigned base;
-                        if (z_store)
-                                base = nir_intrinsic_base(z_store);
-                        else
-                                base = nir_intrinsic_base(s_store);
-                        nir_intrinsic_set_base(combined_store, base);
                         nir_intrinsic_set_src_type(combined_store, nir_type_float32);
 
                         unsigned writeout = 0;