From 917e8e543934266abb175bf3faab5d5ace299704 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 24 Sep 2024 12:43:12 +0200 Subject: [PATCH] broadcom/compiler: rename is_ldunif_dst to try_rf0 We flag nodes used to ldunif dst so we can try and favor allocating rf0 to them, so be more explicit about its purpose. Reviewed-by: Jose Maria Casanova Crespo Part-of: --- src/broadcom/compiler/v3d_compiler.h | 2 +- src/broadcom/compiler/vir_register_allocate.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/broadcom/compiler/v3d_compiler.h b/src/broadcom/compiler/v3d_compiler.h index 0adbab9a45d..409e8970130 100644 --- a/src/broadcom/compiler/v3d_compiler.h +++ b/src/broadcom/compiler/v3d_compiler.h @@ -619,7 +619,7 @@ struct v3d_ra_node_info { bool payload_conflict; /* V3D 7.x */ - bool is_ldunif_dst; + bool try_rf0; } *info; uint32_t alloc_count; }; diff --git a/src/broadcom/compiler/vir_register_allocate.c b/src/broadcom/compiler/vir_register_allocate.c index 767733a6f43..f1583258859 100644 --- a/src/broadcom/compiler/vir_register_allocate.c +++ b/src/broadcom/compiler/vir_register_allocate.c @@ -409,7 +409,7 @@ add_node(struct v3d_compile *c, uint32_t temp, uint8_t class_bits) /* We fill the node priority after we are done inserting spills */ c->nodes.info[node].class_bits = class_bits; c->nodes.info[node].priority = 0; - c->nodes.info[node].is_ldunif_dst = false; + c->nodes.info[node].try_rf0 = false; c->nodes.info[node].is_program_end = false; c->nodes.info[node].unused = false; c->nodes.info[node].payload_conflict = false; @@ -965,7 +965,7 @@ v3d_ra_select_rf(struct v3d_ra_select_callback_data *v3d_ra, * cond field to encode the dst and would prevent merge with * instructions that use cond flags). */ - if (v3d_ra->nodes->info[node].is_ldunif_dst && + if (v3d_ra->nodes->info[node].try_rf0 && BITSET_TEST(regs, v3d_ra->phys_index)) { assert(v3d_ra->devinfo->ver >= 71); *out = v3d_ra->phys_index; @@ -1320,7 +1320,7 @@ update_graph_and_reg_classes_for_inst(struct v3d_compile *c, if (inst->qpu.sig.ldunif || inst->qpu.sig.ldunifa) { const uint32_t dst_n = temp_to_node(c, inst->dst.index); - c->nodes.info[dst_n].is_ldunif_dst = true; + c->nodes.info[dst_n].try_rf0 = true; } } } @@ -1433,7 +1433,7 @@ v3d_register_allocate(struct v3d_compile *c) * without accumulators that can have implicit writes to phys regs. */ for (uint32_t i = 0; i < num_ra_nodes; i++) { - c->nodes.info[i].is_ldunif_dst = false; + c->nodes.info[i].try_rf0 = false; c->nodes.info[i].is_program_end = false; c->nodes.info[i].unused = false; c->nodes.info[i].priority = 0;