OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

agx: Remove nir_register support

Browse Source 
We don't use it anymore, now that we can handle SSA form. Gets rid of
the most gross hack in the compiler.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16268>
This commit is contained in:
Alyssa Rosenzweig
2022-05-01 17:51:09 -04:00
parent 3927a9e911
commit 18ef9398de
3 changed files with 5 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/asahi/compiler/agx_compile.c
View File

@@ -1735,49 +1735,12 @@ agx_compile_shader_nir(nir_shader *nir,
ctx->indexed_nir_blocks =
rzalloc_array(ctx, agx_block *, func->impl->num_blocks);
/* TODO: Handle phi nodes instead of just convert_from_ssa and yolo'ing
* the mapping of nir_register to hardware registers and guaranteeing bad
* performance and breaking spilling... */
ctx->nir_regalloc = rzalloc_array(ctx, unsigned, func->impl->reg_alloc);
/* Leave the last 4 registers for hacky p-copy lowering */
unsigned nir_regalloc = AGX_NUM_REGS - (4 * 2);
/* Assign backwards so we don't need to guess a size */
nir_foreach_register(reg, &func->impl->registers) {
/* Ensure alignment */
if (reg->bit_size >= 32 && (nir_regalloc & 1))
nir_regalloc--;
unsigned size = DIV_ROUND_UP(reg->bit_size * reg->num_components, 16);
nir_regalloc -= size;
ctx->nir_regalloc[reg->index] = nir_regalloc;
}
ctx->max_register = nir_regalloc;
ctx->alloc += func->impl->ssa_alloc;
emit_cf_list(ctx, &func->impl->body);
agx_emit_phis_deferred(ctx);
break; /* TODO: Multi-function shaders */
}
/* TODO: Actual RA... this way passes don't need to deal nir_register */
agx_foreach_instr_global(ctx, I) {
agx_foreach_dest(I, d) {
if (I->dest[d].type == AGX_INDEX_NIR_REGISTER) {
I->dest[d].type = AGX_INDEX_REGISTER;
I->dest[d].value = ctx->nir_regalloc[I->dest[d].value];
}
}
agx_foreach_src(I, s) {
if (I->src[s].type == AGX_INDEX_NIR_REGISTER) {
I->src[s].type = AGX_INDEX_REGISTER;
I->src[s].value = ctx->nir_regalloc[I->src[s].value];
}
}
}
/* Terminate the shader after the exit block */
agx_block *last_block = list_last_entry(&ctx->blocks, agx_block, link);
agx_builder _b = agx_init_builder(ctx, agx_after_block(last_block));