Skip to content

[StandardInstrumentations] Make -print-after-pass-number/-print-after-pass-number options allow multiple pass numbers specified #155228

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 2 commits into from
Aug 26, 2025
Merged

[StandardInstrumentations] Make -print-after-pass-number/-print-after-pass-number options allow multiple pass numbers specified #155228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a8a6786
[StandardInstrumentations] Make -print-after-pass-number/-print-after…
Enna1 Aug 25, 2025
844c819
Merge branch 'main' into users/Enna1/print-before-after-mulitple-pass…
Enna1 Aug 25, 2025
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
22 changes: 11 additions & 11 deletions llvm/lib/Passes/StandardInstrumentations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,15 +118,15 @@ static cl::opt<bool> PrintPassNumbers(
"print-pass-numbers", cl::init(false), cl::Hidden,
cl::desc("Print pass names and their ordinals"));

static cl::opt<unsigned> PrintBeforePassNumber(
"print-before-pass-number", cl::init(0), cl::Hidden,
cl::desc("Print IR before the pass with this number as "
static cl::list<unsigned> PrintBeforePassNumber(
"print-before-pass-number", cl::CommaSeparated, cl::Hidden,
cl::desc("Print IR before the passes with specified numbers as "
"reported by print-pass-numbers"));

static cl::opt<unsigned>
PrintAfterPassNumber("print-after-pass-number", cl::init(0), cl::Hidden,
cl::desc("Print IR after the pass with this number as "
"reported by print-pass-numbers"));
static cl::list<unsigned> PrintAfterPassNumber(
"print-after-pass-number", cl::CommaSeparated, cl::Hidden,
cl::desc("Print IR after the passes with specified numbers as "
"reported by print-pass-numbers"));

static cl::opt<std::string> IRDumpDirectory(
"ir-dump-directory",
Expand Down Expand Up @@ -984,24 +984,24 @@ bool PrintIRInstrumentation::shouldPrintAfterPass(StringRef PassID) {

bool PrintIRInstrumentation::shouldPrintBeforeCurrentPassNumber() {
return shouldPrintBeforeSomePassNumber() &&
(CurrentPassNumber == PrintBeforePassNumber);
(is_contained(PrintBeforePassNumber, CurrentPassNumber));
}

bool PrintIRInstrumentation::shouldPrintAfterCurrentPassNumber() {
return shouldPrintAfterSomePassNumber() &&
(CurrentPassNumber == PrintAfterPassNumber);
(is_contained(PrintAfterPassNumber, CurrentPassNumber));
}

bool PrintIRInstrumentation::shouldPrintPassNumbers() {
return PrintPassNumbers;
}

bool PrintIRInstrumentation::shouldPrintBeforeSomePassNumber() {
return PrintBeforePassNumber > 0;
return !PrintBeforePassNumber.empty();
}

bool PrintIRInstrumentation::shouldPrintAfterSomePassNumber() {
return PrintAfterPassNumber > 0;
return !PrintAfterPassNumber.empty();
}

void PrintIRInstrumentation::registerCallbacks(
Expand Down
10 changes: 10 additions & 0 deletions llvm/test/Other/print-at-pass-number.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,22 @@
; RUN: opt -passes="loop(indvars,loop-deletion,loop-unroll-full)" -print-pass-numbers -filter-print-funcs=baz -S -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=NUMBER-FILTERED
; RUN: opt -passes="loop(indvars,loop-deletion,loop-unroll-full)" -print-module-scope -print-before-pass-number=3 -S -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=BEFORE
; RUN: opt -passes="loop(indvars,loop-deletion,loop-unroll-full)" -print-module-scope -print-after-pass-number=2 -S -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=AFTER
; RUN: opt -passes="loop(indvars,loop-deletion,loop-unroll-full)" -print-module-scope -print-before-pass-number=2,3 -S -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=BEFORE-MULTI
; RUN: opt -passes="loop(indvars,loop-deletion,loop-unroll-full)" -print-module-scope -print-after-pass-number=2,3 -S -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=AFTER-MULTI

define i32 @bar(i32 %arg) {
; BEFORE: *** IR Dump Before 3-IndVarSimplifyPass on loop %bb1 in function bar ***
; BEFORE: define i32 @bar(i32 %arg) {
; AFTER: *** IR Dump After 2-LCSSAPass on bar ***
; AFTER: define i32 @bar(i32 %arg) {
; BEFORE-MULTI: *** IR Dump Before 2-LCSSAPass on bar ***
; BEFORE-MULTI: define i32 @bar(i32 %arg) {
; BEFORE-MULTI: *** IR Dump Before 3-IndVarSimplifyPass on loop %bb1 in function bar ***
; BEFORE-MULTI: define i32 @bar(i32 %arg) {
; AFTER-MULTI: *** IR Dump After 2-LCSSAPass on bar ***
; AFTER-MULTI: define i32 @bar(i32 %arg) {
; AFTER-MULTI: *** IR Dump After 3-IndVarSimplifyPass on loop %bb1 in function bar ***
; AFTER-MULTI: define i32 @bar(i32 %arg) {

bb:
br label %bb1
Expand Down
Loading