Chromium Code Reviews| Index: src/IceCfg.cpp |
| diff --git a/src/IceCfg.cpp b/src/IceCfg.cpp |
| index b6ab31e7c3bf09e726e84f862fd93a0fc458cd30..6801443516e56d86b3d1e16eed9449c9c6aab420 100644 |
| --- a/src/IceCfg.cpp |
| +++ b/src/IceCfg.cpp |
| @@ -798,6 +798,89 @@ void Cfg::shortCircuitJumps() { |
| Nodes = NewList; |
| } |
| +void Cfg::floatConstantCSE() { |
| + // Load multiple uses of a floating point constant (between two call |
| + // instructions or block start/end) into a variable before its first use. |
| + // t1 = b + 1.0 |
| + // t2 = c + 1.0 |
| + // Gets transformed to: |
| + // t0 = 1.0 |
| + // t0_1 = t0 |
| + // t1 = b + t0_1 |
| + // t2 = c + t0_1 |
| + // Call instructions reset the procedure, but uses the same variable, just in |
|
Jim Stichnoth
2016/08/04 01:45:39
s/uses/use/
manasijm
2016/08/04 21:29:44
Done.
|
| + // case it got a register. We are assuming floating point registers are not |
| + // callee saved in general. Example, continuing from before: |
| + // result = call <some function> |
| + // t3 = d + 1.0 |
| + // Gets transformed to: |
| + // result = call <some function> |
| + // t0_2 = t0 |
| + // t3 = d + t0_2 |
| + // TODO(manasijm, stichnot): Figure out how to 'link' t0 to the stack slot of |
| + // 1.0. When t0 does not get a register, introducing an extra assignment |
| + // statement does not make sense. The relevant portion is marked below. |
| + |
| + TimerMarker _(TimerStack::TT_floatConstantCse, this); |
| + for (CfgNode *Node : getNodes()) { |
| + |
| + CfgUnorderedMap<Constant *, Variable *> ConstCache; |
| + llvm::ilist_iterator<Inst> Current = Node->getInsts().begin(); |
|
Jim Stichnoth
2016/08/04 01:45:39
I would just use "auto" here, I do that quite ofte
manasijm
2016/08/04 21:29:44
Done.
|
| + auto End = Node->getInsts().end(); |
| + while (Current != End) { |
| + CfgUnorderedMap<Constant *, CfgVector<Inst *>> FloatUses; |
| + if (llvm::isa<InstCall>(*Current)) { |
|
Jim Stichnoth
2016/08/04 01:45:39
Instead of *Current, please use iteratorToInst(Cur
manasijm
2016/08/04 21:29:44
Done.
|
| + Current++; |
|
Jim Stichnoth
2016/08/04 01:45:39
++Current
manasijm
2016/08/04 21:29:44
Done.
|
| + assert(Current); |
|
Jim Stichnoth
2016/08/04 01:45:39
What exactly does this assert? With a quick searc
manasijm
2016/08/04 21:29:45
Changed to assert(Current != End)
This will be tri
|
| + } |
| + while (Current != End && !llvm::isa<InstCall>(*Current)) { |
|
Jim Stichnoth
2016/08/04 01:45:39
iteratorToInst(Current)
manasijm
2016/08/04 21:29:45
Done.
|
| + for (SizeT i = 0; i < Current->getSrcSize(); ++i) { |
| + if (auto *Const = llvm::dyn_cast<Constant>(Current->getSrc(i))) { |
| + if (Const->getType() == IceType_f32 || |
| + Const->getType() == IceType_f64) { |
| + FloatUses[Const].push_back(Current); |
| + } |
| + } |
| + } |
| + Current++; |
| + } |
| + for (auto &Pair : FloatUses) { |
| + static constexpr SizeT MinUseThreshold = 3; |
| + if (Pair.second.size() < MinUseThreshold) |
| + continue; |
| + // Only consider constants with at least `MinUseThreshold` uses |
| + auto &Insts = Node->getInsts(); |
| + |
| + if (ConstCache.find(Pair.first) == ConstCache.end()) { |
| + // Saw a constant (which is used at least twice) for the first time |
| + auto *NewVar = makeVariable(Pair.first->getType()); |
| + // NewVar->setLinkedTo(Pair.first); |
| + // TODO(manasijm): Plumbing for linking to an Operand. |
| + auto *Assign = InstAssign::create(Node->getCfg(), NewVar, Pair.first); |
| + Insts.insert(Pair.second[0], Assign); |
| + ConstCache[Pair.first] = NewVar; |
| + } |
| + |
| + auto *NewVar = makeVariable(Pair.first->getType()); |
| + NewVar->setLinkedTo(ConstCache[Pair.first]); |
| + auto *Assign = |
| + InstAssign::create(Node->getCfg(), NewVar, ConstCache[Pair.first]); |
| + |
| + Insts.insert(Pair.second[0], Assign); |
| + for (auto *InstUse : Pair.second) { |
| + for (SizeT i = 0; i < InstUse->getSrcSize(); ++i) { |
| + if (auto *Const = llvm::dyn_cast<Constant>(InstUse->getSrc(i))) { |
| + if (Const == Pair.first) { |
| + InstUse->replaceSource(i, NewVar); |
| + } |
| + } |
| + } |
| + } |
| + } |
| + } |
| + } |
| +} |
| + |
| void Cfg::doArgLowering() { |
| TimerMarker T(TimerStack::TT_doArgLowering, this); |
| getTarget()->lowerArguments(); |