diff --git a/mlir/include/mlir/Dialect/MemRef/IR/MemRef.h b/mlir/include/mlir/Dialect/MemRef/IR/MemRef.h --- a/mlir/include/mlir/Dialect/MemRef/IR/MemRef.h +++ b/mlir/include/mlir/Dialect/MemRef/IR/MemRef.h @@ -24,7 +24,7 @@ class Location; class OpBuilder; -raw_ostream &operator<<(raw_ostream &os, Range &range); +raw_ostream &operator<<(raw_ostream &os, const Range &range); /// Return the list of Range (i.e. offset, size, stride). Each Range /// entry contains either the dynamic value or a ConstantIndexOp constructed diff --git a/mlir/include/mlir/IR/OpDefinition.h b/mlir/include/mlir/IR/OpDefinition.h --- a/mlir/include/mlir/IR/OpDefinition.h +++ b/mlir/include/mlir/IR/OpDefinition.h @@ -222,7 +222,7 @@ } /// Allow printing to a stream. -inline raw_ostream &operator<<(raw_ostream &os, OpState &op) { +inline raw_ostream &operator<<(raw_ostream &os, OpState op) { op.print(os, OpPrintingFlags().useLocalScope()); return os; } diff --git a/mlir/include/mlir/IR/Operation.h b/mlir/include/mlir/IR/Operation.h --- a/mlir/include/mlir/IR/Operation.h +++ b/mlir/include/mlir/IR/Operation.h @@ -717,8 +717,8 @@ size_t numTrailingObjects(OverloadToken) const { return numRegions; } }; -inline raw_ostream &operator<<(raw_ostream &os, Operation &op) { - op.print(os, OpPrintingFlags().useLocalScope()); +inline raw_ostream &operator<<(raw_ostream &os, const Operation &op) { + const_cast(op).print(os, OpPrintingFlags().useLocalScope()); return os; } diff --git a/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp b/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp --- a/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp +++ b/mlir/lib/Dialect/MemRef/IR/MemRefOps.cpp @@ -2066,7 +2066,7 @@ return produceSubViewErrorMsg(result, op, expectedType, errMsg); } -raw_ostream &mlir::operator<<(raw_ostream &os, Range &range) { +raw_ostream &mlir::operator<<(raw_ostream &os, const Range &range) { return os << "range " << range.offset << ":" << range.size << ":" << range.stride; } diff --git a/mlir/unittests/IR/OperationSupportTest.cpp b/mlir/unittests/IR/OperationSupportTest.cpp --- a/mlir/unittests/IR/OperationSupportTest.cpp +++ b/mlir/unittests/IR/OperationSupportTest.cpp @@ -10,6 +10,7 @@ #include "mlir/IR/Builders.h" #include "mlir/IR/BuiltinTypes.h" #include "llvm/ADT/BitVector.h" +#include "llvm/Support/FormatVariadic.h" #include "gtest/gtest.h" using namespace mlir; @@ -214,4 +215,14 @@ containerOp->destroy(); } +TEST(OperationFormatPrintTest, CanUseVariadicFormat) { + MLIRContext context; + Builder builder(&context); + + Operation *op = createOp(&context); + + std::string str = formatv("{0}", *op).str(); + ASSERT_STREQ(str.c_str(), "\"foo.bar\"() : () -> ()"); +} + } // end namespace