This is an archive of the discontinued LLVM Phabricator instance.

Differential D89825

Fix pretty printing of linalg GenericOps when there are no inputs.
ClosedPublic

Authored by fedelebron on Oct 20 2020, 2:02 PM.

Details

Reviewers
nicolasvasilache
mravishankar
Commits
rG256492677d95: Fix pretty printing of linalg GenericOps when there are no inputs.

Diff Detail

Event Timeline

fedelebron created this revision.Oct 20 2020, 2:02 PM
Herald added a project: Restricted Project. · View Herald TranscriptOct 20 2020, 2:02 PM
Herald added subscribers: rdzhabarov, tatianashp, msifontes and 13 others. · View Herald Transcript
fedelebron requested review of this revision.Oct 20 2020, 2:02 PM
Herald added a reviewer: nicolasvasilache. · View Herald TranscriptOct 20 2020, 2:02 PM
Herald added subscribers: limo1996, stephenneuendorffer, nicolasvasilache. · View Herald Transcript
mravishankar accepted this revision.Oct 20 2020, 2:05 PM
mravishankar added a subscriber: mravishankar.

Do you mind adding a round-trip test where the ins is empty?

This revision is now accepted and ready to land.Oct 20 2020, 2:05 PM
mravishankar requested changes to this revision.Oct 20 2020, 2:05 PM
This revision now requires changes to proceed.Oct 20 2020, 2:05 PM
fedelebron updated this revision to Diff 299469.Oct 20 2020, 2:17 PM

Resolving review comment.

fedelebron added a comment.Oct 20 2020, 2:18 PM

Comment resolved (not sure why I'm not able to "reply" to your comment Mahesh... no button I can see for that.

mravishankar requested changes to this revision.Oct 20 2020, 2:20 PM
mravishankar added inline comments.
mlir/test/Dialect/Linalg/roundtrip.mlir
322

This is missing the "CHECK-*"

This revision now requires changes to proceed.Oct 20 2020, 2:20 PM
fedelebron updated this revision to Diff 299473.Oct 20 2020, 2:24 PM

Add actual CHECKs...

Harbormaster completed remote builds in B75759: Diff 299465.Oct 20 2020, 2:34 PM
fedelebron updated this revision to Diff 299479.Oct 20 2020, 2:35 PM

More test fixes.

mravishankar accepted this revision.Oct 20 2020, 2:38 PM

Thanks!

This revision is now accepted and ready to land.Oct 20 2020, 2:38 PM
Harbormaster completed remote builds in B75762: Diff 299469.Oct 20 2020, 2:49 PM
This revision was landed with ongoing or failed builds.Oct 20 2020, 2:58 PM
Closed by commit rG256492677d95: Fix pretty printing of linalg GenericOps when there are no inputs. (authored by fedelebron, committed by mravishankar). · Explain Why
This revision was automatically updated to reflect the committed changes.
mravishankar added a commit: rG256492677d95: Fix pretty printing of linalg GenericOps when there are no inputs..
Harbormaster completed remote builds in B75766: Diff 299473.Oct 20 2020, 3:02 PM
Harbormaster completed remote builds in B75771: Diff 299479.Oct 20 2020, 3:25 PM

Revision Contents

PathSize
mlir/
lib/
Dialect/
Linalg/
IR/
3 lines
test/
Dialect/
Linalg/
18 lines

Diff 299479

mlir/lib/Dialect/Linalg/IR/LinalgOps.cpp

Show First 20 Lines • Show All 1,447 Lines • ▼ Show 20 Linesstatic void printNamedStructuredOpResults(OpAsmPrinter &p,
if (resultTypes.empty()) if (resultTypes.empty())
return; return;
p.printOptionalArrowTypeList(resultTypes); p.printOptionalArrowTypeList(resultTypes);
} }
template <typename NamedStructuredOpType> template <typename NamedStructuredOpType>
static void printCommonStructuredOpParts(OpAsmPrinter &p, static void printCommonStructuredOpParts(OpAsmPrinter &p,
NamedStructuredOpType op) { NamedStructuredOpType op) {
if (!op.inputs().empty())
p << " ins(" << op.inputs() << " : " << op.inputs().getTypes() << ")"; p << " ins(" << op.inputs() << " : " << op.inputs().getTypes() << ")";
if (!op.output_buffers().empty()) if (!op.output_buffers().empty())
p << " outs(" << op.output_buffers() << " : " p << " outs(" << op.output_buffers() << " : "
<< op.output_buffers().getTypes() << ")"; << op.output_buffers().getTypes() << ")";
if (!op.init_tensors().empty()) if (!op.init_tensors().empty())
p << " init(" << op.init_tensors() << " : " << op.init_tensors().getTypes() p << " init(" << op.init_tensors() << " : " << op.init_tensors().getTypes()
<< ") "; << ") ";
} }
▲ Show 20 Lines • Show All 121 Lines • Show Last 20 Lines

mlir/test/Dialect/Linalg/roundtrip.mlir

