[Mesa-dev] [PATCH v4 077/129] st, ir3, radeonsi: push lower_deref_instrs back into driver

[Jason Ekstrand]

From: Rob Clark <robdclark at gmail.com>

vc4+vc5 is not really effected by the deref chain to deref instr
conversion, so it no longer needs this pass.  For others, now that
all the passes mesa/st uses are using deref instructions, push the
lowering to deref chains back into driver.

Signed-off-by: Rob Clark <robdclark at gmail.com>
---
 src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c | 2 ++
 src/gallium/drivers/freedreno/ir3/ir3_nir.c          | 4 +---
 src/gallium/drivers/radeonsi/si_compute.c            | 2 ++
 src/gallium/drivers/v3d/v3d_program.c                | 1 -
 src/gallium/drivers/vc4/vc4_program.c                | 1 -
 src/mesa/state_tracker/st_glsl_to_nir.cpp            | 2 --
 6 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
index 356d1bc..1489241 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
@@ -190,6 +190,8 @@ compile_init(struct ir3_compiler *compiler,
 		ctx->s = so->shader->nir;
 	}
 
+	NIR_PASS_V(ctx->s, nir_lower_deref_instrs, ~0);
+
 	/* this needs to be the last pass run, so do this here instead of
 	 * in ir3_optimize_nir():
 	 */
diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
index 91d6d34..da434bf 100644
--- a/src/gallium/drivers/freedreno/ir3/ir3_nir.c
+++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.c
@@ -56,9 +56,7 @@ static const nir_shader_compiler_options options = {
 struct nir_shader *
 ir3_tgsi_to_nir(const struct tgsi_token *tokens)
 {
-	struct nir_shader *shader = tgsi_to_nir(tokens, &options);
-	NIR_PASS_V(shader, nir_lower_deref_instrs, ~0);
-	return shader;
+	return tgsi_to_nir(tokens, &options);
 }
 
 const nir_shader_compiler_options *
diff --git a/src/gallium/drivers/radeonsi/si_compute.c b/src/gallium/drivers/radeonsi/si_compute.c
index e20bae0..a27e628 100644
--- a/src/gallium/drivers/radeonsi/si_compute.c
+++ b/src/gallium/drivers/radeonsi/si_compute.c
@@ -105,6 +105,8 @@ static void si_create_compute_state_async(void *job, int thread_index)
 		assert(program->ir_type == PIPE_SHADER_IR_NIR);
 		sel.nir = program->ir.nir;
 
+		NIR_PASS_V(sel.nir, nir_lower_deref_instrs, ~0);
+
 		si_nir_scan_shader(sel.nir, &sel.info);
 		si_lower_nir(&sel);
 	}
diff --git a/src/gallium/drivers/v3d/v3d_program.c b/src/gallium/drivers/v3d/v3d_program.c
index 5ebb665..036f7c6 100644
--- a/src/gallium/drivers/v3d/v3d_program.c
+++ b/src/gallium/drivers/v3d/v3d_program.c
@@ -207,7 +207,6 @@ v3d_shader_state_create(struct pipe_context *pctx,
                         fprintf(stderr, "\n");
                 }
                 s = tgsi_to_nir(cso->tokens, &v3d_nir_options);
-                NIR_PASS_V(s, nir_lower_deref_instrs, ~0);
 
                 so->was_tgsi = true;
         }
diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index e4ad329..3676131 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -2480,7 +2480,6 @@ vc4_shader_state_create(struct pipe_context *pctx,
                         fprintf(stderr, "\n");
                 }
                 s = tgsi_to_nir(cso->tokens, &nir_options);
-                NIR_PASS_V(s, nir_lower_deref_instrs, ~0);
         }
 
         NIR_PASS_V(s, nir_opt_global_to_local);
diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp
index a8df884..de906e6 100644
--- a/src/mesa/state_tracker/st_glsl_to_nir.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp
@@ -817,8 +817,6 @@ st_finalize_nir(struct st_context *st, struct gl_program *prog,
       NIR_PASS_V(nir, gl_nir_lower_samplers_as_deref, shader_program);
    else
       NIR_PASS_V(nir, gl_nir_lower_samplers, shader_program);
-
-   NIR_PASS_V(nir, nir_lower_deref_instrs, (nir_lower_deref_flags)~0);
 }
 
 } /* extern "C" */
-- 
2.5.0.400.gff86faf