fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-04 17:28:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir,panfrost: Move lower_bool_to_bitsize to panfrost

Browse source 
It's the only driver that uses the pass so it may as well go there.

Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@intel.com>
Reviewed-by: Christoph Pillmayer <christoph.pillmayer@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40307>
This commit is contained in:
Faith Ekstrand 2026-03-09 15:41:28 -04:00 • committed by Marge Bot
parent 3fd471dca5
commit 5de5987678
6 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/compiler/nir/meson.build
View file

@ -149,7 +149,6 @@ else
'nir_lower_atomics_to_ssbo.c', 'nir_lower_atomics_to_ssbo.c',
'nir_lower_bitmap.c', 'nir_lower_bitmap.c',
'nir_lower_blend.c', 'nir_lower_blend.c',
'nir_lower_bool_to_bitsize.c',
'nir_lower_bool_to_float.c', 'nir_lower_bool_to_float.c',
'nir_lower_bool_to_int32.c', 'nir_lower_bool_to_int32.c',
'nir_lower_calls_to_builtins.c', 'nir_lower_calls_to_builtins.c',

1
src/compiler/nir/nir.h
View file

@ -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_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_width(nir_shader *shader, nir_vectorize_cb cb, const void *data);
bool nir_lower_alu_vec8_16_srcs(nir_shader *shader); 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_float(nir_shader *shader, bool has_fcsel_ne);
bool nir_lower_bool_to_int32(nir_shader *shader); bool nir_lower_bool_to_int32(nir_shader *shader);
bool nir_opt_simplify_convert_alu_types(nir_shader *shader); bool nir_opt_simplify_convert_alu_types(nir_shader *shader);

2
src/panfrost/compiler/bifrost/bifrost_compile.c
View file

@ -5885,7 +5885,7 @@ bi_optimize_nir(nir_shader *nir, unsigned gpu_id, nir_variable_mode robust2_mode
if (pan_arch(gpu_id) < 9) if (pan_arch(gpu_id) < 9)
NIR_PASS(_, nir, bifrost_nir_opt_boolean_bitwise); 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_lower_alu_width, bi_vectorize_filter, &gpu_id);
NIR_PASS(_, nir, nir_opt_vectorize, bi_vectorize_filter, &gpu_id); NIR_PASS(_, nir, nir_opt_vectorize, bi_vectorize_filter, &gpu_id);

1
src/panfrost/compiler/meson.build
View file

@ -5,6 +5,7 @@ libpanfrost_compiler_files = files(
'pan_compiler.c', 'pan_compiler.c',
'pan_compiler.h', 'pan_compiler.h',
'pan_nir_collect_varyings.c', 'pan_nir_collect_varyings.c',
'pan_nir_lower_bool_to_bitsize.c',
'pan_nir_lower_frag_coord_zw.c', 'pan_nir_lower_frag_coord_zw.c',
'pan_nir_lower_framebuffer.c', 'pan_nir_lower_framebuffer.c',
'pan_nir_lower_fs_outputs.c', 'pan_nir_lower_fs_outputs.c',

2
src/panfrost/compiler/pan_nir.h
View file

@ -45,6 +45,8 @@ pan_nir_tile_default_coverage(nir_builder *b)
return nir_iand_imm(b, nir_load_cumulative_coverage_pan(b), 0x1f); 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_store_component(nir_shader *shader);
bool pan_nir_lower_vertex_id(nir_shader *shader); bool pan_nir_lower_vertex_id(nir_shader *shader);

12
src/compiler/nir/nir_lower_bool_to_bitsize.c → src/panfrost/compiler/pan_nir_lower_bool_to_bitsize.c
View file

@ -21,7 +21,7 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#include "nir.h" #include "pan_nir.h"
#include "nir_builder.h" #include "nir_builder.h"
static bool static bool
@ -396,9 +396,9 @@ lower_tex_instr(nir_tex_instr *tex)
} }
static bool static bool
nir_lower_bool_to_bitsize_instr(nir_builder *b, lower_bool_to_bitsize_instr(nir_builder *b,
nir_instr *instr, nir_instr *instr,
UNUSED void *cb_data) UNUSED void *cb_data)
{ {
switch (instr->type) { switch (instr->type) {
case nir_instr_type_alu: case nir_instr_type_alu:
@ -427,9 +427,9 @@ nir_lower_bool_to_bitsize_instr(nir_builder *b,
} }
bool 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, nir_metadata_control_flow,
NULL); NULL);
} }