From: Daniel Sanders Date: Fri, 20 Nov 2015 13:13:53 +0000 (+0000) Subject: Revert the revert 253497 and 253539 - These commits aren't the cause of the clang... X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0bee4edf8c07e767791764826d92df532582625c;p=oota-llvm.git Revert the revert 253497 and 253539 - These commits aren't the cause of the clang-cmake-mips failures. Sorry for the noise. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253662 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/llvm/ProfileData/InstrProf.h b/include/llvm/ProfileData/InstrProf.h index 59d0e1877a6..c31f4b5b589 100644 --- a/include/llvm/ProfileData/InstrProf.h +++ b/include/llvm/ProfileData/InstrProf.h @@ -226,7 +226,7 @@ struct InstrProfValueSiteRecord { while (I != IE && I->Value < J->Value) ++I; if (I != IE && I->Value == J->Value) { - I->Count += J->Count; + I->Count = SaturatingAdd(I->Count, J->Count); ++I; continue; } diff --git a/include/llvm/ProfileData/SampleProf.h b/include/llvm/ProfileData/SampleProf.h index 30504981c48..a7b22c73548 100644 --- a/include/llvm/ProfileData/SampleProf.h +++ b/include/llvm/ProfileData/SampleProf.h @@ -177,10 +177,7 @@ public: /// Sample counts accumulate using saturating arithmetic, to avoid wrapping /// around unsigned integers. void addSamples(uint64_t S) { - if (NumSamples <= std::numeric_limits::max() - S) - NumSamples += S; - else - NumSamples = std::numeric_limits::max(); + NumSamples = SaturatingAdd(NumSamples, S); } /// Add called function \p F with samples \p S. @@ -189,10 +186,7 @@ public: /// around unsigned integers. void addCalledTarget(StringRef F, uint64_t S) { uint64_t &TargetSamples = CallTargets[F]; - if (TargetSamples <= std::numeric_limits::max() - S) - TargetSamples += S; - else - TargetSamples = std::numeric_limits::max(); + TargetSamples = SaturatingAdd(TargetSamples, S); } /// Return true if this sample record contains function calls. diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h index 9b5c02528ff..53aad36e929 100644 --- a/include/llvm/Support/MathExtras.h +++ b/include/llvm/Support/MathExtras.h @@ -653,6 +653,32 @@ inline int64_t SignExtend64(uint64_t X, unsigned B) { return int64_t(X << (64 - B)) >> (64 - B); } +/// \brief Add two unsigned integers, X and Y, of type T. +/// Clamp the result to the maximum representable value of T on overflow. +template +typename std::enable_if::value, T>::type +SaturatingAdd(T X, T Y) { + // Hacker's Delight, p. 29 + T Z = X + Y; + if (Z < X || Z < Y) + return std::numeric_limits::max(); + else + return Z; +} + +/// \brief Multiply two unsigned integers, X and Y, of type T. +/// Clamp the result to the maximum representable value of T on overflow. +template +typename std::enable_if::value, T>::type +SaturatingMultiply(T X, T Y) { + // Hacker's Delight, p. 30 + T Z = X * Y; + if (Y != 0 && Z / Y != X) + return std::numeric_limits::max(); + else + return Z; +} + extern const float huge_valf; } // End llvm namespace diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp index 04895e7702f..0f5b1f1afb5 100644 --- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp +++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp @@ -439,6 +439,7 @@ bool SelectionDAGISel::runOnMachineFunction(MachineFunction &mf) { if (Fn.hasFnAttribute(Attribute::OptimizeNone)) NewOptLevel = CodeGenOpt::None; OptLevelChanger OLC(*this, NewOptLevel); + errs() << "OptLevel is -O" << OptLevel << "\n"; TII = MF->getSubtarget().getInstrInfo(); TLI = MF->getSubtarget().getTargetLowering(); diff --git a/lib/Target/Mips/AsmParser/MipsAsmParser.cpp b/lib/Target/Mips/AsmParser/MipsAsmParser.cpp index 32856550b70..74c289f1b9a 100644 --- a/lib/Target/Mips/AsmParser/MipsAsmParser.cpp +++ b/lib/Target/Mips/AsmParser/MipsAsmParser.cpp @@ -1708,14 +1708,25 @@ bool MipsAsmParser::processInstruction(MCInst &Inst, SMLoc IDLoc, MCOperand::createExpr(GotDispRelocExpr), IDLoc, Instructions); } } else { - // If it's an external/weak symbol, we expand to: - // lw/ld $25, 0($gp) - // R_(MICRO)MIPS_CALL16 label - // jalr $25 - const MCExpr *Call16RelocExpr = evaluateRelocExpr(JalExpr, "call16"); - - emitRRX(ABI.ArePtrs64bit() ? Mips::LD : Mips::LW, Mips::T9, Mips::GP, - MCOperand::createExpr(Call16RelocExpr), IDLoc, Instructions); + if (isABI_O32()) { + // If it's an external/weak symbol, we expand to: + // lw/ld $25, 0($gp) + // R_(MICRO)MIPS_CALL16 label + // jalr $25 + const MCExpr *Call16RelocExpr = evaluateRelocExpr(JalExpr, "call16"); + + emitRRX(ABI.ArePtrs64bit() ? Mips::LD : Mips::LW, Mips::T9, Mips::GP, + MCOperand::createExpr(Call16RelocExpr), IDLoc, Instructions); + } else if (isABI_N32() || isABI_N64()) { + // If it's an external/weak symbol, we expand to: + // lw/ld $25, 0($gp) + // R_(MICRO)MIPS_GOT_DISP label + // jalr $25 + const MCExpr *GotDispRelocExpr = evaluateRelocExpr(JalExpr, "got_disp"); + + emitRRX(ABI.ArePtrs64bit() ? Mips::LD : Mips::LW, Mips::T9, Mips::GP, + MCOperand::createExpr(GotDispRelocExpr), IDLoc, Instructions); + } } MCInst JalrInst; diff --git a/unittests/ProfileData/InstrProfTest.cpp b/unittests/ProfileData/InstrProfTest.cpp index a9257fe316e..6891931e4d2 100644 --- a/unittests/ProfileData/InstrProfTest.cpp +++ b/unittests/ProfileData/InstrProfTest.cpp @@ -350,6 +350,38 @@ TEST_F(InstrProfTest, get_icall_data_merge1) { ASSERT_EQ(2U, VD_4[2].Count); } +TEST_F(InstrProfTest, get_icall_data_merge1_saturation) { + const uint64_t Max = std::numeric_limits::max(); + + InstrProfRecord Record1("caller", 0x1234, {1}); + InstrProfRecord Record2("caller", 0x1234, {1}); + InstrProfRecord Record3("callee1", 0x1235, {3, 4}); + + Record1.reserveSites(IPVK_IndirectCallTarget, 1); + InstrProfValueData VD1[] = {{(uint64_t) "callee1", 1}}; + Record1.addValueData(IPVK_IndirectCallTarget, 0, VD1, 1, nullptr); + + Record2.reserveSites(IPVK_IndirectCallTarget, 1); + InstrProfValueData VD2[] = {{(uint64_t) "callee1", Max}}; + Record2.addValueData(IPVK_IndirectCallTarget, 0, VD2, 1, nullptr); + + Writer.addRecord(std::move(Record1)); + Writer.addRecord(std::move(Record2)); + Writer.addRecord(std::move(Record3)); + + auto Profile = Writer.writeBuffer(); + readProfile(std::move(Profile)); + + // Verify saturation of counts. + ErrorOr R = Reader->getInstrProfRecord("caller", 0x1234); + ASSERT_TRUE(NoError(R.getError())); + ASSERT_EQ(1U, R.get().getNumValueSites(IPVK_IndirectCallTarget)); + std::unique_ptr VD = + R.get().getValueForSite(IPVK_IndirectCallTarget, 0); + ASSERT_EQ(StringRef("callee1"), StringRef((const char *)VD[0].Value, 7)); + ASSERT_EQ(Max, VD[0].Count); +} + TEST_F(InstrProfTest, get_max_function_count) { InstrProfRecord Record1("foo", 0x1234, {1ULL << 31, 2}); InstrProfRecord Record2("bar", 0, {1ULL << 63}); diff --git a/unittests/Support/MathExtrasTest.cpp b/unittests/Support/MathExtrasTest.cpp index 8bd47e34c7e..0f3854680ac 100644 --- a/unittests/Support/MathExtrasTest.cpp +++ b/unittests/Support/MathExtrasTest.cpp @@ -190,4 +190,21 @@ TEST(MathExtras, RoundUpToAlignment) { EXPECT_EQ(552u, RoundUpToAlignment(321, 255, 42)); } +template +void SaturatingAddTestHelper() +{ + const T Max = std::numeric_limits::max(); + EXPECT_EQ(T(3), SaturatingAdd(T(1), T(2))); + EXPECT_EQ(Max, SaturatingAdd(Max, T(1))); + EXPECT_EQ(Max, SaturatingAdd(T(1), Max)); + EXPECT_EQ(Max, SaturatingAdd(Max, Max)); +} + +TEST(MathExtras, SaturatingAdd) { + SaturatingAddTestHelper(); + SaturatingAddTestHelper(); + SaturatingAddTestHelper(); + SaturatingAddTestHelper(); +} + }