This is an archive of the discontinued LLVM Phabricator instance.

Differential D95618

[mlir][Linalg] Fix tests in tile-and-pad
ClosedPublic

Authored by hanchung on Jan 28 2021, 7:37 AM.

Details

Reviewers
nicolasvasilache
Commits
rG469096d18efd: [mlir][Linalg] Fix tests in tile-and-pad
Summary

The check match in D95555 was wrong, this patch fixes it.

Diff Detail

Event Timeline

hanchung created this revision.Jan 28 2021, 7:37 AM
Herald added subscribers: mravishankar, teijeong, rdzhabarov and 15 others. · View Herald TranscriptJan 28 2021, 7:37 AM
hanchung requested review of this revision.Jan 28 2021, 7:37 AM
Herald added a project: Restricted Project. · View Herald TranscriptJan 28 2021, 7:37 AM
Herald added subscribers: limo1996, stephenneuendorffer. · View Herald Transcript
Harbormaster completed remote builds in B87026: Diff 319864.Jan 28 2021, 7:52 AM
This revision was not accepted when it landed; it landed in state Needs Review.Jan 28 2021, 8:01 AM
This revision was landed with ongoing or failed builds.
Closed by commit rG469096d18efd: [mlir][Linalg] Fix tests in tile-and-pad (authored by hanchung). · Explain Why
This revision was automatically updated to reflect the committed changes.
hanchung added a commit: rG469096d18efd: [mlir][Linalg] Fix tests in tile-and-pad.

Revision Contents

PathSize
mlir/
test/
Dialect/
Linalg/
10 lines

Diff 319872

mlir/test/Dialect/Linalg/tile-and-pad-tensors.mlir

Show All 12 Lines
// CHECK: %[[sTA:.*]] = subtensor %[[TA]][{{.*}}] : tensor<?x?xf32> to tensor<?x?xf32> // CHECK: %[[sTA:.*]] = subtensor %[[TA]][{{.*}}] : tensor<?x?xf32> to tensor<?x?xf32>
// CHECK: %[[sTB:.*]] = subtensor %[[TB]][{{.*}}] : tensor<?x?xf32> to tensor<?x?xf32> // CHECK: %[[sTB:.*]] = subtensor %[[TB]][{{.*}}] : tensor<?x?xf32> to tensor<?x?xf32>
// CHECK: %[[sTC:.*]] = subtensor %[[TC2]][{{.*}}] : tensor<?x?xf32> to tensor<?x?xf32> // CHECK: %[[sTC:.*]] = subtensor %[[TC2]][{{.*}}] : tensor<?x?xf32> to tensor<?x?xf32>
// Dynamic op has been canonicalized away. // Dynamic op has been canonicalized away.
// CHECK-NOT: linalg.matmul {{.*}} tensor<?x?xf32> // CHECK-NOT: linalg.matmul {{.*}} tensor<?x?xf32>
// Padding injects static information. // Padding injects static information.
// CHECK: %[[pA:.*]] = linalg.pad_tensor %[[sTA]] low[0, 0] high[%{{.*}}, %{{.*}}] // CHECK: %[[pA:.*]] = linalg.pad_tensor %[[sTA]] low[%c0, %c0] high[%{{.*}}, %{{.*}}]
// CHECK: : tensor<?x?xf32> to tensor<2x4xf32>
// CHECK: %[[pB:.*]] = linalg.pad_tensor %[[sTB]] low[0, 0] high[%{{.*}}, %{{.*}}]
// CHECK: : tensor<?x?xf32> to tensor<2x4xf32>
// CHECK: %[[pC:.*]] = linalg.pad_tensor %[[sTC]] low[0, 0] high[%{{.*}}, %{{.*}}]
// CHECK: : tensor<?x?xf32> to tensor<2x4xf32> // CHECK: : tensor<?x?xf32> to tensor<2x4xf32>
// CHECK: %[[pB:.*]] = linalg.pad_tensor %[[sTB]] low[%c0, %c0] high[%{{.*}}, %{{.*}}]
// CHECK: : tensor<?x?xf32> to tensor<4x3xf32>
// CHECK: %[[pC:.*]] = linalg.pad_tensor %[[sTC]] low[%c0, %c0] high[%{{.*}}, %{{.*}}]
// CHECK: : tensor<?x?xf32> to tensor<2x3xf32>
// CHECK: %[[pD:.*]] = linalg.matmul ins(%[[pA]], %[[pB]] : tensor<2x4xf32>, tensor<4x3xf32>) // CHECK: %[[pD:.*]] = linalg.matmul ins(%[[pA]], %[[pB]] : tensor<2x4xf32>, tensor<4x3xf32>)
// CHECK-SAME: outs(%[[pC]] : tensor<2x3xf32>) -> tensor<2x3xf32> // CHECK-SAME: outs(%[[pC]] : tensor<2x3xf32>) -> tensor<2x3xf32>
// CHECK: %[[sTD:.*]] = subtensor %[[pD]][0, 0] [%{{.*}}, %{{.*}}] [1, 1] : tensor<2x3xf32> to tensor<?x?xf32> // CHECK: %[[sTD:.*]] = subtensor %[[pD]][0, 0] [%{{.*}}, %{{.*}}] [1, 1] : tensor<2x3xf32> to tensor<?x?xf32>
// CHECK: %[[TD:.*]] = subtensor_insert %[[sTD]] into %[[TC2]][{{.*}}] : tensor<?x?xf32> into tensor<?x?xf32> // CHECK: %[[TD:.*]] = subtensor_insert %[[sTD]] into %[[TC2]][{{.*}}] : tensor<?x?xf32> into tensor<?x?xf32>
// CHECK: scf.yield %[[TD]] : tensor<?x?xf32> // CHECK: scf.yield %[[TD]] : tensor<?x?xf32>
// CHECK: scf.yield %[[TD2]] : tensor<?x?xf32> // CHECK: scf.yield %[[TD2]] : tensor<?x?xf32>
// CHECK: scf.yield %[[TD1]] : tensor<?x?xf32> // CHECK: scf.yield %[[TD1]] : tensor<?x?xf32>
%0 = linalg.matmul {__internal_linalg_transform__ = "tile-and-pad"} %0 = linalg.matmul {__internal_linalg_transform__ = "tile-and-pad"}
ins(%arg0, %arg1: tensor<?x?xf32>, tensor<?x?xf32>) ins(%arg0, %arg1: tensor<?x?xf32>, tensor<?x?xf32>)
outs(%arg2: tensor<?x?xf32>) outs(%arg2: tensor<?x?xf32>)
-> tensor<?x?xf32> -> tensor<?x?xf32>
// CHECK: return %[[TD0]] : tensor<?x?xf32> // CHECK: return %[[TD0]] : tensor<?x?xf32>
return %0 : tensor<?x?xf32> return %0 : tensor<?x?xf32>
} }