Use isIgnored instead of checking pass name

In preparation for https://reviews.llvm.org/D92616 which will remove
angle brackets from pass manager/adaptor names.

Reviewed By: dexonsmith, thakis

Differential Revision: https://reviews.llvm.org/D92625
This commit is contained in:
Arthur Eubanks 2020-12-03 17:38:00 -08:00
parent 305852686b
commit 0173eb0faf
1 changed files with 6 additions and 10 deletions

View File

@ -474,7 +474,7 @@ PrintIRInstrumentation::popModuleDesc(StringRef PassID) {
}
void PrintIRInstrumentation::printBeforePass(StringRef PassID, Any IR) {
if (PassID.startswith("PassManager<") || PassID.contains("PassAdaptor<"))
if (isIgnored(PassID))
return;
// Saving Module for AfterPassInvalidated operations.
@ -493,7 +493,7 @@ void PrintIRInstrumentation::printBeforePass(StringRef PassID, Any IR) {
}
void PrintIRInstrumentation::printAfterPass(StringRef PassID, Any IR) {
if (PassID.startswith("PassManager<") || PassID.contains("PassAdaptor<"))
if (isIgnored(PassID))
return;
if (!shouldPrintAfterPass(PassID))
@ -511,7 +511,7 @@ void PrintIRInstrumentation::printAfterPassInvalidated(StringRef PassID) {
if (!StoreModuleDesc || !shouldPrintAfterPass(PassName))
return;
if (PassID.startswith("PassManager<") || PassID.contains("PassAdaptor<"))
if (isIgnored(PassID))
return;
const Module *M;
@ -627,13 +627,9 @@ void OptBisectInstrumentation::registerCallbacks(
if (!isEnabled())
return;
std::vector<StringRef> SpecialPasses = {"PassManager", "PassAdaptor"};
PIC.registerShouldRunOptionalPassCallback(
[this, SpecialPasses](StringRef PassID, Any IR) {
return isSpecialPass(PassID, SpecialPasses) ||
checkPass(PassID, getBisectDescription(IR));
});
PIC.registerShouldRunOptionalPassCallback([this](StringRef PassID, Any IR) {
return isIgnored(PassID) || checkPass(PassID, getBisectDescription(IR));
});
}
void PrintPassInstrumentation::registerCallbacks(