Subzero: Slight improvement to phi lowering.
When doing post phi lowering register allocation, the original code limited register allocation to pre-colored or infinite-weight variables with a non-empty live range within the new edge-split nodes. This limitation ends up missing some opportunities. Specifically, when a temporary is introduced to break a dependency cycle, e.g.:
// a = phi(b)
// b = phi(a)
t = a
a = b
b = t
then t was always stack-allocated, even if a physical register was available.
In the new design, the RangeMask bitvector specifies which variables should have their live ranges tracked and computed. For normal liveness analysis, all variables are tracked. For post phi lowering liveness analysis, all variables created from phi lowering, plus all pre-colored variables, plus all infinite-weight variables, are tracked.
The result is slightly better code quality, and sometimes the frame size is 1 or 2 words smaller.
The hope was to narrow the 10% translation-time degradation in pnacl-llc.pexe compared to the old, hackish way of phi lowering, but that goal still proves to be elusive.
BUG= none
R=jvoung@chromium.org
Review URL: https://codereview.chromium.org/1271923002.
diff --git a/src/IceCfgNode.cpp b/src/IceCfgNode.cpp
index f319041..44e9d3e 100644
--- a/src/IceCfgNode.cpp
+++ b/src/IceCfgNode.cpp
@@ -580,6 +580,8 @@
Live |= Liveness->getLiveIn(Succ);
// Mark corresponding argument of phis in successor as live.
for (Inst &I : Succ->Phis) {
+ if (I.isDeleted())
+ continue;
auto Phi = llvm::dyn_cast<InstPhi>(&I);
Phi->livenessPhiOperand(Live, this, Liveness);
}
@@ -698,6 +700,9 @@
InstNumberT LE = i == i2 ? IEB->second : LastInstNum + 1;
Variable *Var = Liveness->getVariable(i, this);
+ // TODO(stichnot): Push getIgnoreLiveness() into the initialization of
+ // Liveness::RangeMask so that LiveBegin and LiveEnd never even reference
+ // such variables.
if (!Var->getIgnoreLiveness()) {
if (LB > LE) {
Var->addLiveRange(FirstInstNum, LE, 1);
@@ -720,7 +725,8 @@
for (int i = LiveInAndOut.find_first(); i != -1;
i = LiveInAndOut.find_next(i)) {
Variable *Var = Liveness->getVariable(i, this);
- Var->addLiveRange(FirstInstNum, LastInstNum + 1, 1);
+ if (Liveness->getRangeMask(Var->getIndex()))
+ Var->addLiveRange(FirstInstNum, LastInstNum + 1, 1);
}
}