mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-16 14:08:07 +02:00
This converts a lot of trivial passes. Nice boilerplate deletion. Via Coccinelle
patch (with a small manual fix-up for panfrost where coccinelle got confused by
genxml + ninja clang-format squashed in, and for Zink because my semantic patch
was slightly buggy).
@def@
typedef bool;
typedef nir_builder;
typedef nir_instr;
typedef nir_def;
identifier fn, instr, intr, x, builder, data;
@@
static fn(nir_builder* builder,
-nir_instr *instr,
+nir_intrinsic_instr *intr,
...)
{
(
- if (instr->type != nir_instr_type_intrinsic)
- return false;
- nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
|
- nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
- if (instr->type != nir_instr_type_intrinsic)
- return false;
)
<...
(
-instr->x
+intr->instr.x
|
-instr
+&intr->instr
)
...>
}
@pass depends on def@
identifier def.fn;
expression shader, progress;
@@
(
-nir_shader_instructions_pass(shader, fn,
+nir_shader_intrinsics_pass(shader, fn,
...)
|
-NIR_PASS_V(shader, nir_shader_instructions_pass, fn,
+NIR_PASS_V(shader, nir_shader_intrinsics_pass, fn,
...)
|
-NIR_PASS(progress, shader, nir_shader_instructions_pass, fn,
+NIR_PASS(progress, shader, nir_shader_intrinsics_pass, fn,
...)
)
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24852>
130 lines
4.6 KiB
C
130 lines
4.6 KiB
C
/*
|
|
* Copyright © 2021 Valve Corporation
|
|
*
|
|
* SPDX-License-Identifier: MIT
|
|
*/
|
|
|
|
#include "ac_nir.h"
|
|
#include "nir.h"
|
|
#include "nir_builder.h"
|
|
|
|
static nir_def *
|
|
try_extract_additions(nir_builder *b, nir_scalar scalar, uint64_t *out_const,
|
|
nir_def **out_offset)
|
|
{
|
|
if (!nir_scalar_is_alu(scalar) || nir_scalar_alu_op(scalar) != nir_op_iadd)
|
|
return NULL;
|
|
|
|
nir_alu_instr *alu = nir_instr_as_alu(scalar.def->parent_instr);
|
|
nir_scalar src0 = nir_scalar_chase_alu_src(scalar, 0);
|
|
nir_scalar src1 = nir_scalar_chase_alu_src(scalar, 1);
|
|
|
|
for (unsigned i = 0; i < 2; ++i) {
|
|
nir_scalar src = i ? src1 : src0;
|
|
if (nir_scalar_is_const(src)) {
|
|
*out_const += nir_scalar_as_uint(src);
|
|
} else if (nir_scalar_is_alu(src) && nir_scalar_alu_op(src) == nir_op_u2u64) {
|
|
nir_scalar offset_scalar = nir_scalar_chase_alu_src(src, 0);
|
|
nir_def *offset = nir_channel(b, offset_scalar.def, offset_scalar.comp);
|
|
if (*out_offset)
|
|
*out_offset = nir_iadd(b, *out_offset, offset);
|
|
else
|
|
*out_offset = offset;
|
|
} else {
|
|
continue;
|
|
}
|
|
|
|
nir_def *replace_src =
|
|
try_extract_additions(b, i == 1 ? src0 : src1, out_const, out_offset);
|
|
return replace_src ? replace_src : nir_ssa_for_alu_src(b, alu, 1 - i);
|
|
}
|
|
|
|
nir_def *replace_src0 = try_extract_additions(b, src0, out_const, out_offset);
|
|
nir_def *replace_src1 = try_extract_additions(b, src1, out_const, out_offset);
|
|
if (!replace_src0 && !replace_src1)
|
|
return NULL;
|
|
|
|
replace_src0 = replace_src0 ? replace_src0 : nir_channel(b, src0.def, src0.comp);
|
|
replace_src1 = replace_src1 ? replace_src1 : nir_channel(b, src1.def, src1.comp);
|
|
return nir_iadd(b, replace_src0, replace_src1);
|
|
}
|
|
|
|
static bool
|
|
process_instr(nir_builder *b, nir_intrinsic_instr *intrin, void *_)
|
|
{
|
|
nir_intrinsic_op op;
|
|
switch (intrin->intrinsic) {
|
|
case nir_intrinsic_load_global:
|
|
case nir_intrinsic_load_global_constant:
|
|
op = nir_intrinsic_load_global_amd;
|
|
break;
|
|
case nir_intrinsic_global_atomic:
|
|
op = nir_intrinsic_global_atomic_amd;
|
|
break;
|
|
case nir_intrinsic_global_atomic_swap:
|
|
op = nir_intrinsic_global_atomic_swap_amd;
|
|
break;
|
|
case nir_intrinsic_store_global:
|
|
op = nir_intrinsic_store_global_amd;
|
|
break;
|
|
default:
|
|
return false;
|
|
}
|
|
unsigned addr_src_idx = op == nir_intrinsic_store_global_amd ? 1 : 0;
|
|
|
|
nir_src *addr_src = &intrin->src[addr_src_idx];
|
|
|
|
uint64_t off_const = 0;
|
|
nir_def *offset = NULL;
|
|
nir_scalar src = {addr_src->ssa, 0};
|
|
b->cursor = nir_after_instr(addr_src->ssa->parent_instr);
|
|
nir_def *addr = try_extract_additions(b, src, &off_const, &offset);
|
|
addr = addr ? addr : addr_src->ssa;
|
|
|
|
b->cursor = nir_before_instr(&intrin->instr);
|
|
|
|
if (off_const > UINT32_MAX) {
|
|
addr = nir_iadd_imm(b, addr, off_const);
|
|
off_const = 0;
|
|
}
|
|
|
|
nir_intrinsic_instr *new_intrin = nir_intrinsic_instr_create(b->shader, op);
|
|
|
|
new_intrin->num_components = intrin->num_components;
|
|
|
|
if (op != nir_intrinsic_store_global_amd)
|
|
nir_def_init(&new_intrin->instr, &new_intrin->def,
|
|
intrin->def.num_components, intrin->def.bit_size);
|
|
|
|
unsigned num_src = nir_intrinsic_infos[intrin->intrinsic].num_srcs;
|
|
for (unsigned i = 0; i < num_src; i++)
|
|
new_intrin->src[i] = nir_src_for_ssa(intrin->src[i].ssa);
|
|
new_intrin->src[num_src] = nir_src_for_ssa(offset ? offset : nir_imm_zero(b, 1, 32));
|
|
new_intrin->src[addr_src_idx] = nir_src_for_ssa(addr);
|
|
|
|
if (nir_intrinsic_has_access(intrin))
|
|
nir_intrinsic_set_access(new_intrin, nir_intrinsic_access(intrin));
|
|
if (nir_intrinsic_has_align_mul(intrin))
|
|
nir_intrinsic_set_align_mul(new_intrin, nir_intrinsic_align_mul(intrin));
|
|
if (nir_intrinsic_has_align_offset(intrin))
|
|
nir_intrinsic_set_align_offset(new_intrin, nir_intrinsic_align_offset(intrin));
|
|
if (nir_intrinsic_has_write_mask(intrin))
|
|
nir_intrinsic_set_write_mask(new_intrin, nir_intrinsic_write_mask(intrin));
|
|
if (nir_intrinsic_has_atomic_op(intrin))
|
|
nir_intrinsic_set_atomic_op(new_intrin, nir_intrinsic_atomic_op(intrin));
|
|
nir_intrinsic_set_base(new_intrin, off_const);
|
|
|
|
nir_builder_instr_insert(b, &new_intrin->instr);
|
|
if (op != nir_intrinsic_store_global_amd)
|
|
nir_def_rewrite_uses(&intrin->def, &new_intrin->def);
|
|
nir_instr_remove(&intrin->instr);
|
|
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
ac_nir_lower_global_access(nir_shader *shader)
|
|
{
|
|
return nir_shader_intrinsics_pass(shader, process_instr,
|
|
nir_metadata_block_index | nir_metadata_dominance, NULL);
|
|
}
|