[clang] [llvm] [mlir] Use llvm::less_first (NFC) (PR #94136)
https://github.com/kazutakahirata closed https://github.com/llvm/llvm-project/pull/94136 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [mlir] Use llvm::less_first (NFC) (PR #94136)
https://github.com/MaskRay approved this pull request. https://github.com/llvm/llvm-project/pull/94136 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [mlir] Use llvm::less_first (NFC) (PR #94136)
https://github.com/joker-eph approved this pull request. https://github.com/llvm/llvm-project/pull/94136 ___ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
[clang] [llvm] [mlir] Use llvm::less_first (NFC) (PR #94136)
llvmbot wrote:
@llvm/pr-subscribers-clang
Author: Kazu Hirata (kazutakahirata)
Changes
---
Full diff: https://github.com/llvm/llvm-project/pull/94136.diff
6 Files Affected:
- (modified) clang/lib/Serialization/ASTWriter.cpp (+1-3)
- (modified) clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
(+1-3)
- (modified) llvm/lib/MC/MCPseudoProbe.cpp (+2-8)
- (modified) llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h (+1-4)
- (modified) mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
(+1-3)
- (modified) mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp
(+1-2)
``diff
diff --git a/clang/lib/Serialization/ASTWriter.cpp
b/clang/lib/Serialization/ASTWriter.cpp
index e830c4026ea78..eb41a205bc82c 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -3205,9 +3205,7 @@ void ASTWriter::WritePragmaDiagnosticMappings(const
DiagnosticsEngine ,
}
// Sort by diag::kind for deterministic output.
- llvm::sort(Mappings, [](const auto , const auto ) {
-return LHS.first < RHS.first;
- });
+ llvm::sort(Mappings, llvm::less_first());
for (const auto : Mappings) {
Record.push_back(I.first);
diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
index 0c047b6c5da2f..0f82f22d8b9a8 100644
--- a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
+++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
@@ -259,9 +259,7 @@ static void canonicalizeDefines(PreprocessorOptions
) {
++Index;
}
- llvm::stable_sort(SimpleNames, [](const MacroOpt , const MacroOpt ) {
-return A.first < B.first;
- });
+ llvm::stable_sort(SimpleNames, llvm::less_first());
// Keep the last instance of each macro name by going in reverse
auto NewEnd = std::unique(
SimpleNames.rbegin(), SimpleNames.rend(),
diff --git a/llvm/lib/MC/MCPseudoProbe.cpp b/llvm/lib/MC/MCPseudoProbe.cpp
index cec50322bb9f9..040f3aab88128 100644
--- a/llvm/lib/MC/MCPseudoProbe.cpp
+++ b/llvm/lib/MC/MCPseudoProbe.cpp
@@ -182,13 +182,10 @@ void MCPseudoProbeInlineTree::emit(MCObjectStreamer *MCOS,
// Emit sorted descendant. InlineSite is unique for each pair, so there will
// be no ordering of Inlinee based on MCPseudoProbeInlineTree*
using InlineeType = std::pair;
- auto Comparer = [](const InlineeType , const InlineeType ) {
-return A.first < B.first;
- };
std::vector Inlinees;
for (const auto : Children)
Inlinees.emplace_back(Child.first, Child.second.get());
- std::sort(Inlinees.begin(), Inlinees.end(), Comparer);
+ llvm::sort(Inlinees, llvm::less_first());
for (const auto : Inlinees) {
// Emit probe index
@@ -230,13 +227,10 @@ void MCPseudoProbeSections::emit(MCObjectStreamer *MCOS) {
// Emit sorted descendant. InlineSite is unique for each pair, so there
// will be no ordering of Inlinee based on MCPseudoProbeInlineTree*
using InlineeType = std::pair;
- auto Comparer = [](const InlineeType , const InlineeType ) {
-return A.first < B.first;
- };
std::vector Inlinees;
for (const auto : Root.getChildren())
Inlinees.emplace_back(Child.first, Child.second.get());
- std::sort(Inlinees.begin(), Inlinees.end(), Comparer);
+ llvm::sort(Inlinees, llvm::less_first());
for (const auto : Inlinees) {
// Emit the group guarded by a sentinel probe.
diff --git a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
index 8c014832f5e46..9fe02e24c8a15 100644
--- a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
+++ b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
@@ -597,10 +597,7 @@ class SIMachineFunctionInfo final : public
AMDGPUMachineFunction,
const ReservedRegSet () const { return WWMReservedRegs; }
ArrayRef getPrologEpilogSGPRSpills() const {
-assert(
-is_sorted(PrologEpilogSGPRSpills, [](const auto , const auto )
{
- return LHS.first < RHS.first;
-}));
+assert(is_sorted(PrologEpilogSGPRSpills, llvm::less_first()));
return PrologEpilogSGPRSpills;
}
diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
b/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
index 36ecf692b02c5..ce7f6b2865375 100644
--- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
+++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
@@ -557,9 +557,7 @@ struct GenericOpScheduler : public
OpRewritePattern {
unsigned lvl = llvm::cast(expr).getPosition();
lvlSeq.push_back(std::make_pair(lvl, lvlSeq.size()));
}
- std::sort(lvlSeq.begin(), lvlSeq.end(), [](auto , auto ) -> bool
{
-return lhs.first < rhs.first;
- });
+ llvm::sort(lvlSeq, llvm::less_first());
[clang] [llvm] [mlir] Use llvm::less_first (NFC) (PR #94136)
llvmbot wrote:
@llvm/pr-subscribers-backend-amdgpu
@llvm/pr-subscribers-clang-modules
Author: Kazu Hirata (kazutakahirata)
Changes
---
Full diff: https://github.com/llvm/llvm-project/pull/94136.diff
6 Files Affected:
- (modified) clang/lib/Serialization/ASTWriter.cpp (+1-3)
- (modified) clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
(+1-3)
- (modified) llvm/lib/MC/MCPseudoProbe.cpp (+2-8)
- (modified) llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h (+1-4)
- (modified) mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
(+1-3)
- (modified) mlir/lib/Dialect/SparseTensor/Transforms/Utils/LoopEmitter.cpp
(+1-2)
``diff
diff --git a/clang/lib/Serialization/ASTWriter.cpp
b/clang/lib/Serialization/ASTWriter.cpp
index e830c4026ea78..eb41a205bc82c 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -3205,9 +3205,7 @@ void ASTWriter::WritePragmaDiagnosticMappings(const
DiagnosticsEngine ,
}
// Sort by diag::kind for deterministic output.
- llvm::sort(Mappings, [](const auto , const auto ) {
-return LHS.first < RHS.first;
- });
+ llvm::sort(Mappings, llvm::less_first());
for (const auto : Mappings) {
Record.push_back(I.first);
diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
index 0c047b6c5da2f..0f82f22d8b9a8 100644
--- a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
+++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
@@ -259,9 +259,7 @@ static void canonicalizeDefines(PreprocessorOptions
) {
++Index;
}
- llvm::stable_sort(SimpleNames, [](const MacroOpt , const MacroOpt ) {
-return A.first < B.first;
- });
+ llvm::stable_sort(SimpleNames, llvm::less_first());
// Keep the last instance of each macro name by going in reverse
auto NewEnd = std::unique(
SimpleNames.rbegin(), SimpleNames.rend(),
diff --git a/llvm/lib/MC/MCPseudoProbe.cpp b/llvm/lib/MC/MCPseudoProbe.cpp
index cec50322bb9f9..040f3aab88128 100644
--- a/llvm/lib/MC/MCPseudoProbe.cpp
+++ b/llvm/lib/MC/MCPseudoProbe.cpp
@@ -182,13 +182,10 @@ void MCPseudoProbeInlineTree::emit(MCObjectStreamer *MCOS,
// Emit sorted descendant. InlineSite is unique for each pair, so there will
// be no ordering of Inlinee based on MCPseudoProbeInlineTree*
using InlineeType = std::pair;
- auto Comparer = [](const InlineeType , const InlineeType ) {
-return A.first < B.first;
- };
std::vector Inlinees;
for (const auto : Children)
Inlinees.emplace_back(Child.first, Child.second.get());
- std::sort(Inlinees.begin(), Inlinees.end(), Comparer);
+ llvm::sort(Inlinees, llvm::less_first());
for (const auto : Inlinees) {
// Emit probe index
@@ -230,13 +227,10 @@ void MCPseudoProbeSections::emit(MCObjectStreamer *MCOS) {
// Emit sorted descendant. InlineSite is unique for each pair, so there
// will be no ordering of Inlinee based on MCPseudoProbeInlineTree*
using InlineeType = std::pair;
- auto Comparer = [](const InlineeType , const InlineeType ) {
-return A.first < B.first;
- };
std::vector Inlinees;
for (const auto : Root.getChildren())
Inlinees.emplace_back(Child.first, Child.second.get());
- std::sort(Inlinees.begin(), Inlinees.end(), Comparer);
+ llvm::sort(Inlinees, llvm::less_first());
for (const auto : Inlinees) {
// Emit the group guarded by a sentinel probe.
diff --git a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
index 8c014832f5e46..9fe02e24c8a15 100644
--- a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
+++ b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
@@ -597,10 +597,7 @@ class SIMachineFunctionInfo final : public
AMDGPUMachineFunction,
const ReservedRegSet () const { return WWMReservedRegs; }
ArrayRef getPrologEpilogSGPRSpills() const {
-assert(
-is_sorted(PrologEpilogSGPRSpills, [](const auto , const auto )
{
- return LHS.first < RHS.first;
-}));
+assert(is_sorted(PrologEpilogSGPRSpills, llvm::less_first()));
return PrologEpilogSGPRSpills;
}
diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
b/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
index 36ecf692b02c5..ce7f6b2865375 100644
--- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
+++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
@@ -557,9 +557,7 @@ struct GenericOpScheduler : public
OpRewritePattern {
unsigned lvl = llvm::cast(expr).getPosition();
lvlSeq.push_back(std::make_pair(lvl, lvlSeq.size()));
}
- std::sort(lvlSeq.begin(), lvlSeq.end(), [](auto , auto ) -> bool
{
-return lhs.first < rhs.first;
- });
+
[clang] [llvm] [mlir] Use llvm::less_first (NFC) (PR #94136)
https://github.com/kazutakahirata created
https://github.com/llvm/llvm-project/pull/94136
None
>From f154605958e5bb7481013861c96fe3c42156a834 Mon Sep 17 00:00:00 2001
From: Kazu Hirata
Date: Sat, 1 Jun 2024 18:15:17 -0700
Subject: [PATCH] Use llvm::less_first (NFC)
---
clang/lib/Serialization/ASTWriter.cpp | 4 +---
.../DependencyScanning/DependencyScanningWorker.cpp| 4 +---
llvm/lib/MC/MCPseudoProbe.cpp | 10 ++
llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h | 5 +
.../SparseTensor/Transforms/SparseReinterpretMap.cpp | 4 +---
.../SparseTensor/Transforms/Utils/LoopEmitter.cpp | 3 +--
6 files changed, 7 insertions(+), 23 deletions(-)
diff --git a/clang/lib/Serialization/ASTWriter.cpp
b/clang/lib/Serialization/ASTWriter.cpp
index e830c4026ea78..eb41a205bc82c 100644
--- a/clang/lib/Serialization/ASTWriter.cpp
+++ b/clang/lib/Serialization/ASTWriter.cpp
@@ -3205,9 +3205,7 @@ void ASTWriter::WritePragmaDiagnosticMappings(const
DiagnosticsEngine ,
}
// Sort by diag::kind for deterministic output.
- llvm::sort(Mappings, [](const auto , const auto ) {
-return LHS.first < RHS.first;
- });
+ llvm::sort(Mappings, llvm::less_first());
for (const auto : Mappings) {
Record.push_back(I.first);
diff --git a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
index 0c047b6c5da2f..0f82f22d8b9a8 100644
--- a/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
+++ b/clang/lib/Tooling/DependencyScanning/DependencyScanningWorker.cpp
@@ -259,9 +259,7 @@ static void canonicalizeDefines(PreprocessorOptions
) {
++Index;
}
- llvm::stable_sort(SimpleNames, [](const MacroOpt , const MacroOpt ) {
-return A.first < B.first;
- });
+ llvm::stable_sort(SimpleNames, llvm::less_first());
// Keep the last instance of each macro name by going in reverse
auto NewEnd = std::unique(
SimpleNames.rbegin(), SimpleNames.rend(),
diff --git a/llvm/lib/MC/MCPseudoProbe.cpp b/llvm/lib/MC/MCPseudoProbe.cpp
index cec50322bb9f9..040f3aab88128 100644
--- a/llvm/lib/MC/MCPseudoProbe.cpp
+++ b/llvm/lib/MC/MCPseudoProbe.cpp
@@ -182,13 +182,10 @@ void MCPseudoProbeInlineTree::emit(MCObjectStreamer *MCOS,
// Emit sorted descendant. InlineSite is unique for each pair, so there will
// be no ordering of Inlinee based on MCPseudoProbeInlineTree*
using InlineeType = std::pair;
- auto Comparer = [](const InlineeType , const InlineeType ) {
-return A.first < B.first;
- };
std::vector Inlinees;
for (const auto : Children)
Inlinees.emplace_back(Child.first, Child.second.get());
- std::sort(Inlinees.begin(), Inlinees.end(), Comparer);
+ llvm::sort(Inlinees, llvm::less_first());
for (const auto : Inlinees) {
// Emit probe index
@@ -230,13 +227,10 @@ void MCPseudoProbeSections::emit(MCObjectStreamer *MCOS) {
// Emit sorted descendant. InlineSite is unique for each pair, so there
// will be no ordering of Inlinee based on MCPseudoProbeInlineTree*
using InlineeType = std::pair;
- auto Comparer = [](const InlineeType , const InlineeType ) {
-return A.first < B.first;
- };
std::vector Inlinees;
for (const auto : Root.getChildren())
Inlinees.emplace_back(Child.first, Child.second.get());
- std::sort(Inlinees.begin(), Inlinees.end(), Comparer);
+ llvm::sort(Inlinees, llvm::less_first());
for (const auto : Inlinees) {
// Emit the group guarded by a sentinel probe.
diff --git a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
index 8c014832f5e46..9fe02e24c8a15 100644
--- a/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
+++ b/llvm/lib/Target/AMDGPU/SIMachineFunctionInfo.h
@@ -597,10 +597,7 @@ class SIMachineFunctionInfo final : public
AMDGPUMachineFunction,
const ReservedRegSet () const { return WWMReservedRegs; }
ArrayRef getPrologEpilogSGPRSpills() const {
-assert(
-is_sorted(PrologEpilogSGPRSpills, [](const auto , const auto )
{
- return LHS.first < RHS.first;
-}));
+assert(is_sorted(PrologEpilogSGPRSpills, llvm::less_first()));
return PrologEpilogSGPRSpills;
}
diff --git a/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
b/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
index 36ecf692b02c5..ce7f6b2865375 100644
--- a/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
+++ b/mlir/lib/Dialect/SparseTensor/Transforms/SparseReinterpretMap.cpp
@@ -557,9 +557,7 @@ struct GenericOpScheduler : public
OpRewritePattern {
unsigned lvl = llvm::cast(expr).getPosition();
lvlSeq.push_back(std::make_pair(lvl, lvlSeq.size()));
}
- std::sort(lvlSeq.begin(), lvlSeq.end(), [](auto , auto ) -> bool
{
-return
