Introduce `!torch.tensor` / `!torch.vtensor` types.
This removes our reliance on the numpy dialect and avoids our off-label
use of the builtin tnesor type for modeling unknown dtypes. The
`!torch.vtensor` (`ValueTensorType`) type is a value-semantic tensor.
The `!torch.tensor` (`NonValueTensorType`) type is a non-value-semantic
tensor. The new types look as follows syntactically:
```
// Least-static-information, non-value-semantic tensor.
!torch.tensor
// Explicit form of least-static-information variant.
!torch.tensor<*,unk>
// Least-static-information, value-semantic tensor.
!torch.vtensor
// Explicit form of least-static-information variant.
!torch.vtensor<*,unk>
// Fixed-set of allowable element types, with first-class support for
// Torch's frontend signedness semantics.
!torch.tensor<*,si32>
// First-class support for unknown dtypes.
!torch.tensor<[?,?,?],unk>
// Standard MLIR representation of `?` for unknown dimensions.
!torch.tensor<[?,2,?,4],unk>
// Statically shaped / dtyped example.
!torch.vtensor<[1,2,3,4],f32>
```
This required fairly significant changes throughout the compiler, but
overall it is a big cleanup. We now have a much clearer layering of "the
Torch frontend lowering" vs "lowering to std + linalg + etc.".
At the C++ level, there is `ValueTensorType`, `NonValueTensorType`.
We also have a helper `BaseTensorType` (kind of like ShapedType) which
interoperates with those two.
Included changes:
- New `torch.tensor(dense<0.0> : tensor<5xf32>) : !torch.tensor` op for
creating torch tensor literals in the frontend.
- Consistently use signedness for the types (except i1 which I didn't
touch -- we need to sort out the situation with !basicpy.BoolType
there anyway so will be attending to that soon)
- Frontend can annotate whether an argument to the function has value
semantics. We currently require this, as our backend contract does not
currently allow us to even model the non-value-semantic case. Before,
the value-semantic assumption was randomly injected in the middle of
the pass pipeline.
- Move ArrayToTensor (now called MaximizeValueSemantics) and
RefinePublicReturn passes to torch dialect.
- The TorchToStd and TorchToLinalg passes are now type conversions from
`!torch.vtensor` to `tensor` and use the dialect conversion infra.
The overall conversion pipeline is set up following the best practices
of the "Type Conversions the Not-So-Hard Way" talk. This required
introducing `torch-func-builtin-tensorize` and
`torch-finalizing-builtin-tensorize` passes analogous to the upstream
bufferization passes with the corresponding names (mostly just
copypasta from there).
- Misc Torch-level canonicalizations -- we now cleanly layer the
lowering to std later in the pipeline, so we are gradually lessening
our reliance on random std constant folding before we get to that
point.
Recommended review order:
- New types in TorchTypes.td/TorchTypes.h/TorchDialect.cpp
- New ops in TorchOps.td / TorchOps.cpp
- Less important / more mechanical stuff
- Frontend changes.
- Pass changes/additions in `Torch/Transforms` and `Conversion/`
2021-05-21 08:07:18 +08:00
|
|
|
//===- MaximizeValueSemantics.cpp --------------------------------*- C++-*-===//
|
2021-04-03 03:02:43 +08:00
|
|
|
//
|
|
|
|
// This file is licensed under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
2021-09-30 00:03:40 +08:00
|
|
|
// Also available under a BSD-style license. See LICENSE.
|
2021-04-03 03:02:43 +08:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "PassDetail.h"
|
|
|
|
|
2022-03-16 18:44:23 +08:00
|
|
|
#include "mlir/Dialect/Func/IR/FuncOps.h"
|
2021-04-03 03:02:43 +08:00
|
|
|
#include "mlir/IR/Builders.h"
|
|
|
|
#include "mlir/IR/BuiltinOps.h"
|
|
|
|
#include "mlir/IR/PatternMatch.h"
|
|
|
|
#include "mlir/Transforms/GreedyPatternRewriteDriver.h"
|
[torch-mlir earthmoving (1/N)] C/C++ code movement.
This creates the `external/torch-mlir` directory as an
LLVM_EXTERNAL_PROJECTS-compatible project (analogous to
`iree-dialects`) and completes movement/rename of all pure MLIR C/C++
compiler code into there. The next step will be to move all the Python
code / code that links/includes PyTorch C++ code (which currently lives
in `frontends/pytorch`) into a subdirectory here.
I call this "earthmoving" because it is mostly mechanical changes and
renames. As a quick summary (we can change this down the road easily)
- C++ `mlir::NPCOMP::Torch -> mlir::torch::Torch`
- CAPI `npcompTorchListTypeGet -> torchMlirTorchListTypeGet`
- preprocessor `#ifndef NPCOMP_ -> #ifndef TORCHMLIR_`
- CMake `NPCOMPFoo -> TorchMLIRFoo`
The goal of this is to create a standalone project creating a center of
mass for entry into the MLIR ecosystem from PyTorch, suitable in scope
for eventual inclusion/ownership in PyTorch. The idea is that
`external/torch-mlir` will some day be pulled out into its own
repository, and then npcomp will simply pull it in as a submodule.
Layering-wise, what lives in `torch-mlir` lowers code from PyTorch
(currently TorchScript, but TorchFX or pytorch/xla-style tracing are
possible extensions) down to what we have been calling the "Torch
backend contract" which is cleaned up IR (inlining, simplifcation,
conversion to value tensors, ...) entirely in the `torch` dialect. This
is the branching off point for further lowering, of which npcomp takes
one opinion (outside `torch-mlir` of course!), namely the
`TorchConversion` dialect/transforms which lower to IR suitable for IREE
and other linalg-on-tensors based lower-level compilers.
Summary of changes:
- move `{include,lib,test}/Dialect/Torch` into `torch-mlir`
- move relevant parts of CAPI into `torch-mlir`.
- leave a few things related to the `torch-mlir` Python build commented
out, which should be resolved in a subsequent change.
2021-09-10 03:24:10 +08:00
|
|
|
#include "torch-mlir/Dialect/Torch/IR/TorchOps.h"
|
|
|
|
#include "torch-mlir/Dialect/Torch/Transforms/Passes.h"
|
2021-04-03 03:02:43 +08:00
|
|
|
|
|
|
|
using namespace mlir;
|
[torch-mlir earthmoving (1/N)] C/C++ code movement.
This creates the `external/torch-mlir` directory as an
LLVM_EXTERNAL_PROJECTS-compatible project (analogous to
`iree-dialects`) and completes movement/rename of all pure MLIR C/C++
compiler code into there. The next step will be to move all the Python
code / code that links/includes PyTorch C++ code (which currently lives
in `frontends/pytorch`) into a subdirectory here.
I call this "earthmoving" because it is mostly mechanical changes and
renames. As a quick summary (we can change this down the road easily)
- C++ `mlir::NPCOMP::Torch -> mlir::torch::Torch`
- CAPI `npcompTorchListTypeGet -> torchMlirTorchListTypeGet`
- preprocessor `#ifndef NPCOMP_ -> #ifndef TORCHMLIR_`
- CMake `NPCOMPFoo -> TorchMLIRFoo`
The goal of this is to create a standalone project creating a center of
mass for entry into the MLIR ecosystem from PyTorch, suitable in scope
for eventual inclusion/ownership in PyTorch. The idea is that
`external/torch-mlir` will some day be pulled out into its own
repository, and then npcomp will simply pull it in as a submodule.
Layering-wise, what lives in `torch-mlir` lowers code from PyTorch
(currently TorchScript, but TorchFX or pytorch/xla-style tracing are
possible extensions) down to what we have been calling the "Torch
backend contract" which is cleaned up IR (inlining, simplifcation,
conversion to value tensors, ...) entirely in the `torch` dialect. This
is the branching off point for further lowering, of which npcomp takes
one opinion (outside `torch-mlir` of course!), namely the
`TorchConversion` dialect/transforms which lower to IR suitable for IREE
and other linalg-on-tensors based lower-level compilers.
Summary of changes:
- move `{include,lib,test}/Dialect/Torch` into `torch-mlir`
- move relevant parts of CAPI into `torch-mlir`.
- leave a few things related to the `torch-mlir` Python build commented
out, which should be resolved in a subsequent change.
2021-09-10 03:24:10 +08:00
|
|
|
using namespace mlir::torch;
|
|
|
|
using namespace mlir::torch::Torch;
|
2021-04-03 03:02:43 +08:00
|
|
|
|
2022-03-16 09:13:45 +08:00
|
|
|
static Value assertNonValueTensor(Value tensor) {
|
|
|
|
assert(tensor.getType().isa<NonValueTensorType>() &&
|
|
|
|
"tensor is expected to be a non-value tensor");
|
|
|
|
return tensor;
|
|
|
|
}
|
|
|
|
|
2022-02-19 02:19:07 +08:00
|
|
|
static bool isViewLikeOp(Operation *op) {
|
|
|
|
// AtenContiguousOp might return a view, so this is conservatively
|
|
|
|
// correct. We could potentially be more precise and identify the cases
|
|
|
|
// that it does not return a view and treat those as having value
|
|
|
|
// semantics.
|
2022-03-16 09:13:45 +08:00
|
|
|
return isa<AtenBroadcastToOp, AtenContiguousOp, AtenExpandAsOp, AtenExpandOp,
|
2022-02-19 02:19:07 +08:00
|
|
|
AtenFlattenUsingIntsOp, AtenPermuteOp, AtenReshapeOp,
|
|
|
|
AtenSelectIntOp, AtenSliceTensorOp, AtenSqueezeDimOp,
|
|
|
|
AtenSqueezeOp, AtenTOp, AtenToDtypeOp, AtenTransposeIntOp,
|
|
|
|
AtenUnsqueezeOp, AtenViewOp, TensorStaticInfoCastOp>(op);
|
|
|
|
}
|
|
|
|
|
2021-06-26 08:25:09 +08:00
|
|
|
namespace {
|
2021-06-19 04:47:47 +08:00
|
|
|
class AbstractlyInterpretCopyToNonValueTensorOpUsersWithinABlock
|
|
|
|
: public OpRewritePattern<CopyToNonValueTensorOp> {
|
|
|
|
public:
|
|
|
|
using OpRewritePattern::OpRewritePattern;
|
2022-02-19 02:19:07 +08:00
|
|
|
|
2022-03-16 09:13:45 +08:00
|
|
|
// Used to represent all of the interpreted ops that have at least
|
|
|
|
// one non-value tensor as input or output.
|
2022-03-11 01:36:52 +08:00
|
|
|
struct InterpretedOps {
|
|
|
|
SmallVector<Operation *> copyLikeOps;
|
|
|
|
SmallVector<Operation *> viewLikeOps;
|
|
|
|
SmallVector<OverwriteTensorContentsOp> overwriteTensorContentsOps;
|
2022-03-16 18:44:23 +08:00
|
|
|
Optional<mlir::func::ReturnOp> returnOp;
|
2022-03-11 01:36:52 +08:00
|
|
|
};
|
2022-02-19 02:19:07 +08:00
|
|
|
|
2022-03-11 01:36:52 +08:00
|
|
|
// Check that graph rewriting is possible by doing an abstract
|
|
|
|
// interpretation within a single basic block. If rewriting is
|
|
|
|
// possible, the interpreted ops are returned split into their
|
|
|
|
// respective categories.
|
2022-03-16 09:13:45 +08:00
|
|
|
static FailureOr<InterpretedOps> abstractlyInterpretSlice(
|
|
|
|
CopyToNonValueTensorOp copyToNonValueTensor,
|
|
|
|
const DenseMap<Operation *, SmallVector<Value>> &nonValueTensorsUsedByOp,
|
|
|
|
PatternRewriter &rewriter) {
|
2021-06-19 04:47:47 +08:00
|
|
|
// Sort by order in the block, so we can abstractly interpret the ops.
|
2022-03-16 09:13:45 +08:00
|
|
|
SmallVector<Operation *> nonValueTensorUsers(
|
|
|
|
llvm::make_first_range(nonValueTensorsUsedByOp));
|
2022-03-11 01:36:52 +08:00
|
|
|
llvm::sort(nonValueTensorUsers, [](Operation *lhs, Operation *rhs) {
|
2021-06-19 04:47:47 +08:00
|
|
|
return lhs->isBeforeInBlock(rhs);
|
|
|
|
});
|
2022-03-11 01:36:52 +08:00
|
|
|
|
|
|
|
// We track the available aliases at each point as well as split the
|
|
|
|
// users into view-like, copy-to-value, and overwrite ops as we walk
|
|
|
|
// forward.
|
|
|
|
InterpretedOps result;
|
|
|
|
result.copyLikeOps.push_back(copyToNonValueTensor);
|
2022-03-16 09:13:45 +08:00
|
|
|
DenseSet<Value> availableAliases{
|
|
|
|
assertNonValueTensor(copyToNonValueTensor.result())};
|
2022-03-11 01:36:52 +08:00
|
|
|
for (Operation *user : nonValueTensorUsers) {
|
2022-03-16 09:13:45 +08:00
|
|
|
for (Value operand : nonValueTensorsUsedByOp.lookup(user)) {
|
2022-03-11 01:36:52 +08:00
|
|
|
if (!availableAliases.contains(operand)) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
copyToNonValueTensor,
|
2022-03-16 09:13:45 +08:00
|
|
|
"operand of op is not a valid tensor alias");
|
2022-03-11 01:36:52 +08:00
|
|
|
}
|
2022-03-16 09:13:45 +08:00
|
|
|
}
|
|
|
|
if (isViewLikeOp(user)) {
|
|
|
|
Value userResult = user->getResult(0);
|
2022-03-11 01:36:52 +08:00
|
|
|
// View-like ops produce a new alias available to later ops.
|
2022-03-16 09:13:45 +08:00
|
|
|
// However, if the view-like op has been partially converted
|
|
|
|
// to use value semantics (which happens for example with ops
|
|
|
|
// that take two aliases as input), then it is possible that the
|
|
|
|
// op no longer generates an alias.
|
|
|
|
if (userResult.getType().isa<NonValueTensorType>())
|
|
|
|
availableAliases.insert(userResult);
|
2022-03-11 01:36:52 +08:00
|
|
|
result.viewLikeOps.push_back(user);
|
|
|
|
} else if (auto copyToValueTensor = dyn_cast<CopyToValueTensorOp>(user)) {
|
|
|
|
result.copyLikeOps.push_back(copyToValueTensor);
|
|
|
|
} else if (auto overwrite = dyn_cast<OverwriteTensorContentsOp>(user)) {
|
|
|
|
// To simplify the analysis, we only support the case where the
|
|
|
|
// only aliases used after an overwrite are the aliases generated
|
|
|
|
// after plus the alias being overwritten.
|
|
|
|
availableAliases.clear();
|
2022-03-16 09:13:45 +08:00
|
|
|
availableAliases.insert(assertNonValueTensor(overwrite.overwritten()));
|
2022-03-11 01:36:52 +08:00
|
|
|
result.overwriteTensorContentsOps.push_back(overwrite);
|
2022-03-16 18:44:23 +08:00
|
|
|
} else if (auto returnOp = dyn_cast<mlir::func::ReturnOp>(user)) {
|
2022-03-10 08:44:22 +08:00
|
|
|
result.returnOp = returnOp;
|
2021-06-19 04:47:47 +08:00
|
|
|
} else {
|
2022-03-11 01:36:52 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
copyToNonValueTensor,
|
|
|
|
"unsupported op encountered during abstract analysis");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Rewrite slice composed of the interpreted ops so that the slice uses
|
|
|
|
// value semantics everywhere.
|
|
|
|
static void rewriteSlice(const InterpretedOps &ops,
|
|
|
|
PatternRewriter &rewriter) {
|
2022-03-10 08:44:22 +08:00
|
|
|
|
|
|
|
DenseMap<int, Type> originalReturnTypes;
|
|
|
|
if (ops.returnOp.hasValue()) {
|
|
|
|
auto returnOp = ops.returnOp.getValue();
|
|
|
|
for (auto operand : llvm::enumerate(returnOp->getOperands())) {
|
|
|
|
auto type = operand.value().getType();
|
|
|
|
if (!type.isa<NonValueTensorType>())
|
|
|
|
continue;
|
|
|
|
originalReturnTypes[operand.index()] = type;
|
|
|
|
}
|
|
|
|
}
|
2022-03-11 01:36:52 +08:00
|
|
|
// The rewriting for the overwrite op involves replacing all uses of its
|
|
|
|
// non-value tensor operand with its value tensor operand. Since the
|
|
|
|
// rewriting of other ops can potentially change the non-value tensor
|
|
|
|
// operand to a value tensor, this rewriting MUST happen first to avoid
|
|
|
|
// wrongly replacing operands that were previously not a view of the
|
|
|
|
// overwritten tensor.
|
|
|
|
for (OverwriteTensorContentsOp overwrite :
|
|
|
|
llvm::reverse(ops.overwriteTensorContentsOps)) {
|
2022-03-16 09:13:45 +08:00
|
|
|
Value overwritten = assertNonValueTensor(overwrite.overwritten());
|
2022-03-11 01:36:52 +08:00
|
|
|
overwritten.replaceUsesWithIf(
|
|
|
|
overwrite.value(), [&](const OpOperand &operand) {
|
|
|
|
return !operand.getOwner()->isBeforeInBlock(overwrite);
|
|
|
|
});
|
|
|
|
rewriter.eraseOp(overwrite);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (Operation *copyLikeOp : ops.copyLikeOps)
|
|
|
|
rewriter.replaceOp(copyLikeOp, copyLikeOp->getOperand(0));
|
|
|
|
|
|
|
|
// Replace return type of view-like ops with value-semantics type variant.
|
|
|
|
for (Operation *viewLikeOp : ops.viewLikeOps) {
|
|
|
|
rewriter.updateRootInPlace(viewLikeOp, [&] {
|
|
|
|
Value result = viewLikeOp->getResult(0);
|
|
|
|
auto resultType = result.getType().dyn_cast<NonValueTensorType>();
|
2022-03-16 09:13:45 +08:00
|
|
|
if (resultType)
|
|
|
|
result.setType(resultType.getWithValueSemantics());
|
2022-03-11 01:36:52 +08:00
|
|
|
});
|
|
|
|
}
|
2022-03-10 08:44:22 +08:00
|
|
|
if (ops.returnOp.hasValue()) {
|
|
|
|
auto returnOp = ops.returnOp.getValue();
|
|
|
|
for (int i = 0, e = returnOp->getNumOperands(); i < e; i++) {
|
|
|
|
OpOperand &operand = returnOp->getOpOperand(i);
|
|
|
|
auto it = originalReturnTypes.find(i);
|
|
|
|
if (it == originalReturnTypes.end())
|
|
|
|
continue;
|
|
|
|
auto originalType = it->second.cast<NonValueTensorType>();
|
|
|
|
rewriter.setInsertionPoint(returnOp);
|
|
|
|
Value newReturnValue = copyTensorToType(rewriter, returnOp->getLoc(),
|
|
|
|
originalType, operand.get());
|
|
|
|
operand.set(newReturnValue);
|
|
|
|
}
|
|
|
|
}
|
2022-03-11 01:36:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
LogicalResult matchAndRewrite(CopyToNonValueTensorOp copy,
|
|
|
|
PatternRewriter &rewriter) const override {
|
|
|
|
// Find a subgraph starting with this CopyToNonValueTensorOp, and
|
|
|
|
// terminating at CopyToValueTensorOp's, possibly with intervening view-like
|
|
|
|
// ops and overwrites. This also catches the special case of a
|
|
|
|
// CopyToNonValueTensorOp that trivially feeds into CopyToValueTensorOp's.
|
2022-03-16 09:13:45 +08:00
|
|
|
DenseMap<Operation *, SmallVector<Value>> nonValueTensorsUsedByOp;
|
|
|
|
|
|
|
|
// Some view-like ops take more than one non-value tensor as input (such as
|
|
|
|
// `aten.view_as`). For these ops, we assume that the tensor view that gets
|
|
|
|
// returned by the op is a view of the first operand of the op.
|
|
|
|
|
|
|
|
// View-like ops that return a non-value tensor and have a view of the
|
|
|
|
// operand of `copy.to_tensor` as the first operand.
|
|
|
|
DenseSet<Operation *> validViewLikeOps;
|
|
|
|
// View-like ops that return a non-value tensor and have a view of the
|
|
|
|
// operand of `copy.to_tensor` as an operand other than the first operand.
|
|
|
|
DenseSet<Operation *> viewLikeOpsToCheck;
|
|
|
|
|
|
|
|
using OpOperandRefs = SmallVector<std::reference_wrapper<OpOperand>>;
|
|
|
|
OpOperandRefs workList(copy.result().getUses());
|
2022-03-11 01:36:52 +08:00
|
|
|
while (!workList.empty()) {
|
2022-03-16 09:13:45 +08:00
|
|
|
OpOperand &operand = workList.pop_back_val();
|
|
|
|
Operation *op = operand.getOwner();
|
2022-03-11 01:36:52 +08:00
|
|
|
if (op->getBlock() != copy->getBlock()) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
copy, "can only analyze within a single basic block");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isViewLikeOp(op)) {
|
2022-03-16 09:13:45 +08:00
|
|
|
// We currently only support view-like ops with one tensor output.
|
|
|
|
if (op->getNumResults() != 1 ||
|
|
|
|
!op->getResult(0).getType().isa<BaseTensorType>()) {
|
2022-03-11 01:36:52 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
2022-03-16 09:13:45 +08:00
|
|
|
copy, "unsupported: view-like ops must have one tensor output, "
|
|
|
|
"and the tensor output must be the first result");
|
2022-03-11 01:36:52 +08:00
|
|
|
}
|
|
|
|
|
2022-03-16 09:13:45 +08:00
|
|
|
Value opResult = op->getResult(0);
|
|
|
|
// There are cases where a view-like op will be partially converted to
|
|
|
|
// value semantics, resulting in at least one of the inputs being a
|
|
|
|
// non-value tensor and the output being a value tensor. If this is the
|
|
|
|
// case then there is no need to look at the users of the result of the
|
|
|
|
// op.
|
|
|
|
if (opResult.getType().isa<NonValueTensorType>()) {
|
|
|
|
if (operand.getOperandNumber() == 0) {
|
|
|
|
validViewLikeOps.insert(op);
|
|
|
|
llvm::append_range(workList, opResult.getUses());
|
|
|
|
} else {
|
|
|
|
viewLikeOpsToCheck.insert(op);
|
|
|
|
}
|
|
|
|
}
|
2021-06-19 04:47:47 +08:00
|
|
|
}
|
2022-03-16 09:13:45 +08:00
|
|
|
|
|
|
|
nonValueTensorsUsedByOp[op].push_back(
|
|
|
|
assertNonValueTensor(operand.get()));
|
2021-06-19 04:47:47 +08:00
|
|
|
}
|
2022-03-11 01:36:52 +08:00
|
|
|
|
2022-03-10 08:44:22 +08:00
|
|
|
// Nothing to do if there is just a ReturnOp -- we know that we won't be
|
|
|
|
// rewriting anything, since we must preserve the ReturnOp's original type.
|
2022-03-16 09:13:45 +08:00
|
|
|
if (llvm::hasSingleElement(nonValueTensorsUsedByOp) &&
|
2022-03-16 18:44:23 +08:00
|
|
|
isa<mlir::func::ReturnOp>(nonValueTensorsUsedByOp.begin()->first)) {
|
2022-03-10 08:44:22 +08:00
|
|
|
return failure();
|
|
|
|
}
|
|
|
|
|
2022-03-16 09:13:45 +08:00
|
|
|
if (llvm::any_of(viewLikeOpsToCheck, [&](Operation *op) {
|
|
|
|
return !validViewLikeOps.contains(op);
|
|
|
|
})) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
copy, "if a view-like op returns a non-value tensor, the first "
|
|
|
|
"operand must be a view of the operand of the `copy.to_tensor` "
|
|
|
|
"op");
|
|
|
|
}
|
|
|
|
|
|
|
|
FailureOr<InterpretedOps> interpretedOps =
|
|
|
|
abstractlyInterpretSlice(copy, nonValueTensorsUsedByOp, rewriter);
|
2022-03-11 01:36:52 +08:00
|
|
|
if (failed(LogicalResult(interpretedOps)))
|
|
|
|
return failure();
|
|
|
|
rewriteSlice(*interpretedOps, rewriter);
|
2021-06-19 04:47:47 +08:00
|
|
|
return success();
|
|
|
|
}
|
|
|
|
};
|
2021-06-26 08:25:09 +08:00
|
|
|
} // namespace
|
2021-06-19 04:47:47 +08:00
|
|
|
|
2021-06-26 08:25:09 +08:00
|
|
|
namespace {
|
|
|
|
// Calculate a forward slice starting from a CopyToNonValueTensorOp
|
|
|
|
// and ending at CopyToValueTensorOp's. If all intervening ops
|
|
|
|
// are just view-like operations (i.e. no mutation), then we can trivially
|
|
|
|
// convert them all to value semantics.
|
2022-03-11 01:36:52 +08:00
|
|
|
// This pattern handles the case where views span multiple basic blocks,
|
|
|
|
// which is currently not supported by
|
|
|
|
// `AbstractlyInterpretCopyToNonValueTensorOpUsersWithinABlock`.
|
2021-06-26 08:25:09 +08:00
|
|
|
class RewriteViewLikeSubgraph
|
2021-06-19 04:47:47 +08:00
|
|
|
: public OpRewritePattern<CopyToNonValueTensorOp> {
|
|
|
|
public:
|
|
|
|
using OpRewritePattern::OpRewritePattern;
|
|
|
|
LogicalResult matchAndRewrite(CopyToNonValueTensorOp copy,
|
|
|
|
PatternRewriter &rewriter) const override {
|
2021-06-26 08:25:09 +08:00
|
|
|
// Find a subgraph starting with this CopyToNonValueTensorOp, and
|
2022-03-10 08:44:22 +08:00
|
|
|
// terminating at CopyToValueTensorOp's or ReturnOp's, possibly with
|
|
|
|
// intervening view-like ops.
|
2021-06-26 08:25:09 +08:00
|
|
|
// This also catches the special case of a CopyToNonValueTensorOp that
|
|
|
|
// trivially feeds into CopyToValueTensorOp's.
|
|
|
|
SmallVector<Operation *> viewLikeOps;
|
|
|
|
SmallVector<CopyToValueTensorOp> copyToValueTensorOps;
|
2022-03-16 18:44:23 +08:00
|
|
|
SmallVector<mlir::func::ReturnOp> returnOps;
|
2021-06-26 08:25:09 +08:00
|
|
|
auto workList = llvm::to_vector<6>(copy.getResult().getUsers());
|
|
|
|
// We currently only support view-like ops with one tensor input and one
|
|
|
|
// tensor output, meaning that the tensor use-def chains form a tree.
|
|
|
|
// This will not be the case for an op like `torch.aten.view_as`, so
|
|
|
|
// we will need to add a set to prune duplicate visitation.
|
|
|
|
while (!workList.empty()) {
|
|
|
|
Operation *op = workList.pop_back_val();
|
|
|
|
if (auto copyToValueTensor = dyn_cast<CopyToValueTensorOp>(op)) {
|
|
|
|
copyToValueTensorOps.push_back(copyToValueTensor);
|
2022-03-16 18:44:23 +08:00
|
|
|
} else if (auto returnOp = dyn_cast<mlir::func::ReturnOp>(op)) {
|
2022-03-10 08:44:22 +08:00
|
|
|
returnOps.push_back(returnOp);
|
2022-02-19 02:19:07 +08:00
|
|
|
} else if (isViewLikeOp(op)) {
|
2021-06-26 08:25:09 +08:00
|
|
|
viewLikeOps.push_back(op);
|
|
|
|
llvm::append_range(workList, op->getResult(0).getUsers());
|
|
|
|
} else {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
copy, "can only handle these transitive user ops");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-03-10 08:44:22 +08:00
|
|
|
if (copyToValueTensorOps.empty() && viewLikeOps.empty())
|
|
|
|
return rewriter.notifyMatchFailure(copy, "no types to change");
|
|
|
|
|
|
|
|
// All uses of `copy` will be updated by the logic below.
|
2021-06-26 08:25:09 +08:00
|
|
|
copy.replaceAllUsesWith(copy.getOperand());
|
2022-03-10 08:44:22 +08:00
|
|
|
// All CopyToValueTensorOp operands will be changed to the correct type
|
|
|
|
// by the logic below.
|
2021-06-26 08:25:09 +08:00
|
|
|
for (CopyToValueTensorOp op : copyToValueTensorOps)
|
|
|
|
rewriter.replaceOp(op, op.getOperand());
|
2022-03-10 08:44:22 +08:00
|
|
|
// Keep track of the original types of any view-like ops, so that we can
|
2022-03-16 18:44:23 +08:00
|
|
|
// correctly copy them back to their mlir::func::ReturnOp's expected types.
|
2022-03-10 08:44:22 +08:00
|
|
|
DenseMap<Value, Type> originalTypes;
|
2021-06-26 08:25:09 +08:00
|
|
|
for (Operation *op : viewLikeOps) {
|
|
|
|
rewriter.updateRootInPlace(op, [&]() {
|
|
|
|
if (auto nonValueTensorType =
|
|
|
|
op->getResult(0).getType().dyn_cast<NonValueTensorType>()) {
|
2022-03-10 08:44:22 +08:00
|
|
|
originalTypes[op->getResult(0)] = nonValueTensorType;
|
2021-06-26 08:25:09 +08:00
|
|
|
op->getResult(0).setType(nonValueTensorType.getWithValueSemantics());
|
|
|
|
}
|
|
|
|
});
|
2021-06-19 04:47:47 +08:00
|
|
|
}
|
2022-03-10 08:44:22 +08:00
|
|
|
// For ReturnOp's, we need to update the operands to their original types.
|
2022-03-16 18:44:23 +08:00
|
|
|
for (mlir::func::ReturnOp op : returnOps) {
|
2022-03-10 08:44:22 +08:00
|
|
|
for (int i = 0, e = op->getNumOperands(); i < e; i++) {
|
|
|
|
OpOperand &operand = op->getOpOperand(i);
|
|
|
|
auto it = originalTypes.find(operand.get());
|
|
|
|
if (it == originalTypes.end())
|
|
|
|
continue;
|
|
|
|
auto originalType = it->second.cast<BaseTensorType>();
|
|
|
|
rewriter.setInsertionPoint(op);
|
|
|
|
Value newReturnValue = copyTensorToType(rewriter, op->getLoc(),
|
|
|
|
originalType, operand.get());
|
|
|
|
operand.set(newReturnValue);
|
|
|
|
}
|
|
|
|
}
|
2021-06-19 04:47:47 +08:00
|
|
|
return success();
|
|
|
|
}
|
|
|
|
};
|
2021-06-26 08:25:09 +08:00
|
|
|
} // namespace
|
2021-06-19 04:47:47 +08:00
|
|
|
|
2021-04-03 03:02:43 +08:00
|
|
|
namespace {
|
Introduce `!torch.tensor` / `!torch.vtensor` types.
This removes our reliance on the numpy dialect and avoids our off-label
use of the builtin tnesor type for modeling unknown dtypes. The
`!torch.vtensor` (`ValueTensorType`) type is a value-semantic tensor.
The `!torch.tensor` (`NonValueTensorType`) type is a non-value-semantic
tensor. The new types look as follows syntactically:
```
// Least-static-information, non-value-semantic tensor.
!torch.tensor
// Explicit form of least-static-information variant.
!torch.tensor<*,unk>
// Least-static-information, value-semantic tensor.
!torch.vtensor
// Explicit form of least-static-information variant.
!torch.vtensor<*,unk>
// Fixed-set of allowable element types, with first-class support for
// Torch's frontend signedness semantics.
!torch.tensor<*,si32>
// First-class support for unknown dtypes.
!torch.tensor<[?,?,?],unk>
// Standard MLIR representation of `?` for unknown dimensions.
!torch.tensor<[?,2,?,4],unk>
// Statically shaped / dtyped example.
!torch.vtensor<[1,2,3,4],f32>
```
This required fairly significant changes throughout the compiler, but
overall it is a big cleanup. We now have a much clearer layering of "the
Torch frontend lowering" vs "lowering to std + linalg + etc.".
At the C++ level, there is `ValueTensorType`, `NonValueTensorType`.
We also have a helper `BaseTensorType` (kind of like ShapedType) which
interoperates with those two.
Included changes:
- New `torch.tensor(dense<0.0> : tensor<5xf32>) : !torch.tensor` op for
creating torch tensor literals in the frontend.
- Consistently use signedness for the types (except i1 which I didn't
touch -- we need to sort out the situation with !basicpy.BoolType
there anyway so will be attending to that soon)
- Frontend can annotate whether an argument to the function has value
semantics. We currently require this, as our backend contract does not
currently allow us to even model the non-value-semantic case. Before,
the value-semantic assumption was randomly injected in the middle of
the pass pipeline.
- Move ArrayToTensor (now called MaximizeValueSemantics) and
RefinePublicReturn passes to torch dialect.
- The TorchToStd and TorchToLinalg passes are now type conversions from
`!torch.vtensor` to `tensor` and use the dialect conversion infra.
The overall conversion pipeline is set up following the best practices
of the "Type Conversions the Not-So-Hard Way" talk. This required
introducing `torch-func-builtin-tensorize` and
`torch-finalizing-builtin-tensorize` passes analogous to the upstream
bufferization passes with the corresponding names (mostly just
copypasta from there).
- Misc Torch-level canonicalizations -- we now cleanly layer the
lowering to std later in the pipeline, so we are gradually lessening
our reliance on random std constant folding before we get to that
point.
Recommended review order:
- New types in TorchTypes.td/TorchTypes.h/TorchDialect.cpp
- New ops in TorchOps.td / TorchOps.cpp
- Less important / more mechanical stuff
- Frontend changes.
- Pass changes/additions in `Torch/Transforms` and `Conversion/`
2021-05-21 08:07:18 +08:00
|
|
|
class MaximizeValueSemanticsPass
|
|
|
|
: public MaximizeValueSemanticsBase<MaximizeValueSemanticsPass> {
|
2021-04-03 03:02:43 +08:00
|
|
|
void runOnOperation() override {
|
|
|
|
MLIRContext *context = &getContext();
|
|
|
|
auto func = getOperation();
|
|
|
|
|
|
|
|
RewritePatternSet patterns(context);
|
2021-06-19 04:47:47 +08:00
|
|
|
patterns.insert<AbstractlyInterpretCopyToNonValueTensorOpUsersWithinABlock,
|
2021-06-26 08:25:09 +08:00
|
|
|
RewriteViewLikeSubgraph>(context);
|
2021-04-03 03:02:43 +08:00
|
|
|
(void)applyPatternsAndFoldGreedily(func, std::move(patterns));
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
std::unique_ptr<OperationPass<FuncOp>>
|
[torch-mlir earthmoving (1/N)] C/C++ code movement.
This creates the `external/torch-mlir` directory as an
LLVM_EXTERNAL_PROJECTS-compatible project (analogous to
`iree-dialects`) and completes movement/rename of all pure MLIR C/C++
compiler code into there. The next step will be to move all the Python
code / code that links/includes PyTorch C++ code (which currently lives
in `frontends/pytorch`) into a subdirectory here.
I call this "earthmoving" because it is mostly mechanical changes and
renames. As a quick summary (we can change this down the road easily)
- C++ `mlir::NPCOMP::Torch -> mlir::torch::Torch`
- CAPI `npcompTorchListTypeGet -> torchMlirTorchListTypeGet`
- preprocessor `#ifndef NPCOMP_ -> #ifndef TORCHMLIR_`
- CMake `NPCOMPFoo -> TorchMLIRFoo`
The goal of this is to create a standalone project creating a center of
mass for entry into the MLIR ecosystem from PyTorch, suitable in scope
for eventual inclusion/ownership in PyTorch. The idea is that
`external/torch-mlir` will some day be pulled out into its own
repository, and then npcomp will simply pull it in as a submodule.
Layering-wise, what lives in `torch-mlir` lowers code from PyTorch
(currently TorchScript, but TorchFX or pytorch/xla-style tracing are
possible extensions) down to what we have been calling the "Torch
backend contract" which is cleaned up IR (inlining, simplifcation,
conversion to value tensors, ...) entirely in the `torch` dialect. This
is the branching off point for further lowering, of which npcomp takes
one opinion (outside `torch-mlir` of course!), namely the
`TorchConversion` dialect/transforms which lower to IR suitable for IREE
and other linalg-on-tensors based lower-level compilers.
Summary of changes:
- move `{include,lib,test}/Dialect/Torch` into `torch-mlir`
- move relevant parts of CAPI into `torch-mlir`.
- leave a few things related to the `torch-mlir` Python build commented
out, which should be resolved in a subsequent change.
2021-09-10 03:24:10 +08:00
|
|
|
mlir::torch::Torch::createMaximizeValueSemanticsPass() {
|
Introduce `!torch.tensor` / `!torch.vtensor` types.
This removes our reliance on the numpy dialect and avoids our off-label
use of the builtin tnesor type for modeling unknown dtypes. The
`!torch.vtensor` (`ValueTensorType`) type is a value-semantic tensor.
The `!torch.tensor` (`NonValueTensorType`) type is a non-value-semantic
tensor. The new types look as follows syntactically:
```
// Least-static-information, non-value-semantic tensor.
!torch.tensor
// Explicit form of least-static-information variant.
!torch.tensor<*,unk>
// Least-static-information, value-semantic tensor.
!torch.vtensor
// Explicit form of least-static-information variant.
!torch.vtensor<*,unk>
// Fixed-set of allowable element types, with first-class support for
// Torch's frontend signedness semantics.
!torch.tensor<*,si32>
// First-class support for unknown dtypes.
!torch.tensor<[?,?,?],unk>
// Standard MLIR representation of `?` for unknown dimensions.
!torch.tensor<[?,2,?,4],unk>
// Statically shaped / dtyped example.
!torch.vtensor<[1,2,3,4],f32>
```
This required fairly significant changes throughout the compiler, but
overall it is a big cleanup. We now have a much clearer layering of "the
Torch frontend lowering" vs "lowering to std + linalg + etc.".
At the C++ level, there is `ValueTensorType`, `NonValueTensorType`.
We also have a helper `BaseTensorType` (kind of like ShapedType) which
interoperates with those two.
Included changes:
- New `torch.tensor(dense<0.0> : tensor<5xf32>) : !torch.tensor` op for
creating torch tensor literals in the frontend.
- Consistently use signedness for the types (except i1 which I didn't
touch -- we need to sort out the situation with !basicpy.BoolType
there anyway so will be attending to that soon)
- Frontend can annotate whether an argument to the function has value
semantics. We currently require this, as our backend contract does not
currently allow us to even model the non-value-semantic case. Before,
the value-semantic assumption was randomly injected in the middle of
the pass pipeline.
- Move ArrayToTensor (now called MaximizeValueSemantics) and
RefinePublicReturn passes to torch dialect.
- The TorchToStd and TorchToLinalg passes are now type conversions from
`!torch.vtensor` to `tensor` and use the dialect conversion infra.
The overall conversion pipeline is set up following the best practices
of the "Type Conversions the Not-So-Hard Way" talk. This required
introducing `torch-func-builtin-tensorize` and
`torch-finalizing-builtin-tensorize` passes analogous to the upstream
bufferization passes with the corresponding names (mostly just
copypasta from there).
- Misc Torch-level canonicalizations -- we now cleanly layer the
lowering to std later in the pipeline, so we are gradually lessening
our reliance on random std constant folding before we get to that
point.
Recommended review order:
- New types in TorchTypes.td/TorchTypes.h/TorchDialect.cpp
- New ops in TorchOps.td / TorchOps.cpp
- Less important / more mechanical stuff
- Frontend changes.
- Pass changes/additions in `Torch/Transforms` and `Conversion/`
2021-05-21 08:07:18 +08:00
|
|
|
return std::make_unique<MaximizeValueSemanticsPass>();
|
2021-04-03 03:02:43 +08:00
|
|
|
}
|