AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Drop "SSA" from NIR language

Browse Source 
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:
Alyssa Rosenzweig
2023-08-12 16:17:15 -04:00
parent 777d336b1f
commit 09d31922de
492 changed files with 10408 additions and 10455 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/nir/nir_opt_vectorize.c
+9 -9
View File
@@ -221,7 +221,7 @@ instr_try_combine(struct set *instr_set, nir_instr *instr1, nir_instr *instr2)
for (unsigned j = 0; j < total_components; j++) {
value[j].u64 = j < alu1_components ? c1[alu1->src[i].swizzle[j]].u64 : c2[alu2->src[i].swizzle[j - alu1_components]].u64;
}
nir_ssa_def *def = nir_build_imm(&b, total_components, bit_size, value);
nir_def *def = nir_build_imm(&b, total_components, bit_size, value);
new_alu->src[i].src = nir_src_for_ssa(def);
for (unsigned j = 0; j < total_components; j++)
@@ -282,20 +282,20 @@ instr_try_combine(struct set *instr_set, nir_instr *instr1, nir_instr *instr2)
/* update all other uses if there are any */
unsigned swiz[NIR_MAX_VEC_COMPONENTS];
if (!nir_ssa_def_is_unused(&alu1->dest.dest.ssa)) {
if (!nir_def_is_unused(&alu1->dest.dest.ssa)) {
for (unsigned i = 0; i < alu1_components; i++)
swiz[i] = i;
nir_ssa_def *new_alu1 = nir_swizzle(&b, &new_alu->dest.dest.ssa, swiz,
alu1_components);
nir_ssa_def_rewrite_uses(&alu1->dest.dest.ssa, new_alu1);
nir_def *new_alu1 = nir_swizzle(&b, &new_alu->dest.dest.ssa, swiz,
alu1_components);
nir_def_rewrite_uses(&alu1->dest.dest.ssa, new_alu1);
}
if (!nir_ssa_def_is_unused(&alu2->dest.dest.ssa)) {
if (!nir_def_is_unused(&alu2->dest.dest.ssa)) {
for (unsigned i = 0; i < alu2_components; i++)
swiz[i] = i + alu1_components;
nir_ssa_def *new_alu2 = nir_swizzle(&b, &new_alu->dest.dest.ssa, swiz,
alu2_components);
nir_ssa_def_rewrite_uses(&alu2->dest.dest.ssa, new_alu2);
nir_def *new_alu2 = nir_swizzle(&b, &new_alu->dest.dest.ssa, swiz,
alu2_components);
nir_def_rewrite_uses(&alu2->dest.dest.ssa, new_alu2);
}
nir_instr_remove(instr1);