37
37
#include " llvm/ADT/SmallPtrSet.h"
38
38
#include " llvm/ADT/TypeSwitch.h"
39
39
#include " llvm/Support/Debug.h"
40
+ #include " llvm/Support/DebugLog.h"
40
41
#include " llvm/Support/ErrorHandling.h"
41
42
#include " llvm/Support/InterleavedRange.h"
42
43
#include < optional>
43
44
44
45
#define DEBUG_TYPE " transform-dialect"
45
- #define DBGS () (llvm::dbgs() << " [" DEBUG_TYPE " ] " )
46
-
47
46
#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)
50
47
51
48
using namespace mlir ;
52
49
@@ -182,8 +179,7 @@ transform::AlternativesOp::apply(transform::TransformRewriter &rewriter,
182
179
DiagnosedSilenceableFailure result =
183
180
state.applyTransform (cast<TransformOpInterface>(transform));
184
181
if (result.isSilenceableFailure ()) {
185
- LLVM_DEBUG (DBGS () << " alternative failed: " << result.getMessage ()
186
- << " \n " );
182
+ LDBG () << " alternative failed: " << result.getMessage ();
187
183
failed = true ;
188
184
break ;
189
185
}
@@ -1155,12 +1151,10 @@ transform::CollectMatchingOp::apply(transform::TransformRewriter &rewriter,
1155
1151
std::optional<DiagnosedSilenceableFailure> maybeFailure;
1156
1152
for (Operation *root : state.getPayloadOps (getRoot ())) {
1157
1153
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;
1164
1158
1165
1159
// Try matching.
1166
1160
SmallVector<SmallVector<MappedValue>> mappings;
@@ -1172,8 +1166,8 @@ transform::CollectMatchingOp::apply(transform::TransformRewriter &rewriter,
1172
1166
if (diag.isDefiniteFailure ())
1173
1167
return WalkResult::interrupt ();
1174
1168
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 ();
1177
1171
return WalkResult::advance ();
1178
1172
}
1179
1173
@@ -1304,12 +1298,10 @@ transform::ForeachMatchOp::apply(transform::TransformRewriter &rewriter,
1304
1298
if (!getRestrictRoot () && op == root)
1305
1299
return WalkResult::advance ();
1306
1300
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;
1313
1305
1314
1306
firstMatchArgument.clear ();
1315
1307
firstMatchArgument.push_back (op);
@@ -1322,8 +1314,8 @@ transform::ForeachMatchOp::apply(transform::TransformRewriter &rewriter,
1322
1314
if (diag.isDefiniteFailure ())
1323
1315
return WalkResult::interrupt ();
1324
1316
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 ();
1327
1319
continue ;
1328
1320
}
1329
1321
@@ -2173,10 +2165,10 @@ DiagnosedSilenceableFailure transform::MatchOperationEmptyOp::matchOperation(
2173
2165
::std::optional<::mlir::Operation *> maybeCurrent,
2174
2166
transform::TransformResults &results, transform::TransformState &state) {
2175
2167
if (!maybeCurrent.has_value ()) {
2176
- DEBUG_MATCHER ({ DBGS_MATCHER ( ) << " MatchOperationEmptyOp success\n " ; }) ;
2168
+ LDBG ( 1 , DEBUG_TYPE_MATCHER ) << " MatchOperationEmptyOp success" ;
2177
2169
return DiagnosedSilenceableFailure::success ();
2178
2170
}
2179
- DEBUG_MATCHER ({ DBGS_MATCHER ( ) << " MatchOperationEmptyOp failure\n " ; }) ;
2171
+ LDBG ( 1 , DEBUG_TYPE_MATCHER ) << " MatchOperationEmptyOp failure" ;
2180
2172
return emitSilenceableError () << " operation is not empty" ;
2181
2173
}
2182
2174
0 commit comments