diff options
| -rw-r--r-- | include/llvm/Bitcode/LLVMBitCodes.h | 6 | ||||
| -rw-r--r-- | lib/Bitcode/Reader/BitcodeReader.cpp | 28 | ||||
| -rw-r--r-- | lib/Bitcode/Writer/BitcodeWriter.cpp | 13 | ||||
| -rw-r--r-- | test/Assembler/vector-select.ll | 1 |
4 files changed, 33 insertions, 15 deletions
diff --git a/include/llvm/Bitcode/LLVMBitCodes.h b/include/llvm/Bitcode/LLVMBitCodes.h index d1dcc74437..5213828d77 100644 --- a/include/llvm/Bitcode/LLVMBitCodes.h +++ b/include/llvm/Bitcode/LLVMBitCodes.h @@ -206,8 +206,10 @@ namespace bitc { FUNC_CODE_INST_GETRESULT = 25, // GETRESULT: [ty, opval, n] FUNC_CODE_INST_EXTRACTVAL = 26, // EXTRACTVAL: [n x operands] FUNC_CODE_INST_INSERTVAL = 27, // INSERTVAL: [n x operands] - // fcmp/icmp returning vector of Int1Ty, NOT for vicmp/vfcmp - FUNC_CODE_INST_VCMP = 28 // VCMP: [opty, opval, opval, pred] + // fcmp/icmp returning Int1TY or vector of Int1Ty, NOT for vicmp/vfcmp + FUNC_CODE_INST_CMP2 = 28, // VCMP: [opty, opval, opval, pred] + // new select on i1 or [N x i1] + FUNC_CODE_INST_VSELECT = 29 // VSELECT: [ty,opval,opval,predty,pred] }; } // End bitc namespace } // End llvm namespace diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp index d7f5b09235..975075c60e 100644 --- a/lib/Bitcode/Reader/BitcodeReader.cpp +++ b/lib/Bitcode/Reader/BitcodeReader.cpp @@ -1495,15 +1495,32 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { } case bitc::FUNC_CODE_INST_SELECT: { // SELECT: [opval, ty, opval, opval] + // obsolete form of select + // handles select i1 ... in old bitcode unsigned OpNum = 0; Value *TrueVal, *FalseVal, *Cond; if (getValueTypePair(Record, OpNum, NextValueNo, TrueVal) || getValue(Record, OpNum, TrueVal->getType(), FalseVal) || getValue(Record, OpNum, Type::Int1Ty, Cond)) return Error("Invalid SELECT record"); + + I = SelectInst::Create(Cond, TrueVal, FalseVal); + break; + } + + case bitc::FUNC_CODE_INST_VSELECT: {// VSELECT: [ty,opval,opval,predty,pred] + // new form of select + // handles select i1 or select [N x i1] + unsigned OpNum = 0; + Value *TrueVal, *FalseVal, *Cond; + if (getValueTypePair(Record, OpNum, NextValueNo, TrueVal) || + getValue(Record, OpNum, TrueVal->getType(), FalseVal) || + getValueTypePair(Record, OpNum, NextValueNo, Cond)) + return Error("Invalid SELECT record"); // select condition can be either i1 or [N x i1] - if (const VectorType* vector_type = dyn_cast<const VectorType>(Cond->getType())) { + if (const VectorType* vector_type = + dyn_cast<const VectorType>(Cond->getType())) { // expect <n x i1> if (vector_type->getElementType() != Type::Int1Ty) return Error("Invalid SELECT condition type"); @@ -1557,6 +1574,8 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { } case bitc::FUNC_CODE_INST_CMP: { // CMP: [opty, opval, opval, pred] + // VFCmp/VICmp + // or old form of ICmp/FCmp returning bool unsigned OpNum = 0; Value *LHS, *RHS; if (getValueTypePair(Record, OpNum, NextValueNo, LHS) || @@ -1574,16 +1593,15 @@ bool BitcodeReader::ParseFunctionBody(Function *F) { I = new VICmpInst((ICmpInst::Predicate)Record[OpNum], LHS, RHS); break; } - case bitc::FUNC_CODE_INST_VCMP: { // VCMP: [opty, opval, opval, pred] - // Fcmp/ICmp returning vector of bool + case bitc::FUNC_CODE_INST_CMP2: { // CMP2: [opty, opval, opval, pred] + // Fcmp/ICmp returning bool or vector of bool unsigned OpNum = 0; Value *LHS, *RHS; if (getValueTypePair(Record, OpNum, NextValueNo, LHS) || getValue(Record, OpNum, LHS->getType(), RHS) || OpNum+1 != Record.size()) - return Error("Invalid VCMP record"); + return Error("Invalid CMP2 record"); - // will always be vector if (LHS->getType()->isFPOrFPVector()) I = new FCmpInst((FCmpInst::Predicate)Record[OpNum], LHS, RHS); else diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp index 19f5beaf19..c647828eeb 100644 --- a/lib/Bitcode/Writer/BitcodeWriter.cpp +++ b/lib/Bitcode/Writer/BitcodeWriter.cpp @@ -746,10 +746,10 @@ static void WriteInstruction(const Instruction &I, unsigned InstID, break; } case Instruction::Select: - Code = bitc::FUNC_CODE_INST_SELECT; + Code = bitc::FUNC_CODE_INST_VSELECT; PushValueAndType(I.getOperand(1), InstID, Vals, VE); Vals.push_back(VE.getValueID(I.getOperand(2))); - Vals.push_back(VE.getValueID(I.getOperand(0))); + PushValueAndType(I.getOperand(0), InstID, Vals, VE); break; case Instruction::ExtractElement: Code = bitc::FUNC_CODE_INST_EXTRACTELT; @@ -772,11 +772,10 @@ static void WriteInstruction(const Instruction &I, unsigned InstID, case Instruction::FCmp: case Instruction::VICmp: case Instruction::VFCmp: - if (isa<VectorType>(I.getOperand(0)->getType()) - && (I.getOpcode() == Instruction::ICmp - || I.getOpcode() == Instruction::FCmp)) { - // compare returning vector of Int1Ty - Code = bitc::FUNC_CODE_INST_VCMP; + if (I.getOpcode() == Instruction::ICmp + || I.getOpcode() == Instruction::FCmp) { + // compare returning Int1Ty or vector of Int1Ty + Code = bitc::FUNC_CODE_INST_CMP2; } else { Code = bitc::FUNC_CODE_INST_CMP; } diff --git a/test/Assembler/vector-select.ll b/test/Assembler/vector-select.ll index 7c76a8678d..87af602aaf 100644 --- a/test/Assembler/vector-select.ll +++ b/test/Assembler/vector-select.ll @@ -1,5 +1,4 @@ ; RUN: llvm-as < %s | llvm-dis | llvm-as | llvm-dis | grep select -; XFAIL: * ; rudimentary test of select on vectors returning vector of bool define <4 x i32> @foo(<4 x i32> %a, <4 x i32> %b, |