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

pan/bi: Only spill nodes that could progress in RA

Browse Source 
This reduces number of spills and hence compile-time by avoiding
pointless decisions. In a terrain shader forced to use full threads:

Before: 39:168 spills:fills
After: 23:127 spills:fills

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11733>
This commit is contained in:
Alyssa Rosenzweig
2021-06-16 16:13:56 -04:00
committed by Marge Bot
parent 113157dafe
commit a38ad8ec65
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/panfrost/bifrost/bi_ra.c
View File

@@ -45,6 +45,9 @@ struct lcra_state {
/* Before solving, forced registers; after solving, solutions. */ /* Before solving, forced registers; after solving, solutions. */
unsigned *solutions; unsigned *solutions;
/** Node which caused register allocation to fail */
unsigned spill_node;
}; };
/* This module is an implementation of "Linearly Constrained /* This module is an implementation of "Linearly Constrained
@@ -143,9 +146,11 @@ lcra_solve(struct lcra_state *l)
} }
/* Out of registers - prepare to spill */ /* Out of registers - prepare to spill */
if (!succ) if (!succ) {
l->spill_node = step;
return false; return false;
} }
}
return true; return true;
} }
@@ -382,14 +387,16 @@ bi_choose_spill_node(bi_context *ctx, struct lcra_state *l)
} }
} }
/* If there are no constraints on a node, do not pick it to spill under
* any circumstance, or else we would hang rather than fail RA */
unsigned best_benefit = 0.0; unsigned best_benefit = 0.0;
signed best_node = -1; signed best_node = -1;
for (unsigned i = 0; i < l->node_count; ++i) { for (unsigned i = 0; i < l->node_count; ++i) {
if (BITSET_TEST(no_spill, i)) continue; if (BITSET_TEST(no_spill, i)) continue;
/* Only spill nodes that interfere with the node failing
* register allocation. It's pointless to spill anything else */
if (!l->linear[(l->spill_node * l->node_count) + i]) continue;
unsigned benefit = lcra_count_constraints(l, i); unsigned benefit = lcra_count_constraints(l, i);
if (benefit > best_benefit) { if (benefit > best_benefit) {