From 49e4248a93a790a40618542b4081f8a54183b27a Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 7 Sep 2017 13:42:17 +1000 Subject: [PATCH] i965/nir: export nir_optimize Reviewed-by: Kenneth Graunke Reviewed-by: Eduardo Lima Mitev --- src/intel/compiler/brw_nir.c | 14 +++++++------- src/intel/compiler/brw_nir.h | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/intel/compiler/brw_nir.c b/src/intel/compiler/brw_nir.c index ce21c016699..a04f4af7b08 100644 --- a/src/intel/compiler/brw_nir.c +++ b/src/intel/compiler/brw_nir.c @@ -521,9 +521,9 @@ brw_nir_lower_cs_shared(nir_shader *nir) this_progress; \ }) -static nir_shader * -nir_optimize(nir_shader *nir, const struct brw_compiler *compiler, - bool is_scalar) +nir_shader * +brw_nir_optimize(nir_shader *nir, const struct brw_compiler *compiler, + bool is_scalar) { nir_variable_mode indirect_mask = 0; if (compiler->glsl_compiler_options[nir->stage].EmitNoIndirectInput) @@ -626,7 +626,7 @@ brw_preprocess_nir(const struct brw_compiler *compiler, nir_shader *nir) OPT(nir_split_var_copies); - nir = nir_optimize(nir, compiler, is_scalar); + nir = brw_nir_optimize(nir, compiler, is_scalar); if (is_scalar) { OPT(nir_lower_load_const_to_scalar); @@ -652,7 +652,7 @@ brw_preprocess_nir(const struct brw_compiler *compiler, nir_shader *nir) nir_lower_divmod64); /* Get rid of split copies */ - nir = nir_optimize(nir, compiler, is_scalar); + nir = brw_nir_optimize(nir, compiler, is_scalar); OPT(nir_remove_dead_variables, nir_var_local); @@ -682,7 +682,7 @@ brw_postprocess_nir(nir_shader *nir, const struct brw_compiler *compiler, OPT(nir_opt_algebraic_before_ffma); } while (progress); - nir = nir_optimize(nir, compiler, is_scalar); + nir = brw_nir_optimize(nir, compiler, is_scalar); if (devinfo->gen >= 6) { /* Try and fuse multiply-adds */ @@ -776,7 +776,7 @@ brw_nir_apply_sampler_key(nir_shader *nir, if (nir_lower_tex(nir, &tex_options)) { nir_validate_shader(nir); - nir = nir_optimize(nir, compiler, is_scalar); + nir = brw_nir_optimize(nir, compiler, is_scalar); } return nir; diff --git a/src/intel/compiler/brw_nir.h b/src/intel/compiler/brw_nir.h index 560027c3662..f4b13b18c34 100644 --- a/src/intel/compiler/brw_nir.h +++ b/src/intel/compiler/brw_nir.h @@ -148,6 +148,10 @@ void brw_nir_analyze_ubo_ranges(const struct brw_compiler *compiler, bool brw_nir_opt_peephole_ffma(nir_shader *shader); +nir_shader *brw_nir_optimize(nir_shader *nir, + const struct brw_compiler *compiler, + bool is_scalar); + #define BRW_NIR_FRAG_OUTPUT_INDEX_SHIFT 0 #define BRW_NIR_FRAG_OUTPUT_INDEX_MASK INTEL_MASK(0, 0) #define BRW_NIR_FRAG_OUTPUT_LOCATION_SHIFT 1 -- 2.30.2