RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-21 18:22:53 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Use uint64_t for branch weights instead of uint32_t"

Browse Source 
This reverts commit 10f2a0d662d8d72eaac48d3e9b31ca8dc90df5a4.

More uint64_t overflows.
This commit is contained in:
Arthur Eubanks 2020-10-31 00:15:46 -07:00
parent d2d3f491b4
commit bb84082e59
80 changed files with 316 additions and 992 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/llvm/IR/Instructions.h
View File

@ -3494,7 +3494,7 @@ public:
/// their prof branch_weights metadata.
class SwitchInstProfUpdateWrapper {
SwitchInst &SI;
Optional<SmallVector<uint64_t, 8>> Weights = None;
Optional<SmallVector<uint32_t, 8> > Weights = None;
bool Changed = false;
protected:

4
include/llvm/IR/MDBuilder.h
View File

@ -58,10 +58,10 @@ public:
//===------------------------------------------------------------------===//
/// Return metadata containing two branch weights.
MDNode *createBranchWeights(uint64_t TrueWeight, uint64_t FalseWeight);
MDNode *createBranchWeights(uint32_t TrueWeight, uint32_t FalseWeight);
/// Return metadata containing a number of branch weights.
MDNode *createBranchWeights(ArrayRef<uint64_t> Weights);
MDNode *createBranchWeights(ArrayRef<uint32_t> Weights);
/// Return metadata specifying that a branch or switch is unpredictable.
MDNode *createUnpredictable();

4
include/llvm/Transforms/Scalar/LowerExpectIntrinsic.h
View File

@ -32,8 +32,8 @@ struct LowerExpectIntrinsicPass : PassInfoMixin<LowerExpectIntrinsicPass> {
PreservedAnalyses run(Function &F, FunctionAnalysisManager &);
};
extern cl::opt<uint64_t> LikelyBranchWeight;
extern cl::opt<uint64_t> UnlikelyBranchWeight;
extern cl::opt<uint32_t> LikelyBranchWeight;
extern cl::opt<uint32_t> UnlikelyBranchWeight;
}
#endif

2
include/llvm/Transforms/Utils/MisExpect.h
View File

