nir: Drop "SSA" from NIR language
Everything is SSA now.
sed -e 's/nir_ssa_def/nir_def/g' \
-e 's/nir_ssa_undef/nir_undef/g' \
-e 's/nir_ssa_scalar/nir_scalar/g' \
-e 's/nir_src_rewrite_ssa/nir_src_rewrite/g' \
-e 's/nir_gather_ssa_types/nir_gather_types/g' \
-i $(git grep -l nir | grep -v relnotes)
git mv src/compiler/nir/nir_gather_ssa_types.c \
src/compiler/nir/nir_gather_types.c
ninja -C build/ clang-format
cd src/compiler/nir && find *.c *.h -type f -exec clang-format -i \{} \;
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Acked-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24585>
This commit is contained in:
@@ -173,31 +173,31 @@ anv_nir_compute_push_layout(nir_shader *nir,
|
||||
case nir_intrinsic_load_desc_set_address_intel: {
|
||||
assert(brw_shader_stage_requires_bindless_resources(nir->info.stage));
|
||||
b->cursor = nir_before_instr(&intrin->instr);
|
||||
nir_ssa_def *pc_load = nir_load_uniform(b, 1, 32,
|
||||
nir_def *pc_load = nir_load_uniform(b, 1, 32,
|
||||
nir_imul_imm(b, intrin->src[0].ssa, sizeof(uint32_t)),
|
||||
.base = offsetof(struct anv_push_constants, desc_offsets),
|
||||
.range = sizeof_field(struct anv_push_constants, desc_offsets),
|
||||
.dest_type = nir_type_uint32);
|
||||
pc_load = nir_iand_imm(b, pc_load, ANV_DESCRIPTOR_SET_OFFSET_MASK);
|
||||
nir_ssa_def *desc_addr =
|
||||
nir_def *desc_addr =
|
||||
nir_pack_64_2x32_split(
|
||||
b, pc_load,
|
||||
nir_load_reloc_const_intel(
|
||||
b, BRW_SHADER_RELOC_DESCRIPTORS_ADDR_HIGH));
|
||||
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, desc_addr);
|
||||
nir_def_rewrite_uses(&intrin->dest.ssa, desc_addr);
|
||||
break;
|
||||
}
|
||||
|
||||
case nir_intrinsic_load_desc_set_dynamic_index_intel: {
|
||||
b->cursor = nir_before_instr(&intrin->instr);
|
||||
nir_ssa_def *pc_load = nir_load_uniform(b, 1, 32,
|
||||
nir_def *pc_load = nir_load_uniform(b, 1, 32,
|
||||
nir_imul_imm(b, intrin->src[0].ssa, sizeof(uint32_t)),
|
||||
.base = offsetof(struct anv_push_constants, desc_offsets),
|
||||
.range = sizeof_field(struct anv_push_constants, desc_offsets),
|
||||
.dest_type = nir_type_uint32);
|
||||
pc_load = nir_iand_imm(
|
||||
b, pc_load, ANV_DESCRIPTOR_SET_DYNAMIC_INDEX_MASK);
|
||||
nir_ssa_def_rewrite_uses(&intrin->dest.ssa, pc_load);
|
||||
nir_def_rewrite_uses(&intrin->dest.ssa, pc_load);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user