intel/nir_lower_printf: modernize nir

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33380>
This commit is contained in:
Alyssa Rosenzweig 2025-02-04 13:06:08 -05:00 committed by Marge Bot
parent 03ff5b2c03
commit 9429d001b9

View file

@ -26,37 +26,30 @@
#include "brw_compiler.h"
static bool
lower_printf_intrinsics(nir_builder *b, nir_instr *instr, void *cb_data)
lower_printf_intrinsics(nir_builder *b, nir_intrinsic_instr *intrin, void *_)
{
if (instr->type != nir_instr_type_intrinsic)
return false;
b->cursor = nir_before_instr(&intrin->instr);
b->cursor = nir_before_instr(instr);
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) {
case nir_intrinsic_load_printf_buffer_address:
nir_def_rewrite_uses(
nir_def_replace(
&intrin->def,
nir_pack_64_2x32_split(
b,
nir_load_reloc_const_intel(b, BRW_SHADER_RELOC_PRINTF_BUFFER_ADDR_LOW),
nir_load_reloc_const_intel(b, BRW_SHADER_RELOC_PRINTF_BUFFER_ADDR_HIGH)));
nir_instr_remove(instr);
return true;
case nir_intrinsic_load_printf_base_identifier:
nir_def_rewrite_uses(
nir_def_replace(
&intrin->def,
nir_load_reloc_const_intel(b, BRW_SHADER_RELOC_PRINTF_BASE_IDENTIFIER));
nir_instr_remove(instr);
return true;
case nir_intrinsic_load_printf_buffer_size:
nir_def_rewrite_uses(
nir_def_replace(
&intrin->def,
nir_load_reloc_const_intel(b, BRW_SHADER_RELOC_PRINTF_BUFFER_SIZE));
nir_instr_remove(instr);
return true;
default:
@ -67,7 +60,6 @@ lower_printf_intrinsics(nir_builder *b, nir_instr *instr, void *cb_data)
bool
intel_nir_lower_printf(nir_shader *nir)
{
return nir_shader_instructions_pass(nir, lower_printf_intrinsics,
nir_metadata_control_flow,
NULL);
return nir_shader_intrinsics_pass(nir, lower_printf_intrinsics,
nir_metadata_control_flow, NULL);
}