@ -28,7 +28,7 @@ namespace misexpect {
/// \param Weights A vector of profile weights for each target block
/// \param Ctx The current LLVM context
void verifyMisExpect(llvm::Instruction *I,
const llvm::SmallVector<uint64_t, 4> &Weights,
const llvm::SmallVector<uint32_t, 4> &Weights,
llvm::LLVMContext &Ctx);
/// checkClangInstrumentation - verify if llvm.expect matches PGO profile

54
lib/Analysis/BranchProbabilityInfo.cpp
View File

@ -38,7 +38,6 @@
#include "llvm/Support/Casting.h"
#include "llvm/Support/CommandLine.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/MathExtras.h"
#include "llvm/Support/raw_ostream.h"
#include <cassert>
#include <cstdint>
@ -435,28 +434,6 @@ bool BranchProbabilityInfo::calcUnreachableHeuristics(const BasicBlock *BB) {
return true;
}
// Scales all values in Weights so that the total fits in 64 bits. Returns the
// total.
// FIXME: only scale by the minimum necessary to fit the total within 64 bits.
static uint64_t ScaleWeights(MutableArrayRef<uint64_t> Weights) {
uint64_t Total = 0;
bool Overflowed = false;
for (uint64_t W : Weights) {
Total = SaturatingAdd(Total, W, &Overflowed);
if (Overflowed)
break;
}
if (Overflowed) {
uint64_t ScaledTotal = 0;
for (uint64_t &W : Weights) {
W /= UINT32_MAX;
ScaledTotal += W;
}
return ScaledTotal;
}
return Total;
}
// Propagate existing explicit probabilities from either profile data or
// 'expect' intrinsic processing. Examine metadata against unreachable
// heuristic. The probability of the edge coming to unreachable block is
@ -481,7 +458,10 @@ bool BranchProbabilityInfo::calcMetadataWeights(const BasicBlock *BB) {
return false;
// Build up the final weights that will be used in a temporary buffer.
SmallVector<uint64_t, 2> Weights;
// Compute the sum of all weights to later decide whether they need to
// be scaled to fit in 32 bits.
uint64_t WeightSum = 0;
SmallVector<uint32_t, 2> Weights;
SmallVector<unsigned, 2> UnreachableIdxs;
SmallVector<unsigned, 2> ReachableIdxs;
Weights.reserve(TI->getNumSuccessors());
@ -490,10 +470,10 @@ bool BranchProbabilityInfo::calcMetadataWeights(const BasicBlock *BB) {
mdconst::dyn_extract<ConstantInt>(WeightsNode->getOperand(I));
if (!Weight)
return false;
// TODO: remove scaling by UINT32_MAX and use full uint64_t range.
uint64_t WeightVal = Weight->getZExtValue();
Weights.push_back(WeightVal);
// WeightSum += WeightVal;
assert(Weight->getValue().getActiveBits() <= 32 &&
"Too many bits for uint32_t");
Weights.push_back(Weight->getZExtValue());
WeightSum += Weights.back();
if (PostDominatedByUnreachable.count(TI->getSuccessor(I - 1)))
UnreachableIdxs.push_back(I - 1);
else
@ -501,7 +481,20 @@ bool BranchProbabilityInfo::calcMetadataWeights(const BasicBlock *BB) {
}
assert(Weights.size() == TI->getNumSuccessors() && "Checked above");
uint64_t WeightSum = ScaleWeights(Weights);
// If the sum of weights does not fit in 32 bits, scale every weight down
// accordingly.
uint64_t ScalingFactor =
(WeightSum > UINT32_MAX) ? WeightSum / UINT32_MAX + 1 : 1;
if (ScalingFactor > 1) {
WeightSum = 0;
for (unsigned I = 0, E = TI->getNumSuccessors(); I != E; ++I) {
Weights[I] /= ScalingFactor;
WeightSum += Weights[I];
}
}
assert(WeightSum <= UINT32_MAX &&
"Expected weights to scale down to 32 bits");
if (WeightSum == 0 || ReachableIdxs.size() == 0) {
for (unsigned I = 0, E = TI->getNumSuccessors(); I != E; ++I)
@ -512,8 +505,7 @@ bool BranchProbabilityInfo::calcMetadataWeights(const BasicBlock *BB) {
// Set the probability.
SmallVector<BranchProbability, 2> BP;
for (unsigned I = 0, E = TI->getNumSuccessors(); I != E; ++I)
BP.push_back(
BranchProbability::getBranchProbability(Weights[I], WeightSum));
BP.push_back({ Weights[I], static_cast<uint32_t>(WeightSum) });
// Examine the metadata against unreachable heuristic.
// If the unreachable heuristic is more strong then we use it for this edge.

10
lib/IR/Instructions.cpp
View File

@ -4060,7 +4060,7 @@ MDNode *SwitchInstProfUpdateWrapper::buildProfBranchWeightsMD() {
"num of prof branch_weights must accord with num of successors");
bool AllZeroes =
all_of(Weights.getValue(), [](uint64_t W) { return W == 0; });
all_of(Weights.getValue(), [](uint32_t W) { return W == 0; });
if (AllZeroes || Weights.getValue().size() < 2)
return nullptr;
@ -4078,10 +4078,10 @@ void SwitchInstProfUpdateWrapper::init() {
"not correspond to number of succesors");
}
SmallVector<uint64_t, 8> Weights;
SmallVector<uint32_t, 8> Weights;
for (unsigned CI = 1, CE = SI.getNumSuccessors(); CI <= CE; ++CI) {
ConstantInt *C = mdconst::extract<ConstantInt>(ProfileData->getOperand(CI));
uint64_t CW = C->getValue().getZExtValue();
uint32_t CW = C->getValue().getZExtValue();
Weights.push_back(CW);
}
this->Weights = std::move(Weights);
@ -4109,7 +4109,7 @@ void SwitchInstProfUpdateWrapper::addCase(
if (!Weights && W && *W) {
Changed = true;
Weights = SmallVector<uint64_t, 8>(SI.getNumSuccessors(), 0);
Weights = SmallVector<uint32_t, 8>(SI.getNumSuccessors(), 0);
Weights.getValue()[SI.getNumSuccessors() - 1] = *W;
} else if (Weights) {
Changed = true;
@ -4142,7 +4142,7 @@ void SwitchInstProfUpdateWrapper::setSuccessorWeight(
return;
if (!Weights && *W)
Weights = SmallVector<uint64_t, 8>(SI.getNumSuccessors(), 0);
Weights = SmallVector<uint32_t, 8>(SI.getNumSuccessors(), 0);
if (Weights) {
auto &OldW = Weights.getValue()[idx];

10
lib/IR/MDBuilder.cpp
View File

@ -34,20 +34,20 @@ MDNode *MDBuilder::createFPMath(float Accuracy) {
return MDNode::get(Context, Op);
}
MDNode *MDBuilder::createBranchWeights(uint64_t TrueWeight,
uint64_t FalseWeight) {
MDNode *MDBuilder::createBranchWeights(uint32_t TrueWeight,
uint32_t FalseWeight) {
return createBranchWeights({TrueWeight, FalseWeight});
}
MDNode *MDBuilder::createBranchWeights(ArrayRef<uint64_t> Weights) {
MDNode *MDBuilder::createBranchWeights(ArrayRef<uint32_t> Weights) {
assert(Weights.size() >= 1 && "Need at least one branch weights!");
SmallVector<Metadata *, 4> Vals(Weights.size() + 1);
Vals[0] = createString("branch_weights");
Type *Int64Ty = Type::getInt64Ty(Context);
Type *Int32Ty = Type::getInt32Ty(Context);
for (unsigned i = 0, e = Weights.size(); i != e; ++i)
Vals[i + 1] = createConstant(ConstantInt::get(Int64Ty, Weights[i]));
Vals[i + 1] = createConstant(ConstantInt::get(Int32Ty, Weights[i]));
return MDNode::get(Context, Vals);
}

16
lib/Transforms/IPO/SampleProfile.cpp
View File

@ -1584,7 +1584,8 @@ void SampleProfileLoader::propagateWeights(Function &F) {
SortedCallTargets.size());
} else if (!isa<IntrinsicInst>(&I)) {
I.setMetadata(LLVMContext::MD_prof,
MDB.createBranchWeights({BlockWeights[BB]}));
MDB.createBranchWeights(
{static_cast<uint32_t>(BlockWeights[BB])}));
}
}
}
@ -1599,17 +1600,24 @@ void SampleProfileLoader::propagateWeights(Function &F) {
<< ((BranchLoc) ? Twine(BranchLoc.getLine())
: Twine("<UNKNOWN LOCATION>"))
<< ".\n");
SmallVector<uint64_t, 4> Weights;
uint64_t MaxWeight = 0;
SmallVector<uint32_t, 4> Weights;
uint32_t MaxWeight = 0;
Instruction *MaxDestInst;
for (unsigned I = 0; I < TI->getNumSuccessors(); ++I) {
BasicBlock *Succ = TI->getSuccessor(I);
Edge E = std::make_pair(BB, Succ);
uint64_t Weight = EdgeWeights[E];
LLVM_DEBUG(dbgs() << "\t"; printEdgeWeight(dbgs(), E));
// Use uint32_t saturated arithmetic to adjust the incoming weights,
// if needed. Sample counts in profiles are 64-bit unsigned values,
// but internally branch weights are expressed as 32-bit values.
if (Weight > std::numeric_limits<uint32_t>::max()) {
LLVM_DEBUG(dbgs() << " (saturated due to uint32_t overflow)");
Weight = std::numeric_limits<uint32_t>::max();
}
// Weight is added by one to avoid propagation errors introduced by
// 0 weights.
Weights.push_back(Weight + 1);
Weights.push_back(static_cast<uint32_t>(Weight + 1));
if (Weight != 0) {
if (Weight > MaxWeight) {
MaxWeight = Weight;

6
lib/Transforms/Instrumentation/ControlHeightReduction.cpp
View File

@ -1865,9 +1865,9 @@ void CHR::fixupBranchesAndSelects(CHRScope *Scope,
<< " branches or selects";
});
MergedBR->setCondition(MergedCondition);
uint64_t Weights[] = {
CHRBranchBias.scale(1000),
CHRBranchBias.getCompl().scale(1000),
uint32_t Weights[] = {
static_cast<uint32_t>(CHRBranchBias.scale(1000)),
static_cast<uint32_t>(CHRBranchBias.getCompl().scale(1000)),
};
MDBuilder MDB(F.getContext());
MergedBR->setMetadata(LLVMContext::MD_prof, MDB.createBranchWeights(Weights));

3
lib/Transforms/Instrumentation/PGOInstrumentation.cpp
View File

@ -116,7 +116,6 @@
#include <cstdint>
#include <memory>
#include <numeric>
#include <stdint.h>
#include <string>
#include <unordered_map>
#include <utility>
@ -1831,7 +1830,7 @@ void llvm::setProfMetadata(Module *M, Instruction *TI,
MDBuilder MDB(M->getContext());
assert(MaxCount > 0 && "Bad max count");
uint64_t Scale = calculateCountScale(MaxCount);
SmallVector<uint64_t, 4> Weights;
SmallVector<unsigned, 4> Weights;
for (const auto &ECI : EdgeCounts)
Weights.push_back(scaleBranchCount(ECI, Scale));

4
lib/Transforms/Scalar/JumpThreading.cpp
View File

@ -293,7 +293,7 @@ static void updatePredecessorProfileMetadata(PHINode *PN, BasicBlock *BB) {
if (BP >= BranchProbability(50, 100))
continue;
SmallVector<uint64_t, 2> Weights;
SmallVector<uint32_t, 2> Weights;
if (PredBr->getSuccessor(0) == PredOutEdge.second) {
Weights.push_back(BP.getNumerator());
Weights.push_back(BP.getCompl().getNumerator());
@ -2541,7 +2541,7 @@ void JumpThreadingPass::UpdateBlockFreqAndEdgeWeight(BasicBlock *PredBB,
// shouldn't make edges extremely likely or unlikely based solely on static
// estimation.
if (BBSuccProbs.size() >= 2 && doesBlockHaveProfileData(BB)) {
SmallVector<uint64_t, 4> Weights;
SmallVector<uint32_t, 4> Weights;
for (auto Prob : BBSuccProbs)
Weights.push_back(Prob.getNumerator());

18
lib/Transforms/Scalar/LowerExpectIntrinsic.cpp
View File

@ -47,14 +47,14 @@ STATISTIC(ExpectIntrinsicsHandled,
// 'select' instructions. It may be worthwhile to hoist these values to some
// shared space, so they can be used directly by other passes.
cl::opt<uint64_t> llvm::LikelyBranchWeight(
cl::opt<uint32_t> llvm::LikelyBranchWeight(
"likely-branch-weight", cl::Hidden, cl::init(2000),
cl::desc("Weight of the branch likely to be taken (default = 2000)"));
cl::opt<uint64_t> llvm::UnlikelyBranchWeight(
cl::opt<uint32_t> llvm::UnlikelyBranchWeight(
"unlikely-branch-weight", cl::Hidden, cl::init(1),
cl::desc("Weight of the branch unlikely to be taken (default = 1)"));
static std::tuple<uint64_t, uint64_t>
static std::tuple<uint32_t, uint32_t>
getBranchWeight(Intrinsic::ID IntrinsicID, CallInst *CI, int BranchCount) {
if (IntrinsicID == Intrinsic::expect) {
// __builtin_expect
@ -69,8 +69,8 @@ getBranchWeight(Intrinsic::ID IntrinsicID, CallInst *CI, int BranchCount) {
assert((TrueProb >= 0.0 && TrueProb <= 1.0) &&
"probability value must be in the range [0.0, 1.0]");
double FalseProb = (1.0 - TrueProb) / (BranchCount - 1);
uint64_t LikelyBW = ceil((TrueProb * (double)(INT32_MAX - 1)) + 1.0);
uint64_t UnlikelyBW = ceil((FalseProb * (double)(INT32_MAX - 1)) + 1.0);
uint32_t LikelyBW = ceil((TrueProb * (double)(INT32_MAX - 1)) + 1.0);
uint32_t UnlikelyBW = ceil((FalseProb * (double)(INT32_MAX - 1)) + 1.0);
return std::make_tuple(LikelyBW, UnlikelyBW);
}
}
@ -92,11 +92,11 @@ static bool handleSwitchExpect(SwitchInst &SI) {
SwitchInst::CaseHandle Case = *SI.findCaseValue(ExpectedValue);
unsigned n = SI.getNumCases(); // +1 for default case.
uint64_t LikelyBranchWeightVal, UnlikelyBranchWeightVal;
uint32_t LikelyBranchWeightVal, UnlikelyBranchWeightVal;
std::tie(LikelyBranchWeightVal, UnlikelyBranchWeightVal) =
getBranchWeight(Fn->getIntrinsicID(), CI, n + 1);
SmallVector<uint64_t, 16> Weights(n + 1, UnlikelyBranchWeightVal);
SmallVector<uint32_t, 16> Weights(n + 1, UnlikelyBranchWeightVal);
uint64_t Index = (Case == *SI.case_default()) ? 0 : Case.getCaseIndex() + 1;
Weights[Index] = LikelyBranchWeightVal;
@ -248,7 +248,7 @@ static void handlePhiDef(CallInst *Expect) {
return true;
return false;
};
uint64_t LikelyBranchWeightVal, UnlikelyBranchWeightVal;
uint32_t LikelyBranchWeightVal, UnlikelyBranchWeightVal;
std::tie(LikelyBranchWeightVal, UnlikelyBranchWeightVal) = getBranchWeight(
Expect->getCalledFunction()->getIntrinsicID(), Expect, 2);
@ -318,7 +318,7 @@ template <class BrSelInst> static bool handleBrSelExpect(BrSelInst &BSI) {
MDNode *Node;
MDNode *ExpNode;
uint64_t LikelyBranchWeightVal, UnlikelyBranchWeightVal;
uint32_t LikelyBranchWeightVal, UnlikelyBranchWeightVal;
std::tie(LikelyBranchWeightVal, UnlikelyBranchWeightVal) =
getBranchWeight(Fn->getIntrinsicID(), CI, 2);

3
lib/Transforms/Utils/CodeExtractor.cpp
View File

@ -67,7 +67,6 @@
#include <iterator>
#include <map>
#include <set>
#include <stdint.h>
#include <utility>
#include <vector>
@ -1364,7 +1363,7 @@ void CodeExtractor::calculateNewCallTerminatorWeights(
// Update the branch weights for the exit block.
Instruction *TI = CodeReplacer->getTerminator();
SmallVector<uint64_t, 8> BranchWeights(TI->getNumSuccessors(), 0);
SmallVector<unsigned, 8> BranchWeights(TI->getNumSuccessors(), 0);
// Block Frequency distribution with dummy node.
Distribution BranchDist;

7
lib/Transforms/Utils/Local.cpp
View File

@ -207,7 +207,7 @@ bool llvm::ConstantFoldTerminator(BasicBlock *BB, bool DeleteDeadConditions,
// left, unless the metadata doesn't match the switch.
if (NCases > 1 && MD && MD->getNumOperands() == 2 + NCases) {
// Collect branch weights into a vector.
SmallVector<uint64_t, 8> Weights;
SmallVector<uint32_t, 8> Weights;
for (unsigned MD_i = 1, MD_e = MD->getNumOperands(); MD_i < MD_e;
++MD_i) {
auto *CI = mdconst::extract<ConstantInt>(MD->getOperand(MD_i));
@ -2091,8 +2091,11 @@ CallInst *llvm::createCallMatchingInvoke(InvokeInst *II) {
// If the invoke had profile metadata, try converting them for CallInst.
uint64_t TotalWeight;
if (NewCall->extractProfTotalWeight(TotalWeight)) {
// Set the total weight if it fits into i32, otherwise reset.
MDBuilder MDB(NewCall->getContext());
auto NewWeights = MDB.createBranchWeights({TotalWeight});
auto NewWeights = uint32_t(TotalWeight) != TotalWeight
? nullptr
: MDB.createBranchWeights({uint32_t(TotalWeight)});
NewCall->setMetadata(LLVMContext::MD_prof, NewWeights);
}

4
lib/Transforms/Utils/MisExpect.cpp
View File

@ -93,7 +93,7 @@ void emitMisexpectDiagnostic(Instruction *I, LLVMContext &Ctx,
namespace llvm {
namespace misexpect {
void verifyMisExpect(Instruction *I, const SmallVector<uint64_t, 4> &Weights,
void verifyMisExpect(Instruction *I, const SmallVector<uint32_t, 4> &Weights,
LLVMContext &Ctx) {
if (auto *MisExpectData = I->getMetadata(LLVMContext::MD_misexpect)) {
auto *MisExpectDataName = dyn_cast<MDString>(MisExpectData->getOperand(0));
@ -161,7 +161,7 @@ void checkFrontendInstrumentation(Instruction &I) {
// Operand 0 is a string tag "branch_weights"
if (MDString *Tag = cast<MDString>(MD->getOperand(0))) {
if (Tag->getString().equals("branch_weights")) {
SmallVector<uint64_t, 4> RealWeights(NOps - 1);
SmallVector<uint32_t, 4> RealWeights(NOps - 1);
for (unsigned i = 1; i < NOps; i++) {
ConstantInt *Value =
mdconst::dyn_extract<ConstantInt>(MD->getOperand(i));

44
lib/Transforms/Utils/SimplifyCFG.cpp
View File

@ -238,7 +238,7 @@ class SimplifyCFGOpt {
const TargetTransformInfo &TTI);
bool SimplifyTerminatorOnSelect(Instruction *OldTerm, Value *Cond,
BasicBlock *TrueBB, BasicBlock *FalseBB,
uint64_t TrueWeight, uint64_t FalseWeight);
uint32_t TrueWeight, uint32_t FalseWeight);
bool SimplifyBranchOnICmpChain(BranchInst *BI, IRBuilder<> &Builder,
const DataLayout &DL);
bool SimplifySwitchOnSelect(SwitchInst *SI, SelectInst *Select);
@ -825,19 +825,19 @@ static bool ValuesOverlap(std::vector<ValueEqualityComparisonCase> &C1,
// Set branch weights on SwitchInst. This sets the metadata if there is at
// least one non-zero weight.
static void setBranchWeights(SwitchInst *SI, ArrayRef<uint64_t> Weights) {
static void setBranchWeights(SwitchInst *SI, ArrayRef<uint32_t> Weights) {
// Check that there is at least one non-zero weight. Otherwise, pass
// nullptr to setMetadata which will erase the existing metadata.
MDNode *N = nullptr;
if (llvm::any_of(Weights, [](uint64_t W) { return W != 0; }))
if (llvm::any_of(Weights, [](uint32_t W) { return W != 0; }))
N = MDBuilder(SI->getParent()->getContext()).createBranchWeights(Weights);
SI->setMetadata(LLVMContext::MD_prof, N);
}
// Similar to the above, but for branch and select instructions that take
// exactly 2 weights.
static void setBranchWeights(Instruction *I, uint64_t TrueWeight,
uint64_t FalseWeight) {
static void setBranchWeights(Instruction *I, uint32_t TrueWeight,
uint32_t FalseWeight) {
assert(isa<BranchInst>(I) || isa<SelectInst>(I));
// Check that there is at least one non-zero weight. Otherwise, pass
// nullptr to setMetadata which will erase the existing metadata.
@ -1025,6 +1025,16 @@ static void GetBranchWeights(Instruction *TI,
}
}
/// Keep halving the weights until all can fit in uint32_t.
static void FitWeights(MutableArrayRef<uint64_t> Weights) {
uint64_t Max = *std::max_element(Weights.begin(), Weights.end());
if (Max > UINT_MAX) {
unsigned Offset = 32 - countLeadingZeros(Max);
for (uint64_t &I : Weights)
I >>= Offset;
}
}
/// The specified terminator is a value equality comparison instruction
/// (either a switch or a branch on "X == c").
/// See if any of the predecessors of the terminator block are value comparisons
@ -1210,7 +1220,10 @@ bool SimplifyCFGOpt::FoldValueComparisonIntoPredecessors(Instruction *TI,
NewSI->addCase(V.Value, V.Dest);
if (PredHasWeights || SuccHasWeights) {
SmallVector<uint64_t, 8> MDWeights(Weights.begin(), Weights.end());
// Halve the weights if any of them cannot fit in an uint32_t
FitWeights(Weights);
SmallVector<uint32_t, 8> MDWeights(Weights.begin(), Weights.end());
setBranchWeights(NewSI, MDWeights);
}
@ -2941,7 +2954,10 @@ bool llvm::FoldBranchToCommonDest(BranchInst *BI, MemorySSAUpdater *MSSAU,
PBI->setSuccessor(1, FalseDest);
}
if (NewWeights.size() == 2) {
SmallVector<uint64_t, 8> MDWeights(NewWeights.begin(),
// Halve the weights if any of them cannot fit in an uint32_t
FitWeights(NewWeights);
SmallVector<uint32_t, 8> MDWeights(NewWeights.begin(),
NewWeights.end());
setBranchWeights(PBI, MDWeights[0], MDWeights[1]);
} else
@ -3569,6 +3585,8 @@ static bool SimplifyCondBranchToCondBranch(BranchInst *PBI, BranchInst *BI,
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);
setBranchWeights(PBI, NewWeights[0], NewWeights[1]);
}
@ -3604,6 +3622,8 @@ static bool SimplifyCondBranchToCondBranch(BranchInst *PBI, BranchInst *BI,
uint64_t NewWeights[2] = {PredCommon * (SuccCommon + SuccOther),
PredOther * SuccCommon};
FitWeights(NewWeights);
setBranchWeights(NV, NewWeights[0], NewWeights[1]);
}
}
@ -3625,8 +3645,8 @@ static bool SimplifyCondBranchToCondBranch(BranchInst *PBI, BranchInst *BI,
bool SimplifyCFGOpt::SimplifyTerminatorOnSelect(Instruction *OldTerm,
Value *Cond, BasicBlock *TrueBB,
BasicBlock *FalseBB,
uint64_t TrueWeight,
uint64_t FalseWeight) {
uint32_t TrueWeight,
uint32_t FalseWeight) {
// Remove any superfluous successor edges from the CFG.
// First, figure out which successors to preserve.
// If TrueBB and FalseBB are equal, only try to preserve one copy of that
@ -3700,16 +3720,16 @@ bool SimplifyCFGOpt::SimplifySwitchOnSelect(SwitchInst *SI,
BasicBlock *FalseBB = SI->findCaseValue(FalseVal)->getCaseSuccessor();
// Get weight for TrueBB and FalseBB.
uint64_t TrueWeight = 0, FalseWeight = 0;
uint32_t TrueWeight = 0, FalseWeight = 0;
SmallVector<uint64_t, 8> Weights;
bool HasWeights = HasBranchWeights(SI);
if (HasWeights) {
GetBranchWeights(SI, Weights);
if (Weights.size() == 1 + SI->getNumCases()) {
TrueWeight =
(uint64_t)Weights[SI->findCaseValue(TrueVal)->getSuccessorIndex()];
(uint32_t)Weights[SI->findCaseValue(TrueVal)->getSuccessorIndex()];
FalseWeight =
(uint64_t)Weights[SI->findCaseValue(FalseVal)->getSuccessorIndex()];
(uint32_t)Weights[SI->findCaseValue(FalseVal)->getSuccessorIndex()];
}
}

28
test/Analysis/BranchProbabilityInfo/basic.ll
View File

@ -45,7 +45,7 @@ exit:
ret i32 %result
}
!0 = !{!"branch_weights", i64 64, i64 4}
!0 = !{!"branch_weights", i32 64, i32 4}
define i32 @test3(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test3'
@ -89,7 +89,7 @@ exit:
ret i32 %result
}
!1 = !{!"branch_weights", i64 4, i64 4, i64 64, i64 4, i64 4}
!1 = !{!"branch_weights", i32 4, i32 4, i32 64, i32 4, i32 4}
define i32 @test4(i32 %x) nounwind uwtable readnone ssp {
; CHECK: Printing analysis {{.*}} for function 'test4'
@ -116,7 +116,7 @@ return:
ret i32 %retval.0
}
!2 = !{!"branch_weights", i64 7, i64 6, i64 4, i64 4, i64 64}
!2 = !{!"branch_weights", i32 7, i32 6, i32 4, i32 4, i32 64}
declare void @coldfunc() cold
@ -196,7 +196,7 @@ exit:
ret i32 %result
}
!3 = !{!"branch_weights", i64 100, i64 1}
!3 = !{!"branch_weights", i32 100, i32 1}
define i32 @test_cold_call_sites(i32* %a) {
; Test that edges to blocks post-dominated by cold call sites
@ -328,13 +328,13 @@ invoke.to0:
; CHECK: edge invoke.to0 -> invoke.to1 probability is 0x7ffff800 / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge invoke.to0 -> lpad probability is 0x00000800 / 0x80000000 = 0.00%
invoke i32 @InvokeCall() to label %invoke.to1 unwind label %lpad,
!prof !{!"branch_weights", i64 444}
!prof !{!"branch_weights", i32 444}
invoke.to1:
; CHECK: invoke.to1 -> invoke.to2 probability is 0x55555555 / 0x80000000 = 66.67%
; CHECK: invoke.to1 -> lpad probability is 0x2aaaaaab / 0x80000000 = 33.33%
invoke i32 @InvokeCall() to label %invoke.to2 unwind label %lpad,
!prof !{!"branch_weights", i64 222, i64 111}
!prof !{!"branch_weights", i32 222, i32 111}
ret void
invoke.to2:
@ -435,7 +435,7 @@ exit:
ret i32 %b
}
!4 = !{!"branch_weights", i64 0, i64 1}
!4 = !{!"branch_weights", i32 0, i32 1}
define i32 @test_unreachable_with_prof_equal(i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_prof_equal'
@ -453,7 +453,7 @@ exit:
ret i32 %b
}
!5 = !{!"branch_weights", i64 2147483647, i64 1}
!5 = !{!"branch_weights", i32 2147483647, i32 1}
define i32 @test_unreachable_with_prof_zero(i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_prof_zero'
@ -471,7 +471,7 @@ exit:
ret i32 %b
}
!6 = !{!"branch_weights", i64 0, i64 0}
!6 = !{!"branch_weights", i32 0, i32 0}
define i32 @test_unreachable_with_prof_less(i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_prof_less'
@ -489,7 +489,7 @@ exit:
ret i32 %b
}
!7 = !{!"branch_weights", i64 1, i64 0}
!7 = !{!"branch_weights", i32 1, i32 0}
define i32 @test_unreachable_with_switch_prof1(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_switch_prof1'
@ -532,7 +532,7 @@ exit:
ret i32 %result
}
!8 = !{!"branch_weights", i64 4, i64 4, i64 64, i64 4, i64 4}
!8 = !{!"branch_weights", i32 4, i32 4, i32 64, i32 4, i32 4}
define i32 @test_unreachable_with_switch_prof2(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_switch_prof2'
@ -574,7 +574,7 @@ exit:
ret i32 %result
}
!9 = !{!"branch_weights", i64 4, i64 4, i64 64, i64 4, i64 4}
!9 = !{!"branch_weights", i32 4, i32 4, i32 64, i32 4, i32 4}
define i32 @test_unreachable_with_switch_prof3(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_switch_prof3'
@ -615,7 +615,7 @@ exit:
ret i32 %result
}
!10 = !{!"branch_weights", i64 0, i64 4, i64 64, i64 4, i64 4}
!10 = !{!"branch_weights", i32 0, i32 4, i32 64, i32 4, i32 4}
define i32 @test_unreachable_with_switch_prof4(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_switch_prof4'
@ -647,4 +647,4 @@ case_e:
}
!11 = !{!"branch_weights", i64 0, i64 4, i64 64, i64 4, i64 4}
!11 = !{!"branch_weights", i32 0, i32 4, i32 64, i32 4, i32 4}

650
test/Analysis/BranchProbabilityInfo/basic_i32.ll
View File

@ -1,650 +0,0 @@
; RUN: opt < %s -analyze -branch-prob -enable-new-pm=0 | FileCheck %s
; RUN: opt < %s -analyze -lazy-branch-prob -enable-new-pm=0 | FileCheck %s
; RUN: opt < %s -passes='print<branch-prob>' -disable-output 2>&1 | FileCheck %s
define i32 @test1(i32 %i, i32* %a) {
; CHECK: Printing analysis {{.*}} for function 'test1'
entry:
br label %body
; CHECK: edge entry -> body probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
body:
%iv = phi i32 [ 0, %entry ], [ %next, %body ]
%base = phi i32 [ 0, %entry ], [ %sum, %body ]
%arrayidx = getelementptr inbounds i32, i32* %a, i32 %iv
%0 = load i32, i32* %arrayidx
%sum = add nsw i32 %0, %base
%next = add i32 %iv, 1
%exitcond = icmp eq i32 %next, %i
br i1 %exitcond, label %exit, label %body
; CHECK: edge body -> exit probability is 0x04000000 / 0x80000000 = 3.12%
; CHECK: edge body -> body probability is 0x7c000000 / 0x80000000 = 96.88% [HOT edge]
exit:
ret i32 %sum
}
define i32 @test2(i32 %i, i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'test2'
entry:
%cond = icmp ult i32 %i, 42
br i1 %cond, label %then, label %else, !prof !0
; CHECK: edge entry -> then probability is 0x78787878 / 0x80000000 = 94.12% [HOT edge]
; CHECK: edge entry -> else probability is 0x07878788 / 0x80000000 = 5.88%
then:
br label %exit
; CHECK: edge then -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
else:
br label %exit
; CHECK: edge else -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
exit:
%result = phi i32 [ %a, %then ], [ %b, %else ]
ret i32 %result
}
!0 = !{!"branch_weights", i32 64, i32 4}
define i32 @test3(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test3'
entry:
switch i32 %i, label %case_a [ i32 1, label %case_b
i32 2, label %case_c
i32 3, label %case_d
i32 4, label %case_e ], !prof !1
; CHECK: edge entry -> case_a probability is 0x06666666 / 0x80000000 = 5.00%
; CHECK: edge entry -> case_b probability is 0x06666666 / 0x80000000 = 5.00%
; CHECK: edge entry -> case_c probability is 0x66666666 / 0x80000000 = 80.00%
; CHECK: edge entry -> case_d probability is 0x06666666 / 0x80000000 = 5.00%
; CHECK: edge entry -> case_e probability is 0x06666666 / 0x80000000 = 5.00%
case_a:
br label %exit
; CHECK: edge case_a -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_b:
br label %exit
; CHECK: edge case_b -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_c:
br label %exit
; CHECK: edge case_c -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_d:
br label %exit
; CHECK: edge case_d -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_e:
br label %exit
; CHECK: edge case_e -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
exit:
%result = phi i32 [ %a, %case_a ],
[ %b, %case_b ],
[ %c, %case_c ],
[ %d, %case_d ],
[ %e, %case_e ]
ret i32 %result
}
!1 = !{!"branch_weights", i32 4, i32 4, i32 64, i32 4, i32 4}
define i32 @test4(i32 %x) nounwind uwtable readnone ssp {
; CHECK: Printing analysis {{.*}} for function 'test4'
entry:
%conv = sext i32 %x to i64
switch i64 %conv, label %return [
i64 0, label %sw.bb
i64 1, label %sw.bb
i64 2, label %sw.bb
i64 5, label %sw.bb1
], !prof !2
; CHECK: edge entry -> return probability is 0x0a8a8a8b / 0x80000000 = 8.24%
; CHECK: edge entry -> sw.bb probability is 0x15151515 / 0x80000000 = 16.47%
; CHECK: edge entry -> sw.bb1 probability is 0x60606060 / 0x80000000 = 75.29%
sw.bb:
br label %return
sw.bb1:
br label %return
return:
%retval.0 = phi i32 [ 5, %sw.bb1 ], [ 1, %sw.bb ], [ 0, %entry ]
ret i32 %retval.0
}
!2 = !{!"branch_weights", i32 7, i32 6, i32 4, i32 4, i32 64}
declare void @coldfunc() cold
define i32 @test5(i32 %a, i32 %b, i1 %flag) {
; CHECK: Printing analysis {{.*}} for function 'test5'
entry:
br i1 %flag, label %then, label %else
; CHECK: edge entry -> then probability is 0x07878788 / 0x80000000 = 5.88%
; CHECK: edge entry -> else probability is 0x78787878 / 0x80000000 = 94.12% [HOT edge]
then:
call void @coldfunc()
br label %exit
; CHECK: edge then -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
else:
br label %exit
; CHECK: edge else -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
exit:
%result = phi i32 [ %a, %then ], [ %b, %else ]
ret i32 %result
}
define i32 @test_cold_loop(i32 %a, i32 %b) {
entry:
%cond1 = icmp eq i32 %a, 42
br i1 %cond1, label %header, label %exit
header:
br label %body
body:
%cond2 = icmp eq i32 %b, 42
br i1 %cond2, label %header, label %exit
; CHECK: edge body -> header probability is 0x40000000 / 0x80000000 = 50.00%
exit:
call void @coldfunc()
ret i32 %b
}
declare i32 @regular_function(i32 %i)
define i32 @test_cold_call_sites_with_prof(i32 %a, i32 %b, i1 %flag, i1 %flag2) {
; CHECK: Printing analysis {{.*}} for function 'test_cold_call_sites_with_prof'
entry:
br i1 %flag, label %then, label %else
; CHECK: edge entry -> then probability is 0x07878788 / 0x80000000 = 5.88%
; CHECK: edge entry -> else probability is 0x78787878 / 0x80000000 = 94.12% [HOT edge]
then:
br i1 %flag2, label %then2, label %else2, !prof !3
; CHECK: edge then -> then2 probability is 0x7ebb907a / 0x80000000 = 99.01% [HOT edge]
; CHECK: edge then -> else2 probability is 0x01446f86 / 0x80000000 = 0.99%
then2:
br label %join
; CHECK: edge then2 -> join probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
else2:
br label %join
; CHECK: edge else2 -> join probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
join:
%joinresult = phi i32 [ %a, %then2 ], [ %b, %else2 ]
call void @coldfunc()
br label %exit
; CHECK: edge join -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
else:
br label %exit
; CHECK: edge else -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
exit:
%result = phi i32 [ %joinresult, %join ], [ %b, %else ]
ret i32 %result
}
!3 = !{!"branch_weights", i32 100, i32 1}
define i32 @test_cold_call_sites(i32* %a) {
; Test that edges to blocks post-dominated by cold call sites
; are marked as not expected to be taken.
; TODO(dnovillo) The calls to regular_function should not be merged, but
; they are currently being merged. Convert this into a code generation test
; after that is fixed.
; CHECK: Printing analysis {{.*}} for function 'test_cold_call_sites'
; CHECK: edge entry -> then probability is 0x07878788 / 0x80000000 = 5.88%
; CHECK: edge entry -> else probability is 0x78787878 / 0x80000000 = 94.12% [HOT edge]
entry:
%gep1 = getelementptr i32, i32* %a, i32 1
%val1 = load i32, i32* %gep1
%cond1 = icmp ugt i32 %val1, 1
br i1 %cond1, label %then, label %else
then:
; This function is not declared cold, but this call site is.
%val4 = call i32 @regular_function(i32 %val1) cold
br label %exit
else:
%gep2 = getelementptr i32, i32* %a, i32 2
%val2 = load i32, i32* %gep2
%val3 = call i32 @regular_function(i32 %val2)
br label %exit
exit:
%ret = phi i32 [ %val4, %then ], [ %val3, %else ]
ret i32 %ret
}
; CHECK-LABEL: test_invoke_code_callsite1
define i32 @test_invoke_code_callsite1(i1 %c) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
entry:
br i1 %c, label %if.then, label %if.end
; Edge "entry->if.end" should have higher probability based on the cold call
; heuristic which treat %if.then as a cold block because the normal destination
; of the invoke instruction in %if.then is post-dominated by ColdFunc().
; CHECK: edge entry -> if.then probability is 0x07878788 / 0x80000000 = 5.88%
; CHECK: edge entry -> if.end probability is 0x78787878 / 0x80000000 = 94.12% [HOT edge]
if.then:
invoke i32 @InvokeCall()
to label %invoke.cont unwind label %lpad
; CHECK: edge if.then -> invoke.cont probability is 0x7ffff800 / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge if.then -> lpad probability is 0x00000800 / 0x80000000 = 0.00%
invoke.cont:
call void @ColdFunc() #0
br label %if.end
lpad:
%ll = landingpad { i8*, i32 }
cleanup
br label %if.end
if.end:
ret i32 0
}
; CHECK-LABEL: test_invoke_code_callsite2
define i32 @test_invoke_code_callsite2(i1 %c) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
entry:
br i1 %c, label %if.then, label %if.end
; CHECK: edge entry -> if.then probability is 0x40000000 / 0x80000000 = 50.00%
; CHECK: edge entry -> if.end probability is 0x40000000 / 0x80000000 = 50.00%
if.then:
invoke i32 @InvokeCall()
to label %invoke.cont unwind label %lpad
; The cold call heuristic should not kick in when the cold callsite is in EH path.
; CHECK: edge if.then -> invoke.cont probability is 0x7ffff800 / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge if.then -> lpad probability is 0x00000800 / 0x80000000 = 0.00%
invoke.cont:
br label %if.end
lpad:
%ll = landingpad { i8*, i32 }
cleanup
call void @ColdFunc() #0
br label %if.end
if.end:
ret i32 0
}
; CHECK-LABEL: test_invoke_code_callsite3
define i32 @test_invoke_code_callsite3(i1 %c) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
entry:
br i1 %c, label %if.then, label %if.end
; CHECK: edge entry -> if.then probability is 0x07878788 / 0x80000000 = 5.88%
; CHECK: edge entry -> if.end probability is 0x78787878 / 0x80000000 = 94.12% [HOT edge]
if.then:
invoke i32 @InvokeCall()
to label %invoke.cont unwind label %lpad
; Regardless of cold calls, edge weights from a invoke instruction should be
; determined by the invoke heuristic.
; CHECK: edge if.then -> invoke.cont probability is 0x7ffff800 / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge if.then -> lpad probability is 0x00000800 / 0x80000000 = 0.00%
invoke.cont:
call void @ColdFunc() #0
br label %if.end
lpad:
%ll = landingpad { i8*, i32 }
cleanup
call void @ColdFunc() #0
br label %if.end
if.end:
ret i32 0
}
; CHECK-LABEL: test_invoke_code_profiled
define void @test_invoke_code_profiled(i1 %c) personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
entry:
; CHECK: edge entry -> invoke.to0 probability is 0x7ffff800 / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge entry -> lpad probability is 0x00000800 / 0x80000000 = 0.00%
invoke i32 @InvokeCall() to label %invoke.to0 unwind label %lpad
invoke.to0:
; CHECK: edge invoke.to0 -> invoke.to1 probability is 0x7ffff800 / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge invoke.to0 -> lpad probability is 0x00000800 / 0x80000000 = 0.00%
invoke i32 @InvokeCall() to label %invoke.to1 unwind label %lpad,
!prof !{!"branch_weights", i32 444}
invoke.to1:
; CHECK: invoke.to1 -> invoke.to2 probability is 0x55555555 / 0x80000000 = 66.67%
; CHECK: invoke.to1 -> lpad probability is 0x2aaaaaab / 0x80000000 = 33.33%
invoke i32 @InvokeCall() to label %invoke.to2 unwind label %lpad,
!prof !{!"branch_weights", i32 222, i32 111}
ret void
invoke.to2:
ret void
lpad:
%ll = landingpad { i8*, i32 }
cleanup
ret void
}
declare i32 @__gxx_personality_v0(...)
declare void @ColdFunc()
declare i32 @InvokeCall()
attributes #0 = { cold }
define i32 @zero1(i32 %i, i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'zero1'
entry:
%cond = icmp eq i32 %i, 0
br i1 %cond, label %then, label %else
; CHECK: edge entry -> then probability is 0x30000000 / 0x80000000 = 37.50%
; CHECK: edge entry -> else probability is 0x50000000 / 0x80000000 = 62.50%
then:
br label %exit
else:
br label %exit
exit:
%result = phi i32 [ %a, %then ], [ %b, %else ]
ret i32 %result
}
define i32 @zero2(i32 %i, i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'zero2'
entry:
%cond = icmp ne i32 %i, -1
br i1 %cond, label %then, label %else
; CHECK: edge entry -> then probability is 0x50000000 / 0x80000000 = 62.50%
; CHECK: edge entry -> else probability is 0x30000000 / 0x80000000 = 37.50%
then:
br label %exit
else:
br label %exit
exit:
%result = phi i32 [ %a, %then ], [ %b, %else ]
ret i32 %result
}
define i32 @zero3(i32 %i, i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'zero3'
entry:
; AND'ing with a single bit bitmask essentially leads to a bool comparison,
; meaning we don't have probability information.
%and = and i32 %i, 2
%tobool = icmp eq i32 %and, 0
br i1 %tobool, label %then, label %else
; CHECK: edge entry -> then probability is 0x40000000 / 0x80000000 = 50.00%
; CHECK: edge entry -> else probability is 0x40000000 / 0x80000000 = 50.00%
then:
; AND'ing with other bitmask might be something else, so we still assume the
; usual probabilities.
%and2 = and i32 %i, 5
%tobool2 = icmp eq i32 %and2, 0
br i1 %tobool2, label %else, label %exit
; CHECK: edge then -> else probability is 0x30000000 / 0x80000000 = 37.50%
; CHECK: edge then -> exit probability is 0x50000000 / 0x80000000 = 62.50%
else:
br label %exit
exit:
%result = phi i32 [ %a, %then ], [ %b, %else ]
ret i32 %result
}
define i32 @test_unreachable_with_prof_greater(i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_prof_greater'
entry:
%cond = icmp eq i32 %a, 42
br i1 %cond, label %exit, label %unr, !prof !4
; CHECK: edge entry -> exit probability is 0x7fffffff / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge entry -> unr probability is 0x00000001 / 0x80000000 = 0.00%
unr:
unreachable
exit:
ret i32 %b
}
!4 = !{!"branch_weights", i32 0, i32 1}
define i32 @test_unreachable_with_prof_equal(i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_prof_equal'
entry:
%cond = icmp eq i32 %a, 42
br i1 %cond, label %exit, label %unr, !prof !5
; CHECK: edge entry -> exit probability is 0x7fffffff / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge entry -> unr probability is 0x00000001 / 0x80000000 = 0.00%
unr:
unreachable
exit:
ret i32 %b
}
!5 = !{!"branch_weights", i32 2147483647, i32 1}
define i32 @test_unreachable_with_prof_zero(i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_prof_zero'
entry:
%cond = icmp eq i32 %a, 42
br i1 %cond, label %exit, label %unr, !prof !6
; CHECK: edge entry -> exit probability is 0x7fffffff / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge entry -> unr probability is 0x00000001 / 0x80000000 = 0.00%
unr:
unreachable
exit:
ret i32 %b
}
!6 = !{!"branch_weights", i32 0, i32 0}
define i32 @test_unreachable_with_prof_less(i32 %a, i32 %b) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_prof_less'
entry:
%cond = icmp eq i32 %a, 42
br i1 %cond, label %exit, label %unr, !prof !7
; CHECK: edge entry -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
; CHECK: edge entry -> unr probability is 0x00000000 / 0x80000000 = 0.00%
unr:
unreachable
exit:
ret i32 %b
}
!7 = !{!"branch_weights", i32 1, i32 0}
define i32 @test_unreachable_with_switch_prof1(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_switch_prof1'
entry:
switch i32 %i, label %case_a [ i32 1, label %case_b
i32 2, label %case_c
i32 3, label %case_d
i32 4, label %case_e ], !prof !8
; Reachable probabilities keep their relation: 4/64/4/4 = 5.26% / 84.21% / 5.26% / 5.26%.
; CHECK: edge entry -> case_a probability is 0x00000001 / 0x80000000 = 0.00%
; CHECK: edge entry -> case_b probability is 0x06bca1af / 0x80000000 = 5.26%
; CHECK: edge entry -> case_c probability is 0x6bca1af3 / 0x80000000 = 84.21% [HOT edge]
; CHECK: edge entry -> case_d probability is 0x06bca1af / 0x80000000 = 5.26%
; CHECK: edge entry -> case_e probability is 0x06bca1af / 0x80000000 = 5.26%
case_a:
unreachable
case_b:
br label %exit
; CHECK: edge case_b -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_c:
br label %exit
; CHECK: edge case_c -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_d:
br label %exit
; CHECK: edge case_d -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_e:
br label %exit
; CHECK: edge case_e -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
exit:
%result = phi i32 [ %b, %case_b ],
[ %c, %case_c ],
[ %d, %case_d ],
[ %e, %case_e ]
ret i32 %result
}
!8 = !{!"branch_weights", i32 4, i32 4, i32 64, i32 4, i32 4}
define i32 @test_unreachable_with_switch_prof2(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_switch_prof2'
entry:
switch i32 %i, label %case_a [ i32 1, label %case_b
i32 2, label %case_c
i32 3, label %case_d
i32 4, label %case_e ], !prof !9
; Reachable probabilities keep their relation: 64/4/4 = 88.89% / 5.56% / 5.56%.
; CHECK: edge entry -> case_a probability is 0x00000001 / 0x80000000 = 0.00%
; CHECK: edge entry -> case_b probability is 0x00000001 / 0x80000000 = 0.00%
; CHECK: edge entry -> case_c probability is 0x71c71c71 / 0x80000000 = 88.89% [HOT edge]
; CHECK: edge entry -> case_d probability is 0x071c71c7 / 0x80000000 = 5.56%
; CHECK: edge entry -> case_e probability is 0x071c71c7 / 0x80000000 = 5.56%
case_a:
unreachable
case_b:
unreachable
case_c:
br label %exit
; CHECK: edge case_c -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_d:
br label %exit
; CHECK: edge case_d -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_e:
br label %exit
; CHECK: edge case_e -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
exit:
%result = phi i32 [ %c, %case_c ],
[ %d, %case_d ],
[ %e, %case_e ]
ret i32 %result
}
!9 = !{!"branch_weights", i32 4, i32 4, i32 64, i32 4, i32 4}
define i32 @test_unreachable_with_switch_prof3(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_switch_prof3'
entry:
switch i32 %i, label %case_a [ i32 1, label %case_b
i32 2, label %case_c
i32 3, label %case_d
i32 4, label %case_e ], !prof !10
; Reachable probabilities keep their relation: 64/4/4 = 88.89% / 5.56% / 5.56%.
; CHECK: edge entry -> case_a probability is 0x00000000 / 0x80000000 = 0.00%
; CHECK: edge entry -> case_b probability is 0x00000001 / 0x80000000 = 0.00%
; CHECK: edge entry -> case_c probability is 0x71c71c71 / 0x80000000 = 88.89% [HOT edge]
; CHECK: edge entry -> case_d probability is 0x071c71c7 / 0x80000000 = 5.56%
; CHECK: edge entry -> case_e probability is 0x071c71c7 / 0x80000000 = 5.56%
case_a:
unreachable
case_b:
unreachable
case_c:
br label %exit
; CHECK: edge case_c -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_d:
br label %exit
; CHECK: edge case_d -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
case_e:
br label %exit
; CHECK: edge case_e -> exit probability is 0x80000000 / 0x80000000 = 100.00% [HOT edge]
exit:
%result = phi i32 [ %c, %case_c ],
[ %d, %case_d ],
[ %e, %case_e ]
ret i32 %result
}
!10 = !{!"branch_weights", i32 0, i32 4, i32 64, i32 4, i32 4}
define i32 @test_unreachable_with_switch_prof4(i32 %i, i32 %a, i32 %b, i32 %c, i32 %d, i32 %e) {
; CHECK: Printing analysis {{.*}} for function 'test_unreachable_with_switch_prof4'
entry:
switch i32 %i, label %case_a [ i32 1, label %case_b
i32 2, label %case_c
i32 3, label %case_d
i32 4, label %case_e ], !prof !11
; CHECK: edge entry -> case_a probability is 0x1999999a / 0x80000000 = 20.00%
; CHECK: edge entry -> case_b probability is 0x1999999a / 0x80000000 = 20.00%
; CHECK: edge entry -> case_c probability is 0x1999999a / 0x80000000 = 20.00%
; CHECK: edge entry -> case_d probability is 0x1999999a / 0x80000000 = 20.00%
; CHECK: edge entry -> case_e probability is 0x1999999a / 0x80000000 = 20.00%
case_a:
unreachable
case_b:
unreachable
case_c:
unreachable
case_d:
unreachable
case_e:
unreachable
}
!11 = !{!"branch_weights", i32 0, i32 4, i32 64, i32 4, i32 4}

48
test/Analysis/BranchProbabilityInfo/branch-large-weights.ll
View File

@ -1,48 +0,0 @@
; RUN: opt < %s -passes='print<branch-prob>' -disable-output 2>&1 | FileCheck %s
; CHECK: Printing analysis {{.*}} for function 'branch'
; CHECK: edge -> return probability is 0x40000000 / 0x80000000 = 50.00%
; CHECK: edge -> return2 probability is 0x40000000 / 0x80000000 = 50.00%
define void @branch(i1 %x) {
br i1 %x, label %return, label %return2, !prof !1
return:
ret void
return2:
ret void
}
!1 = !{!"branch_weights",
i64 -4611686018427387904,
i64 -4611686018427387904}
define void @switch(i32 %x) {
switch i32 %x, label %return [
i32 0, label %return2
i32 3, label %return2
i32 6, label %return2
i32 1, label %return2
i32 4, label %return2
i32 7, label %return2
i32 2, label %return2
i32 5, label %return2
i32 8, label %return2
i32 9, label %return2
], !prof !2
return:
ret void
return2:
ret void
}
!2 = !{!"branch_weights",
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904,
i64 -4611686018427387904}

2
test/Instrumentation/AddressSanitizer/basic.ll
View File

@ -229,4 +229,4 @@ define void @test_swifterror_3() sanitize_address {
; CHECK: call void @__asan_init()
; PROF
; CHECK: ![[PROF]] = !{!"branch_weights", i64 1, i64 100000}
; CHECK: ![[PROF]] = !{!"branch_weights", i32 1, i32 100000}

6
test/Transforms/CodeExtractor/MultipleExitBranchProb.ll
View File

@ -28,7 +28,7 @@ ret i32 %val
!llvm.module.flags = !{!0}
!0 = !{i32 1, !"MaxFunctionCount", i32 10000}
!1 = !{!"function_entry_count", i64 10000}
!2 = !{!"branch_weights", i64 5, i64 5}
!3 = !{!"branch_weights", i64 4, i64 1}
!2 = !{!"branch_weights", i32 5, i32 5}
!3 = !{!"branch_weights", i32 4, i32 1}
; CHECK: [[COUNT1]] = !{!"branch_weights", i64 31, i64 8}
; CHECK: [[COUNT1]] = !{!"branch_weights", i32 31, i32 8}

12
test/Transforms/CorrelatedValuePropagation/profmd.ll
View File

@ -24,7 +24,7 @@ negative:
i32 2, label %out
i32 3, label %out
; CHECK-NEXT: !prof ![[MD0:[0-9]+]]
], !prof !{!"branch_weights", i64 99, i64 1, i64 2, i64 3, i64 4, i64 5, i64 6}
], !prof !{!"branch_weights", i32 99, i32 1, i32 2, i32 3, i32 4, i32 5, i32 6}
out:
%p = phi i32 [ 1, %entry ], [ -1, %negative ], [ -1, %negative ], [ -1, %negative ], [ -1, %negative ], [ -1, %negative ]
@ -51,7 +51,7 @@ positive:
i32 0, label %out
i32 -1, label %next
i32 -2, label %next
], !prof !{!"branch_weights", i64 99, i64 1, i64 2, i64 3}
], !prof !{!"branch_weights", i32 99, i32 1, i32 2, i32 3}
out:
%p = phi i32 [ -1, %entry ], [ 1, %positive ], [ 1, %positive ]
@ -78,7 +78,7 @@ positive:
i32 1, label %next
i32 -1, label %next
i32 -2, label %next
], !prof !{!"branch_weights", i64 99, i64 1, i64 2, i64 3}
], !prof !{!"branch_weights", i32 99, i32 1, i32 2, i32 3}
out:
%p = phi i32 [ -1, %entry ], [ 1, %positive ]
@ -108,12 +108,12 @@ negative:
i32 1, label %out
i32 2, label %out
i32 3, label %out
], !prof !{!"branch_weights", i64 99, i64 1, i64 2, i64 3, i64 4}
], !prof !{!"branch_weights", i32 99, i32 1, i32 2, i32 3, i32 4}
out:
%p = phi i32 [ 1, %entry ], [ -1, %negative ], [ -1, %negative ], [ -1, %negative ], [ -1, %negative ], [ -1, %negative ]
ret i32 %p
}
; CHECK: ![[MD0]] = !{!"branch_weights", i64 99, i64 4, i64 3}
; CHECK: ![[MD1]] = !{!"branch_weights", i64 1, i64 99}
; CHECK: ![[MD0]] = !{!"branch_weights", i32 99, i32 4, i32 3}
; CHECK: ![[MD1]] = !{!"branch_weights", i32 1, i32 99}

6
test/Transforms/JumpThreading/threading_prof1.ll
View File

@ -94,6 +94,6 @@ declare i32 @a()
declare i32 @b()
!0 = !{!"branch_weights", i64 2146410443, i64 1073205}
;CHECK: ![[PROF1]] = !{!"branch_weights", i64 1073205, i64 2146410443}
;CHECK: ![[PROF2]] = !{!"branch_weights", i64 2146410443, i64 1073205}
!0 = !{!"branch_weights", i32 2146410443, i32 1073205}
;CHECK: ![[PROF1]] = !{!"branch_weights", i32 1073205, i32 2146410443}
;CHECK: ![[PROF2]] = !{!"branch_weights", i32 2146410443, i32 1073205}

6
test/Transforms/JumpThreading/threading_prof2.ll
View File

@ -37,6 +37,6 @@ declare i32 @a()
declare i32 @b()
!0 = !{!"branch_weights", i64 2146410443, i64 1073205}
;CHECK: ![[PROF1]] = !{!"branch_weights", i64 1073205, i64 2146410443}
;CHECK: ![[PROF2]] = !{!"branch_weights", i64 2146410443, i64 1073205}
!0 = !{!"branch_weights", i32 2146410443, i32 1073205}
;CHECK: ![[PROF1]] = !{!"branch_weights", i32 1073205, i32 2146410443}
;CHECK: ![[PROF2]] = !{!"branch_weights", i32 2146410443, i32 1073205}

6
test/Transforms/JumpThreading/update-edge-weight.ll
View File

@ -3,7 +3,7 @@
; Test if edge weights are properly updated after jump threading.
; CHECK: !2 = !{!"branch_weights", i64 1629125526, i64 518358122}
; CHECK: !2 = !{!"branch_weights", i32 1629125526, i32 518358122}
define void @foo(i32 %n) !prof !0 {
entry:
@ -40,5 +40,5 @@ declare void @c()
declare void @d()
!0 = !{!"function_entry_count", i64 1}
!1 = !{!"branch_weights", i64 10, i64 5}
!2 = !{!"branch_weights", i64 10, i64 1}
!1 = !{!"branch_weights", i32 10, i32 5}
!2 = !{!"branch_weights", i32 10, i32 1}

14
test/Transforms/LoopUnroll/peel-loop-pgo-deopt.ll
View File

@ -77,14 +77,14 @@ attributes #1 = { nounwind optsize }
!13 = !{i32 999000, i64 1, i32 10}
!14 = !{i32 999999, i64 1, i32 10}
!15 = !{!"function_entry_count", i64 1}
!16 = !{!"branch_weights", i64 3001, i64 1001}
!17 = !{!"branch_weights", i64 1, i64 0}
!16 = !{!"branch_weights", i32 3001, i32 1001}
!17 = !{!"branch_weights", i32 1, i32 0}
; This is a weights of deopt side-exit.
;CHECK: !15 = !{!"branch_weights", i64 1, i64 0}
;CHECK: !15 = !{!"branch_weights", i32 1, i32 0}
; This is a weights of latch and its copies.
;CHECK: !16 = !{!"branch_weights", i64 3001, i64 1001}
;CHECK: !17 = !{!"branch_weights", i64 2000, i64 1001}
;CHECK: !18 = !{!"branch_weights", i64 999, i64 1001}
;CHECK: !19 = !{!"branch_weights", i64 1, i64 1001}
;CHECK: !16 = !{!"branch_weights", i32 3001, i32 1001}
;CHECK: !17 = !{!"branch_weights", i32 2000, i32 1001}
;CHECK: !18 = !{!"branch_weights", i32 999, i32 1001}
;CHECK: !19 = !{!"branch_weights", i32 1, i32 1001}

10
test/Transforms/LoopUnroll/peel-loop-pgo.ll
View File

@ -101,10 +101,10 @@ attributes #1 = { nounwind optsize }
!13 = !{i32 999000, i64 1, i32 10}
!14 = !{i32 999999, i64 1, i32 10}
!15 = !{!"function_entry_count", i64 1}
!16 = !{!"branch_weights", i64 3001, i64 1001}
!16 = !{!"branch_weights", i32 3001, i32 1001}
;CHECK: !15 = !{!"branch_weights", i64 3001, i64 1001}
;CHECK: !16 = !{!"branch_weights", i64 2000, i64 1001}
;CHECK: !17 = !{!"branch_weights", i64 999, i64 1001}
;CHECK: !18 = !{!"branch_weights", i64 1, i64 1001}
;CHECK: !15 = !{!"branch_weights", i32 3001, i32 1001}
;CHECK: !16 = !{!"branch_weights", i32 2000, i32 1001}
;CHECK: !17 = !{!"branch_weights", i32 999, i32 1001}
;CHECK: !18 = !{!"branch_weights", i32 1, i32 1001}

6
test/Transforms/LoopUnroll/runtime-loop-branchweight.ll
View File

@ -7,8 +7,8 @@
; CHECK: br i1 [[COND1:%.*]], label %for.end.loopexit.unr-lcssa.loopexit, label %for.body, !prof ![[#PROF:]], !llvm.loop ![[#LOOP:]]
; CHECK-LABEL: for.body.epil:
; CHECK: br i1 [[COND2:%.*]], label %for.body.epil, label %for.end.loopexit.epilog-lcssa, !prof ![[#PROF2:]], !llvm.loop ![[#LOOP2:]]
; CHECK: ![[#PROF]] = !{!"branch_weights", i64 1, i64 9999}
; CHECK: ![[#PROF2]] = !{!"branch_weights", i64 3, i64 1}
; CHECK: ![[#PROF]] = !{!"branch_weights", i32 1, i32 9999}
; CHECK: ![[#PROF2]] = !{!"branch_weights", i32 3, i32 1}
define i3 @test(i3* %a, i3 %n) {
entry:
@ -31,4 +31,4 @@ for.end:
ret i3 %sum.0.lcssa
}
!0 = !{!"branch_weights", i64 1, i64 9999}
!0 = !{!"branch_weights", i32 1, i32 9999}

14
test/Transforms/LoopVectorize/check-prof-info.ll
View File

@ -80,11 +80,11 @@ attributes #0 = { "use-soft-float"="false" }
!llvm.module.flags = !{!0}
!llvm.ident = !{!1}
; CHECK: [[LP1_255]] = !{!"branch_weights", i64 1, i64 255}
; CHECK: [[LP0_0]] = !{!"branch_weights", i64 0, i64 0}
; CHECK-MASKED: [[LP1_63]] = !{!"branch_weights", i64 1, i64 63}
; CHECK-MASKED: [[LP0_0]] = !{!"branch_weights", i64 0, i64 0}
; CHECK: [[LP1_2]] = !{!"branch_weights", i64 1, i64 2}
; CHECK: [[LP1_255]] = !{!"branch_weights", i32 1, i32 255}
; CHECK: [[LP0_0]] = !{!"branch_weights", i32 0, i32 0}
; CHECK-MASKED: [[LP1_63]] = !{!"branch_weights", i32 1, i32 63}
; CHECK-MASKED: [[LP0_0]] = !{!"branch_weights", i32 0, i32 0}
; CHECK: [[LP1_2]] = !{!"branch_weights", i32 1, i32 2}
!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{!"clang version 10.0.0 (https://github.com/llvm/llvm-project c292b5b5e059e6ce3e6449e6827ef7e1037c21c4)"}
@ -92,5 +92,5 @@ attributes #0 = { "use-soft-float"="false" }
!3 = !{!"int", !4, i64 0}
!4 = !{!"omnipotent char", !5, i64 0}
!5 = !{!"Simple C++ TBAA"}
!6 = !{!"branch_weights", i64 1, i64 1023}
!7 = !{!"branch_weights", i64 1, i64 1026}
!6 = !{!"branch_weights", i32 1, i32 1023}
!7 = !{!"branch_weights", i32 1, i32 1026}

10
test/Transforms/LoopVectorize/tripcount.ll
View File

@ -207,8 +207,8 @@ for.end: ; preds = %for.body
ret i32 0
}
; CHECK: [[LP3]] = !{!"branch_weights", i64 10, i64 2490}
; CHECK: [[LP6]] = !{!"branch_weights", i64 10, i64 0}
; CHECK: [[LP3]] = !{!"branch_weights", i32 10, i32 2490}
; CHECK: [[LP6]] = !{!"branch_weights", i32 10, i32 0}
; original loop has latchExitWeight=10 and backedgeTakenWeight=10,000,
; therefore estimatedBackedgeTakenCount=1,000 and estimatedTripCount=1,001.
; Vectorizing by 4 produces estimatedTripCounts of 1,001/4=250 and 1,001%4=1
@ -217,6 +217,6 @@ for.end: ; preds = %for.body
; loop invocation weights of 10 are the above {10, 2490} and {10, 0}.
!0 = !{!"function_entry_count", i64 100}
!1 = !{!"branch_weights", i64 100, i64 0}
!2 = !{!"branch_weights", i64 10, i64 90}
!3 = !{!"branch_weights", i64 10, i64 10000}
!1 = !{!"branch_weights", i32 100, i32 0}
!2 = !{!"branch_weights", i32 10, i32 90}
!3 = !{!"branch_weights", i32 10, i32 10000}

8
test/Transforms/LowerExpectIntrinsic/basic.ll
View File

@ -285,10 +285,10 @@ define i32 @test10(i64 %t6) {
declare i1 @llvm.expect.i1(i1, i1) nounwind readnone
; CHECK: !0 = !{!"branch_weights", i64 2000, i64 1}
; CHECK: !0 = !{!"branch_weights", i32 2000, i32 1}
; CHECK: !1 = !{!"misexpect", i64 0, i64 2000, i64 1}
; CHECK: !2 = !{!"branch_weights", i64 1, i64 2000}
; CHECK: !2 = !{!"branch_weights", i32 1, i32 2000}
; CHECK: !3 = !{!"misexpect", i64 1, i64 2000, i64 1}
; CHECK: !4 = !{!"branch_weights", i64 1, i64 1, i64 2000}
; CHECK: !4 = !{!"branch_weights", i32 1, i32 1, i32 2000}
; CHECK: !5 = !{!"misexpect", i64 2, i64 2000, i64 1}
; CHECK: !6 = !{!"branch_weights", i64 2000, i64 1, i64 1}
; CHECK: !6 = !{!"branch_weights", i32 2000, i32 1, i32 1}

8
test/Transforms/LowerExpectIntrinsic/expect-with-probability.ll
View File

@ -285,11 +285,11 @@ define i32 @test10(i64 %t6) {
declare i1 @llvm.expect.with.probability.i1(i1, i1, double) nounwind readnone
; CHECK: !0 = !{!"branch_weights", i64 1717986918, i64 429496731}
; CHECK: !0 = !{!"branch_weights", i32 1717986918, i32 429496731}
; CHECK: !1 = !{!"misexpect", i64 0, i64 1717986918, i64 429496731}
; CHECK: !2 = !{!"branch_weights", i64 429496731, i64 1717986918}
; CHECK: !2 = !{!"branch_weights", i32 429496731, i32 1717986918}
; CHECK: !3 = !{!"misexpect", i64 1, i64 1717986918, i64 429496731}
; CHECK: !4 = !{!"branch_weights", i64 214748366, i64 214748366, i64 1717986918}
; CHECK: !4 = !{!"branch_weights", i32 214748366, i32 214748366, i32 1717986918}
; CHECK: !5 = !{!"misexpect", i64 2, i64 1717986918, i64 214748366}
; CHECK: !6 = !{!"branch_weights", i64 1717986918, i64 214748366, i64 214748366}
; CHECK: !6 = !{!"branch_weights", i32 1717986918, i32 214748366, i32 214748366}
; CHECK: !7 = !{!"misexpect", i64 0, i64 1717986918, i64 214748366}

4
test/Transforms/LowerExpectIntrinsic/expect_nonboolean.ll
View File

@ -99,6 +99,6 @@ attributes #1 = { nounwind readnone }
!0 = !{i32 1, !"wchar_size", i32 4}
!1 = !{!"clang version 5.0.0 (trunk 304373)"}
; CHECK: [[LIKELY]] = !{!"branch_weights", i64 2000, i64 1}
; CHECK: [[UNLIKELY]] = !{!"branch_weights", i64 1, i64 2000}
; CHECK: [[LIKELY]] = !{!"branch_weights", i32 2000, i32 1}
; CHECK: [[UNLIKELY]] = !{!"branch_weights", i32 1, i32 2000}

4
test/Transforms/LowerExpectIntrinsic/phi_merge.ll
View File

@ -352,5 +352,5 @@ declare i64 @llvm.expect.i64(i64, i64)
!llvm.ident = !{!0}
!0 = !{!"clang version 5.0.0 (trunk 302965)"}
; CHECK: [[WEIGHT]] = !{!"branch_weights", i64 2000, i64 1}
; CHECK: [[WEIGHT2]] = !{!"branch_weights", i64 1, i64 2000}
; CHECK: [[WEIGHT]] = !{!"branch_weights", i32 2000, i32 1}
; CHECK: [[WEIGHT2]] = !{!"branch_weights", i32 1, i32 2000}

4
test/Transforms/LowerExpectIntrinsic/phi_or.ll
View File

@ -99,5 +99,5 @@ declare i64 @llvm.expect.i64(i64, i64)
!0 = !{!"clang version 5.0.0 (trunk 302965)"}
; CHECK: [[WEIGHT]] = !{!"branch_weights", i64 2000, i64 1}
; CHECK: [[WEIGHT2]] = !{!"branch_weights", i64 1, i64 2000}
; CHECK: [[WEIGHT]] = !{!"branch_weights", i32 2000, i32 1}
; CHECK: [[WEIGHT2]] = !{!"branch_weights", i32 1, i32 2000}

2
test/Transforms/LowerExpectIntrinsic/phi_tern.ll
View File

@ -53,4 +53,4 @@ declare i64 @llvm.expect.i64(i64, i64)
!0 = !{!"clang version 5.0.0 (trunk 302965)"}
; CHECK: [[WEIGHT]] = !{!"branch_weights", i64 1, i64 2000}
; CHECK: [[WEIGHT]] = !{!"branch_weights", i32 1, i32 2000}

4
test/Transforms/PGOProfile/branch1.ll
View File

@ -37,10 +37,10 @@ entry:
br i1 %cmp, label %if.then, label %if.end
; USE: br i1 %cmp, label %if.then, label %if.end
; USE-SAME: !prof ![[BW_ENTRY:[0-9]+]]
; USE-DAG: ![[BW_ENTRY]] = !{!"branch_weights", i64 2, i64 1}
; USE-DAG: ![[BW_ENTRY]] = !{!"branch_weights", i32 2, i32 1}
; USE-LARGE: br i1 %cmp, label %if.then, label %if.end
; USE-LARGE-SAME: !prof ![[BW_L_ENTRY:[0-9]+]]
; USE-LARGE-DAG: ![[BW_L_ENTRY]] = !{!"branch_weights", i64 2863311530, i64 1431655765}
; USE-LARGE-DAG: ![[BW_L_ENTRY]] = !{!"branch_weights", i32 -1431655766, i32 1431655765}
if.then:
; GEN: if.then:

2
test/Transforms/PGOProfile/branch2.ll
View File

@ -25,7 +25,7 @@ entry:
br i1 %cmp, label %if.then, label %if.else
; USE: br i1 %cmp, label %if.then, label %if.else
; USE-SAME: !prof ![[BW_ENTRY:[0-9]+]]
; USE: ![[BW_ENTRY]] = !{!"branch_weights", i64 1, i64 1}
; USE: ![[BW_ENTRY]] = !{!"branch_weights", i32 1, i32 1}
if.then:
; GEN: if.then:

16
test/Transforms/PGOProfile/chr.ll
View File

@ -2543,11 +2543,11 @@ bb3:
!13 = !{i32 999999, i64 1, i32 2}
!14 = !{!"function_entry_count", i64 100}
!15 = !{!"branch_weights", i64 0, i64 1}
!16 = !{!"branch_weights", i64 1, i64 1}
!17 = !{!"branch_weights", i64 0, i64 0}
; CHECK: !15 = !{!"branch_weights", i64 1000, i64 0}
; CHECK: !16 = !{!"branch_weights", i64 0, i64 1}
; CHECK: !17 = !{!"branch_weights", i64 1, i64 1}
; CHECK: !18 = !{!"branch_weights", i64 1, i64 0}
; CHECK: !19 = !{!"branch_weights", i64 0, i64 1000}
!15 = !{!"branch_weights", i32 0, i32 1}
!16 = !{!"branch_weights", i32 1, i32 1}
!17 = !{!"branch_weights", i32 0, i32 0}
; CHECK: !15 = !{!"branch_weights", i32 1000, i32 0}
; CHECK: !16 = !{!"branch_weights", i32 0, i32 1}
; CHECK: !17 = !{!"branch_weights", i32 1, i32 1}
; CHECK: !18 = !{!"branch_weights", i32 1, i32 0}
; CHECK: !19 = !{!"branch_weights", i32 0, i32 1000}

6
test/Transforms/PGOProfile/criticaledge.ll
View File

@ -117,6 +117,6 @@ entry:
ret i32 %i
}
; USE: ![[BW_SWITCH]] = !{!"branch_weights", i64 2, i64 1, i64 0, i64 2, i64 1, i64 1}
; USE: ![[BW_SW_BB2]] = !{!"branch_weights", i64 2, i64 2}
; USE: ![[BW_SW_DEFAULT]] = !{!"branch_weights", i64 1, i64 1}
; USE: ![[BW_SWITCH]] = !{!"branch_weights", i32 2, i32 1, i32 0, i32 2, i32 1, i32 1}
; USE: ![[BW_SW_BB2]] = !{!"branch_weights", i32 2, i32 2}
; USE: ![[BW_SW_DEFAULT]] = !{!"branch_weights", i32 1, i32 1}

8
test/Transforms/PGOProfile/cspgo_profile_summary.ll
View File

@ -132,7 +132,7 @@ entry:
; PGOSUMMARY: {{![0-9]+}} = !{!"MaxFunctionCount", i64 800000}
; PGOSUMMARY: {{![0-9]+}} = !{!"NumCounts", i64 14}
; PGOSUMMARY: {{![0-9]+}} = !{!"NumFunctions", i64 8}
; PGOSUMMARY-DAG: ![[BW_PGO_BAR]] = !{!"branch_weights", i64 100000, i64 100000}
; PGOSUMMARY-DAG: ![[BW_PGO_BAR]] = !{!"branch_weights", i32 100000, i32 100000}
; CSPGOSUMMARY: {{![0-9]+}} = !{i32 1, !"ProfileSummary", !1}
; CSPGOSUMMARY: {{![0-9]+}} = !{!"ProfileFormat", !"InstrProf"}
@ -150,6 +150,6 @@ entry:
; CSPGOSUMMARY: {{![0-9]+}} = !{!"MaxInternalCount", i64 100000}
; CSPGOSUMMARY: {{![0-9]+}} = !{!"MaxFunctionCount", i64 200000}
; CSPGOSUMMARY: {{![0-9]+}} = !{!"NumCounts", i64 23}
; CSPGOSUMMARY-DAG: ![[BW_CSPGO_BAR]] = !{!"branch_weights", i64 100000, i64 100000}
; CSPGOSUMMARY-DAG: ![[BW1_CSPGO_FOO]] = !{!"branch_weights", i64 100000, i64 0}
; CSPGOSUMMARY-DAG: ![[BW2_CSPGO_FOO]] = !{!"branch_weights", i64 0, i64 100000}
; CSPGOSUMMARY-DAG: ![[BW_CSPGO_BAR]] = !{!"branch_weights", i32 100000, i32 100000}
; CSPGOSUMMARY-DAG: ![[BW1_CSPGO_FOO]] = !{!"branch_weights", i32 100000, i32 0}
; CSPGOSUMMARY-DAG: ![[BW2_CSPGO_FOO]] = !{!"branch_weights", i32 0, i32 100000}

2
test/Transforms/PGOProfile/fix_entry_count.ll
View File

@ -31,4 +31,4 @@ for.end:
ret i32 %sum
}
; USE: ![[ENTRY_COUNT]] = !{!"function_entry_count", i64 1}
; USE: ![[BW_FOR_COND]] = !{!"branch_weights", i64 96, i64 1}
; USE: ![[BW_FOR_COND]] = !{!"branch_weights", i32 96, i32 1}

2
test/Transforms/PGOProfile/icp_covariant_call_return.ll
View File

@ -40,5 +40,5 @@ entry:
!1 = !{!"VP", i32 0, i64 12345, i64 -3913987384944532146, i64 12345}
; ICALL-PROM-NOT: !1 = !{!"VP", i32 0, i64 12345, i64 -3913987384944532146, i64 12345}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i64 12345, i64 0}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i32 12345, i32 0}
; ICALL-PROM-NOT: !1 = !{!"VP", i32 0, i64 12345, i64 -3913987384944532146, i64 12345}

2
test/Transforms/PGOProfile/icp_covariant_invoke_return.ll
View File

@ -108,5 +108,5 @@ eh.resume:
!1 = !{!"VP", i32 0, i64 12345, i64 -3913987384944532146, i64 12345}
; ICALL-PROM-NOT: !1 = !{!"VP", i32 0, i64 12345, i64 -3913987384944532146, i64 12345}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i64 12345, i64 0}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i32 12345, i32 0}
; ICALL-PROM-NOT: !1 = !{!"VP", i32 0, i64 12345, i64 -3913987384944532146, i64 12345}

2
test/Transforms/PGOProfile/icp_invoke.ll
View File

@ -103,4 +103,4 @@ declare void @__cxa_end_catch()
!3 = !{!"VP", i32 0, i64 1, i64 -6116256810522035449, i64 1}
; ICP-NOT: !3 = !{!"VP", i32 0, i64 1, i64 -2732222848796217051, i64 1}
; ICP-NOT: !4 = !{!"VP", i32 0, i64 1, i64 -6116256810522035449, i64 1}
; ICP: [[BRANCH_WEIGHT]] = !{!"branch_weights", i64 1, i64 0}
; ICP: [[BRANCH_WEIGHT]] = !{!"branch_weights", i32 1, i32 0}

2
test/Transforms/PGOProfile/icp_vararg.ll
View File

@ -30,4 +30,4 @@ entry:
}
!1 = !{!"VP", i32 0, i64 12345, i64 989055279648259519, i64 12345}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i64 12345, i64 0}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i32 12345, i32 0}

4
test/Transforms/PGOProfile/indirect_call_promotion.ll
View File

@ -60,6 +60,6 @@ entry:
!1 = !{!"VP", i32 0, i64 1600, i64 7651369219802541373, i64 1030, i64 -4377547752858689819, i64 410, i64 -6929281286627296573, i64 150, i64 -2545542355363006406, i64 10}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i64 1030, i64 570}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i32 1030, i32 570}
; ICALL-PROM: [[NEW_VP_METADATA]] = !{!"VP", i32 0, i64 570, i64 -4377547752858689819, i64 410}
; ICALL-PROM-SAMPLEPGO: [[CALL_METADATA]] = !{!"branch_weights", i64 1030}
; ICALL-PROM-SAMPLEPGO: [[CALL_METADATA]] = !{!"branch_weights", i32 1030}

8
test/Transforms/PGOProfile/indirect_call_promotion_musttail.ll
View File

@ -62,7 +62,7 @@ entry:
!1 = !{!"VP", i32 0, i64 1600, i64 7651369219802541373, i64 1030, i64 -4377547752858689819, i64 410, i64 -6929281286627296573, i64 150, i64 -2545542355363006406, i64 10}
!2 = !{!"VP", i32 0, i64 100, i64 7651369219802541373, i64 100}
; ICALL-PROM: [[BRANCH_WEIGHT1]] = !{!"branch_weights", i64 1030, i64 570}
; ICALL-PROM: [[BRANCH_WEIGHT2]] = !{!"branch_weights", i64 410, i64 160}
; ICALL-PROM: [[BRANCH_WEIGHT3]] = !{!"branch_weights", i64 150, i64 10}
; ICALL-PROM: [[BRANCH_WEIGHT4]] = !{!"branch_weights", i64 100, i64 0}
; ICALL-PROM: [[BRANCH_WEIGHT1]] = !{!"branch_weights", i32 1030, i32 570}
; ICALL-PROM: [[BRANCH_WEIGHT2]] = !{!"branch_weights", i32 410, i32 160}
; ICALL-PROM: [[BRANCH_WEIGHT3]] = !{!"branch_weights", i32 150, i32 10}
; ICALL-PROM: [[BRANCH_WEIGHT4]] = !{!"branch_weights", i32 100, i32 0}

2
test/Transforms/PGOProfile/indirect_call_promotion_vla.ll
View File

@ -24,5 +24,5 @@ entry:
ret i32 %call
}
; CHECK: [[BRANCH_WEIGHT]] = !{!"branch_weights", i64 1500, i64 100}
; CHECK: [[BRANCH_WEIGHT]] = !{!"branch_weights", i32 1500, i32 100}
!1 = !{!"VP", i32 0, i64 1600, i64 -2545542355363006406, i64 1500}

2
test/Transforms/PGOProfile/indirectbr.ll
View File

@ -26,7 +26,7 @@ if.then:
indirectbr i8* %0, [label %return, label %label2, label %label3]
; USE: indirectbr i8* %0, [label %return, label %label2, label %label3]
; USE-SAME: !prof ![[BW_INDBR:[0-9]+]]
; USE: ![[BW_INDBR]] = !{!"branch_weights", i64 63, i64 20, i64 5}
; USE: ![[BW_INDBR]] = !{!"branch_weights", i32 63, i32 20, i32 5}
label2:
br label %return

2
test/Transforms/PGOProfile/instr_entry_bb.ll
View File

@ -21,7 +21,7 @@ entry:
; GENA: %{{[0-9+]}} = atomicrmw add i64* getelementptr inbounds ([2 x i64], [2 x i64]* @__profc_test_br_2, i64 0, i64 0), i64 1 monotonic
; USE: br i1 %cmp, label %if.then, label %if.else
; USE-SAME: !prof ![[BW_ENTRY:[0-9]+]]
; USE: ![[BW_ENTRY]] = !{!"branch_weights", i64 0, i64 1}
; USE: ![[BW_ENTRY]] = !{!"branch_weights", i32 0, i32 1}
%cmp = icmp sgt i32 %i, 0
br i1 %cmp, label %if.then, label %if.else

6
test/Transforms/PGOProfile/landingpad.ll
View File

@ -132,6 +132,6 @@ declare i8* @__cxa_begin_catch(i8*)
declare void @__cxa_end_catch()
; USE: ![[BW_BAR_ENTRY]] = !{!"branch_weights", i64 2, i64 1}
; USE: ![[BW_FOO_ENTRY]] = !{!"branch_weights", i64 3, i64 2}
; USE: ![[BW_CATCH_DISPATCH]] = !{!"branch_weights", i64 2, i64 0}
; USE: ![[BW_BAR_ENTRY]] = !{!"branch_weights", i32 2, i32 1}
; USE: ![[BW_FOO_ENTRY]] = !{!"branch_weights", i32 3, i32 2}
; USE: ![[BW_CATCH_DISPATCH]] = !{!"branch_weights", i32 2, i32 0}

2
test/Transforms/PGOProfile/loop1.ll
View File

@ -32,7 +32,7 @@ for.cond:
br i1 %cmp, label %for.body, label %for.end
; USE: br i1 %cmp, label %for.body, label %for.end
; USE-SAME: !prof ![[BW_FOR_COND:[0-9]+]]
; USE: ![[BW_FOR_COND]] = !{!"branch_weights", i64 96, i64 4}
; USE: ![[BW_FOR_COND]] = !{!"branch_weights", i32 96, i32 4}
for.body:
; GEN: for.body:

4
test/Transforms/PGOProfile/loop2.ll
View File

@ -78,6 +78,6 @@ for.end.outer:
ret i32 %sum.0
}
; USE-DAG: ![[BW_FOR_COND_OUTER]] = !{!"branch_weights", i64 10, i64 6}
; USE-DAG: ![[BW_FOR_COND_INNER]] = !{!"branch_weights", i64 33, i64 10}
; USE-DAG: ![[BW_FOR_COND_OUTER]] = !{!"branch_weights", i32 10, i32 6}
; USE-DAG: ![[BW_FOR_COND_INNER]] = !{!"branch_weights", i32 33, i32 10}

6
test/Transforms/PGOProfile/memop_size_opt.ll
View File

@ -143,7 +143,7 @@ for.end6:
ret void
}
; MEMOP_OPT: [[SWITCH_BW]] = !{!"branch_weights", i64 457, i64 99}
; MEMOP_OPT: [[SWITCH_BW]] = !{!"branch_weights", i32 457, i32 99}
; Should be 457 total left (original total count 556, minus 99 from specialized
; value 1, which is removed from VP array. Also, we only end up with 5 total
; values, since the default max number of promotions is 5 and therefore
@ -180,8 +180,8 @@ for.end6:
!25 = !{i32 999990, i64 1, i32 5}
!26 = !{i32 999999, i64 1, i32 5}
!27 = !{!"function_entry_count", i64 1}
!28 = !{!"branch_weights", i64 20, i64 1}
!29 = !{!"branch_weights", i64 556, i64 20}
!28 = !{!"branch_weights", i32 20, i32 1}
!29 = !{!"branch_weights", i32 556, i32 20}
!30 = !{!"VP", i32 1, i64 556, i64 1, i64 99, i64 2, i64 88, i64 3, i64 77, i64 9, i64 72, i64 4, i64 66, i64 5, i64 55, i64 6, i64 44, i64 7, i64 33, i64 8, i64 22}
!31 = !{!"VP", i32 1, i64 556, i64 1, i64 99, i64 2, i64 88, i64 3, i64 77, i64 9, i64 72, i64 4, i64 66, i64 5, i64 55, i64 6, i64 44, i64 7, i64 33, i64 8, i64 22}

4
test/Transforms/PGOProfile/multiple_hash_profile.ll
View File

@ -30,10 +30,10 @@ entry:
%mul.i = select i1 %cmp.i, i32 1, i32 %i
; CHECK: %mul.i = select i1 %cmp.i, i32 1, i32 %i
; CHECK-SAME: !prof ![[BW:[0-9]+]]
; CHECK: ![[BW]] = !{!"branch_weights", i64 12, i64 6}
; CHECK: ![[BW]] = !{!"branch_weights", i32 12, i32 6}
; CHECKOLDHASH: %mul.i = select i1 %cmp.i, i32 1, i32 %i
; CHECKOLDHASH-SAME: !prof ![[BW:[0-9]+]]
; CHECKOLDHASH: ![[BW]] = !{!"branch_weights", i64 6, i64 12}
; CHECKOLDHASH: ![[BW]] = !{!"branch_weights", i32 6, i32 12}
%retval.0.i = mul nsw i32 %mul.i, %i
ret i32 %retval.0.i
}

4
test/Transforms/PGOProfile/noreturncall.ll
View File

@ -41,5 +41,5 @@ if.end7:
%mul = mul nsw i32 %ret.0, %ret.0
ret i32 %mul
}
; USE: ![[BW_ENTRY]] = !{!"branch_weights", i64 21, i64 0}
; USE: ![[BW_IF]] = !{!"branch_weights", i64 0, i64 21}
; USE: ![[BW_ENTRY]] = !{!"branch_weights", i32 21, i32 0}
; USE: ![[BW_IF]] = !{!"branch_weights", i32 0, i32 21}

2
test/Transforms/PGOProfile/remap.ll
View File

@ -25,4 +25,4 @@ if.end:
; USE-DAG: {{![0-9]+}} = !{i32 1, !"ProfileSummary", {{![0-9]+}}}
; USE-DAG: {{![0-9]+}} = !{!"DetailedSummary", {{![0-9]+}}}
; USE-DAG: ![[FUNC_ENTRY_COUNT]] = !{!"function_entry_count", i64 3}
; USE-DAG: ![[BW_ENTRY]] = !{!"branch_weights", i64 2, i64 1}
; USE-DAG: ![[BW_ENTRY]] = !{!"branch_weights", i32 2, i32 1}

2
test/Transforms/PGOProfile/select1.ll
View File

@ -20,7 +20,7 @@ if.then:
;NOSELECT-NOT: call void @llvm.instrprof.increment.step
%s = select i1 %cmp, i32 %add, i32 0
;USE: select i1 %cmp{{.*}}, !prof ![[BW_ENTRY:[0-9]+]]
;USE: ![[BW_ENTRY]] = !{!"branch_weights", i64 1, i64 3}
;USE: ![[BW_ENTRY]] = !{!"branch_weights", i32 1, i32 3}
br label %if.end

4
test/Transforms/PGOProfile/select2.ll
View File

@ -33,5 +33,5 @@ for.end:
}
;USE: ![[ENTRY_COUNT]] = !{!"function_entry_count", i64 3}
;USE: ![[BW_FOR_BR]] = !{!"branch_weights", i64 800, i64 3}
;USE: ![[BW_FOR_SELECT]] = !{!"branch_weights", i64 300, i64 500}
;USE: ![[BW_FOR_BR]] = !{!"branch_weights", i32 800, i32 3}
;USE: ![[BW_FOR_SELECT]] = !{!"branch_weights", i32 300, i32 500}

2
test/Transforms/PGOProfile/switch.ll
View File

@ -27,7 +27,7 @@ entry:
]
; USE: ]
; USE-SAME: !prof ![[BW_SWITCH:[0-9]+]]
; USE: ![[BW_SWITCH]] = !{!"branch_weights", i64 3, i64 2, i64 0, i64 5}
; USE: ![[BW_SWITCH]] = !{!"branch_weights", i32 3, i32 2, i32 0, i32 5}
sw.bb:
; GEN: sw.bb:

6
test/Transforms/PGOProfile/thinlto_cspgo_use.ll
View File

@ -14,8 +14,8 @@
; CSUSE: {{![0-9]+}} = !{i32 1, !"ProfileSummary", {{![0-9]+}}}
; CSUSE: {{![0-9]+}} = !{i32 1, !"CSProfileSummary", {{![0-9]+}}}
; CSUSE-DAG: {{![0-9]+}} = !{!"branch_weights", i64 100000, i64 0}
; CSUSE-DAG: {{![0-9]+}} = !{!"branch_weights", i64 0, i64 100000}
; CSUSE-DAG: {{![0-9]+}} = !{!"branch_weights", i32 100000, i32 0}
; CSUSE-DAG: {{![0-9]+}} = !{!"branch_weights", i32 0, i32 100000}
source_filename = "cspgo.c"
target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
@ -79,4 +79,4 @@ attributes #0 = { "target-cpu"="x86-64" }
!26 = !{i32 999990, i64 100000, i32 4}
!27 = !{i32 999999, i64 1, i32 6}
!29 = !{!"function_entry_count", i64 1}
!30 = !{!"branch_weights", i64 100000, i64 1}
!30 = !{!"branch_weights", i32 100000, i32 1}

2
test/Transforms/PGOProfile/thinlto_indirect_call_promotion.ll
View File

@ -35,5 +35,5 @@ entry:
; Should not have a VP annotation on new indirect call (check before and after
; branch_weights annotation).
; ICALL-PROM-NOT: !"VP"
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i64 1, i64 0}
; ICALL-PROM: [[BRANCH_WEIGHT]] = !{!"branch_weights", i32 1, i32 0}
; ICALL-PROM-NOT: !"VP"

4
test/Transforms/SCCP/switch.ll
View File

@ -220,7 +220,7 @@ define internal i32 @test_ip_range(i32 %x) {
i32 1, label %switch.1
i32 2, label %switch.2
i32 3, label %switch.3
], !prof !{!"branch_weights", i64 1, i64 2, i64 3, i64 4, i64 5}
], !prof !{!"branch_weights", i32 1, i32 2, i32 3, i32 4, i32 5}
switch.default:
ret i32 -1
@ -251,4 +251,4 @@ define void @call_test_ip_range() {
declare void @llvm.assume(i1)
; CHECK: !1 = !{!"branch_weights", i64 1, i64 5, i64 3, i64 4}
; CHECK: !1 = !{!"branch_weights", i32 1, i32 5, i32 3, i32 4}

1
test/Transforms/SampleProfile/entry_counts_cold.ll
View File

@ -1,4 +1,3 @@
; RUN: opt < %s -passes=sample-profile -sample-profile-file=%S/Inputs/entry_counts_cold.prof -S | FileCheck %s
; RUN: opt < %s -sample-profile -sample-profile-file=%S/Inputs/entry_counts_cold.prof -S | FileCheck %s
; ModuleID = 'temp.bc'
source_filename = "temp.c"

8
test/Transforms/SampleProfile/indirect-call.ll
View File

@ -123,7 +123,7 @@ else:
; CHECK-LABEL: @branch_prof_valid
; Check the conditional branch generated by indirect call promotion won't
; have invalid profile like !{!"branch_weights", i64 0, i64 0}.
; have invalid profile like !{!"branch_weights", i32 0, i32 0}.
define void @branch_prof_valid(void ()* %t0) #0 !dbg !33 {
%t1 = alloca void ()*
store void ()* %t0, void ()** %t1
@ -200,10 +200,10 @@ attributes #0 = {"use-sample-profile"}
!4 = !DILocation(line: 4, scope: !3)
!5 = !DILocation(line: 6, scope: !3)
; CHECK: ![[PROF]] = !{!"VP", i32 0, i64 3457, i64 9191153033785521275, i64 2059, i64 -1069303473483922844, i64 1398}
; CHECK: ![[BR1]] = !{!"branch_weights", i64 4000, i64 4000}
; CHECK: ![[BR2]] = !{!"branch_weights", i64 3000, i64 1000}
; CHECK: ![[BR1]] = !{!"branch_weights", i32 4000, i32 4000}
; CHECK: ![[BR2]] = !{!"branch_weights", i32 3000, i32 1000}
; CHECK: ![[VP]] = !{!"VP", i32 0, i64 8000, i64 -6391416044382067764, i64 1000}
; CHECK: ![[BR3]] = !{!"branch_weights", i64 1, i64 0}
; CHECK: ![[BR3]] = !{!"branch_weights", i32 1, i32 0}
!6 = distinct !DISubprogram(name: "test_inline", scope: !1, file: !1, line: 6, unit: !0)
!7 = !DILocation(line: 7, scope: !6)
!8 = distinct !DISubprogram(name: "test_inline_strip", scope: !1, file: !1, line: 8, unit: !0)

4
test/Transforms/SampleProfile/inline-mergeprof-dup.ll
View File

@ -76,5 +76,5 @@ attributes #0 = { "use-sample-profile" }
;; Check the profile of funciton sum is only merged once though the original callsite is replicted.
; CHECK: name: "sum"
; CHECK-NEXT: {!"function_entry_count", i64 46}
; CHECK: !{!"branch_weights", i64 11, i64 37}
; CHECK: !{!"branch_weights", i64 11, i64 1}
; CHECK: !{!"branch_weights", i32 11, i32 37}
; CHECK: !{!"branch_weights", i32 11, i32 1}

6
test/Transforms/SampleProfile/inline-mergeprof.ll
View File

@ -90,14 +90,14 @@ declare i32 @printf(i8*, ...)
; SCALE: name: "sum"
; SCALE-NEXT: {!"function_entry_count", i64 46}
; SCALE: !{!"branch_weights", i64 11, i64 2}
; SCALE: !{!"branch_weights", i32 11, i32 2}
; SCALE: !{!"branch_weights", i64 20}
; SCALE: name: "sub"
; SCALE-NEXT: {!"function_entry_count", i64 -1}
; MERGE: name: "sum"
; MERGE-NEXT: {!"function_entry_count", i64 46}
; MERGE: !{!"branch_weights", i64 11, i64 23}
; MERGE: !{!"branch_weights", i64 10}
; MERGE: !{!"branch_weights", i32 11, i32 23}
; MERGE: !{!"branch_weights", i32 10}
; MERGE: name: "sub"
; MERGE-NEXT: {!"function_entry_count", i64 3}

6
test/Transforms/SampleProfile/profile-format-compress.ll
View File

@ -30,9 +30,9 @@
; CHECK: call i32 (i8*, ...) @printf{{.*}} !prof ![[IDX3:[0-9]*]]
; CHECK: = !{!"TotalCount", i64 26781}
; CHECK: = !{!"MaxCount", i64 5553}
; CHECK: ![[IDX1]] = !{!"branch_weights", i64 5392, i64 163}
; CHECK: ![[IDX2]] = !{!"branch_weights", i64 5280, i64 113}
; CHECK: ![[IDX3]] = !{!"branch_weights", i64 1}
; CHECK: ![[IDX1]] = !{!"branch_weights", i32 5392, i32 163}
; CHECK: ![[IDX2]] = !{!"branch_weights", i32 5280, i32 113}
; CHECK: ![[IDX3]] = !{!"branch_weights", i32 1}
; Function Attrs: nounwind uwtable
define i32 @_Z3sumii(i32 %x, i32 %y) #0 !dbg !4 {

6
test/Transforms/SampleProfile/profile-format.ll
View File

@ -32,9 +32,9 @@
; CHECK: call i32 (i8*, ...) @printf{{.*}} !prof ![[IDX3:[0-9]*]]
; CHECK: = !{!"TotalCount", i64 26781}
; CHECK: = !{!"MaxCount", i64 5553}
; CHECK: ![[IDX1]] = !{!"branch_weights", i64 5392, i64 163}
; CHECK: ![[IDX2]] = !{!"branch_weights", i64 5280, i64 113}
; CHECK: ![[IDX3]] = !{!"branch_weights", i64 1}
; CHECK: ![[IDX1]] = !{!"branch_weights", i32 5392, i32 163}
; CHECK: ![[IDX2]] = !{!"branch_weights", i32 5280, i32 113}
; CHECK: ![[IDX3]] = !{!"branch_weights", i32 1}
; Function Attrs: nounwind uwtable
define i32 @_Z3sumii(i32 %x, i32 %y) #0 !dbg !4 {

6
test/Transforms/SimpleLoopUnswitch/basictest-profmd.ll
View File

@ -16,7 +16,7 @@ loop_begin:
switch i32 %c, label %default [
i32 1, label %inc
i32 2, label %dec
], !prof !{!"branch_weights", i64 99, i64 1, i64 2}
], !prof !{!"branch_weights", i32 99, i32 1, i32 2}
inc:
call void @incf()
@ -30,5 +30,5 @@ default:
ret i32 0
}
; CHECK: ![[MD0]] = !{!"branch_weights", i64 99, i64 1, i64 2}
; CHECK: ![[MD1]] = !{!"branch_weights", i64 2, i64 1}
; CHECK: ![[MD0]] = !{!"branch_weights", i32 99, i32 1, i32 2}
; CHECK: ![[MD1]] = !{!"branch_weights", i32 2, i32 1}

16
test/Transforms/SimpleLoopUnswitch/trivial-unswitch-profmd.ll
View File

@ -47,7 +47,7 @@ loop_begin:
i32 0, label %loop0
i32 1, label %loop1
i32 2, label %loop_exit2
], !prof !{!"branch_weights", i64 99, i64 100, i64 101, i64 102}
], !prof !{!"branch_weights", i32 99, i32 100, i32 101, i32 102}
loop0:
call void @some_func()
@ -118,7 +118,7 @@ loop_begin:
i32 0, label %loop0
i32 1, label %loop1
i32 2, label %loop2
], !prof !{!"branch_weights", i64 99, i64 100, i64 101, i64 102}
], !prof !{!"branch_weights", i32 99, i32 100, i32 101, i32 102}
loop0:
call void @some_func()
@ -194,7 +194,7 @@ loop_begin:
i32 13, label %loop_exit1
i32 2, label %loop2
i32 42, label %loop_exit3
], !prof !{!"branch_weights", i64 99, i64 100, i64 101, i64 113, i64 102, i64 142}
], !prof !{!"branch_weights", i32 99, i32 100, i32 101, i32 113, i32 102, i32 142}
loop0:
call void @some_func()
@ -221,8 +221,8 @@ loop_exit3:
ret i32 0
}
; CHECK: ![[MD0]] = !{!"branch_weights", i64 300, i64 102}
; CHECK: ![[MD1]] = !{!"branch_weights", i64 99, i64 100, i64 101}
; CHECK: ![[MD2]] = !{!"branch_weights", i64 99, i64 100, i64 101, i64 102}
; CHECK: ![[MD3]] = !{!"branch_weights", i64 102, i64 100, i64 101}
; CHECK: ![[MD4]] = !{!"branch_weights", i64 99, i64 113, i64 142, i64 100, i64 101, i64 102}
; CHECK: ![[MD0]] = !{!"branch_weights", i32 300, i32 102}
; CHECK: ![[MD1]] = !{!"branch_weights", i32 99, i32 100, i32 101}
; CHECK: ![[MD2]] = !{!"branch_weights", i32 99, i32 100, i32 101, i32 102}
; CHECK: ![[MD3]] = !{!"branch_weights", i32 102, i32 100, i32 101}
; CHECK: ![[MD4]] = !{!"branch_weights", i32 99, i32 113, i32 142, i32 100, i32 101, i32 102}

4
test/Transforms/SimplifyCFG/invoke_unwind.ll
View File

@ -17,7 +17,7 @@ Rethrow:
resume { i8*, i32 } %exn
}
!0 = !{!"branch_weights", i64 369, i64 2}
!0 = !{!"branch_weights", i32 369, i32 2}
define i32 @test2() personality i32 (...)* @__gxx_personality_v0 {
; CHECK-LABEL: @test2(
@ -76,4 +76,4 @@ lpad2:
declare i32 @__gxx_personality_v0(...)
; CHECK: ![[PROF]] = !{!"branch_weights", i64 371}
; CHECK: ![[PROF]] = !{!"branch_weights", i32 371}

18
test/Transforms/SimplifyCFG/preserve-branchweights-switch-create.ll
View File

@ -129,12 +129,12 @@ sw.epilog:
ret void
}
!0 = !{!"branch_weights", i64 64, i64 4}
!1 = !{!"branch_weights", i64 4, i64 64}
; CHECK: !0 = !{!"branch_weights", i64 256, i64 4352, i64 16}
!2 = !{!"branch_weights", i64 4, i64 4, i64 8}
!3 = !{!"branch_weights", i64 8, i64 8, i64 4}
; CHECK: !1 = !{!"branch_weights", i64 32, i64 48, i64 96, i64 16}
!4 = !{!"branch_weights", i64 7, i64 6, i64 4, i64 3}
!5 = !{!"branch_weights", i64 17, i64 13, i64 9}
; CHECK: !3 = !{!"branch_weights", i64 7, i64 3, i64 4, i64 6}
!0 = !{!"branch_weights", i32 64, i32 4}
!1 = !{!"branch_weights", i32 4, i32 64}
; CHECK: !0 = !{!"branch_weights", i32 256, i32 4352, i32 16}
!2 = !{!"branch_weights", i32 4, i32 4, i32 8}
!3 = !{!"branch_weights", i32 8, i32 8, i32 4}
; CHECK: !1 = !{!"branch_weights", i32 32, i32 48, i32 96, i32 16}
!4 = !{!"branch_weights", i32 7, i32 6, i32 4, i32 3}
!5 = !{!"branch_weights", i32 17, i32 13, i32 9}
; CHECK: !3 = !{!"branch_weights", i32 7, i32 3, i32 4, i32 6}

70
test/Transforms/SimplifyCFG/preserve-branchweights.ll
View File

@ -636,38 +636,40 @@ exit:
ret i32 %outval
}
!0 = !{!"branch_weights", i64 3, i64 5}
!1 = !{!"branch_weights", i64 1, i64 1}
!2 = !{!"branch_weights", i64 1, i64 2}
!3 = !{!"branch_weights", i64 4, i64 3, i64 2, i64 1}
!4 = !{!"branch_weights", i64 4, i64 3, i64 2, i64 1}
!5 = !{!"branch_weights", i64 7, i64 6, i64 5}
!6 = !{!"branch_weights", i64 1, i64 3}
!7 = !{!"branch_weights", i64 33, i64 9, i64 8, i64 7}
!8 = !{!"branch_weights", i64 33, i64 9, i64 8}
!9 = !{!"branch_weights", i64 7, i64 6}
!10 = !{!"branch_weights", i64 672646, i64 21604207}
!11 = !{!"branch_weights", i64 6960, i64 21597248}
!12 = !{!"these_are_not_the_branch_weights_you_are_looking_for", i64 3, i64 5}
!13 = !{!"branch_weights", i64 2, i64 3}
!14 = !{!"branch_weights", i64 4, i64 7}
!0 = !{!"branch_weights", i32 3, i32 5}
!1 = !{!"branch_weights", i32 1, i32 1}
!2 = !{!"branch_weights", i32 1, i32 2}
!3 = !{!"branch_weights", i32 4, i32 3, i32 2, i32 1}
!4 = !{!"branch_weights", i32 4, i32 3, i32 2, i32 1}
!5 = !{!"branch_weights", i32 7, i32 6, i32 5}
!6 = !{!"branch_weights", i32 1, i32 3}
!7 = !{!"branch_weights", i32 33, i32 9, i32 8, i32 7}
!8 = !{!"branch_weights", i32 33, i32 9, i32 8}
!9 = !{!"branch_weights", i32 7, i32 6}
!10 = !{!"branch_weights", i32 672646, i32 21604207}
!11 = !{!"branch_weights", i32 6960, i32 21597248}
!12 = !{!"these_are_not_the_branch_weights_you_are_looking_for", i32 3, i32 5}
!13 = !{!"branch_weights", i32 2, i32 3}
!14 = !{!"branch_weights", i32 4, i32 7}
; CHECK: !0 = !{!"branch_weights", i64 5, i64 11}
; CHECK: !1 = !{!"branch_weights", i64 1, i64 3}
; CHECK: !2 = !{!"branch_weights", i64 1, i64 5}
; CHECK: !3 = !{!"branch_weights", i64 7, i64 1, i64 2}
; CHECK: !4 = !{!"branch_weights", i64 49, i64 12, i64 24, i64 35}
; CHECK: !5 = !{!"branch_weights", i64 11, i64 5}
; CHECK: !6 = !{!"branch_weights", i64 17, i64 15}
; CHECK: !7 = !{!"branch_weights", i64 9, i64 7}
; CHECK: !8 = !{!"branch_weights", i64 17, i64 9, i64 8, i64 7, i64 17}
; CHECK: !9 = !{!"branch_weights", i64 24, i64 33}
; CHECK: !10 = !{!"branch_weights", i64 8, i64 33}
; CHECK: !11 = !{!"branch_weights", i64 14682349375088, i64 466591416422336}
; CHECK: !12 = !{!"branch_weights", i64 3, i64 5}
; CHECK: !13 = !{!"branch_weights", i64 22, i64 12}
; CHECK: !14 = !{!"branch_weights", i64 34, i64 21}
; CHECK: !15 = !{!"branch_weights", i64 33, i64 14}
; CHECK: !16 = !{!"branch_weights", i64 47, i64 8}
; CHECK: !17 = !{!"branch_weights", i64 6, i64 2}
; CHECK: !18 = !{!"branch_weights", i64 8, i64 2}
; CHECK: !0 = !{!"branch_weights", i32 5, i32 11}
; CHECK: !1 = !{!"branch_weights", i32 1, i32 3}
; CHECK: !2 = !{!"branch_weights", i32 1, i32 5}
; CHECK: !3 = !{!"branch_weights", i32 7, i32 1, i32 2}
; CHECK: !4 = !{!"branch_weights", i32 49, i32 12, i32 24, i32 35}
; CHECK: !5 = !{!"branch_weights", i32 11, i32 5}
; CHECK: !6 = !{!"branch_weights", i32 17, i32 15}
; CHECK: !7 = !{!"branch_weights", i32 9, i32 7}
; CHECK: !8 = !{!"branch_weights", i32 17, i32 9, i32 8, i32 7, i32 17}
; CHECK: !9 = !{!"branch_weights", i32 24, i32 33}
; CHECK: !10 = !{!"branch_weights", i32 8, i32 33}
;; The false weight prints out as a negative integer here, but inside llvm, we
;; treat the weight as an unsigned integer.
; CHECK: !11 = !{!"branch_weights", i32 112017436, i32 -735157296}
; CHECK: !12 = !{!"branch_weights", i32 3, i32 5}
; CHECK: !13 = !{!"branch_weights", i32 22, i32 12}
; CHECK: !14 = !{!"branch_weights", i32 34, i32 21}
; CHECK: !15 = !{!"branch_weights", i32 33, i32 14}
; CHECK: !16 = !{!"branch_weights", i32 47, i32 8}
; CHECK: !17 = !{!"branch_weights", i32 6, i32 2}
; CHECK: !18 = !{!"branch_weights", i32 8, i32 2}

4
test/Transforms/SimplifyCFG/switch-profmd.ll
View File

@ -12,7 +12,7 @@ define i32 @test_switch_to_unreachable(i32 %val) {
i32 0, label %on0
i32 1, label %on1
i32 2, label %on2
], !prof !{!"branch_weights", i64 99, i64 0, i64 1, i64 2}
], !prof !{!"branch_weights", i32 99, i32 0, i32 1, i32 2}
; CHECK: !prof ![[MD0:[0-9]+]]
otherwise:
@ -32,4 +32,4 @@ on2:
ret i32 %result2
}
; CHECK: ![[MD0]] = !{!"branch_weights", i64 99, i64 2, i64 1}
; CHECK: ![[MD0]] = !{!"branch_weights", i32 99, i32 2, i32 1}

2
test/Transforms/Util/libcalls-shrinkwrap-double.ll
View File

@ -238,4 +238,4 @@ define void @test_pow(i32 %int_val, double %exp) {
declare double @pow(double, double)
; CHECK: ![[BRANCH_WEIGHT]] = !{!"branch_weights", i64 1, i64 2000}
; CHECK: ![[BRANCH_WEIGHT]] = !{!"branch_weights", i32 1, i32 2000}

2
test/Transforms/Util/libcalls-shrinkwrap-float.ll
View File

@ -188,4 +188,4 @@ declare float @log2f(float)
declare float @logbf(float)
declare float @log1pf(float)
; CHECK: ![[BRANCH_WEIGHT]] = !{!"branch_weights", i64 1, i64 2000}
; CHECK: ![[BRANCH_WEIGHT]] = !{!"branch_weights", i32 1, i32 2000}

2
test/Transforms/Util/libcalls-shrinkwrap-long-double.ll
View File

@ -189,4 +189,4 @@ declare x86_fp80 @log2l(x86_fp80)
declare x86_fp80 @logbl(x86_fp80)
declare x86_fp80 @log1pl(x86_fp80)
; CHECK: ![[BRANCH_WEIGHT]] = !{!"branch_weights", i64 1, i64 2000}
; CHECK: ![[BRANCH_WEIGHT]] = !{!"branch_weights", i32 1, i32 2000}

2
unittests/Analysis/ProfileSummaryInfoTest.cpp
View File

@ -339,7 +339,7 @@ TEST_F(ProfileSummaryInfoTest, SampleProf) {
CallBase &CS1 = cast<CallBase>(*BB1->getFirstNonPHI());
auto *CI2 = BB2->getFirstNonPHI();
// Manually attach branch weights metadata to the call instruction.
SmallVector<uint64_t, 1> Weights;
SmallVector<uint32_t, 1> Weights;
Weights.push_back(1000);
MDBuilder MDB(M->getContext());
CI2->setMetadata(LLVMContext::MD_prof, MDB.createBranchWeights(Weights));