[llvm-branch-commits] [llvm-branch] r325592 - Merging r325525:
Hans Wennborg via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Tue Feb 20 08:22:18 PST 2018
Author: hans
Date: Tue Feb 20 08:22:18 2018
New Revision: 325592
URL: http://llvm.org/viewvc/llvm-project?rev=325592&view=rev
Log:
Merging r325525:
------------------------------------------------------------------------
r325525 | steven_wu | 2018-02-19 20:22:28 +0100 (Mon, 19 Feb 2018) | 13 lines
bitcode support change for fast flags compatibility
Summary: The discussion and as per need, each vendor needs a way to keep the old fast flags and the new fast flags in the auto upgrade path of the IR upgrader. This revision addresses that issue.
Patched by Michael Berg
Reviewers: qcolombet, hans, steven_wu
Reviewed By: qcolombet, steven_wu
Subscribers: dexonsmith, vsk, mehdi_amini, andrewrk, MatzeB, wristow, spatel
Differential Revision: https://reviews.llvm.org/D43253
------------------------------------------------------------------------
Modified:
llvm/branches/release_60/ (props changed)
llvm/branches/release_60/include/llvm/Bitcode/LLVMBitCodes.h
llvm/branches/release_60/lib/Bitcode/Reader/BitcodeReader.cpp
llvm/branches/release_60/lib/Bitcode/Writer/BitcodeWriter.cpp
llvm/branches/release_60/test/Bitcode/compatibility-3.6.ll
llvm/branches/release_60/test/Bitcode/compatibility-3.7.ll
llvm/branches/release_60/test/Bitcode/compatibility-3.8.ll
llvm/branches/release_60/test/Bitcode/compatibility-3.9.ll
llvm/branches/release_60/test/Bitcode/compatibility-4.0.ll
llvm/branches/release_60/test/Bitcode/compatibility-5.0.ll
Propchange: llvm/branches/release_60/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 20 08:22:18 2018
@@ -1,3 +1,3 @@
/llvm/branches/Apple/Pertwee:110850,110961
/llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321911,321980,321991,321993-321994,322003,322016,322053,322056,322103,322106,322108,322123,322131,322223,322272,322313,322372,322473,322623,322644,322724,322767,322875,322878-322879,322900,322904-322905,322973,322993,323034,323155,323190,323307,323331,323355,323369,323371,323384,323469,323515,323536,323582,323643,323671-323672,323706,323710,323759,323781,323810-323811,323813,323857,323907-323909,323913,323915,324002,324039,324110,324195,324353,324422,324449,324497,324576,324645,324746,324772,324916,324962,325049,325085,325139,325148,325168,325463,325550
+/llvm/trunk:155241,321751,321789,321791,321806,321862,321870,321872,321878,321911,321980,321991,321993-321994,322003,322016,322053,322056,322103,322106,322108,322123,322131,322223,322272,322313,322372,322473,322623,322644,322724,322767,322875,322878-322879,322900,322904-322905,322973,322993,323034,323155,323190,323307,323331,323355,323369,323371,323384,323469,323515,323536,323582,323643,323671-323672,323706,323710,323759,323781,323810-323811,323813,323857,323907-323909,323913,323915,324002,324039,324110,324195,324353,324422,324449,324497,324576,324645,324746,324772,324916,324962,325049,325085,325139,325148,325168,325463,325525,325550
Modified: llvm/branches/release_60/include/llvm/Bitcode/LLVMBitCodes.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/include/llvm/Bitcode/LLVMBitCodes.h?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/include/llvm/Bitcode/LLVMBitCodes.h (original)
+++ llvm/branches/release_60/include/llvm/Bitcode/LLVMBitCodes.h Tue Feb 20 08:22:18 2018
@@ -395,6 +395,20 @@ enum OverflowingBinaryOperatorOptionalFl
OBO_NO_SIGNED_WRAP = 1
};
+/// FastMath Flags
+/// This is a fixed layout derived from the bitcode emitted by LLVM 5.0
+/// intended to decouple the in-memory representation from the serialization.
+enum FastMathMap {
+ UnsafeAlgebra = (1 << 0), // Legacy
+ NoNaNs = (1 << 1),
+ NoInfs = (1 << 2),
+ NoSignedZeros = (1 << 3),
+ AllowReciprocal = (1 << 4),
+ AllowContract = (1 << 5),
+ ApproxFunc = (1 << 6),
+ AllowReassoc = (1 << 7)
+};
+
/// PossiblyExactOperatorOptionalFlags - Flags for serializing
/// PossiblyExactOperator's SubclassOptionalData contents.
enum PossiblyExactOperatorOptionalFlags { PEO_EXACT = 0 };
Modified: llvm/branches/release_60/lib/Bitcode/Reader/BitcodeReader.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/Bitcode/Reader/BitcodeReader.cpp?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/lib/Bitcode/Reader/BitcodeReader.cpp (original)
+++ llvm/branches/release_60/lib/Bitcode/Reader/BitcodeReader.cpp Tue Feb 20 08:22:18 2018
@@ -1046,19 +1046,21 @@ static Comdat::SelectionKind getDecodedC
static FastMathFlags getDecodedFastMathFlags(unsigned Val) {
FastMathFlags FMF;
- if (0 != (Val & FastMathFlags::AllowReassoc))
+ if (0 != (Val & bitc::UnsafeAlgebra))
+ FMF.setFast();
+ if (0 != (Val & bitc::AllowReassoc))
FMF.setAllowReassoc();
- if (0 != (Val & FastMathFlags::NoNaNs))
+ if (0 != (Val & bitc::NoNaNs))
FMF.setNoNaNs();
- if (0 != (Val & FastMathFlags::NoInfs))
+ if (0 != (Val & bitc::NoInfs))
FMF.setNoInfs();
- if (0 != (Val & FastMathFlags::NoSignedZeros))
+ if (0 != (Val & bitc::NoSignedZeros))
FMF.setNoSignedZeros();
- if (0 != (Val & FastMathFlags::AllowReciprocal))
+ if (0 != (Val & bitc::AllowReciprocal))
FMF.setAllowReciprocal();
- if (0 != (Val & FastMathFlags::AllowContract))
+ if (0 != (Val & bitc::AllowContract))
FMF.setAllowContract(true);
- if (0 != (Val & FastMathFlags::ApproxFunc))
+ if (0 != (Val & bitc::ApproxFunc))
FMF.setApproxFunc();
return FMF;
}
Modified: llvm/branches/release_60/lib/Bitcode/Writer/BitcodeWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/lib/Bitcode/Writer/BitcodeWriter.cpp?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/lib/Bitcode/Writer/BitcodeWriter.cpp (original)
+++ llvm/branches/release_60/lib/Bitcode/Writer/BitcodeWriter.cpp Tue Feb 20 08:22:18 2018
@@ -1330,19 +1330,19 @@ static uint64_t getOptimizationFlags(con
Flags |= 1 << bitc::PEO_EXACT;
} else if (const auto *FPMO = dyn_cast<FPMathOperator>(V)) {
if (FPMO->hasAllowReassoc())
- Flags |= FastMathFlags::AllowReassoc;
+ Flags |= bitc::AllowReassoc;
if (FPMO->hasNoNaNs())
- Flags |= FastMathFlags::NoNaNs;
+ Flags |= bitc::NoNaNs;
if (FPMO->hasNoInfs())
- Flags |= FastMathFlags::NoInfs;
+ Flags |= bitc::NoInfs;
if (FPMO->hasNoSignedZeros())
- Flags |= FastMathFlags::NoSignedZeros;
+ Flags |= bitc::NoSignedZeros;
if (FPMO->hasAllowReciprocal())
- Flags |= FastMathFlags::AllowReciprocal;
+ Flags |= bitc::AllowReciprocal;
if (FPMO->hasAllowContract())
- Flags |= FastMathFlags::AllowContract;
+ Flags |= bitc::AllowContract;
if (FPMO->hasApproxFunc())
- Flags |= FastMathFlags::ApproxFunc;
+ Flags |= bitc::ApproxFunc;
}
return Flags;
@@ -3183,7 +3183,7 @@ void ModuleBitcodeWriter::writeBlockInfo
Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 6)); // LHS
Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::VBR, 6)); // RHS
Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 4)); // opc
- Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 7)); // flags
+ Abbv->Add(BitCodeAbbrevOp(BitCodeAbbrevOp::Fixed, 8)); // flags
if (Stream.EmitBlockInfoAbbrev(bitc::FUNCTION_BLOCK_ID, Abbv) !=
FUNCTION_INST_BINOP_FLAGS_ABBREV)
llvm_unreachable("Unexpected abbrev ordering!");
Modified: llvm/branches/release_60/test/Bitcode/compatibility-3.6.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/test/Bitcode/compatibility-3.6.ll?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/test/Bitcode/compatibility-3.6.ll (original)
+++ llvm/branches/release_60/test/Bitcode/compatibility-3.6.ll Tue Feb 20 08:22:18 2018
@@ -612,9 +612,7 @@ define void @fastmathflags(float %op1, f
%f.arcp = fadd arcp float %op1, %op2
; CHECK: %f.arcp = fadd arcp float %op1, %op2
%f.fast = fadd fast float %op1, %op2
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'contract' and 'afn' bits set, so this is not fully 'fast'.
- ; CHECK: %f.fast = fadd reassoc nnan ninf nsz arcp float %op1, %op2
+ ; CHECK: %f.fast = fadd fast float %op1, %op2
ret void
}
Modified: llvm/branches/release_60/test/Bitcode/compatibility-3.7.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/test/Bitcode/compatibility-3.7.ll?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/test/Bitcode/compatibility-3.7.ll (original)
+++ llvm/branches/release_60/test/Bitcode/compatibility-3.7.ll Tue Feb 20 08:22:18 2018
@@ -656,9 +656,7 @@ define void @fastmathflags(float %op1, f
%f.arcp = fadd arcp float %op1, %op2
; CHECK: %f.arcp = fadd arcp float %op1, %op2
%f.fast = fadd fast float %op1, %op2
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'contract' and 'afn' bits set, so this is not fully 'fast'.
- ; CHECK: %f.fast = fadd reassoc nnan ninf nsz arcp float %op1, %op2
+ ; CHECK: %f.fast = fadd fast float %op1, %op2
ret void
}
Modified: llvm/branches/release_60/test/Bitcode/compatibility-3.8.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/test/Bitcode/compatibility-3.8.ll?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/test/Bitcode/compatibility-3.8.ll (original)
+++ llvm/branches/release_60/test/Bitcode/compatibility-3.8.ll Tue Feb 20 08:22:18 2018
@@ -687,9 +687,7 @@ define void @fastmathflags(float %op1, f
%f.arcp = fadd arcp float %op1, %op2
; CHECK: %f.arcp = fadd arcp float %op1, %op2
%f.fast = fadd fast float %op1, %op2
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'contract' and 'afn' bits set, so this is not fully 'fast'.
- ; CHECK: %f.fast = fadd reassoc nnan ninf nsz arcp float %op1, %op2
+ ; CHECK: %f.fast = fadd fast float %op1, %op2
ret void
}
@@ -702,9 +700,7 @@ declare <4 x double> @fmf3()
; CHECK-LABEL: fastMathFlagsForCalls(
define void @fastMathFlagsForCalls(float %f, double %d1, <4 x double> %d2) {
%call.fast = call fast float @fmf1()
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'contract' and 'aml' bits set, so this is not fully 'fast'.
- ; CHECK: %call.fast = call reassoc nnan ninf nsz arcp float @fmf1()
+ ; CHECK: %call.fast = call fast float @fmf1()
; Throw in some other attributes to make sure those stay in the right places.
Modified: llvm/branches/release_60/test/Bitcode/compatibility-3.9.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/test/Bitcode/compatibility-3.9.ll?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/test/Bitcode/compatibility-3.9.ll (original)
+++ llvm/branches/release_60/test/Bitcode/compatibility-3.9.ll Tue Feb 20 08:22:18 2018
@@ -758,9 +758,7 @@ define void @fastmathflags(float %op1, f
%f.arcp = fadd arcp float %op1, %op2
; CHECK: %f.arcp = fadd arcp float %op1, %op2
%f.fast = fadd fast float %op1, %op2
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'contract' and 'afn' bits set, so this is not fully 'fast'.
- ; CHECK: %f.fast = fadd reassoc nnan ninf nsz arcp float %op1, %op2
+ ; CHECK: %f.fast = fadd fast float %op1, %op2
ret void
}
@@ -773,9 +771,7 @@ declare <4 x double> @fmf3()
; CHECK-LABEL: fastMathFlagsForCalls(
define void @fastMathFlagsForCalls(float %f, double %d1, <4 x double> %d2) {
%call.fast = call fast float @fmf1()
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'contract' and 'afn' bits set, so this is not fully 'fast'.
- ; CHECK: %call.fast = call reassoc nnan ninf nsz arcp float @fmf1()
+ ; CHECK: %call.fast = call fast float @fmf1()
; Throw in some other attributes to make sure those stay in the right places.
Modified: llvm/branches/release_60/test/Bitcode/compatibility-4.0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/test/Bitcode/compatibility-4.0.ll?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/test/Bitcode/compatibility-4.0.ll (original)
+++ llvm/branches/release_60/test/Bitcode/compatibility-4.0.ll Tue Feb 20 08:22:18 2018
@@ -757,10 +757,8 @@ define void @fastmathflags(float %op1, f
; CHECK: %f.nsz = fadd nsz float %op1, %op2
%f.arcp = fadd arcp float %op1, %op2
; CHECK: %f.arcp = fadd arcp float %op1, %op2
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'contract' and 'afn' bits set, so this is not fully 'fast'.
%f.fast = fadd fast float %op1, %op2
- ; CHECK: %f.fast = fadd reassoc nnan ninf nsz arcp float %op1, %op2
+ ; CHECK: %f.fast = fadd fast float %op1, %op2
ret void
}
@@ -773,9 +771,7 @@ declare <4 x double> @fmf3()
; CHECK-LABEL: fastMathFlagsForCalls(
define void @fastMathFlagsForCalls(float %f, double %d1, <4 x double> %d2) {
%call.fast = call fast float @fmf1()
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'contract' and 'afn' bits set, so this is not fully 'fast'.
- ; CHECK: %call.fast = call reassoc nnan ninf nsz arcp float @fmf1()
+ ; CHECK: %call.fast = call fast float @fmf1()
; Throw in some other attributes to make sure those stay in the right places.
Modified: llvm/branches/release_60/test/Bitcode/compatibility-5.0.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_60/test/Bitcode/compatibility-5.0.ll?rev=325592&r1=325591&r2=325592&view=diff
==============================================================================
--- llvm/branches/release_60/test/Bitcode/compatibility-5.0.ll (original)
+++ llvm/branches/release_60/test/Bitcode/compatibility-5.0.ll Tue Feb 20 08:22:18 2018
@@ -765,9 +765,7 @@ define void @fastmathflags(float %op1, f
%f.contract = fadd contract float %op1, %op2
; CHECK: %f.contract = fadd contract float %op1, %op2
%f.fast = fadd fast float %op1, %op2
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'afn' bit set, so this is not fully 'fast'.
- ; CHECK: %f.fast = fadd reassoc nnan ninf nsz arcp contract float %op1, %op2
+ ; CHECK: %f.fast = fadd fast float %op1, %op2
ret void
}
@@ -780,9 +778,7 @@ declare <4 x double> @fmf3()
; CHECK-LABEL: fastMathFlagsForCalls(
define void @fastMathFlagsForCalls(float %f, double %d1, <4 x double> %d2) {
%call.fast = call fast float @fmf1()
- ; 'fast' used to be its own bit, but this changed in Oct 2017.
- ; The binary test file does not have the newer 'afn' bit set, so this is not fully 'fast'.
- ; CHECK: %call.fast = call reassoc nnan ninf nsz arcp contract float @fmf1()
+ ; CHECK: %call.fast = call fast float @fmf1()
; Throw in some other attributes to make sure those stay in the right places.
More information about the llvm-branch-commits
mailing list