AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aco/wave32: Use lane mask regclass for exec/vcc.

Browse Source 
Currently all usages of exec and vcc are hardcoded to use s2 regclass.
This commit makes it possible to use s1 in wave32 mode and
s2 in wave64 mode.

Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
This commit is contained in:
Timur Kristóf
2019-11-27 11:04:47 +01:00
committed by Daniel Schürmann
parent b4efe179ed
commit e0bcefc3a0
12 changed files with 250 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/compiler/aco_live_var_analysis.cpp
+6 -6
View File
@@ -54,7 +54,7 @@ void process_live_temps_per_block(Program *program, live& lives, Block* block,
bool exec_live = false;
if (block->live_out_exec != Temp()) {
live_sgprs.insert(block->live_out_exec);
new_demand.sgpr += 2;
new_demand.sgpr += program->lane_mask.size();
exec_live = true;
}
@@ -77,10 +77,10 @@ void process_live_temps_per_block(Program *program, live& lives, Block* block,
if (is_phi(insn))
break;
/* substract the 2 sgprs from exec */
/* substract the 1 or 2 sgprs from exec */
if (exec_live)
assert(new_demand.sgpr >= 2);
register_demand[idx] = RegisterDemand(new_demand.vgpr, new_demand.sgpr - (exec_live ? 2 : 0));
assert(new_demand.sgpr >= (int16_t) program->lane_mask.size());
register_demand[idx] = RegisterDemand(new_demand.vgpr, new_demand.sgpr - (exec_live ? program->lane_mask.size() : 0));
/* KILL */
for (Definition& definition : insn->definitions) {
@@ -144,8 +144,8 @@ void process_live_temps_per_block(Program *program, live& lives, Block* block,
/* update block's register demand for a last time */
if (exec_live)
assert(new_demand.sgpr >= 2);
new_demand.sgpr -= exec_live ? 2 : 0;
assert(new_demand.sgpr >= (int16_t) program->lane_mask.size());
new_demand.sgpr -= exec_live ? program->lane_mask.size() : 0;
block->register_demand.update(new_demand);
/* handle phi definitions */