maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove remaining callers of CreateShuffleVector with unsigned indices and mark it as deprecated 

No functionality change intended.
This commit is contained in:
Benjamin Kramer 2020-04-19 11:48:28 +02:00
parent 59b0e015fc
commit ff54d1c897
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/include/llvm/IR/IRBuilder.h
View File

@ -2377,8 +2377,10 @@ public:
return CreateShuffleVector(V1, V2, IntMask, Name);
}
Value *CreateShuffleVector(Value *V1, Value *V2, ArrayRef<uint32_t> Mask,
const Twine &Name = "") {
LLVM_ATTRIBUTE_DEPRECATED(Value *CreateShuffleVector(Value *V1, Value *V2,
ArrayRef<uint32_t> Mask,
const Twine &Name = ""),
"Pass indices as 'int' instead") {
SmallVector<int, 16> IntMask;
IntMask.assign(Mask.begin(), Mask.end());
return CreateShuffleVector(V1, V2, IntMask, Name);

14
llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp
View File

@ -4079,7 +4079,7 @@ Value *BoUpSLP::vectorizeTree(ArrayRef<Value *> VL) {
}
static void inversePermutation(ArrayRef<unsigned> Indices,
SmallVectorImpl<unsigned> &Mask) {
SmallVectorImpl<int> &Mask) {
Mask.clear();
const unsigned E = Indices.size();
Mask.resize(E);
@ -4161,7 +4161,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E) {
case Instruction::ExtractElement: {
Value *V = E->getSingleOperand(0);
if (!E->ReorderIndices.empty()) {
OrdersType Mask;
SmallVector<int, 4> Mask;
inversePermutation(E->ReorderIndices, Mask);
Builder.SetInsertPoint(VL0);
V = Builder.CreateShuffleVector(V, UndefValue::get(VecTy), Mask,
@ -4186,7 +4186,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E) {
LoadInst *V = Builder.CreateAlignedLoad(VecTy, Ptr, LI->getAlign());
Value *NewV = propagateMetadata(V, E->Scalars);
if (!E->ReorderIndices.empty()) {
OrdersType Mask;
SmallVector<int, 4> Mask;
inversePermutation(E->ReorderIndices, Mask);
NewV = Builder.CreateShuffleVector(NewV, UndefValue::get(VecTy), Mask,
"reorder_shuffle");
@ -4375,7 +4375,7 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E) {
LI = Builder.CreateAlignedLoad(VecTy, VecPtr, Alignment);
Value *V = propagateMetadata(LI, E->Scalars);
if (IsReorder) {
OrdersType Mask;
SmallVector<int, 4> Mask;
inversePermutation(E->ReorderIndices, Mask);
V = Builder.CreateShuffleVector(V, UndefValue::get(V->getType()),
Mask, "reorder_shuffle");
@ -4400,10 +4400,10 @@ Value *BoUpSLP::vectorizeTree(TreeEntry *E) {
Value *VecValue = vectorizeTree(E->getOperand(0));
if (IsReorder) {
OrdersType Mask;
inversePermutation(E->ReorderIndices, Mask);
SmallVector<int, 4> Mask(E->ReorderIndices.begin(),
E->ReorderIndices.end());
VecValue = Builder.CreateShuffleVector(
VecValue, UndefValue::get(VecValue->getType()), E->ReorderIndices,
VecValue, UndefValue::get(VecValue->getType()), Mask,
"reorder_shuffle");
}
Value *ScalarPtr = SI->getPointerOperand();