fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 15:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco/ra: Fix build with print_regs enabled

Browse source 
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8719>
This commit is contained in:
Tony Wasserka 2021-01-26 16:05:01 +01:00
parent b241a050da
commit 3675aefa84
1 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/amd/compiler/aco_register_allocation.cpp
View file

@ -359,14 +359,13 @@ private:
void print_regs(ra_ctx& ctx, bool vgprs, RegisterFile& reg_file) void print_regs(ra_ctx& ctx, bool vgprs, RegisterFile& reg_file)
{ {
unsigned max = vgprs ? ctx.program->max_reg_demand.vgpr : ctx.program->max_reg_demand.sgpr; unsigned max = vgprs ? ctx.program->max_reg_demand.vgpr : ctx.program->max_reg_demand.sgpr;
unsigned lb = vgprs ? 256 : 0; PhysRegInterval regs { vgprs ? PhysReg{256} : PhysReg{0}, max };
unsigned ub = lb + max;
char reg_char = vgprs ? 'v' : 's'; char reg_char = vgprs ? 'v' : 's';
/* print markers */ /* print markers */
printf(" "); printf(" ");
for (unsigned i = lb; i < ub; i += 3) { for (unsigned i = 0; i < regs.size; i += 3) {
printf("%.2u ", i - lb); printf("%.2u ", i);
} }
printf("\n"); printf("\n");
@ -375,12 +374,12 @@ void print_regs(ra_ctx& ctx, bool vgprs, RegisterFile& reg_file)
unsigned free_regs = 0; unsigned free_regs = 0;
unsigned prev = 0; unsigned prev = 0;
bool char_select = false; bool char_select = false;
for (unsigned i = lb; i < ub; i++) { for (auto reg : regs) {
if (reg_file[i] == 0xFFFFFFFF) { if (reg_file[reg] == 0xFFFFFFFF) {
printf("~"); printf("~");
} else if (reg_file[i]) { } else if (reg_file[reg]) {
if (reg_file[i] != prev) { if (reg_file[reg] != prev) {
prev = reg_file[i]; prev = reg_file[reg];
char_select = !char_select; char_select = !char_select;
} }
printf(char_select ? "#" : "@"); printf(char_select ? "#" : "@");
@ -396,18 +395,18 @@ void print_regs(ra_ctx& ctx, bool vgprs, RegisterFile& reg_file)
/* print assignments */ /* print assignments */
prev = 0; prev = 0;
unsigned size = 0; unsigned size = 0;
for (unsigned i = lb; i < ub; i++) { for (auto i : regs) {
if (reg_file[i] != prev) { if (reg_file[i] != prev) {
if (prev && size > 1) if (prev && size > 1)
printf("-%d]\n", i - 1 - lb); printf("-%d]\n", i - regs.lo() - 1);
else if (prev) else if (prev)
printf("]\n"); printf("]\n");
prev = reg_file[i]; prev = reg_file[i];
if (prev && prev != 0xFFFFFFFF) { if (prev && prev != 0xFFFFFFFF) {
if (ctx.orig_names.count(reg_file[i]) && ctx.orig_names[reg_file[i]].id() != reg_file[i]) if (ctx.orig_names.count(reg_file[i]) && ctx.orig_names[reg_file[i]].id() != reg_file[i])
printf("%%%u (was %%%d) = %c[%d", reg_file[i], ctx.orig_names[reg_file[i]].id(), reg_char, i - lb); printf("%%%u (was %%%d) = %c[%d", reg_file[i], ctx.orig_names[reg_file[i]].id(), reg_char, i - regs.lo());
else else
printf("%%%u = %c[%d", reg_file[i], reg_char, i - lb); printf("%%%u = %c[%d", reg_file[i], reg_char, i - regs.lo());
} }
size = 1; size = 1;
} else { } else {
@ -415,7 +414,7 @@ void print_regs(ra_ctx& ctx, bool vgprs, RegisterFile& reg_file)
} }
} }
if (prev && size > 1) if (prev && size > 1)
printf("-%d]\n", ub - lb - 1); printf("-%d]\n", regs.size - 1);
else if (prev) else if (prev)
printf("]\n"); printf("]\n");
} }