[ADT] Add convenience function filter_to_vector
#117460
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This materializes a filter range as a small vector. Similar to `map_to_vector`, this new utility function lives in the `SmallVectorExtras.h` header.
kuhar
requested review from
MaskRay,
llvm-beanz,
dwblaikie,
kazutakahirata and
Groverkss
|
@llvm/pr-subscribers-llvm-adt Author: Jakub Kuderski (kuhar) ChangesThis materializes a filter range as a small vector. Similar to Full diff: https://github.com/llvm/llvm-project/pull/117460.diff 3 Files Affected:
diff --git a/llvm/include/llvm/ADT/SmallVectorExtras.h b/llvm/include/llvm/ADT/SmallVectorExtras.h
index eea91ca81ca612..061293fae08307 100644
--- a/llvm/include/llvm/ADT/SmallVectorExtras.h
+++ b/llvm/include/llvm/ADT/SmallVectorExtras.h
@@ -19,12 +19,28 @@
namespace llvm {
+/// Filter a range to a SmallVector with the element types deduced.
+template <unsigned Size, class ContainerTy, class PredicateFn>
+auto filter_to_vector(ContainerTy &&C, PredicateFn &&Pred) {
+ return to_vector<Size>(make_filter_range(std::forward<ContainerTy>(C),
+ std::forward<PredicateFn>(Pred)));
+}
+
+/// Filter a range to a SmallVector with the element types deduced.
+template <class ContainerTy, class PredicateFn>
+auto filter_to_vector(ContainerTy &&C, PredicateFn &&Pred) {
+ return to_vector(make_filter_range(std::forward<ContainerTy>(C),
+ std::forward<PredicateFn>(Pred)));
+}
+
/// Map a range to a SmallVector with element types deduced from the mapping.
template <unsigned Size, class ContainerTy, class FuncTy>
auto map_to_vector(ContainerTy &&C, FuncTy &&F) {
return to_vector<Size>(
map_range(std::forward<ContainerTy>(C), std::forward<FuncTy>(F)));
}
+
+/// Map a range to a SmallVector with element types deduced from the mapping.
template <class ContainerTy, class FuncTy>
auto map_to_vector(ContainerTy &&C, FuncTy &&F) {
return to_vector(
diff --git a/llvm/unittests/ADT/CMakeLists.txt b/llvm/unittests/ADT/CMakeLists.txt
index b0077d5b54a3ee..c9bc58f45f08cf 100644
--- a/llvm/unittests/ADT/CMakeLists.txt
+++ b/llvm/unittests/ADT/CMakeLists.txt
@@ -75,6 +75,7 @@ add_llvm_unittest(ADTTests
SmallPtrSetTest.cpp
SmallSetTest.cpp
SmallStringTest.cpp
+ SmallVectorExtrasTest.cpp
SmallVectorTest.cpp
SparseBitVectorTest.cpp
SparseMultiSetTest.cpp
diff --git a/llvm/unittests/ADT/SmallVectorExtrasTest.cpp b/llvm/unittests/ADT/SmallVectorExtrasTest.cpp
new file mode 100644
index 00000000000000..43a51d22b485aa
--- /dev/null
+++ b/llvm/unittests/ADT/SmallVectorExtrasTest.cpp
@@ -0,0 +1,37 @@
+//===- llvm/unittest/ADT/SmallVectorExtrasTest.cpp ------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// SmallVectorExtras unit tests.
+//
+//===----------------------------------------------------------------------===//
+
+#include "llvm/ADT/SmallVectorExtras.h"
+#include "gmock/gmock.h"
+#include "gtest/gtest.h"
+
+#include <type_traits>
+#include <vector>
+
+using testing::ElementsAre;
+
+namespace llvm {
+namespace {
+
+TEST(SmallVectorExtrasTest, FilterToVector) {
+ std::vector<int> Numbers = {0, 1, 2, 3, 4};
+ auto Odd = filter_to_vector<2>(Numbers, [](int X) { return (X % 2) != 0; });
+ static_assert(std::is_same_v<decltype(Odd), SmallVector<int, 2>>);
+ EXPECT_THAT(Odd, ElementsAre(1, 3));
+
+ auto Even = filter_to_vector(Numbers, [](int X) { return (X % 2) == 0; });
+ static_assert(std::is_same_v<decltype(Even), SmallVector<int>>);
+ EXPECT_THAT(Even, ElementsAre(0, 2, 4));
+}
+
+} // end namespace
+} // namespace llvm
|
|
✅ With the latest revision this PR passed the C/C++ code formatter. |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/35/builds/4019 Here is the relevant piece of the build log for the reference |
|
I probably had similar feedback on previous *_to_vector - but I do wonder whether these are worthwhile/that much of a benefit compared to composing the two operations when needed? |
I see |
|
My guess is that the reason for that in MLIR specifically is that we have multiple functions/methods that return ranges of IR constructs, e.g., |
kuhar
added a commit
to kuhar/iree
that referenced
this pull request
Nov 26, 2024
I recently added this to SmallVectorExtras: llvm/llvm-project#117460. Signed-off-by: Jakub Kuderski <[email protected]>
kuhar
added a commit
to iree-org/iree
that referenced
this pull request
Nov 26, 2024
I recently added this to SmallVectorExtras: llvm/llvm-project#117460.
kuhar
added a commit
to kuhar/llvm-project
that referenced
this pull request
Nov 26, 2024
This got recently added to SmallVectorExtras: llvm#117460.
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/146/builds/1690 Here is the relevant piece of the build log for the reference |
kuhar
added a commit
that referenced
this pull request
Nov 26, 2024
This got recently added to SmallVectorExtras: #117460.
Groverkss
pushed a commit
to Groverkss/iree
that referenced
this pull request
Dec 1, 2024
I recently added this to SmallVectorExtras: llvm/llvm-project#117460.
giacs-epic
pushed a commit
to giacs-epic/iree
that referenced
this pull request
Dec 4, 2024
I recently added this to SmallVectorExtras: llvm/llvm-project#117460. Signed-off-by: Giacomo Serafini <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This materializes a filter range as a small vector.
Similar to
map_to_vector, this new utility function lives in theSmallVectorExtras.hheader.