Skip to content

[mlir][vector] Switch to llvm::interleaved in debug prints. NFC. #136248

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.

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 18, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 4 additions & 8 deletions mlir/lib/Dialect/Vector/Transforms/VectorUnroll.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@
#include "mlir/Dialect/Affine/IR/AffineOps.h"
#include "mlir/Dialect/Utils/IndexingUtils.h"
#include "mlir/Dialect/Vector/Transforms/VectorTransforms.h"
#include "mlir/IR/ImplicitLocOpBuilder.h"
#include "mlir/Interfaces/VectorInterfaces.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/Support/Debug.h"
#include <numeric>
#include "llvm/Support/InterleavedRange.h"
#include <optional>

#define DEBUG_TYPE "vector-unroll"
Expand All @@ -28,7 +27,7 @@
using namespace mlir;
using namespace mlir::vector;

/// Compute the indices of the slice `index` for a tranfer op.
/// Compute the indices of the slice `index` for a transfer op.
static SmallVector<Value> sliceTransferIndices(ArrayRef<int64_t> elementOffsets,
ArrayRef<Value> indices,
AffineMap permutationMap,
Expand Down Expand Up @@ -88,17 +87,14 @@ getTargetShape(const vector::UnrollVectorOptions &options, Operation *op) {
LDBG("--could not get shape of op " << *op << " -> BAIL");
return std::nullopt;
}
LLVM_DEBUG(
llvm::interleaveComma(*maybeUnrollShape, DBGS() << "--vector op shape: ");
llvm::dbgs() << "\n";);
LDBG("--vector op shape: " << llvm::interleaved(*maybeUnrollShape));

std::optional<SmallVector<int64_t>> targetShape = options.nativeShape(op);
if (!targetShape) {
LDBG("--no unrolling target shape defined " << *op << "-> SKIP");
return std::nullopt;
}
LLVM_DEBUG(llvm::interleaveComma(*targetShape, DBGS() << "--target shape: ");
llvm::dbgs() << "\n";);
LDBG("--target shape: " << llvm::interleaved(*targetShape));

auto maybeShapeRatio = computeShapeRatio(*maybeUnrollShape, *targetShape);
if (!maybeShapeRatio) {
Expand Down
6 changes: 2 additions & 4 deletions mlir/lib/Dialect/Vector/Utils/VectorUtils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
#include "mlir/Support/LLVM.h"

#include "llvm/ADT/DenseSet.h"
#include "llvm/ADT/SetVector.h"
#include "llvm/Support/InterleavedRange.h"

#define DEBUG_TYPE "vector-utils"

Expand Down Expand Up @@ -372,9 +372,7 @@ Value vector::createReadOrMaskedRead(OpBuilder &builder, Location loc,
LogicalResult
vector::isValidMaskedInputVector(ArrayRef<int64_t> shape,
ArrayRef<int64_t> inputVectorSizes) {
LDBG("Iteration space static sizes:");
LLVM_DEBUG(llvm::interleaveComma(shape, llvm::dbgs()));
LLVM_DEBUG(llvm::dbgs() << "\n");
LDBG("Iteration space static sizes:" << llvm::interleaved(shape));

if (inputVectorSizes.size() != shape.size()) {
LDBG("Input vector sizes don't match the number of loops");
Expand Down
Loading