This is an archive of the discontinued LLVM Phabricator instance.

Differential D77109

Fix linalg.generic access of hoisted constants
ClosedPublic

Authored by asaadaldien on Mar 30 2020, 5:45 PM.

Details

Reviewers
nicolasvasilache
rriddle
mravishankar
Commits
rG221fa96cd43c: Fix linalg.generic access of hoisted constants
Summary

Otherwise the added @generic_const_int will fail

Diff Detail

Event Timeline

asaadaldien created this revision.Mar 30 2020, 5:45 PM
Herald added a project: Restricted Project. · View Herald TranscriptMar 30 2020, 5:45 PM
Herald added subscribers: llvm-commits, grosul1, Joonsoo and 9 others. · View Herald Transcript
nicolasvasilache accepted this revision.Mar 30 2020, 6:23 PM

Thanks for the fix!

This revision is now accepted and ready to land.Mar 30 2020, 6:23 PM
Harbormaster completed remote builds in B51065: Diff 253750.Mar 30 2020, 9:18 PM
Closed by commit rG221fa96cd43c: Fix linalg.generic access of hoisted constants (authored by asaadaldien). · Explain WhyMar 30 2020, 9:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
mlir/
lib/
Dialect/
Linalg/
Transforms/
2 lines
test/
Dialect/
Linalg/
21 lines

Diff 253778

mlir/lib/Dialect/Linalg/Transforms/LinalgToLoops.cpp

Show First 20 Lines • Show All 95 Lines • ▼ Show 20 Lines for (auto &op : block.without_terminator()) {
auto *newOp = b.clone(op, map); auto *newOp = b.clone(op, map);
map.map(op.getResults(), newOp->getResults()); map.map(op.getResults(), newOp->getResults());
} }
Operation &terminator = block.back(); Operation &terminator = block.back();
assert(isa<YieldOp>(terminator) && assert(isa<YieldOp>(terminator) &&
"expected an yield op in the end of the region"); "expected an yield op in the end of the region");
for (unsigned i = 0, e = terminator.getNumOperands(); i < e; ++i) { for (unsigned i = 0, e = terminator.getNumOperands(); i < e; ++i) {
std_store(map.lookup(terminator.getOperand(i)), outputBuffers[i], std_store(map.lookupOrDefault(terminator.getOperand(i)), outputBuffers[i],
indexing[i]); indexing[i]);
} }
} }
namespace { namespace {
template <typename IndexedValueType, typename LinalgOpType> template <typename IndexedValueType, typename LinalgOpType>
class LinalgScopedEmitter {}; class LinalgScopedEmitter {};
▲ Show 20 Lines • Show All 602 Lines • Show Last 20 Lines

mlir/test/Dialect/Linalg/loops.mlir

Show First 20 Lines • Show All 516 Lines • ▼ Show 20 Lines
// CHECK-SAME: %[[ARG2:[a-zA-Z0-9_]*]]: memref<f32> // CHECK-SAME: %[[ARG2:[a-zA-Z0-9_]*]]: memref<f32>
// CHECK: loop.for %[[i:.*]] = {{.*}} // CHECK: loop.for %[[i:.*]] = {{.*}}
// CHECK: %[[a:.*]] = load %[[ARG0]][%[[i]]] // CHECK: %[[a:.*]] = load %[[ARG0]][%[[i]]]
// CHECK: %[[b:.*]] = load %[[ARG1]][] // CHECK: %[[b:.*]] = load %[[ARG1]][]
// CHECK: %[[c:.*]] = load %[[ARG2]][] // CHECK: %[[c:.*]] = load %[[ARG2]][]
// CHECK: %[[d:.*]] = select %{{.*}}, %[[b]], %[[c]] // CHECK: %[[d:.*]] = select %{{.*}}, %[[b]], %[[c]]
// CHECK: %[[e:.*]] = addf %[[a]], %[[d]] // CHECK: %[[e:.*]] = addf %[[a]], %[[d]]
// CHECK: store %[[e]], %[[ARG2]][] // CHECK: store %[[e]], %[[ARG2]][]
#trait_const_fill = {
args_in = 0,
args_out = 1,
indexing_maps = [affine_map<(i) -> (i)>],
iterator_types = ["parallel"],
library_call = "some_external_fn"
}
func @generic_const_init(%arg0: memref<?xf32>) {
%cst = constant 1.0 : f32
linalg.generic #trait_const_fill %arg0 {
^bb0(%arg1: f32): // no predecessors
linalg.yield %cst : f32
}: memref<?xf32>
return
}
// CHECK-LABEL: @generic_const_init
// CHECK-SAME: %[[ARG0:.*]]: memref<?xf32>
// CHECK: %[[CONST:.*]] = constant 1.000000e+00 : f32
// CHECK: loop.for %[[i:.*]] = {{.*}}
// CHECK: store %[[CONST]], %[[ARG0]]