/// are then marked as "stackified", meaning references to them are replaced by
/// "push" and "pop" from the stack.
///
-/// This is primarily a code size optimiation, since temporary values on the
+/// This is primarily a code size optimization, since temporary values on the
/// expression don't need to be named.
///
//===----------------------------------------------------------------------===//
}
// Decorate the given instruction with implicit operands that enforce the
-// expression stack ordering constraints.
-static void ImposeStackOrdering(MachineInstr *MI) {
- // Read and write the opaque EXPR_STACK register.
- MI->addOperand(MachineOperand::CreateReg(WebAssembly::EXPR_STACK,
- /*isDef=*/true,
- /*isImp=*/true));
+// expression stack ordering constraints needed for an instruction which is
+// consumed by an instruction using the expression stack.
+static void ImposeStackInputOrdering(MachineInstr *MI) {
+ // Write the opaque EXPR_STACK register.
+ if (!MI->definesRegister(WebAssembly::EXPR_STACK))
+ MI->addOperand(MachineOperand::CreateReg(WebAssembly::EXPR_STACK,
+ /*isDef=*/true,
+ /*isImp=*/true));
+}
+
+// Decorate the given instruction with implicit operands that enforce the
+// expression stack ordering constraints for an instruction which is on
+// the expression stack.
+static void ImposeStackOrdering(MachineInstr *MI, MachineRegisterInfo &MRI) {
+ ImposeStackInputOrdering(MI);
+
+ // Also read the opaque EXPR_STACK register.
MI->addOperand(MachineOperand::CreateReg(WebAssembly::EXPR_STACK,
/*isDef=*/false,
/*isImp=*/true));
+
+ // Also, mark any inputs to this instruction as being consumed by an
+ // instruction on the expression stack.
+ // TODO: Find a lighter way to describe the appropriate constraints.
+ for (MachineOperand &MO : MI->uses()) {
+ if (!MO.isReg())
+ continue;
+ unsigned Reg = MO.getReg();
+ if (!TargetRegisterInfo::isVirtualRegister(Reg))
+ continue;
+ MachineInstr *Def = MRI.getVRegDef(Reg);
+ if (Def->getOpcode() == TargetOpcode::PHI)
+ continue;
+ ImposeStackInputOrdering(Def);
+ }
}
// Test whether it's safe to move Def to just before Insert. Note that this
// more precise.
static bool IsSafeToMove(const MachineInstr *Def, const MachineInstr *Insert,
AliasAnalysis &AA) {
+ assert(Def->getParent() == Insert->getParent());
bool SawStore = false, SawSideEffects = false;
MachineBasicBlock::const_iterator D(Def), I(Insert);
for (--I; I != D; --I)
WebAssemblyFunctionInfo &MFI = *MF.getInfo<WebAssemblyFunctionInfo>();
AliasAnalysis &AA = getAnalysis<AAResultsWrapperPass>().getAAResults();
+ assert(MRI.isSSA() && "RegStackify depends on SSA form");
+
// Walk the instructions from the bottom up. Currently we don't look past
// block boundaries, and the blocks aren't ordered so the block visitation
// order isn't significant, but we may want to change this in the future.
break;
// Iterate through the inputs in reverse order, since we'll be pulling
- // operands off the stack in FIFO order.
+ // operands off the stack in LIFO order.
bool AnyStackified = false;
for (MachineOperand &Op : reverse(Insert->uses())) {
// We're only interested in explicit virtual register operands.
continue;
unsigned Reg = Op.getReg();
- if (!TargetRegisterInfo::isVirtualRegister(Reg))
+ if (TargetRegisterInfo::isPhysicalRegister(Reg)) {
+ // An instruction with a physical register. Conservatively mark it as
+ // an expression stack input so that it isn't reordered with anything
+ // in an expression stack which might use it (physical registers
+ // aren't in SSA form so it's not trivial to determine this).
+ // TODO: Be less conservative.
+ ImposeStackInputOrdering(Insert);
continue;
+ }
// Only consider registers with a single definition.
// TODO: Eventually we may relax this, to stackify phi transfers.
Def->getOpcode() == WebAssembly::ARGUMENT_F64)
continue;
- // Single-use expression trees require defs that have one use, or that
- // they be trivially clonable.
+ // Single-use expression trees require defs that have one use.
// TODO: Eventually we'll relax this, to take advantage of set_local
// returning its result.
if (!MRI.hasOneUse(Reg))
continue;
- // For now, be conservative and don't look across block boundaries,
- // unless we have something trivially clonable.
+ // For now, be conservative and don't look across block boundaries.
// TODO: Be more aggressive.
- if (Def->getParent() != &MBB && !Def->isMoveImmediate())
+ if (Def->getParent() != &MBB)
continue;
// Don't move instructions that have side effects or memory dependencies
MBB.insert(MachineBasicBlock::instr_iterator(Insert),
Def->removeFromParent());
MFI.stackifyVReg(Reg);
- ImposeStackOrdering(Def);
+ ImposeStackOrdering(Def, MRI);
Insert = Def;
}
if (AnyStackified)
- ImposeStackOrdering(&MI);
+ ImposeStackOrdering(&MI, MRI);
}
}
continue;
unsigned VReg = MO.getReg();
+ // Don't stackify physregs like SP or FP.
+ if (!TargetRegisterInfo::isVirtualRegister(VReg))
+ continue;
+
if (MFI.isVRegStackified(VReg)) {
if (MO.isDef())
Stack.push_back(VReg);