Skip to content

Commit c825c8a

Browse files
authored
[SLP][NFC] Simplify insert(std::make_pair(K, V)) -> try_emplace(K, V) (#155233)
These are equivalent as `MapVector::insert` simply calls `MapVector::try_emplace`. BTW, correct a comment typo.
1 parent 1739a0e commit c825c8a

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8030,11 +8030,11 @@ void BoUpSLP::reorderTopToBottom() {
80308030
// it is an attempt to reorder node with reused scalars but with
80318031
// external uses.
80328032
if (OpTE->getVectorFactor() != OpTE->Scalars.size()) {
8033-
OrdersUses.insert(std::make_pair(OrdersType(), 0)).first->second +=
8033+
OrdersUses.try_emplace(OrdersType(), 0).first->second +=
80348034
ExternalUserReorderIndices.size();
80358035
} else {
80368036
for (const OrdersType &ExtOrder : ExternalUserReorderIndices)
8037-
++OrdersUses.insert(std::make_pair(ExtOrder, 0)).first->second;
8037+
++OrdersUses.try_emplace(ExtOrder, 0).first->second;
80388038
}
80398039
// No other useful reorder data in this entry.
80408040
if (Order.empty())
@@ -8054,9 +8054,9 @@ void BoUpSLP::reorderTopToBottom() {
80548054
return Idx == PoisonMaskElem ? E : static_cast<unsigned>(Idx);
80558055
});
80568056
fixupOrderingIndices(CurrentOrder);
8057-
++OrdersUses.insert(std::make_pair(CurrentOrder, 0)).first->second;
8057+
++OrdersUses.try_emplace(CurrentOrder, 0).first->second;
80588058
} else {
8059-
++OrdersUses.insert(std::make_pair(Order, 0)).first->second;
8059+
++OrdersUses.try_emplace(Order, 0).first->second;
80608060
}
80618061
}
80628062
if (OrdersUses.empty())
@@ -8480,12 +8480,11 @@ void BoUpSLP::reorderBottomToTop(bool IgnoreReorder) {
84808480
return Idx == PoisonMaskElem ? E : static_cast<unsigned>(Idx);
84818481
});
84828482
fixupOrderingIndices(CurrentOrder);
8483-
OrdersUses.insert(std::make_pair(CurrentOrder, 0)).first->second +=
8484-
NumOps;
8483+
OrdersUses.try_emplace(CurrentOrder, 0).first->second += NumOps;
84858484
} else {
8486-
OrdersUses.insert(std::make_pair(Order, 0)).first->second += NumOps;
8485+
OrdersUses.try_emplace(Order, 0).first->second += NumOps;
84878486
}
8488-
auto Res = OrdersUses.insert(std::make_pair(OrdersType(), 0));
8487+
auto Res = OrdersUses.try_emplace(OrdersType(), 0);
84898488
const auto AllowsReordering = [&](const TreeEntry *TE) {
84908489
if (!TE->ReorderIndices.empty() || !TE->ReuseShuffleIndices.empty() ||
84918490
(TE->State == TreeEntry::Vectorize && TE->isAltShuffle()) ||
@@ -23797,9 +23796,7 @@ class HorizontalReduction {
2379723796
size_t Key, Idx;
2379823797
std::tie(Key, Idx) = generateKeySubkey(V, &TLI, GenerateLoadsSubkey,
2379923798
/*AllowAlternate=*/false);
23800-
++PossibleReducedVals[Key][Idx]
23801-
.insert(std::make_pair(V, 0))
23802-
.first->second;
23799+
++PossibleReducedVals[Key][Idx].try_emplace(V, 0).first->second;
2380323800
}
2380423801
for (Instruction *I : reverse(PossibleReductionOps))
2380523802
Worklist.emplace_back(I, I->getParent() == BB ? 0 : Level + 1);
@@ -26061,7 +26058,7 @@ bool SLPVectorizerPass::vectorizeChainsInBlock(BasicBlock *BB, BoUpSLP &R) {
2606126058

2606226059
InstSetVector PostProcessInserts;
2606326060
SmallSetVector<CmpInst *, 8> PostProcessCmps;
26064-
// Vectorizes Inserts in `PostProcessInserts` and if `VecctorizeCmps` is true
26061+
// Vectorizes Inserts in `PostProcessInserts` and if `VectorizeCmps` is true
2606526062
// also vectorizes `PostProcessCmps`.
2606626063
auto VectorizeInsertsAndCmps = [&](bool VectorizeCmps) {
2606726064
bool Changed = vectorizeInserts(PostProcessInserts, BB, R);

0 commit comments

Comments
 (0)