Mesa (master): nir: add sparse_residency_code_and

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 2d2decc905931ef872a9046193d9e01de5377a52
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2d2decc905931ef872a9046193d9e01de5377a52

Author: Rhys Perry <pendingchaos02 at gmail.com>
Date:   Mon Dec  7 13:36:22 2020 +0000

nir: add sparse_residency_code_and

Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7774>

---

 src/compiler/nir/nir_divergence_analysis.c | 3 ++-
 src/compiler/nir/nir_intrinsics.py         | 3 +++
 src/compiler/nir/nir_opt_peephole_select.c | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c
index 63dfa3c8585..c4eb88bf332 100644
--- a/src/compiler/nir/nir_divergence_analysis.c
+++ b/src/compiler/nir/nir_divergence_analysis.c
@@ -295,7 +295,8 @@ visit_intrinsic(nir_shader *shader, nir_intrinsic_instr *instr)
    case nir_intrinsic_atomic_counter_read_deref:
    case nir_intrinsic_quad_swizzle_amd:
    case nir_intrinsic_masked_swizzle_amd:
-   case nir_intrinsic_is_sparse_texels_resident: {
+   case nir_intrinsic_is_sparse_texels_resident:
+   case nir_intrinsic_sparse_residency_code_and: {
       unsigned num_srcs = nir_intrinsic_infos[instr->intrinsic].num_srcs;
       for (unsigned i = 0; i < num_srcs; i++) {
          if (instr->src[i].ssa->divergent) {
diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py
index 0da1de09044..70819dba2b4 100644
--- a/src/compiler/nir/nir_intrinsics.py
+++ b/src/compiler/nir/nir_intrinsics.py
@@ -290,6 +290,9 @@ intrinsic("addr_mode_is", src_comp=[-1], dest_comp=1,
 
 intrinsic("is_sparse_texels_resident", dest_comp=1, src_comp=[1], bit_sizes=[1],
           flags=[CAN_ELIMINATE, CAN_REORDER])
+# result code is resident only if both inputs are resident
+intrinsic("sparse_residency_code_and", dest_comp=1, src_comp=[1, 1], bit_sizes=[32],
+          flags=[CAN_ELIMINATE, CAN_REORDER])
 
 # a barrier is an intrinsic with no inputs/outputs but which can't be moved
 # around/optimized in general
diff --git a/src/compiler/nir/nir_opt_peephole_select.c b/src/compiler/nir/nir_opt_peephole_select.c
index b2a0601c816..5e155c7d458 100644
--- a/src/compiler/nir/nir_opt_peephole_select.c
+++ b/src/compiler/nir/nir_opt_peephole_select.c
@@ -115,6 +115,7 @@ block_check_for_allowed_instrs(nir_block *block, unsigned *count,
          case nir_intrinsic_load_num_subgroups:
          case nir_intrinsic_load_frag_shading_rate:
          case nir_intrinsic_is_sparse_texels_resident:
+         case nir_intrinsic_sparse_residency_code_and:
             if (!alu_ok)
                return false;
             break;