summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--llvm/docs/LangRef.rst8
-rw-r--r--llvm/include/llvm/IR/IRBuilder.h5
-rw-r--r--llvm/include/llvm/IR/Operator.h6
-rw-r--r--llvm/lib/Analysis/IVDescriptors.cpp3
-rw-r--r--llvm/lib/AsmParser/LLParser.cpp14
-rw-r--r--llvm/lib/Bitcode/Reader/BitcodeReader.cpp29
-rw-r--r--llvm/lib/Bitcode/Writer/BitcodeWriter.cpp5
-rw-r--r--llvm/lib/CodeGen/CodeGenPrepare.cpp2
-rw-r--r--llvm/test/Bitcode/compatibility.ll21
-rw-r--r--llvm/unittests/IR/InstructionsTest.cpp7
10 files changed, 14 insertions, 86 deletions
diff --git a/llvm/docs/LangRef.rst b/llvm/docs/LangRef.rst
index a38356aa27e..87e1b971605 100644
--- a/llvm/docs/LangRef.rst
+++ b/llvm/docs/LangRef.rst
@@ -10067,7 +10067,7 @@ Syntax:
::
- <result> = phi [fast-math-flags] <ty> [ <val0>, <label0>], ...
+ <result> = phi <ty> [ <val0>, <label0>], ...
Overview:
"""""""""
@@ -10094,12 +10094,6 @@ deemed to occur on the edge from the corresponding predecessor block to
the current block (but after any definition of an '``invoke``'
instruction's return value on the same edge).
-The optional ``fast-math-flags`` marker indicates that the phi has one
-or more :ref:`fast-math-flags <fastmath>`. These are optimization hints
-to enable otherwise unsafe floating-point optimizations. Fast-math-flags
-are only valid for phis that return a floating-point scalar or vector
-type.
-
Semantics:
""""""""""
diff --git a/llvm/include/llvm/IR/IRBuilder.h b/llvm/include/llvm/IR/IRBuilder.h
index c3918473eac..e5dcea1d4c0 100644
--- a/llvm/include/llvm/IR/IRBuilder.h
+++ b/llvm/include/llvm/IR/IRBuilder.h
@@ -2231,10 +2231,7 @@ public:
PHINode *CreatePHI(Type *Ty, unsigned NumReservedValues,
const Twine &Name = "") {
- PHINode *Phi = PHINode::Create(Ty, NumReservedValues);
- if (isa<FPMathOperator>(Phi))
- Phi = cast<PHINode>(setFPAttrs(Phi, nullptr /* MDNode* */, FMF));
- return Insert(Phi, Name);
+ return Insert(PHINode::Create(Ty, NumReservedValues), Name);
}
CallInst *CreateCall(FunctionType *FTy, Value *Callee,
diff --git a/llvm/include/llvm/IR/Operator.h b/llvm/include/llvm/IR/Operator.h
index 608f33c3ed5..8199c65ca8a 100644
--- a/llvm/include/llvm/IR/Operator.h
+++ b/llvm/include/llvm/IR/Operator.h
@@ -379,17 +379,13 @@ public:
return false;
switch (Opcode) {
- // FIXME: To clean up and correct the semantics of fast-math-flags, FCmp
- // should not be treated as a math op, but the other opcodes should.
- // This would make things consistent with Select/PHI (FP value type
- // determines whether they are math ops and, therefore, capable of
- // having fast-math-flags).
case Instruction::FCmp:
return true;
// non math FP Operators (no FMF)
case Instruction::ExtractElement:
case Instruction::ShuffleVector:
case Instruction::InsertElement:
+ case Instruction::PHI:
return false;
default:
return V->getType()->isFPOrFPVectorTy();
diff --git a/llvm/lib/Analysis/IVDescriptors.cpp b/llvm/lib/Analysis/IVDescriptors.cpp
index 6fb600114bc..ce285f82f72 100644
--- a/llvm/lib/Analysis/IVDescriptors.cpp
+++ b/llvm/lib/Analysis/IVDescriptors.cpp
@@ -300,8 +300,7 @@ bool RecurrenceDescriptor::AddReductionVar(PHINode *Phi, RecurrenceKind Kind,
ReduxDesc = isRecurrenceInstr(Cur, Kind, ReduxDesc, HasFunNoNaNAttr);
if (!ReduxDesc.isRecurrence())
return false;
- // FIXME: FMF is allowed on phi, but propagation is not handled correctly.
- if (isa<FPMathOperator>(ReduxDesc.getPatternInst()) && !IsAPhi)
+ if (isa<FPMathOperator>(ReduxDesc.getPatternInst()))
FMF &= ReduxDesc.getPatternInst()->getFastMathFlags();
}
diff --git a/llvm/lib/AsmParser/LLParser.cpp b/llvm/lib/AsmParser/LLParser.cpp
index 5ea0b7d39c1..eb66a7c82b5 100644
--- a/llvm/lib/AsmParser/LLParser.cpp
+++ b/llvm/lib/AsmParser/LLParser.cpp
@@ -5802,19 +5802,7 @@ int LLParser::ParseInstruction(Instruction *&Inst, BasicBlock *BB,
case lltok::kw_extractelement: return ParseExtractElement(Inst, PFS);
case lltok::kw_insertelement: return ParseInsertElement(Inst, PFS);
case lltok::kw_shufflevector: return ParseShuffleVector(Inst, PFS);
- case lltok::kw_phi: {
- FastMathFlags FMF = EatFastMathFlagsIfPresent();
- int Res = ParsePHI(Inst, PFS);
- if (Res != 0)
- return Res;
- if (FMF.any()) {
- if (!Inst->getType()->isFPOrFPVectorTy())
- return Error(Loc, "fast-math-flags specified for phi without "
- "floating-point scalar or vector return type");
- Inst->setFastMathFlags(FMF);
- }
- return 0;
- }
+ case lltok::kw_phi: return ParsePHI(Inst, PFS);
case lltok::kw_landingpad: return ParseLandingPad(Inst, PFS);
// Call.
case lltok::kw_call: return ParseCall(Inst, PFS, CallInst::TCK_None);
diff --git a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
index 9c377552b4a..89a5b7bdd5b 100644
--- a/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/llvm/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -4629,48 +4629,31 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
InstructionList.push_back(I);
break;
case bitc::FUNC_CODE_INST_PHI: { // PHI: [ty, val0,bb0, ...]
- if (Record.size() < 1)
+ if (Record.size() < 1 || ((Record.size()-1)&1))
return error("Invalid record");
- // The first record specifies the type.
FullTy = getFullyStructuredTypeByID(Record[0]);
Type *Ty = flattenPointerTypes(FullTy);
if (!Ty)
return error("Invalid record");
- // Phi arguments are pairs of records of [value, basic block].
- // There is an optional final record for fast-math-flags if this phi has a
- // floating-point type.
- size_t NumArgs = (Record.size() - 1) / 2;
- if ((Record.size() - 1) % 2 == 1 && !Ty->isFloatingPointTy())
- return error("Invalid record");
-
- PHINode *PN = PHINode::Create(Ty, NumArgs);
+ PHINode *PN = PHINode::Create(Ty, (Record.size()-1)/2);
InstructionList.push_back(PN);
- for (unsigned i = 0; i != NumArgs; i++) {
+ for (unsigned i = 0, e = Record.size()-1; i != e; i += 2) {
Value *V;
// With the new function encoding, it is possible that operands have
// negative IDs (for forward references). Use a signed VBR
// representation to keep the encoding small.
if (UseRelativeIDs)
- V = getValueSigned(Record, i * 2 + 1, NextValueNo, Ty);
+ V = getValueSigned(Record, 1+i, NextValueNo, Ty);
else
- V = getValue(Record, i * 2 + 1, NextValueNo, Ty);
- BasicBlock *BB = getBasicBlock(Record[i * 2 + 2]);
+ V = getValue(Record, 1+i, NextValueNo, Ty);
+ BasicBlock *BB = getBasicBlock(Record[2+i]);
if (!V || !BB)
return error("Invalid record");
PN->addIncoming(V, BB);
}
I = PN;
-
- // If there are an even number of records, the final record must be FMF.
- if (Record.size() % 2 == 0) {
- assert(isa<FPMathOperator>(I) && "Unexpected phi type");
- FastMathFlags FMF = getDecodedFastMathFlags(Record[Record.size() - 1]);
- if (FMF.any())
- I->setFastMathFlags(FMF);
- }
-
break;
}
diff --git a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
index 2818e843b50..0eea6dc87ce 100644
--- a/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/llvm/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -2880,11 +2880,6 @@ void ModuleBitcodeWriter::writeInstruction(const Instruction &I,
pushValueSigned(PN.getIncomingValue(i), InstID, Vals64);
Vals64.push_back(VE.getValueID(PN.getIncomingBlock(i)));
}
-
- uint64_t Flags = getOptimizationFlags(&I);
- if (Flags != 0)
- Vals64.push_back(Flags);
-
// Emit a Vals64 vector and exit.
Stream.EmitRecord(Code, Vals64, AbbrevToUse);
Vals64.clear();
diff --git a/llvm/lib/CodeGen/CodeGenPrepare.cpp b/llvm/lib/CodeGen/CodeGenPrepare.cpp
index 0333232983d..b3a6e284f4f 100644
--- a/llvm/lib/CodeGen/CodeGenPrepare.cpp
+++ b/llvm/lib/CodeGen/CodeGenPrepare.cpp
@@ -5951,7 +5951,7 @@ bool CodeGenPrepare::optimizeSelectInst(SelectInst *SI) {
// If branch conversion isn't desirable, exit early.
if (DisableSelectToBranch || OptSize || !TLI)
return false;
-TLI->isSelectSupported(<#SelectSupportKind#>)
+
// Find all consecutive select instructions that share the same condition.
SmallVector<SelectInst *, 2> ASI;
ASI.push_back(SI);
diff --git a/llvm/test/Bitcode/compatibility.ll b/llvm/test/Bitcode/compatibility.ll
index 9e7f6ac9917..b17aeda8ebb 100644
--- a/llvm/test/Bitcode/compatibility.ll
+++ b/llvm/test/Bitcode/compatibility.ll
@@ -861,27 +861,6 @@ define void @fastmathflags_vector_select(<2 x i1> %cond, <2 x double> %op1, <2 x
ret void
}
-define void @fastmathflags_phi(i1 %cond, float %f1, float %f2, double %d1, double %d2, half %h1, half %h2) {
-entry:
- br i1 %cond, label %L1, label %L2
-L1:
- br label %exit
-L2:
- br label %exit
-exit:
- %p.nnan = phi nnan float [ %f1, %L1 ], [ %f2, %L2 ]
- ; CHECK: %p.nnan = phi nnan float [ %f1, %L1 ], [ %f2, %L2 ]
- %p.ninf = phi ninf double [ %d1, %L1 ], [ %d2, %L2 ]
- ; CHECK: %p.ninf = phi ninf double [ %d1, %L1 ], [ %d2, %L2 ]
- %p.contract = phi contract half [ %h1, %L1 ], [ %h2, %L2 ]
- ; CHECK: %p.contract = phi contract half [ %h1, %L1 ], [ %h2, %L2 ]
- %p.nsz.reassoc = phi reassoc nsz float [ %f1, %L1 ], [ %f2, %L2 ]
- ; CHECK: %p.nsz.reassoc = phi reassoc nsz float [ %f1, %L1 ], [ %f2, %L2 ]
- %p.fast = phi fast half [ %h2, %L1 ], [ %h1, %L2 ]
- ; CHECK: %p.fast = phi fast half [ %h2, %L1 ], [ %h1, %L2 ]
- ret void
-}
-
; Check various fast math flags and floating-point types on calls.
declare float @fmf1()
diff --git a/llvm/unittests/IR/InstructionsTest.cpp b/llvm/unittests/IR/InstructionsTest.cpp
index afd579400ff..b2ea3844d33 100644
--- a/llvm/unittests/IR/InstructionsTest.cpp
+++ b/llvm/unittests/IR/InstructionsTest.cpp
@@ -1034,16 +1034,13 @@ TEST(InstructionsTest, SkipDebug) {
EXPECT_EQ(nullptr, Term->getNextNonDebugInstruction());
}
-TEST(InstructionsTest, PhiMightNotBeFPMathOperator) {
+TEST(InstructionsTest, PhiIsNotFPMathOperator) {
LLVMContext Context;
IRBuilder<> Builder(Context);
MDBuilder MDHelper(Context);
- Instruction *I = Builder.CreatePHI(Builder.getInt32Ty(), 0);
+ Instruction *I = Builder.CreatePHI(Builder.getDoubleTy(), 0);
EXPECT_FALSE(isa<FPMathOperator>(I));
I->deleteValue();
- Instruction *FP = Builder.CreatePHI(Builder.getDoubleTy(), 0);
- EXPECT_TRUE(isa<FPMathOperator>(FP));
- FP->deleteValue();
}
TEST(InstructionsTest, FNegInstruction) {
OpenPOWER on IntegriCloud