<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Mar 13, 2015 at 9:59 AM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@googlemail.com" target="_blank">benny.kra@googlemail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: d0k<br>
Date: Fri Mar 13 11:59:29 2015<br>
New Revision: 232178<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=232178&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=232178&view=rev</a><br>
Log:<br>
unique_ptrs are unique already, no need to unique them any further.<br></blockquote><div><br>Luls - nice.<br> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Modified:<br>
llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp<br>
<br>
Modified: llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp?rev=232178&r1=232177&r2=232178&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp?rev=232178&r1=232177&r2=232178&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp (original)<br>
+++ llvm/trunk/lib/Target/AArch64/AArch64A57FPLoadBalancing.cpp Fri Mar 13 11:59:29 2015<br>
@@ -142,7 +142,7 @@ private:<br>
int scavengeRegister(Chain *G, Color C, MachineBasicBlock &MBB);<br>
void scanInstruction(MachineInstr *MI, unsigned Idx,<br>
std::map<unsigned, Chain*> &Active,<br>
- std::set<std::unique_ptr<Chain>> &AllChains);<br>
+ std::vector<std::unique_ptr<Chain>> &AllChains);<br>
void maybeKillChain(MachineOperand &MO, unsigned Idx,<br>
std::map<unsigned, Chain*> &RegChains);<br>
Color getColor(unsigned Register);<br>
@@ -336,7 +336,7 @@ bool AArch64A57FPLoadBalancing::runOnBas<br>
// been killed yet. This is keyed by register - all chains can only have one<br>
// "link" register between each inst in the chain.<br>
std::map<unsigned, Chain*> ActiveChains;<br>
- std::set<std::unique_ptr<Chain>> AllChains;<br>
+ std::vector<std::unique_ptr<Chain>> AllChains;<br>
unsigned Idx = 0;<br>
for (auto &MI : MBB)<br>
scanInstruction(&MI, Idx++, ActiveChains, AllChains);<br>
@@ -603,10 +603,9 @@ bool AArch64A57FPLoadBalancing::colorCha<br>
return Changed;<br>
}<br>
<br>
-void AArch64A57FPLoadBalancing::<br>
-scanInstruction(MachineInstr *MI, unsigned Idx,<br>
- std::map<unsigned, Chain*> &ActiveChains,<br>
- std::set<std::unique_ptr<Chain>> &AllChains) {<br>
+void AArch64A57FPLoadBalancing::scanInstruction(<br>
+ MachineInstr *MI, unsigned Idx, std::map<unsigned, Chain *> &ActiveChains,<br>
+ std::vector<std::unique_ptr<Chain>> &AllChains) {<br>
// Inspect "MI", updating ActiveChains and AllChains.<br>
<br>
if (isMul(MI)) {<br>
@@ -625,7 +624,7 @@ scanInstruction(MachineInstr *MI, unsign<br>
<br>
auto G = llvm::make_unique<Chain>(MI, Idx, getColor(DestReg));<br>
ActiveChains[DestReg] = G.get();<br>
- AllChains.insert(std::move(G));<br>
+ AllChains.push_back(std::move(G));<br>
<br>
} else if (isMla(MI)) {<br>
<br>
@@ -669,7 +668,7 @@ scanInstruction(MachineInstr *MI, unsign<br>
<< TRI->getName(DestReg) << "\n");<br>
auto G = llvm::make_unique<Chain>(MI, Idx, getColor(DestReg));<br>
ActiveChains[DestReg] = G.get();<br>
- AllChains.insert(std::move(G));<br>
+ AllChains.push_back(std::move(G));<br>
<br>
} else {<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>