Skip to content

-sil-print-all (et al.) should print specialized functions when they … #14486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 8, 2018
Merged

-sil-print-all (et al.) should print specialized functions when they … #14486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions include/swift/SILOptimizer/PassManager/PassManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,9 @@ class SILPassManager {
CompletedPassesMap.clear();
}

/// \brief Notify the pass manager of a newly create function for tracing.
void notifyOfNewFunction(SILFunction *F, SILTransform *T);

/// \brief Add the function \p F to the function pass worklist.
/// If not null, the function \p DerivedFrom is the function from which \p F
/// is derived. This is used to avoid an infinite amount of functions pushed
Expand Down Expand Up @@ -291,6 +294,9 @@ class SILPassManager {
/// Return true if all analyses are unlocked.
bool analysesUnlocked();

/// Dumps information about the pass with index \p TransIdx to llvm::dbgs().
void dumpPassInfo(const char *Title, SILTransform *Tr, SILFunction *F);

/// Dumps information about the pass with index \p TransIdx to llvm::dbgs().
void dumpPassInfo(const char *Title, unsigned TransIdx,
SILFunction *F = nullptr);
Expand Down
2 changes: 2 additions & 0 deletions include/swift/SILOptimizer/PassManager/Transforms.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ namespace swift {
/// The number should be small anyway, but bugs in optimizations could cause
/// an infinite loop in the passmanager.
void notifyAddFunction(SILFunction *F, SILFunction *DerivedFrom) {
PM->notifyOfNewFunction(F, this);
PM->addFunctionToWorklist(F, DerivedFrom);
PM->notifyAnalysisOfFunction(F);
}
Expand Down Expand Up @@ -171,6 +172,7 @@ namespace swift {

/// Inform the pass manager of an added function.
void notifyAddFunction(SILFunction *F) {
PM->notifyOfNewFunction(F, this);
PM->notifyAnalysisOfFunction(F);
}
};
Expand Down
17 changes: 17 additions & 0 deletions lib/SILOptimizer/PassManager/PassManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,16 @@ static bool breakBeforeRunning(StringRef fnName, SILFunctionTransform *SFT) {
&& (SFT->getID() == SILBreakOnPass || SFT->getTag() == SILBreakOnPass);
}

void SILPassManager::dumpPassInfo(const char *Title, SILTransform *Tr,
SILFunction *F) {
llvm::dbgs() << " " << Title << " #" << NumPassesRun << ", stage "
<< StageName << ", pass : " << Tr->getID()
<< " (" << Tr->getTag() << ")";
if (F)
llvm::dbgs() << ", Function: " << F->getName();
llvm::dbgs() << '\n';
}

void SILPassManager::dumpPassInfo(const char *Title, unsigned TransIdx,
SILFunction *F) {
SILTransform *Tr = Transformations[TransIdx];
Expand Down Expand Up @@ -541,6 +551,13 @@ SILPassManager::~SILPassManager() {
}
}

void SILPassManager::notifyOfNewFunction(SILFunction *F, SILTransform *T) {
if (doPrintAfter(T, F, SILPrintAll)) {
dumpPassInfo("*** New SIL function in ", T, F);
F->dump(getOptions().EmitVerboseSIL);
}
}

void SILPassManager::addFunctionToWorklist(SILFunction *F,
SILFunction *DerivedFrom) {
assert(F && F->isDefinition() && (isMandatoryPipeline || F->shouldOptimize())
Expand Down