diff options
| author | Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> | 2019-08-30 11:04:52 -0700 |
|---|---|---|
| committer | Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> | 2019-08-30 15:50:27 -0700 |
| commit | eb3cc20f42feb4a79c35ca717d4bda2430223d78 (patch) | |
| tree | 0b86b40bd9a5ef8d3a1495ade84fd91e3db2bc59 /src/panfrost | |
| parent | e5ba016d3ab1abb9f97e7864fbe5ab96e3877ee7 (diff) | |
| download | mesa-eb3cc20f42feb4a79c35ca717d4bda2430223d78.tar.gz | |
pan/midgard: Fix misc. RA issues
When running the register allocator after scheduling, the MIR looks a
little different, so we need to extend the RA to handle a few of these
extra cases correctly.
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Diffstat (limited to 'src/panfrost')
| -rw-r--r-- | src/panfrost/midgard/midgard_ra.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/panfrost/midgard/midgard_ra.c b/src/panfrost/midgard/midgard_ra.c index 02b76d6a987..c19c6674f57 100644 --- a/src/panfrost/midgard/midgard_ra.c +++ b/src/panfrost/midgard/midgard_ra.c @@ -350,7 +350,7 @@ check_read_class(unsigned *classes, unsigned tag, unsigned node) case REG_CLASS_TEXW: return (tag != TAG_LOAD_STORE_4); case REG_CLASS_WORK: - return (tag == TAG_ALU_4); + return IS_ALU(tag); default: unreachable("Invalid class"); } @@ -372,7 +372,7 @@ check_write_class(unsigned *classes, unsigned tag, unsigned node) return (tag == TAG_TEXTURE_4); case REG_CLASS_LDST: case REG_CLASS_WORK: - return (tag == TAG_ALU_4) || (tag == TAG_LOAD_STORE_4); + return IS_ALU(tag) || (tag == TAG_LOAD_STORE_4); default: unreachable("Invalid class"); } @@ -394,7 +394,8 @@ mir_lower_special_reads(compiler_context *ctx) { size_t sz = BITSET_WORDS(ctx->temp_count) * sizeof(BITSET_WORD); - /* Bitfields for the various types of registers we could have */ + /* Bitfields for the various types of registers we could have. aluw can + * be written by either ALU or load/store */ unsigned *alur = calloc(sz, 1); unsigned *aluw = calloc(sz, 1); @@ -410,9 +411,11 @@ mir_lower_special_reads(compiler_context *ctx) mark_node_class(aluw, ins->dest); mark_node_class(alur, ins->src[0]); mark_node_class(alur, ins->src[1]); + mark_node_class(alur, ins->src[2]); break; case TAG_LOAD_STORE_4: + mark_node_class(aluw, ins->dest); mark_node_class(ldst, ins->src[0]); mark_node_class(ldst, ins->src[1]); mark_node_class(ldst, ins->src[2]); @@ -793,7 +796,13 @@ install_registers_instr( midgard_instruction *ins) { switch (ins->type) { - case TAG_ALU_4: { + case TAG_ALU_4: + case TAG_ALU_8: + case TAG_ALU_12: + case TAG_ALU_16: { + if (ins->compact_branch) + return; + struct phys_reg src1 = index_to_reg(ctx, g, ins->src[0]); struct phys_reg src2 = index_to_reg(ctx, g, ins->src[1]); struct phys_reg dest = index_to_reg(ctx, g, ins->dest); @@ -950,10 +959,6 @@ install_registers_instr( void install_registers(compiler_context *ctx, struct ra_graph *g) { - mir_foreach_block(ctx, block) { - mir_foreach_instr_in_block(block, ins) { - install_registers_instr(ctx, g, ins); - } - } - + mir_foreach_instr_global(ctx, ins) + install_registers_instr(ctx, g, ins); } |