Skip to content

Commit f6d2fcc

Browse files
authored
[MLIR] Migrate Transform/IR/TransformOps.cpp to LDBG() debugging macro (NFC) (#155098)
1 parent c0f7091 commit f6d2fcc

File tree

1 file changed

+16
-24
lines changed

1 file changed

+16
-24
lines changed

mlir/lib/Dialect/Transform/IR/TransformOps.cpp

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,13 @@
3737
#include "llvm/ADT/SmallPtrSet.h"
3838
#include "llvm/ADT/TypeSwitch.h"
3939
#include "llvm/Support/Debug.h"
40+
#include "llvm/Support/DebugLog.h"
4041
#include "llvm/Support/ErrorHandling.h"
4142
#include "llvm/Support/InterleavedRange.h"
4243
#include <optional>
4344

4445
#define DEBUG_TYPE "transform-dialect"
45-
#define DBGS() (llvm::dbgs() << "[" DEBUG_TYPE "] ")
46-
4746
#define DEBUG_TYPE_MATCHER "transform-matcher"
48-
#define DBGS_MATCHER() (llvm::dbgs() << "[" DEBUG_TYPE_MATCHER "] ")
49-
#define DEBUG_MATCHER(x) DEBUG_WITH_TYPE(DEBUG_TYPE_MATCHER, x)
5047

5148
using namespace mlir;
5249

@@ -182,8 +179,7 @@ transform::AlternativesOp::apply(transform::TransformRewriter &rewriter,
182179
DiagnosedSilenceableFailure result =
183180
state.applyTransform(cast<TransformOpInterface>(transform));
184181
if (result.isSilenceableFailure()) {
185-
LLVM_DEBUG(DBGS() << "alternative failed: " << result.getMessage()
186-
<< "\n");
182+
LDBG() << "alternative failed: " << result.getMessage();
187183
failed = true;
188184
break;
189185
}
@@ -1155,12 +1151,10 @@ transform::CollectMatchingOp::apply(transform::TransformRewriter &rewriter,
11551151
std::optional<DiagnosedSilenceableFailure> maybeFailure;
11561152
for (Operation *root : state.getPayloadOps(getRoot())) {
11571153
WalkResult walkResult = root->walk([&](Operation *op) {
1158-
DEBUG_MATCHER({
1159-
DBGS_MATCHER() << "matching ";
1160-
op->print(llvm::dbgs(),
1161-
OpPrintingFlags().assumeVerified().skipRegions());
1162-
llvm::dbgs() << " @" << op << "\n";
1163-
});
1154+
LDBG(1, DEBUG_TYPE_MATCHER)
1155+
<< "matching "
1156+
<< OpWithFlags(op, OpPrintingFlags().assumeVerified().skipRegions())
1157+
<< " @" << op;
11641158

11651159
// Try matching.
11661160
SmallVector<SmallVector<MappedValue>> mappings;
@@ -1172,8 +1166,8 @@ transform::CollectMatchingOp::apply(transform::TransformRewriter &rewriter,
11721166
if (diag.isDefiniteFailure())
11731167
return WalkResult::interrupt();
11741168
if (diag.isSilenceableFailure()) {
1175-
DEBUG_MATCHER(DBGS_MATCHER() << "matcher " << matcher.getName()
1176-
<< " failed: " << diag.getMessage());
1169+
LDBG(1, DEBUG_TYPE_MATCHER) << "matcher " << matcher.getName()
1170+
<< " failed: " << diag.getMessage();
11771171
return WalkResult::advance();
11781172
}
11791173

@@ -1304,12 +1298,10 @@ transform::ForeachMatchOp::apply(transform::TransformRewriter &rewriter,
13041298
if (!getRestrictRoot() && op == root)
13051299
return WalkResult::advance();
13061300

1307-
DEBUG_MATCHER({
1308-
DBGS_MATCHER() << "matching ";
1309-
op->print(llvm::dbgs(),
1310-
OpPrintingFlags().assumeVerified().skipRegions());
1311-
llvm::dbgs() << " @" << op << "\n";
1312-
});
1301+
LDBG(1, DEBUG_TYPE_MATCHER)
1302+
<< "matching "
1303+
<< OpWithFlags(op, OpPrintingFlags().assumeVerified().skipRegions())
1304+
<< " @" << op;
13131305

13141306
firstMatchArgument.clear();
13151307
firstMatchArgument.push_back(op);
@@ -1322,8 +1314,8 @@ transform::ForeachMatchOp::apply(transform::TransformRewriter &rewriter,
13221314
if (diag.isDefiniteFailure())
13231315
return WalkResult::interrupt();
13241316
if (diag.isSilenceableFailure()) {
1325-
DEBUG_MATCHER(DBGS_MATCHER() << "matcher " << matcher.getName()
1326-
<< " failed: " << diag.getMessage());
1317+
LDBG(1, DEBUG_TYPE_MATCHER) << "matcher " << matcher.getName()
1318+
<< " failed: " << diag.getMessage();
13271319
continue;
13281320
}
13291321

@@ -2173,10 +2165,10 @@ DiagnosedSilenceableFailure transform::MatchOperationEmptyOp::matchOperation(
21732165
::std::optional<::mlir::Operation *> maybeCurrent,
21742166
transform::TransformResults &results, transform::TransformState &state) {
21752167
if (!maybeCurrent.has_value()) {
2176-
DEBUG_MATCHER({ DBGS_MATCHER() << "MatchOperationEmptyOp success\n"; });
2168+
LDBG(1, DEBUG_TYPE_MATCHER) << "MatchOperationEmptyOp success";
21772169
return DiagnosedSilenceableFailure::success();
21782170
}
2179-
DEBUG_MATCHER({ DBGS_MATCHER() << "MatchOperationEmptyOp failure\n"; });
2171+
LDBG(1, DEBUG_TYPE_MATCHER) << "MatchOperationEmptyOp failure";
21802172
return emitSilenceableError() << "operation is not empty";
21812173
}
21822174

0 commit comments

Comments
 (0)