This is an archive of the discontinued LLVM Phabricator instance.

Differential D97261

Allow !shape.size type operands in "shape.from_extents" op.
ClosedPublic

Authored by Jing on Feb 23 2021, 12:11 AM.

Details

Reviewers
jpienaar
silvas
Commits
rGc519460745ec: Allow !shape.size type operands in "shape.from_extents" op.
Summary

This expands the op to support error propagation and also makes it symmetric with "shape.get_extent" op.

Diff Detail

Event Timeline

Jing created this revision.Feb 23 2021, 12:11 AM
Herald added a reviewer: jpienaar. · View Herald TranscriptFeb 23 2021, 12:11 AM
Herald added a reviewer: silvas. · View Herald Transcript
Herald added subscribers: teijeong, rdzhabarov, tatianashp and 14 others. · View Herald Transcript
Jing requested review of this revision.Feb 23 2021, 12:11 AM
Herald added a project: Restricted Project. · View Herald TranscriptFeb 23 2021, 12:11 AM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
Harbormaster completed remote builds in B90348: Diff 325695.Feb 23 2021, 12:44 AM
Jing added a comment.Feb 24 2021, 10:01 AM

Ping?

silvas accepted this revision.Feb 24 2021, 11:02 AM
silvas added inline comments.
mlir/test/Dialect/Shape/canonicalize.mlir
174

add a snippet (here or in ops.mlir) that tests the new !shape.size operand types.

Jing updated this revision to Diff 326176.Feb 24 2021, 12:09 PM

Add a test that uses !shape.size type

Herald added a subscriber: cota. · View Herald TranscriptFeb 24 2021, 12:09 PM
Jing marked an inline comment as done.Feb 24 2021, 12:10 PM

Thanks! Could you help submit the patch?

This revision was not accepted when it landed; it landed in state Needs Review.Feb 24 2021, 2:50 PM
This revision was landed with ongoing or failed builds.
Closed by commit rGc519460745ec: Allow !shape.size type operands in "shape.from_extents" op. (authored by Jing, committed by silvas). · Explain Why
This revision was automatically updated to reflect the committed changes.
silvas added a commit: rGc519460745ec: Allow !shape.size type operands in "shape.from_extents" op..
Harbormaster completed remote builds in B90669: Diff 326176.Feb 24 2021, 3:13 PM

Revision Contents

PathSize
mlir/
include/
mlir/
Dialect/
Shape/
IR/
4 lines
test/
Dialect/
Shape/
16 lines

Diff 326213

mlir/include/mlir/Dialect/Shape/IR/ShapeOps.td

Show First 20 Lines • Show All 192 Lines • ▼ Show 20 Lines let description = [{
```mlir ```mlir
// Rank 2 shape. // Rank 2 shape.
%s0 = shape.from_extents %a, %b %s0 = shape.from_extents %a, %b
// Rank 0 shape. // Rank 0 shape.
%s1 = shape.from_extents %s1 = shape.from_extents
``` ```
}]; }];
let arguments = (ins Variadic<Index>:$extents); let arguments = (ins Variadic<Shape_SizeOrIndexType>:$extents);
let results = (outs Shape_ShapeType:$shape); let results = (outs Shape_ShapeType:$shape);
let assemblyFormat = "$extents attr-dict"; let assemblyFormat = "$extents attr-dict `:` type($extents)";
let hasFolder = 1; let hasFolder = 1;
} }
def Shape_FromExtentTensorOp : Shape_Op<"from_extent_tensor", [NoSideEffect]> { def Shape_FromExtentTensorOp : Shape_Op<"from_extent_tensor", [NoSideEffect]> {
let summary = "Creates a shape from a tensor of extents"; let summary = "Creates a shape from a tensor of extents";
let description = [{ let description = [{
Creates a shape from a 1D integral tensor of extents. The rank of the Creates a shape from a 1D integral tensor of extents. The rank of the
▲ Show 20 Lines • Show All 704 Lines • Show Last 20 Lines

mlir/test/Dialect/Shape/canonicalize.mlir

Show First 20 Lines • Show All 165 Lines • ▼ Show 20 Lines
// ----- // -----
// Basic case. // Basic case.
// CHECK-LABEL: func @f() // CHECK-LABEL: func @f()
func @f() -> !shape.shape { func @f() -> !shape.shape {
// CHECK: shape.const_shape [3, 5, 11] : !shape.shape // CHECK: shape.const_shape [3, 5, 11] : !shape.shape
%e0 = constant 3 : index %e0 = constant 3 : index
%e1 = constant 5 : index %e1 = constant 5 : index
silvasUnsubmitted
Done
ReplyInline Actions

add a snippet (here or in ops.mlir) that tests the new !shape.size operand types.

silvas: add a snippet (here or in ops.mlir) that tests the new !shape.size operand types.
%e2 = constant 11 : index %e2 = constant 11 : index
%ret = shape.from_extents %e0, %e1, %e2 %ret = shape.from_extents %e0, %e1, %e2 : index, index, index
return %ret : !shape.shape
}
// -----
// fold_const_size
// CHECK-LABEL: func @fold_const_size()
func @fold_const_size() -> !shape.shape {
// CHECK: shape.const_shape [3, 5] : !shape.shape
%e0 = shape.const_size 3
%e1 = shape.const_size 5
%ret = shape.from_extents %e0, %e1 : !shape.size, !shape.size
return %ret : !shape.shape return %ret : !shape.shape
} }
// ----- // -----
// CHECK-LABEL: func @no_fold // CHECK-LABEL: func @no_fold
func @no_fold(%arg0: index) -> !shape.shape { func @no_fold(%arg0: index) -> !shape.shape {
// CHECK-NOT: shape.const_shape // CHECK-NOT: shape.const_shape
%e0 = constant 3 : index %e0 = constant 3 : index
%ret = shape.from_extents %e0, %arg0 %ret = shape.from_extents %e0, %arg0 : index, index
return %ret : !shape.shape return %ret : !shape.shape
} }
// ----- // -----
// Cast constant size to index and fold it away. // Cast constant size to index and fold it away.
// CHECK-LABEL: func @const_size_to_index // CHECK-LABEL: func @const_size_to_index
func @const_size_to_index() -> index { func @const_size_to_index() -> index {
▲ Show 20 Lines • Show All 876 Lines • Show Last 20 Lines