diff options
| author | Christopher Tetreault <ctetreau@quicinc.com> | 2020-01-17 11:32:52 -0800 |
|---|---|---|
| committer | Huihui Zhang <huihuiz@quicinc.com> | 2020-01-17 11:34:08 -0800 |
| commit | 5df53a22592729e631c4030f38c599b9f37095b7 (patch) | |
| tree | 942a97699897fbc505f0e913b2e49cc9c717741c /llvm/lib/Bitcode/Reader/BitcodeReader.cpp | |
| parent | c33ba8c15858c0316378caf2667c8feee32dad36 (diff) | |
| download | llvm-5df53a22592729e631c4030f38c599b9f37095b7.zip llvm-5df53a22592729e631c4030f38c599b9f37095b7.tar.gz llvm-5df53a22592729e631c4030f38c599b9f37095b7.tar.bz2 | |
[SVE] Pass Scalable argument to VectorType::get in Bitcode Reader
Summary:
* Pass the Scalability test to VectorType::get in order to be
able to deserialize bitcode that contains scalable vector operations
Change-Id: I37fe5b1c0c237a9153130deefdc1a6d595c7f12e
Reviewers: efriedma, pcc, sdesmalen, apazos, huihuiz, chrisj
Reviewed By: sdesmalen
Subscribers: tschuett, hiraditya, rkruppe, psnobl, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D72792
Diffstat (limited to 'llvm/lib/Bitcode/Reader/BitcodeReader.cpp')
| -rw-r--r-- | llvm/lib/Bitcode/Reader/BitcodeReader.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp index 1eefb1b..1a5bd02 100644 --- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp @@ -2630,12 +2630,13 @@ Error BitcodeReader::parseConstants() { Type *SelectorTy = Type::getInt1Ty(Context); - // The selector might be an i1 or an <n x i1> + // The selector might be an i1, an <n x i1>, or a <vscale x n x i1> // Get the type from the ValueList before getting a forward ref. if (VectorType *VTy = dyn_cast<VectorType>(CurTy)) if (Value *V = ValueList[Record[0]]) if (SelectorTy != V->getType()) - SelectorTy = VectorType::get(SelectorTy, VTy->getNumElements()); + SelectorTy = VectorType::get(SelectorTy, + VTy->getElementCount()); V = ConstantExpr::getSelect(ValueList.getConstantFwdRef(Record[0], SelectorTy), @@ -2693,7 +2694,7 @@ Error BitcodeReader::parseConstants() { Constant *Op0 = ValueList.getConstantFwdRef(Record[0], OpTy); Constant *Op1 = ValueList.getConstantFwdRef(Record[1], OpTy); Type *ShufTy = VectorType::get(Type::getInt32Ty(Context), - OpTy->getNumElements()); + OpTy->getElementCount()); Constant *Op2 = ValueList.getConstantFwdRef(Record[2], ShufTy); V = ConstantExpr::getShuffleVector(Op0, Op1, Op2); break; @@ -2707,7 +2708,7 @@ Error BitcodeReader::parseConstants() { Constant *Op0 = ValueList.getConstantFwdRef(Record[1], OpTy); Constant *Op1 = ValueList.getConstantFwdRef(Record[2], OpTy); Type *ShufTy = VectorType::get(Type::getInt32Ty(Context), - RTy->getNumElements()); + RTy->getElementCount()); Constant *Op2 = ValueList.getConstantFwdRef(Record[3], ShufTy); V = ConstantExpr::getShuffleVector(Op0, Op1, Op2); break; @@ -4168,9 +4169,15 @@ Error BitcodeReader::parseFunctionBody(Function *F) { return error("Invalid record"); if (!Vec1->getType()->isVectorTy() || !Vec2->getType()->isVectorTy()) return error("Invalid type for value"); + + ElementCount EC1 = cast<VectorType>(Vec1->getType())->getElementCount(); + + if (EC1 != cast<VectorType>(Vec2->getType())->getElementCount()) + return error("Mismatch between argument types"); + I = new ShuffleVectorInst(Vec1, Vec2, Mask); FullTy = VectorType::get(FullTy->getVectorElementType(), - Mask->getType()->getVectorNumElements()); + EC1); InstructionList.push_back(I); break; } |