Skip to content

Commit 67205f9

Browse files
committed
Remove -action suffix from the tag defining an Action: it is redundant here
Differential Revision: https://reviews.llvm.org/D149036
1 parent 7a6dc3d commit 67205f9

File tree

4 files changed

+18
-18
lines changed

4 files changed

+18
-18
lines changed

mlir/include/mlir/Rewrite/PatternApplicator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ class ApplyPatternAction : public tracing::ActionImpl<ApplyPatternAction> {
3232
using Base = tracing::ActionImpl<ApplyPatternAction>;
3333
ApplyPatternAction(ArrayRef<IRUnit> irUnits, const Pattern &pattern)
3434
: Base(irUnits), pattern(pattern) {}
35-
static constexpr StringLiteral tag = "apply-pattern-action";
35+
static constexpr StringLiteral tag = "apply-pattern";
3636
static constexpr StringLiteral desc =
3737
"Encapsulate the application of rewrite patterns";
3838

mlir/lib/Pass/PassDetail.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ struct PassExecutionAction : public tracing::ActionImpl<PassExecutionAction> {
2121
using Base = tracing::ActionImpl<PassExecutionAction>;
2222
PassExecutionAction(ArrayRef<IRUnit> irUnits, const Pass &pass)
2323
: Base(irUnits), pass(pass) {}
24-
static constexpr StringLiteral tag = "pass-execution-action";
24+
static constexpr StringLiteral tag = "pass-execution";
2525
void print(raw_ostream &os) const override;
2626
const Pass &getPass() const { return pass; }
2727
Operation *getOp() const {

mlir/test/Pass/action-logging-filter.mlir

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ func.func @c() {
2020
// Specify the current file as filter, expect to see all actions.
2121
// RUN: mlir-opt %s --log-mlir-actions-filter=%s --log-actions-to=- -pass-pipeline="builtin.module(func.func(canonicalize))" -o %t --mlir-disable-threading | FileCheck %s
2222

23-
// CHECK: [thread {{.*}}] begins (no breakpoint) Action `pass-execution-action` running `Canonicalizer` on Operation `func.func` (func.func @a() {...}
24-
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution-action`
25-
// CHECK-NEXT: [thread {{.*}}] begins (no breakpoint) Action `pass-execution-action` running `Canonicalizer` on Operation `func.func` (func.func @b() {...}
26-
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution-action`
27-
// CHECK-NEXT: [thread {{.*}}] begins (no breakpoint) Action `pass-execution-action` running `Canonicalizer` on Operation `func.func` (func.func @c() {...}
28-
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution-action`
23+
// CHECK: [thread {{.*}}] begins (no breakpoint) Action `pass-execution` running `Canonicalizer` on Operation `func.func` (func.func @a() {...}
24+
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution`
25+
// CHECK-NEXT: [thread {{.*}}] begins (no breakpoint) Action `pass-execution` running `Canonicalizer` on Operation `func.func` (func.func @b() {...}
26+
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution`
27+
// CHECK-NEXT: [thread {{.*}}] begins (no breakpoint) Action `pass-execution` running `Canonicalizer` on Operation `func.func` (func.func @c() {...}
28+
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution`
2929

3030
////////////////////////////////////
3131
/// 2. No match
@@ -46,15 +46,15 @@ func.func @c() {
4646

4747
// CHECK-SECOND-NOT: @a
4848
// CHECK-SECOND-NOT: @c
49-
// CHECK-SECOND: [thread {{.*}}] begins (no breakpoint) Action `pass-execution-action` running `Canonicalizer` on Operation `func.func` (func.func @b() {...}
50-
// CHECK-SECOND-NEXT: [thread {{.*}}] completed `pass-execution-action`
49+
// CHECK-SECOND: [thread {{.*}}] begins (no breakpoint) Action `pass-execution` running `Canonicalizer` on Operation `func.func` (func.func @b() {...}
50+
// CHECK-SECOND-NEXT: [thread {{.*}}] completed `pass-execution`
5151

5252
// Filter the first and third functions
5353
// RUN: mlir-opt %s --log-mlir-actions-filter=%s:4,%s:12 --log-actions-to=- -pass-pipeline="builtin.module(func.func(canonicalize))" -o %t --mlir-disable-threading | FileCheck %s --check-prefix=CHECK-FIRST-THIRD
5454

5555
// CHECK-FIRST-THIRD-NOT: Canonicalizer
56-
// CHECK-FIRST-THIRD: [thread {{.*}}] begins (no breakpoint) Action `pass-execution-action` running `Canonicalizer` on Operation `func.func` (func.func @a() {...}
57-
// CHECK-FIRST-THIRD-NEXT: [thread {{.*}}] completed `pass-execution-action`
58-
// CHECK-FIRST-THIRD-NEXT: [thread {{.*}}] begins (no breakpoint) Action `pass-execution-action` running `Canonicalizer` on Operation `func.func` (func.func @c() {...}
59-
// CHECK-FIRST-THIRD-NEXT: [thread {{.*}}] completed `pass-execution-action`
56+
// CHECK-FIRST-THIRD: [thread {{.*}}] begins (no breakpoint) Action `pass-execution` running `Canonicalizer` on Operation `func.func` (func.func @a() {...}
57+
// CHECK-FIRST-THIRD-NEXT: [thread {{.*}}] completed `pass-execution`
58+
// CHECK-FIRST-THIRD-NEXT: [thread {{.*}}] begins (no breakpoint) Action `pass-execution` running `Canonicalizer` on Operation `func.func` (func.func @c() {...}
59+
// CHECK-FIRST-THIRD-NEXT: [thread {{.*}}] completed `pass-execution`
6060
// CHECK-FIRST-THIRD-NOT: Canonicalizer

mlir/test/Pass/action-logging.mlir

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// RUN: mlir-opt %s --log-actions-to=- -canonicalize -test-module-pass | FileCheck %s
22

3-
// CHECK: [thread {{.*}}] begins (no breakpoint) Action `pass-execution-action` running `Canonicalizer` on Operation `builtin.module` (module {...}
4-
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution-action`
5-
// CHECK-NEXT: [thread {{.*}}] begins (no breakpoint) Action `pass-execution-action` running `{{.*}}TestModulePass` on Operation `builtin.module` (module {...}
6-
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution-action`
3+
// CHECK: [thread {{.*}}] begins (no breakpoint) Action `pass-execution` running `Canonicalizer` on Operation `builtin.module` (module {...}
4+
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution`
5+
// CHECK-NEXT: [thread {{.*}}] begins (no breakpoint) Action `pass-execution` running `{{.*}}TestModulePass` on Operation `builtin.module` (module {...}
6+
// CHECK-NEXT: [thread {{.*}}] completed `pass-execution`
77
// CHECK-NOT: Action

0 commit comments

Comments
 (0)