[PATCH] D104024: [llvm] remove Sequence::asSmallVector()
Guillaume Chatelet via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 14 01:28:26 PDT 2021
This revision was automatically updated to reflect the committed changes.
Closed by commit rG1d49e5352f95: [llvm] remove Sequence::asSmallVector() (authored by gchatelet).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D104024/new/
https://reviews.llvm.org/D104024
Files:
llvm/include/llvm/ADT/Sequence.h
mlir/lib/Conversion/PDLToPDLInterp/PDLToPDLInterp.cpp
mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp
Index: mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp
===================================================================
--- mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp
+++ mlir/lib/Dialect/Linalg/Transforms/Vectorization.cpp
@@ -24,6 +24,8 @@
#include "mlir/Support/LLVM.h"
#include "mlir/Transforms/RegionUtils.h"
#include "llvm/ADT/ScopeExit.h"
+#include "llvm/ADT/Sequence.h"
+#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/TypeSwitch.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/raw_ostream.h"
@@ -303,7 +305,7 @@
auto targetShape = linalgOp.computeStaticLoopSizes();
// Compute a one-dimensional index vector for the index op dimension.
SmallVector<int64_t> constantSeq =
- llvm::seq<int64_t>(0, targetShape[indexOp.dim()]).asSmallVector();
+ llvm::to_vector<16>(llvm::seq<int64_t>(0, targetShape[indexOp.dim()]));
ConstantOp constantOp =
b.create<ConstantOp>(loc, b.getIndexVectorAttr(constantSeq));
// Return the one-dimensional index vector if it lives in the trailing
@@ -318,7 +320,7 @@
auto broadCastOp = b.create<vector::BroadcastOp>(
loc, VectorType::get(targetShape, b.getIndexType()), constantOp);
SmallVector<int64_t> transposition =
- llvm::seq<int64_t>(0, linalgOp.getNumLoops()).asSmallVector();
+ llvm::to_vector<16>(llvm::seq<int64_t>(0, linalgOp.getNumLoops()));
std::swap(transposition.back(), transposition[indexOp.dim()]);
auto transposeOp =
b.create<vector::TransposeOp>(loc, broadCastOp, transposition);
Index: mlir/lib/Conversion/PDLToPDLInterp/PDLToPDLInterp.cpp
===================================================================
--- mlir/lib/Conversion/PDLToPDLInterp/PDLToPDLInterp.cpp
+++ mlir/lib/Conversion/PDLToPDLInterp/PDLToPDLInterp.cpp
@@ -15,7 +15,9 @@
#include "mlir/Pass/Pass.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/ScopedHashTable.h"
+#include "llvm/ADT/Sequence.h"
#include "llvm/ADT/SetVector.h"
+#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/TypeSwitch.h"
using namespace mlir;
@@ -380,9 +382,8 @@
if (kind == Predicates::OperandCountAtLeastQuestion ||
kind == Predicates::ResultCountAtLeastQuestion) {
// Order the children such that the cases are in reverse numerical order.
- SmallVector<unsigned> sortedChildren =
- llvm::seq<unsigned>(0, switchNode->getChildren().size())
- .asSmallVector();
+ SmallVector<unsigned> sortedChildren = llvm::to_vector<16>(
+ llvm::seq<unsigned>(0, switchNode->getChildren().size()));
llvm::sort(sortedChildren, [&](unsigned lhs, unsigned rhs) {
return cast<UnsignedAnswer>(switchNode->getChild(lhs).first)->getValue() >
cast<UnsignedAnswer>(switchNode->getChild(rhs).first)->getValue();
Index: llvm/include/llvm/ADT/Sequence.h
===================================================================
--- llvm/include/llvm/ADT/Sequence.h
+++ llvm/include/llvm/ADT/Sequence.h
@@ -15,8 +15,6 @@
#ifndef LLVM_ADT_SEQUENCE_H
#define LLVM_ADT_SEQUENCE_H
-#include "llvm/ADT/SmallVector.h"
-
#include <cstddef> //std::ptrdiff_t
#include <iterator> //std::random_access_iterator_tag
@@ -167,8 +165,6 @@
auto rbegin() const { return const_reverse_iterator(End - 1); }
auto rend() const { return const_reverse_iterator(Begin - 1); }
- auto asSmallVector() const { return SmallVector<ValueT>(begin(), end()); }
-
private:
static_assert(std::is_same<ValueT, std::remove_cv_t<ValueT>>::value,
"ValueT must not be const nor volatile");
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D104024.351794.patch
Type: text/x-patch
Size: 3550 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20210614/e63553eb/attachment.bin>
More information about the llvm-commits
mailing list