Skip to content

[mlir][linalg] Clean up debug prints. NFC. #136438

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 1 commit into from
Apr 20, 2025
Merged

[mlir][linalg] Clean up debug prints. NFC. #136438

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
115 changes: 58 additions & 57 deletions mlir/lib/Dialect/Linalg/Transforms/Transforms.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
#include "llvm/ADT/ScopeExit.h"
#include "llvm/ADT/TypeSwitch.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/InterleavedRange.h"
#include "llvm/Support/raw_ostream.h"
#include <type_traits>
#include <utility>
Expand Down Expand Up @@ -95,6 +96,10 @@ static bool hasAtMostOneResultFunctionOfDim(AffineMap map, int64_t dim) {
}
return true;
}

static std::string stringifyReassocIndices(ReassociationIndicesRef ri) {
return llvm::interleaved(ri, ", ", /*Prefix=*/"|", /*Suffix=*/"");
}
#endif // NDEBUG

/// Return the index of the first result of `map` that is a function of
Expand Down Expand Up @@ -278,22 +283,21 @@ FailureOr<LowerPackResult> linalg::lowerPack(RewriterBase &rewriter,
highs, paddingValue, /*nofold=*/false);

LLVM_DEBUG(
DBGSNL(); DBGSNL(); llvm::interleaveComma(packingMetadata.insertPositions,
DBGS() << "insertPositions: ");
DBGSNL(); llvm::interleaveComma(packingMetadata.outerPositions,
DBGS() << "outerPositions: ");
DBGSNL(); llvm::interleaveComma(packedTensorType.getShape(),
DBGS() << "packedShape: ");
DBGSNL(); DBGSNL();
DBGS() << "insertPositions: "
<< llvm::interleaved(packingMetadata.insertPositions);
DBGSNL(); DBGS() << "outerPositions: "
<< llvm::interleaved(packingMetadata.outerPositions);
DBGSNL(); DBGS() << "packedShape: "
<< llvm::interleaved(packedTensorType.getShape());
DBGSNL(); DBGS() << "packedToStripMinedShapePerm: "
<< llvm::interleaved(packedToStripMinedShapePerm);
DBGSNL();
llvm::interleaveComma(packedToStripMinedShapePerm,
DBGS() << "packedToStripMinedShapePerm: ");
DBGSNL(); llvm::interleaveComma(
packingMetadata.reassociations, DBGS() << "reassociations: ",
[&](ReassociationIndices ri) {
llvm::interleaveComma(ri, llvm::dbgs() << "|");
});
DBGS() << "reassociations: "
<< llvm::interleaved(llvm::map_range(
packingMetadata.reassociations, stringifyReassocIndices));
DBGSNL();
llvm::interleaveComma(stripMinedShape, DBGS() << "stripMinedShape: ");
DBGS() << "stripMinedShape: " << llvm::interleaved(stripMinedShape);
DBGSNL(); DBGS() << "collapsed type: " << collapsed; DBGSNL(););