Show First 20 Lines • Show All 313 Lines • ▼ Show 20 Lines
// CHECK: linalg.generic { // CHECK: linalg.generic {
// CHECK-SAME: indexing_maps = [#{{[0-9a-z]*}}, #{{[0-9a-z]*}}], // CHECK-SAME: indexing_maps = [#{{[0-9a-z]*}}, #{{[0-9a-z]*}}],
// CHECK-SAME: iterator_types = ["parallel", "parallel", "parallel"], // CHECK-SAME: iterator_types = ["parallel", "parallel", "parallel"],
// CHECK-SAME: library_call = "some_external_function_name_1"} // CHECK-SAME: library_call = "some_external_function_name_1"}
// CHECK-SAME: ins({{.*}} : memref<?x?xvector<3x4xi4>, #[[$strided2D]]>) // CHECK-SAME: ins({{.*}} : memref<?x?xvector<3x4xi4>, #[[$strided2D]]>)
// CHECK-SAME: outs({{.*}} : memref<?x?x?xf32, #[[$strided3D]]>) // CHECK-SAME: outs({{.*}} : memref<?x?x?xf32, #[[$strided3D]]>)
// CHECK-SAME: {foo = 1 : i64} // CHECK-SAME: {foo = 1 : i64}
func @generic_with_tensor_input(%arg0: tensor<?x?xvector<3x4xi4>>, func @generic_with_tensor_input(%arg0: tensor<?x?xvector<3x4xi4>>,
mravishankarUnsubmitted
Not Done
ReplyInline Actions

This is missing the "CHECK-*"

mravishankar: This is missing the "CHECK-*"
%arg1: memref<?x?x?xf32, offset: ?, strides: [?, ?, 1]>) { %arg1: memref<?x?x?xf32, offset: ?, strides: [?, ?, 1]>) {
linalg.generic #trait linalg.generic #trait
ins(%arg0 : tensor<?x?xvector<3x4xi4>>) ins(%arg0 : tensor<?x?xvector<3x4xi4>>)
outs(%arg1 : memref<?x?x?xf32, offset: ?, strides: [?, ?, 1]>) outs(%arg1 : memref<?x?x?xf32, offset: ?, strides: [?, ?, 1]>)
attrs = {foo = 1} { attrs = {foo = 1} {
^bb(%0: vector<3x4xi4>, %1: f32) : ^bb(%0: vector<3x4xi4>, %1: f32) :
%f0 = constant 0.0 : f32 %f0 = constant 0.0 : f32
linalg.yield %f0 : f32 linalg.yield %f0 : f32
} }
return return
} }
// CHECK-LABEL: func @generic_with_tensor_input // CHECK-LABEL: func @generic_with_tensor_input
// CHECK: linalg.generic { // CHECK: linalg.generic {
// CHECK-SAME: indexing_maps = [#{{.*}}, #{{.*}}], iterator_types = ["parallel", "parallel", "parallel"], // CHECK-SAME: indexing_maps = [#{{.*}}, #{{.*}}], iterator_types = ["parallel", "parallel", "parallel"],
// CHECK-SAME: library_call = "some_external_function_name_1"} // CHECK-SAME: library_call = "some_external_function_name_1"}
// CHECK-SAME: ins({{.*}} : tensor<?x?xvector<3x4xi4>>) // CHECK-SAME: ins({{.*}} : tensor<?x?xvector<3x4xi4>>)
// CHECK-SAME: outs({{.*}} : memref<?x?x?xf32, #[[$strided3D]]>) // CHECK-SAME: outs({{.*}} : memref<?x?x?xf32, #[[$strided3D]]>)
// CHECK-SAME: {foo = 1 : i64} // CHECK-SAME: {foo = 1 : i64}
// ----- // -----
#map0 = affine_map<(d0, d1, d2) -> (d0, d1, d2)>
func @generic_without_inputs(%arg0 : memref<?x?x?xf32>) {
linalg.generic {indexing_maps = [#map0],
iterator_types = ["parallel", "parallel", "parallel"]}
outs(%arg0 : memref<?x?x?xf32>) {
^bb0(%arg3: f32): // no predecessors
%cst = constant 0.000000e+00 : f32
linalg.yield %cst : f32
}
return
}
// CHECK-LABEL: func @generic_without_inputs
// CHECK: linalg.generic
// CHECK-NOT: ins
// -----
#accesses = [ #accesses = [
affine_map<(i, j, k) -> (j, i)>, affine_map<(i, j, k) -> (j, i)>,
affine_map<(i, j, k) -> (i, k, i + j)>, affine_map<(i, j, k) -> (i, k, i + j)>,
affine_map<(i, j, k) -> (i, k, i + j)> affine_map<(i, j, k) -> (i, k, i + j)>
] ]
#trait2 = { #trait2 = {
indexing_maps = #accesses, indexing_maps = #accesses,
▲ Show 20 Lines • Show All 327 Lines • Show Last 20 Lines