From 84a0bf64a82ff7caead3c97093065d2a09f6e7d6 Mon Sep 17 00:00:00 2001 From: Sanjay Patel Date: Fri, 6 May 2016 17:51:37 +0000 Subject: revert r268751 - caused same failures on msan bot llvm-svn: 268765 --- llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 33 +++++++++---------------------- 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'llvm/lib/Transforms/Utils/SimplifyCFG.cpp') diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 691c59141cf..fe7c609051e 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -848,7 +848,7 @@ static void GetBranchWeights(TerminatorInst *TI, } } -/// Scale each weight so they all fit in uint32_t. +/// Keep halving the weights until all can fit in uint32_t. static void FitWeights(MutableArrayRef Weights) { uint64_t Max = *std::max_element(Weights.begin(), Weights.end()); if (Max > UINT_MAX) { @@ -2820,28 +2820,28 @@ static bool SimplifyCondBranchToCondBranch(BranchInst *PBI, BranchInst *BI, PBI->setSuccessor(1, OtherDest); // Update branch weight for PBI. - MDBuilder MDB(BI->getContext()); uint64_t PredTrueWeight, PredFalseWeight, SuccTrueWeight, SuccFalseWeight; - uint64_t PredCommon, PredOther, SuccCommon, SuccOther; bool PredHasWeights = PBI->extractProfMetadata(PredTrueWeight, PredFalseWeight); bool SuccHasWeights = BI->extractProfMetadata(SuccTrueWeight, SuccFalseWeight); if (PredHasWeights && SuccHasWeights) { - PredCommon = PBIOp ? PredFalseWeight : PredTrueWeight; - PredOther = PBIOp ? PredTrueWeight : PredFalseWeight; - SuccCommon = BIOp ? SuccFalseWeight : SuccTrueWeight; - SuccOther = BIOp ? SuccTrueWeight : SuccFalseWeight; + uint64_t PredCommon = PBIOp ? PredFalseWeight : PredTrueWeight; + uint64_t PredOther = PBIOp ?PredTrueWeight : PredFalseWeight; + uint64_t SuccCommon = BIOp ? SuccFalseWeight : SuccTrueWeight; + uint64_t SuccOther = BIOp ? SuccTrueWeight : SuccFalseWeight; // The weight to CommonDest should be PredCommon * SuccTotal + // PredOther * SuccCommon. // The weight to OtherDest should be PredOther * SuccOther. uint64_t NewWeights[2] = {PredCommon * (SuccCommon + SuccOther) + PredOther * SuccCommon, PredOther * SuccOther}; + // Halve the weights if any of them cannot fit in an uint32_t FitWeights(NewWeights); PBI->setMetadata(LLVMContext::MD_prof, - MDB.createBranchWeights(NewWeights[0], NewWeights[1])); + MDBuilder(BI->getContext()) + .createBranchWeights(NewWeights[0], NewWeights[1])); } // OtherDest may have phi nodes. If so, add an entry from PBI's @@ -2860,24 +2860,9 @@ static bool SimplifyCondBranchToCondBranch(BranchInst *PBI, BranchInst *BI, Value *PBIV = PN->getIncomingValue(PBBIdx); if (BIV != PBIV) { // Insert a select in PBI to pick the right value. - SelectInst *NV = cast + Value *NV = cast (Builder.CreateSelect(PBICond, PBIV, BIV, PBIV->getName() + ".mux")); PN->setIncomingValue(PBBIdx, NV); - // Although the select has the same condition as PBI, the original branch - // weights for PBI do not apply to the new select because the select's - // 'logical' edges are incoming edges of the phi that is eliminated, not - // the outgoing edges of PBI. - if (PredHasWeights && SuccHasWeights) { - // The weight to PredCommonDest should be PredCommon * SuccTotal. - // The weight to PredOtherDest should be PredOther * SuccCommon. - uint64_t NewWeights[2] = {PredCommon * (SuccCommon + SuccOther), - PredOther * SuccCommon}; - - FitWeights(NewWeights); - - NV->setMetadata(LLVMContext::MD_prof, - MDB.createBranchWeights(NewWeights[0], NewWeights[1])); - } } } -- cgit v1.2.3