if (lowerPadLikeWithInsertSlice && packOp.isLikePad()) {
Expand Down Expand Up @@ -343,7 +347,7 @@ FailureOr<LowerPackResult> linalg::lowerPack(RewriterBase &rewriter,

LLVM_DEBUG(DBGSNL(); DBGSNL(); DBGSNL();
DBGS() << "reshape op: " << reshapeOp; DBGSNL();
llvm::interleaveComma(transpPerm, DBGS() << "transpPerm: ");
DBGS() << "transpPerm: " << llvm::interleaved(transpPerm);
DBGSNL(); DBGS() << "transpose op: " << transposeOp; DBGSNL(););

// 7. Replace packOp by transposeOp.
Expand Down Expand Up @@ -412,20 +416,19 @@ linalg::lowerUnPack(RewriterBase &rewriter, linalg::UnPackOp unPackOp,
loc, unPackOp.getSource(), emptyOp, packedToStripMinedShapePerm);

LLVM_DEBUG(
DBGSNL(); DBGSNL(); llvm::interleaveComma(packingMetadata.insertPositions,
DBGS() << "insertPositions: ");
DBGSNL(); llvm::interleaveComma(packedTensorType.getShape(),
DBGS() << "packedShape: ");
DBGSNL(); DBGSNL();
DBGS() << "insertPositions: "
<< llvm::interleaved(packingMetadata.insertPositions);
DBGSNL(); DBGS() << "packedShape: "
<< llvm::interleaved(packedTensorType.getShape());
DBGSNL(); DBGS() << "packedToStripMinedShapePerm: "
<< llvm::interleaved(packedToStripMinedShapePerm);
DBGSNL();
llvm::interleaveComma(packedToStripMinedShapePerm,
DBGS() << "packedToStripMinedShapePerm: ");
DBGSNL(); llvm::interleaveComma(
packingMetadata.reassociations, DBGS() << "reassociations: ",
[&](ReassociationIndices ri) {
llvm::interleaveComma(ri, llvm::dbgs() << "|");
});
DBGS() << "reassociations: "
<< llvm::interleaved(llvm::map_range(
packingMetadata.reassociations, stringifyReassocIndices));
DBGSNL();
llvm::interleaveComma(stripMinedShape, DBGS() << "stripMinedShape: ");
DBGS() << "stripMinedShape: " << llvm::interleaved(stripMinedShape);
DBGSNL(); DBGS() << "collapsed type: " << collapsedType; DBGSNL(););

// 4. Collapse from the stripMinedShape to the padded result.
Expand Down Expand Up @@ -488,10 +491,10 @@ FailureOr<PackResult> linalg::pack(RewriterBase &rewriter,
SmallVector<AffineMap> indexingMaps = linalgOp.getIndexingMapsArray();
SmallVector<utils::IteratorType> iteratorTypes =
linalgOp.getIteratorTypesArray();
LLVM_DEBUG(DBGS() << "Start packing: " << linalgOp << "\n";
llvm::interleaveComma(indexingMaps, DBGS() << "maps: "); DBGSNL();
llvm::interleaveComma(iteratorTypes, DBGS() << "iterators: ");
DBGSNL(););
LLVM_DEBUG(DBGS() << "Start packing: " << linalgOp << "\n"
<< "maps: " << llvm::interleaved(indexingMaps) << "\n"
<< "iterators: " << llvm::interleaved(iteratorTypes)
<< "\n");

SmallVector<linalg::PackOp> packOps;
SmallVector<linalg::UnPackOp> unPackOps;
Expand All @@ -515,18 +518,18 @@ FailureOr<PackResult> linalg::pack(RewriterBase &rewriter,

LLVM_DEBUG(
DBGS() << "++++ After pack size #" << i << ": " << packedSizes[i]
<< "\n";
llvm::interleaveComma(indexingMaps, DBGS() << "maps: "); DBGSNL();
llvm::interleaveComma(iteratorTypes, DBGS() << "iterators: "); DBGSNL();
llvm::interleaveComma(packedOperandsDims.packedDimForEachOperand,
DBGS() << "packedDimForEachOperand: ");
DBGSNL(););
<< "\n"
<< "maps: " << llvm::interleaved(indexingMaps) << "\n"
<< "iterators: " << llvm::interleaved(iteratorTypes) << "\n"
<< "packedDimForEachOperand: "
<< llvm::interleaved(packedOperandsDims.packedDimForEachOperand)
<< "\n");
}

// Step 2. Propagate packing to all LinalgOp operands.
SmallVector<Value> inputsAndInits, results;
SmallVector<OpOperand *> initOperands = llvm::to_vector(llvm::map_range(
linalgOp.getDpsInitsMutable(), [](OpOperand &o) { return &o; }));
SmallVector<OpOperand *> initOperands =
llvm::to_vector(llvm::make_pointer_range(linalgOp.getDpsInitsMutable()));
SmallVector<OpOperand *> inputOperands = linalgOp.getDpsInputOperands();
for (const auto &operandsList : {inputOperands, initOperands}) {
for (OpOperand *opOperand : operandsList) {
Expand All @@ -536,11 +539,10 @@ FailureOr<PackResult> linalg::pack(RewriterBase &rewriter,
listOfPackedOperandsDim.extractPackedDimsForOperand(pos);
SmallVector<OpFoldResult> innerPackSizes =
listOfPackedOperandsDim.extractPackSizesForOperand(pos);
LLVM_DEBUG(
DBGS() << "operand: " << operand << "\n";
llvm::interleaveComma(innerPos, DBGS() << "innerPos: "); DBGSNL();
llvm::interleaveComma(innerPackSizes, DBGS() << "innerPackSizes: ");
DBGSNL(););
LLVM_DEBUG(DBGS() << "operand: " << operand << "\n"
<< "innerPos: " << llvm::interleaved(innerPos) << "\n"
<< "innerPackSizes: "
<< llvm::interleaved(innerPackSizes) << "\n");
if (innerPackSizes.empty()) {
inputsAndInits.push_back(operand);
continue;
Expand Down Expand Up @@ -835,7 +837,7 @@ linalg::packMatmulGreedily(RewriterBase &rewriter, LinalgOp linalgOp,
// not change the indexings of any operand.
SmallVector<int64_t> permutation =
computePermutationVector(numLoops, {mPos, nPos, kPos}, mmnnkkPos);
LLVM_DEBUG(llvm::interleaveComma(permutation, DBGS() << "perm: "); DBGSNL(););
LLVM_DEBUG(DBGS() << "perm: " << llvm::interleaved(permutation) << "\n");
// Sign .. unsigned pollution.
SmallVector<unsigned> unsignedPerm(permutation.begin(), permutation.end());
FailureOr<GenericOp> interchangeResult =
Expand Down Expand Up @@ -864,12 +866,12 @@ linalg::packMatmulGreedily(RewriterBase &rewriter, LinalgOp linalgOp,

// Add leading zeros to match numLoops, we only pack the last 3 dimensions
// post interchange.
LLVM_DEBUG(llvm::interleaveComma(paddedSizesNextMultipleOf,
DBGS() << "paddedSizesNextMultipleOf: ");
DBGSNL(););
LLVM_DEBUG(llvm::interleaveComma(loopRanges, DBGS() << "loopRanges: ",
[](Range r) { llvm::dbgs() << r.size; });
DBGSNL(););
LLVM_DEBUG(DBGS() << "paddedSizesNextMultipleOf: "
<< llvm::interleaved(paddedSizesNextMultipleOf) << "\n"
<< "loopRanges: "
<< llvm::interleaved(llvm::map_range(
loopRanges, [](Range r) { return r.size; }))
<< "\n");
SmallVector<OpFoldResult> adjustedPackedSizes(numLoops - packedSizes.size(),
rewriter.getIndexAttr(0));
for (int64_t i = 0, e = numPackedDims; i < e; ++i) {
Expand All @@ -885,9 +887,8 @@ linalg::packMatmulGreedily(RewriterBase &rewriter, LinalgOp linalgOp,
{loopRanges[adjustedPackedSizes.size()].size,
rewriter.getIndexAttr(paddedSizesNextMultipleOf[i])}));
}
LLVM_DEBUG(llvm::interleaveComma(adjustedPackedSizes,
DBGS() << "adjustedPackedSizes: ");
DBGSNL(););
LLVM_DEBUG(DBGS() << "adjustedPackedSizes: "
<< llvm::interleaved(adjustedPackedSizes) << "\n");

// TODO: If we wanted to give the genericOp a name after packing, after
// calling `pack` would be a good time. One would still need to check that
Expand Down Expand Up @@ -1202,9 +1203,9 @@ LogicalResult DecomposeOuterUnitDimsPackOpPattern::matchAndRewrite(

srcPermForTranspose.append(SmallVector<int64_t>(packOp.getInnerDimsPos()));

LLVM_DEBUG(DBGS() << "Pack permutation: " << packOp << "\n";
llvm::interleaveComma(srcPermForTranspose, DBGS() << "perm: ");
DBGSNL(););
LLVM_DEBUG(DBGS() << "Pack permutation: " << packOp << "\n"
<< "perm: " << llvm::interleaved(srcPermForTranspose)
<< "\n");

// 2.1 Create tensor.empty (init value for TransposeOp)
SmallVector<OpFoldResult> transShapeForEmptyOp(srcRank - numTiles,
Expand Down
Loading