diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build index 8047cab8408..2beaa99979f 100644 --- a/src/compiler/nir/meson.build +++ b/src/compiler/nir/meson.build @@ -149,7 +149,6 @@ else 'nir_lower_atomics_to_ssbo.c', 'nir_lower_bitmap.c', 'nir_lower_blend.c', - 'nir_lower_bool_to_bitsize.c', 'nir_lower_bool_to_float.c', 'nir_lower_bool_to_int32.c', 'nir_lower_calls_to_builtins.c', diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index f0e4a92125c..7c552657292 100644 --- a/src/compiler/nir/nir.h +++ b/src/compiler/nir/nir.h @@ -5734,7 +5734,6 @@ bool nir_scale_fdiv(nir_shader *shader); bool nir_lower_alu_to_scalar(nir_shader *shader, nir_instr_filter_cb cb, const void *data); bool nir_lower_alu_width(nir_shader *shader, nir_vectorize_cb cb, const void *data); bool nir_lower_alu_vec8_16_srcs(nir_shader *shader); -bool nir_lower_bool_to_bitsize(nir_shader *shader); bool nir_lower_bool_to_float(nir_shader *shader, bool has_fcsel_ne); bool nir_lower_bool_to_int32(nir_shader *shader); bool nir_opt_simplify_convert_alu_types(nir_shader *shader); diff --git a/src/panfrost/compiler/bifrost/bifrost_compile.c b/src/panfrost/compiler/bifrost/bifrost_compile.c index c40d390c71a..9cae39e9f5b 100644 --- a/src/panfrost/compiler/bifrost/bifrost_compile.c +++ b/src/panfrost/compiler/bifrost/bifrost_compile.c @@ -5885,7 +5885,7 @@ bi_optimize_nir(nir_shader *nir, unsigned gpu_id, nir_variable_mode robust2_mode if (pan_arch(gpu_id) < 9) NIR_PASS(_, nir, bifrost_nir_opt_boolean_bitwise); - NIR_PASS(_, nir, nir_lower_bool_to_bitsize); + NIR_PASS(_, nir, pan_nir_lower_bool_to_bitsize); NIR_PASS(_, nir, nir_lower_alu_width, bi_vectorize_filter, &gpu_id); NIR_PASS(_, nir, nir_opt_vectorize, bi_vectorize_filter, &gpu_id); diff --git a/src/panfrost/compiler/meson.build b/src/panfrost/compiler/meson.build index a3e21f4a8d9..928ba06dea4 100644 --- a/src/panfrost/compiler/meson.build +++ b/src/panfrost/compiler/meson.build @@ -5,6 +5,7 @@ libpanfrost_compiler_files = files( 'pan_compiler.c', 'pan_compiler.h', 'pan_nir_collect_varyings.c', + 'pan_nir_lower_bool_to_bitsize.c', 'pan_nir_lower_frag_coord_zw.c', 'pan_nir_lower_framebuffer.c', 'pan_nir_lower_fs_outputs.c', diff --git a/src/panfrost/compiler/pan_nir.h b/src/panfrost/compiler/pan_nir.h index eb192c47650..32b7ebbb4c9 100644 --- a/src/panfrost/compiler/pan_nir.h +++ b/src/panfrost/compiler/pan_nir.h @@ -45,6 +45,8 @@ pan_nir_tile_default_coverage(nir_builder *b) return nir_iand_imm(b, nir_load_cumulative_coverage_pan(b), 0x1f); } +bool pan_nir_lower_bool_to_bitsize(nir_shader *shader); + bool pan_nir_lower_store_component(nir_shader *shader); bool pan_nir_lower_vertex_id(nir_shader *shader); diff --git a/src/compiler/nir/nir_lower_bool_to_bitsize.c b/src/panfrost/compiler/pan_nir_lower_bool_to_bitsize.c similarity index 97% rename from src/compiler/nir/nir_lower_bool_to_bitsize.c rename to src/panfrost/compiler/pan_nir_lower_bool_to_bitsize.c index c248229751f..8b8815091e8 100644 --- a/src/compiler/nir/nir_lower_bool_to_bitsize.c +++ b/src/panfrost/compiler/pan_nir_lower_bool_to_bitsize.c @@ -21,7 +21,7 @@ * IN THE SOFTWARE. */ -#include "nir.h" +#include "pan_nir.h" #include "nir_builder.h" static bool @@ -396,9 +396,9 @@ lower_tex_instr(nir_tex_instr *tex) } static bool -nir_lower_bool_to_bitsize_instr(nir_builder *b, - nir_instr *instr, - UNUSED void *cb_data) +lower_bool_to_bitsize_instr(nir_builder *b, + nir_instr *instr, + UNUSED void *cb_data) { switch (instr->type) { case nir_instr_type_alu: @@ -427,9 +427,9 @@ nir_lower_bool_to_bitsize_instr(nir_builder *b, } bool -nir_lower_bool_to_bitsize(nir_shader *shader) +pan_nir_lower_bool_to_bitsize(nir_shader *shader) { - return nir_shader_instructions_pass(shader, nir_lower_bool_to_bitsize_instr, + return nir_shader_instructions_pass(shader, lower_bool_to_bitsize_instr, nir_metadata_control_flow, NULL); }