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

Revert "[InlineCost] Addressing a very strict assert check in CostAnnotationWriter::emitInstructionAnnot"

Browse Source 
This reverts commit 66947d05fd193bb8948943a62455d617974f2012.
This commit is contained in:
Kirill Naumov 2020-04-29 21:59:20 +00:00
parent 902656a553
commit c7ceb85a1d
2 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
lib/Analysis/InlineCost.cpp
View File

@ -54,8 +54,8 @@ static cl::opt<int>
cl::ZeroOrMore,
cl::desc("Default amount of inlining to perform"));
static cl::opt<bool> PrintDebugInstructionDeltas(
"print-instruction-deltas", cl::Hidden, cl::init(false),
static cl::opt<bool> PrintDebugInstructionDeltas("print-instruction-deltas",
cl::Hidden, cl::init(false),
cl::desc("Prints deltas of cost and threshold per instruction"));
static cl::opt<int> InlineThreshold(
@ -132,10 +132,10 @@ class CostAnnotationWriter : public AssemblyAnnotationWriter {
public:
// This DenseMap stores the delta change in cost and threshold after
// accounting for the given instruction.
DenseMap<const Instruction *, InstructionCostDetail> CostThresholdMap;
DenseMap <const Instruction *, InstructionCostDetail> CostThresholdMap;
virtual void emitInstructionAnnot(const Instruction *I,
formatted_raw_ostream &OS);
formatted_raw_ostream &OS);
};
class CallAnalyzer : public InstVisitor<CallAnalyzer, bool> {
@ -590,7 +590,7 @@ class InlineCostCallAnalyzer final : public CallAnalyzer {
// This function is called to store the initial cost of inlining before
// the given instruction was assessed.
if (!PrintDebugInstructionDeltas)
return;
return ;
Writer.CostThresholdMap[I].CostBefore = Cost;
Writer.CostThresholdMap[I].ThresholdBefore = Threshold;
}
@ -599,7 +599,7 @@ class InlineCostCallAnalyzer final : public CallAnalyzer {
// This function is called to find new values of cost and threshold after
// the instruction has been assessed.
if (!PrintDebugInstructionDeltas)
return;
return ;
Writer.CostThresholdMap[I].CostAfter = Cost;
Writer.CostThresholdMap[I].ThresholdAfter = Threshold;
}
@ -727,24 +727,22 @@ void CallAnalyzer::disableSROAForArg(AllocaInst *SROAArg) {
disableLoadElimination();
}
void CostAnnotationWriter::emitInstructionAnnot(const Instruction *I,
formatted_raw_ostream &OS) {
// The cost of inlining of the given instruction is printed always.
// The threshold delta is printed only when it is non-zero. It happens
// when we decided to give a bonus at a particular instruction.
if (CostThresholdMap.count(I) == 0) {
OS << "; No analysis for the instruction\n";
return;
}
const auto &Record = CostThresholdMap[I];
OS << "; cost before = " << Record.CostBefore
<< ", cost after = " << Record.CostAfter
<< ", threshold before = " << Record.ThresholdBefore
<< ", threshold after = " << Record.ThresholdAfter << ", ";
OS << "cost delta = " << Record.getCostDelta();
if (Record.hasThresholdChanged())
OS << ", threshold delta = " << Record.getThresholdDelta();
OS << "\n";
void CostAnnotationWriter::emitInstructionAnnot(
const Instruction *I, formatted_raw_ostream &OS) {
// The cost of inlining of the given instruction is printed always.
// The threshold delta is printed only when it is non-zero. It happens
// when we decided to give a bonus at a particular instruction.
assert(CostThresholdMap.count(I) > 0 &&
"Expected each instruction to have an instruction annotation");
const auto &Record = CostThresholdMap[I];
OS << "; cost before = " << Record.CostBefore
<< ", cost after = " << Record.CostAfter
<< ", threshold before = " << Record.ThresholdBefore
<< ", threshold after = " << Record.ThresholdAfter << ", ";
OS << "cost delta = " << Record.getCostDelta();
if (Record.hasThresholdChanged())
OS << ", threshold delta = " << Record.getThresholdDelta();
OS << "\n";
}
/// If 'V' maps to a SROA candidate, disable SROA for it.
@ -806,8 +804,7 @@ bool CallAnalyzer::isGEPFree(GetElementPtrInst &GEP) {
else
Operands.push_back(*I);
return TargetTransformInfo::TCC_Free ==
TTI.getUserCost(&GEP, Operands,
TargetTransformInfo::TCK_SizeAndLatency);
TTI.getUserCost(&GEP, Operands, TargetTransformInfo::TCK_SizeAndLatency);
}
bool CallAnalyzer::visitAlloca(AllocaInst &I) {

16
test/Transforms/Inline/print-instructions-deltas-unfinished.ll
View File

@ -1,16 +0,0 @@
; RUN: opt < %s -inline -debug-only=inline-cost -disable-output -print-instruction-deltas -inline-threshold=0 2>&1 | FileCheck %s
; CHECK: No analysis for the instruction
; CHECK: ret void
declare void @callee1()
define void @bar() {
call void @callee1()
ret void
}
define void @foo() {
call void @bar()
ret void
}