2022-08-03 10:47:52 +08:00
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// Part of the LLVM Project, 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
|
|
|
|
// Also available under a BSD-style license. See LICENSE.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
#include "torch-mlir/Conversion/TorchToStablehlo/TorchToStablehlo.h"
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
#include "../PassDetail.h"
|
2023-02-02 21:29:47 +08:00
|
|
|
#include "PopulatePatterns.h"
|
|
|
|
|
2022-10-05 21:28:06 +08:00
|
|
|
#include "mlir/Dialect/Arith/IR/Arith.h"
|
2022-08-03 10:47:52 +08:00
|
|
|
#include "mlir/Dialect/Tensor/IR/Tensor.h"
|
2023-03-21 05:14:27 +08:00
|
|
|
#include "stablehlo/dialect/ChloOps.h"
|
2023-02-02 21:29:47 +08:00
|
|
|
#include "stablehlo/dialect/StablehloOps.h"
|
2024-01-30 01:59:33 +08:00
|
|
|
#include "torch-mlir/Conversion/TorchToStablehlo/StablehloLegalizeUtils.h"
|
2022-08-03 10:47:52 +08:00
|
|
|
#include "torch-mlir/Conversion/Utils/Utils.h"
|
|
|
|
#include "torch-mlir/Dialect/Torch/IR/TorchDialect.h"
|
|
|
|
#include "torch-mlir/Dialect/Torch/IR/TorchOps.h"
|
|
|
|
#include "torch-mlir/Dialect/Torch/Utils/TorchUpstream.h"
|
|
|
|
#include "torch-mlir/Dialect/Torch/Utils/Utils.h"
|
|
|
|
#include "torch-mlir/Dialect/TorchConversion/IR/TorchConversionOps.h"
|
|
|
|
|
|
|
|
using namespace mlir;
|
|
|
|
using namespace mlir::torch;
|
|
|
|
using namespace mlir::torch::Torch;
|
2023-02-02 21:29:47 +08:00
|
|
|
using namespace mlir::torch::torch_to_stablehlo;
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
static Value createInitialValueForReduceOp(Operation *op, Type elementTy,
|
|
|
|
PatternRewriter &rewriter) {
|
|
|
|
auto constType = RankedTensorType::get({}, elementTy);
|
2023-03-21 05:14:27 +08:00
|
|
|
if (isa<AtenSumOp, AtenSumDimIntListOp, AtenFrobeniusNormDimOp,
|
|
|
|
AtenLinalgVectorNormOp>(op)) {
|
2022-08-03 10:47:52 +08:00
|
|
|
if (elementTy.isa<mlir::FloatType>()) {
|
|
|
|
auto constAttr = DenseElementsAttr::get(
|
|
|
|
constType, {APFloat::getZero(
|
|
|
|
elementTy.cast<mlir::FloatType>().getFloatSemantics(),
|
|
|
|
/*negative=*/false)});
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.create<stablehlo::ConstantOp>(op->getLoc(), constType,
|
|
|
|
constAttr);
|
2022-08-03 10:47:52 +08:00
|
|
|
} else if (elementTy.isa<mlir::IntegerType>() &&
|
|
|
|
elementTy.getIntOrFloatBitWidth() != 8) {
|
|
|
|
auto constAttr = DenseElementsAttr::get(
|
|
|
|
constType, {APInt::getZero(elementTy.getIntOrFloatBitWidth())});
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.create<stablehlo::ConstantOp>(op->getLoc(), constType,
|
|
|
|
constAttr);
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (isa<AtenMaxOp, AtenMaxDimOp, AtenArgmaxOp>(op)) {
|
|
|
|
if (elementTy.isa<mlir::FloatType>()) {
|
|
|
|
auto constAttr = DenseElementsAttr::get(
|
2023-05-07 03:05:51 +08:00
|
|
|
constType, {APFloat::getInf(
|
2022-08-03 10:47:52 +08:00
|
|
|
elementTy.cast<mlir::FloatType>().getFloatSemantics(),
|
|
|
|
/*negative=*/true)});
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.create<stablehlo::ConstantOp>(op->getLoc(), constType,
|
|
|
|
constAttr);
|
2022-08-03 10:47:52 +08:00
|
|
|
} else if (elementTy.isa<mlir::IntegerType>() &&
|
|
|
|
elementTy.getIntOrFloatBitWidth() != 8) {
|
|
|
|
auto constAttr = DenseElementsAttr::get(
|
|
|
|
constType,
|
|
|
|
{APInt::getSignedMinValue(elementTy.getIntOrFloatBitWidth())});
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.create<stablehlo::ConstantOp>(op->getLoc(), constType,
|
|
|
|
constAttr);
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-08-30 01:12:41 +08:00
|
|
|
if (isa<AtenMinOp>(op)) {
|
|
|
|
if (elementTy.isa<mlir::FloatType>()) {
|
|
|
|
auto constAttr = DenseElementsAttr::get(
|
|
|
|
constType, {APFloat::getInf(
|
|
|
|
elementTy.cast<mlir::FloatType>().getFloatSemantics(),
|
|
|
|
/*negative=*/false)});
|
|
|
|
return rewriter.create<stablehlo::ConstantOp>(op->getLoc(), constType,
|
|
|
|
constAttr);
|
|
|
|
} else if (elementTy.isa<mlir::IntegerType>() &&
|
|
|
|
elementTy.getIntOrFloatBitWidth() != 8) {
|
|
|
|
auto constAttr = DenseElementsAttr::get(
|
|
|
|
constType,
|
|
|
|
{APInt::getSignedMaxValue(elementTy.getIntOrFloatBitWidth())});
|
|
|
|
return rewriter.create<stablehlo::ConstantOp>(op->getLoc(), constType,
|
|
|
|
constAttr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-08-03 10:47:52 +08:00
|
|
|
op->emitError("unimplemented lowering in "
|
|
|
|
"createInitialValueForReduceOp");
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Util for converting AtenArgmaxOp and AtenMaxDimOp
|
2022-12-20 18:17:27 +08:00
|
|
|
static std::optional<ValueRange>
|
2022-08-03 10:47:52 +08:00
|
|
|
getMaxInDim(ConversionPatternRewriter &rewriter, Operation *op, Value &input,
|
2022-09-01 10:36:02 +08:00
|
|
|
ArrayRef<Value> inputShapeVec, int64_t dim,
|
|
|
|
size_t dimSizeIndexBits) {
|
2022-08-03 10:47:52 +08:00
|
|
|
auto inputTy = input.getType().template cast<RankedTensorType>();
|
|
|
|
if (!inputTy) {
|
2022-12-14 18:44:05 +08:00
|
|
|
return std::nullopt;
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
if (!inputTy.getElementType().isIntOrFloat()) {
|
2022-12-14 18:44:05 +08:00
|
|
|
return std::nullopt;
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
auto inputShape = inputTy.getShape();
|
|
|
|
auto inputElemTy = inputTy.getElementType();
|
|
|
|
|
|
|
|
Value initValue = createInitialValueForReduceOp(op, inputElemTy, rewriter);
|
2022-12-14 18:44:05 +08:00
|
|
|
if (!initValue)
|
|
|
|
return std::nullopt;
|
2022-08-09 17:02:50 +08:00
|
|
|
Value initIndex;
|
2022-09-01 10:36:02 +08:00
|
|
|
if (dimSizeIndexBits == 32) {
|
2023-02-02 21:29:47 +08:00
|
|
|
initIndex = hlo::getConstTensor<int32_t>(rewriter, op, {0}, {}).value();
|
2022-08-09 17:02:50 +08:00
|
|
|
} else {
|
2023-02-02 21:29:47 +08:00
|
|
|
initIndex = hlo::getConstTensor<int64_t>(rewriter, op, {0}, {}).value();
|
2022-08-09 17:02:50 +08:00
|
|
|
}
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
auto inputShapeTensor = rewriter.create<mlir::tensor::FromElementsOp>(
|
|
|
|
op->getLoc(), inputShapeVec);
|
2023-02-02 21:29:47 +08:00
|
|
|
auto indexTensor = rewriter.create<stablehlo::DynamicIotaOp>(
|
2022-09-01 10:36:02 +08:00
|
|
|
op->getLoc(),
|
|
|
|
RankedTensorType::get(inputShape,
|
|
|
|
rewriter.getIntegerType(dimSizeIndexBits)),
|
2022-08-03 10:47:52 +08:00
|
|
|
inputShapeTensor, static_cast<uint64_t>(dim));
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
auto stablehloReduceOp = rewriter.create<stablehlo::ReduceOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), ValueRange{input, indexTensor},
|
|
|
|
ValueRange{
|
|
|
|
initValue,
|
|
|
|
initIndex,
|
|
|
|
},
|
Bump stablehlo to openxla/stablehlo@fd52182f76cadb82f2064fe5fc49a4fb4347a826 (#2821)
With the recent LLVM integrate and changes from
https://github.com/llvm/llvm-project/pull/78260, we hit this build error
in Stablehlo (which is quite old).
```
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1020:14: error: no member named 'startRootUpdate' in 'mlir::PatternRewriter'
rewriter.startRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1026:16: error: no member named 'finalizeRootUpdate' in 'mlir::PatternRewriter'
rewriter.finalizeRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1029:16: error: no member named 'cancelRootUpdate' in 'mlir::PatternRewriter'
rewriter.cancelRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1108:14: error: no member named 'updateRootInPlace' in 'mlir::PatternRewriter'
rewriter.updateRootInPlace(op->getParentOp(), [&]() { return; });
~~~~~~~~ ^
4 errors generated.
Target @torch-mlir//:torch-mlir-opt failed to build
```
I'm still puzzled as to how this didn't fail with the CMake merge gating
CI (do we not test Stablehlo builds/tests?). In any case, bumping our
submodule to https://github.com/openxla/stablehlo/pull/1918 fixes it.
It exposes a new failing lit test in TorchToStablehlo though, that I
have looped stablehlo developers into
([here](https://discord.com/channels/999073994483433573/999074539138990131/1201235845391331419)).
```
bazel run @torch-mlir//test/Conversion:TorchToStablehlo/scatter.mlir.test
...external/torch-mlir/test/Conversion/TorchToStablehlo/scatter.mlir
within split at <stdin>:1 offset :33:8: error: unexpected error: Expects non-empty reduction block for type inference
%0 = torch.aten.scatter.src %arg0, %int0, %arg1, %arg2 : !torch.vtensor<[?,?],si64>, !torch.int, !torch.vtensor<[?,?],si64>, !torch.vtensor<[?,?],si64> -> !torch.vtensor<[?,?],si64>
^
LLVM ERROR: Failed to infer result type(s).
```
Bazel CI:
https://github.com/sjain-stanford/torch-mlir/actions/runs/7732673480/job/21083102228
2024-02-01 06:21:17 +08:00
|
|
|
rewriter.getDenseI64ArrayAttr(dim));
|
2022-08-03 10:47:52 +08:00
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
Block &block = stablehloReduceOp.getBody().emplaceBlock();
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
// Add block arguments
|
|
|
|
auto blockValArgumentType =
|
|
|
|
RankedTensorType::get({}, inputTy.getElementType());
|
2022-09-01 10:36:02 +08:00
|
|
|
auto blockIdxArgumentType =
|
|
|
|
RankedTensorType::get({}, rewriter.getIntegerType(dimSizeIndexBits));
|
2022-08-03 10:47:52 +08:00
|
|
|
auto compareResultType = RankedTensorType::get({}, rewriter.getI1Type());
|
|
|
|
block.addArgument(blockValArgumentType, op->getLoc());
|
|
|
|
block.addArgument(blockIdxArgumentType, op->getLoc());
|
|
|
|
|
|
|
|
block.addArgument(blockValArgumentType, op->getLoc());
|
|
|
|
block.addArgument(blockIdxArgumentType, op->getLoc());
|
|
|
|
|
|
|
|
auto *firstValArg = block.args_begin();
|
|
|
|
auto *firstIdxArg = std::next(firstValArg);
|
|
|
|
auto *secondValArg = std::next(firstIdxArg);
|
|
|
|
auto *secondIdxArg = std::next(secondValArg);
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
stablehlo::ComparisonTypeAttr compareTypeAttr;
|
2022-08-03 10:47:52 +08:00
|
|
|
if (inputTy.getElementType().isa<mlir::FloatType>()) {
|
2023-02-02 21:29:47 +08:00
|
|
|
compareTypeAttr = stablehlo::ComparisonTypeAttr::get(
|
|
|
|
rewriter.getContext(), stablehlo::ComparisonType::FLOAT);
|
2022-08-03 10:47:52 +08:00
|
|
|
} else if (inputTy.getElementType().isa<mlir::IntegerType>()) {
|
2023-02-02 21:29:47 +08:00
|
|
|
compareTypeAttr = stablehlo::ComparisonTypeAttr::get(
|
|
|
|
rewriter.getContext(), stablehlo::ComparisonType::SIGNED);
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
2023-02-02 21:29:47 +08:00
|
|
|
stablehlo::ComparisonDirectionAttr compareGeDirectionAttr =
|
|
|
|
stablehlo::ComparisonDirectionAttr::get(
|
|
|
|
rewriter.getContext(), stablehlo::ComparisonDirection::GE);
|
|
|
|
stablehlo::ComparisonDirectionAttr compareEqDirectionAttr =
|
|
|
|
stablehlo::ComparisonDirectionAttr::get(
|
|
|
|
rewriter.getContext(), stablehlo::ComparisonDirection::EQ);
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
{
|
|
|
|
OpBuilder::InsertionGuard guard(rewriter);
|
|
|
|
rewriter.setInsertionPointToStart(&block);
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
Value compareGeResult = rewriter.create<stablehlo::CompareOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), compareResultType, *firstValArg, *secondValArg,
|
|
|
|
compareGeDirectionAttr, compareTypeAttr);
|
2023-02-02 21:29:47 +08:00
|
|
|
Value retValResult = rewriter.create<stablehlo::SelectOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), compareGeResult, *firstValArg, *secondValArg);
|
|
|
|
|
|
|
|
// get smaller index value if compared nums are equal.
|
2023-02-02 21:29:47 +08:00
|
|
|
Value compareEqResult = rewriter.create<stablehlo::CompareOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), compareResultType, *firstValArg, *secondValArg,
|
|
|
|
compareEqDirectionAttr, compareTypeAttr);
|
2023-02-02 21:29:47 +08:00
|
|
|
Value minIdx = rewriter.create<stablehlo::MinOp>(op->getLoc(), *firstIdxArg,
|
|
|
|
*secondIdxArg);
|
|
|
|
Value idxWithGeVal = rewriter.create<stablehlo::SelectOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), compareGeResult, *firstIdxArg, *secondIdxArg);
|
2023-02-02 21:29:47 +08:00
|
|
|
Value retIdxResult = rewriter.create<stablehlo::SelectOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), compareEqResult, minIdx, idxWithGeVal);
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.create<stablehlo::ReturnOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), mlir::ValueRange{retValResult, retIdxResult});
|
|
|
|
}
|
2023-02-02 21:29:47 +08:00
|
|
|
return stablehloReduceOp.getResults();
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
namespace {
|
|
|
|
template <typename AtenOpT>
|
2022-09-01 10:36:02 +08:00
|
|
|
class ConvertAtenReductionOp : public ConvertAtenOp<AtenOpT> {
|
2022-08-03 10:47:52 +08:00
|
|
|
public:
|
2022-09-01 10:36:02 +08:00
|
|
|
using ConvertAtenOp<AtenOpT>::ConvertAtenOp;
|
2022-08-03 10:47:52 +08:00
|
|
|
using OpAdaptor = typename AtenOpT::Adaptor;
|
|
|
|
LogicalResult
|
|
|
|
matchAndRewrite(AtenOpT op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const override;
|
|
|
|
};
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
// AtenArgmaxOp
|
|
|
|
namespace {
|
|
|
|
template <>
|
|
|
|
LogicalResult ConvertAtenReductionOp<AtenArgmaxOp>::matchAndRewrite(
|
|
|
|
AtenArgmaxOp op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const {
|
2022-12-08 04:20:41 +08:00
|
|
|
Value input = adaptor.getSelf();
|
2022-08-03 10:47:52 +08:00
|
|
|
auto inputTy = input.getType().template cast<RankedTensorType>();
|
|
|
|
if (!inputTy) {
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "only Tensor types supported in StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
auto inputElemTy = inputTy.getElementType();
|
|
|
|
if (!inputElemTy.isIntOrFloat()) {
|
|
|
|
return op.emitError(
|
|
|
|
"only floating-point or integer datatype legalization supported");
|
|
|
|
}
|
|
|
|
// Currently, (u)int8 dtype is not supported!
|
|
|
|
if (inputElemTy.isa<mlir::IntegerType>() &&
|
|
|
|
inputElemTy.getIntOrFloatBitWidth() == 8) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "IntegerType with bitwidth 8 unsupported in convertion from "
|
2023-02-02 21:29:47 +08:00
|
|
|
"AtenArgmaxOp to StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
int64_t dim;
|
2022-12-08 04:20:41 +08:00
|
|
|
if (!matchPattern(op.getDim(), m_TorchConstantInt(&dim))) {
|
2022-08-03 10:47:52 +08:00
|
|
|
return rewriter.notifyMatchFailure(op, "non-int dim unsupported");
|
|
|
|
}
|
|
|
|
dim = toPositiveDim(dim, inputTy.getRank());
|
|
|
|
if (!isValidDim(dim, inputTy.getRank())) {
|
|
|
|
return rewriter.notifyMatchFailure(op, "dim is not a valid dim");
|
|
|
|
}
|
|
|
|
|
|
|
|
bool keepDim = false;
|
2022-12-08 04:20:41 +08:00
|
|
|
if (!matchPattern(op.getKeepdim(), m_TorchConstantBool(&keepDim))) {
|
2022-08-03 10:47:52 +08:00
|
|
|
return rewriter.notifyMatchFailure(op, "non-bool keepdim unsupported");
|
|
|
|
}
|
|
|
|
|
2022-09-01 10:36:02 +08:00
|
|
|
const auto &options = getOptions();
|
|
|
|
auto inputShapeInfo =
|
2023-02-02 21:29:47 +08:00
|
|
|
hlo::getDimSizesOfTensor(rewriter, op, input, options.dimSizeIndexBits);
|
2022-08-03 10:47:52 +08:00
|
|
|
if (failed(inputShapeInfo)) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "failed to get dimension sizes of the input");
|
|
|
|
}
|
|
|
|
auto inputShapeVec = *inputShapeInfo;
|
2023-02-02 21:29:47 +08:00
|
|
|
auto stablehloReduceResults = getMaxInDim(rewriter, op, input, inputShapeVec,
|
|
|
|
dim, options.dimSizeIndexBits)
|
|
|
|
.value();
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
if (keepDim) {
|
|
|
|
auto outShapeVec = inputShapeVec;
|
|
|
|
outShapeVec[dim] = rewriter.create<mlir::arith::ConstantOp>(
|
2022-09-01 10:36:02 +08:00
|
|
|
op->getLoc(),
|
|
|
|
rewriter.getIntegerAttr(
|
|
|
|
rewriter.getIntegerType(options.dimSizeIndexBits), 1));
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
auto outShapeTensor = rewriter.create<mlir::tensor::FromElementsOp>(
|
|
|
|
op->getLoc(), outShapeVec);
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.replaceOpWithNewOp<stablehlo::DynamicReshapeOp>(
|
|
|
|
op, typeConverter->convertType(op.getType()), stablehloReduceResults[1],
|
2022-08-03 10:47:52 +08:00
|
|
|
outShapeTensor);
|
|
|
|
return success();
|
|
|
|
}
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.replaceOp(op, stablehloReduceResults[1]);
|
2022-08-03 10:47:52 +08:00
|
|
|
return success();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
// AtenMaxDimOp
|
|
|
|
namespace {
|
|
|
|
template <>
|
|
|
|
LogicalResult ConvertAtenReductionOp<AtenMaxDimOp>::matchAndRewrite(
|
|
|
|
AtenMaxDimOp op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const {
|
2022-12-08 04:20:41 +08:00
|
|
|
Value input = adaptor.getSelf();
|
2022-08-03 10:47:52 +08:00
|
|
|
auto inputTy = input.getType().template dyn_cast<RankedTensorType>();
|
|
|
|
if (!inputTy) {
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "only Tensor types supported in StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
auto inputElemTy = inputTy.getElementType();
|
|
|
|
if (!inputElemTy.isIntOrFloat()) {
|
|
|
|
return op.emitError(
|
|
|
|
"Only floating-point or integer datatype legalization supported");
|
|
|
|
}
|
|
|
|
// Currently, (u)int8 dtype is not supported
|
|
|
|
if (inputElemTy.isa<mlir::IntegerType>() &&
|
|
|
|
inputElemTy.getIntOrFloatBitWidth() == 8) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "IntegerType with bitwidth 8 unsupported in convertion from "
|
2023-02-02 21:29:47 +08:00
|
|
|
"AtenMaxDimOp to StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
RankedTensorType valResultType = getTypeConverter()
|
|
|
|
->convertType(op.getResult(0).getType())
|
|
|
|
.template cast<RankedTensorType>();
|
|
|
|
RankedTensorType idxResultType = getTypeConverter()
|
|
|
|
->convertType(op.getResult(1).getType())
|
|
|
|
.template cast<RankedTensorType>();
|
|
|
|
Type idxElementType = idxResultType.getElementType();
|
|
|
|
if (!idxElementType.isa<mlir::IntegerType>()) {
|
|
|
|
return op.emitError("Aten.max.dim needs integer-like result");
|
|
|
|
}
|
|
|
|
|
|
|
|
int64_t dim;
|
2022-12-08 04:20:41 +08:00
|
|
|
if (!matchPattern(op.getDim(), m_TorchConstantInt(&dim))) {
|
2022-08-03 10:47:52 +08:00
|
|
|
return rewriter.notifyMatchFailure(op, "non-int dim unsupported");
|
|
|
|
}
|
|
|
|
dim = toPositiveDim(dim, inputTy.getRank());
|
|
|
|
if (!isValidDim(dim, inputTy.getRank())) {
|
|
|
|
return rewriter.notifyMatchFailure(op, "dim is not a valid dim");
|
|
|
|
}
|
|
|
|
bool keepDim = false;
|
2022-12-08 04:20:41 +08:00
|
|
|
if (!matchPattern(op.getKeepdim(), m_TorchConstantBool(&keepDim))) {
|
2022-08-03 10:47:52 +08:00
|
|
|
return rewriter.notifyMatchFailure(op, "non-bool keepdim unsupported");
|
|
|
|
}
|
|
|
|
|
2022-09-01 10:36:02 +08:00
|
|
|
const auto &options = getOptions();
|
|
|
|
auto inputShapeInfo =
|
2023-02-02 21:29:47 +08:00
|
|
|
hlo::getDimSizesOfTensor(rewriter, op, input, options.dimSizeIndexBits);
|
2022-08-03 10:47:52 +08:00
|
|
|
if (failed(inputShapeInfo)) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "failed to get dimension sizes of the input");
|
|
|
|
}
|
|
|
|
auto inputShapeVec = *inputShapeInfo;
|
2023-02-02 21:29:47 +08:00
|
|
|
auto stablehloReduceResults = getMaxInDim(rewriter, op, input, inputShapeVec,
|
|
|
|
dim, options.dimSizeIndexBits)
|
|
|
|
.value();
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
if (keepDim) {
|
|
|
|
auto outShapeVec = inputShapeVec;
|
|
|
|
outShapeVec[dim] = rewriter.create<mlir::arith::ConstantOp>(
|
2022-09-01 10:36:02 +08:00
|
|
|
op->getLoc(),
|
|
|
|
rewriter.getIntegerAttr(
|
|
|
|
rewriter.getIntegerType(options.dimSizeIndexBits), 1));
|
2022-08-03 10:47:52 +08:00
|
|
|
auto outShapeTensor = rewriter.create<mlir::tensor::FromElementsOp>(
|
|
|
|
op->getLoc(), outShapeVec);
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
auto stablehloReduceValueResult =
|
|
|
|
rewriter.create<stablehlo::DynamicReshapeOp>(
|
|
|
|
op->getLoc(), valResultType, stablehloReduceResults[0],
|
|
|
|
outShapeTensor);
|
|
|
|
auto stablehloReduceIndexResult =
|
|
|
|
rewriter.create<stablehlo::DynamicReshapeOp>(
|
|
|
|
op->getLoc(), idxResultType, stablehloReduceResults[1],
|
|
|
|
outShapeTensor);
|
|
|
|
rewriter.replaceOp(
|
|
|
|
op, {stablehloReduceValueResult, stablehloReduceIndexResult});
|
2022-08-03 10:47:52 +08:00
|
|
|
return success();
|
|
|
|
}
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.replaceOp(op,
|
|
|
|
{stablehloReduceResults[0], stablehloReduceResults[1]});
|
2022-08-03 10:47:52 +08:00
|
|
|
return success();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
// AtenSumOp
|
|
|
|
namespace {
|
|
|
|
template <>
|
|
|
|
LogicalResult ConvertAtenReductionOp<AtenSumOp>::matchAndRewrite(
|
|
|
|
AtenSumOp op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const {
|
2022-12-08 04:20:41 +08:00
|
|
|
Value input = adaptor.getSelf();
|
2022-08-03 10:47:52 +08:00
|
|
|
auto inputTy = input.getType().dyn_cast<RankedTensorType>();
|
2022-11-23 15:02:41 +08:00
|
|
|
auto outTy = getTypeConverter()
|
|
|
|
->convertType(op.getType())
|
|
|
|
.template dyn_cast<RankedTensorType>();
|
2022-08-03 10:47:52 +08:00
|
|
|
if (!inputTy) {
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "only Tensor types supported in StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
2022-11-23 15:02:41 +08:00
|
|
|
if (inputTy.getElementType() != outTy.getElementType()) {
|
|
|
|
// Use output element type as computation type.
|
|
|
|
auto dstElemTy = outTy.getElementType();
|
2023-02-02 21:29:47 +08:00
|
|
|
input =
|
|
|
|
rewriter.create<stablehlo::ConvertOp>(op->getLoc(), input, dstElemTy);
|
2022-08-03 10:47:52 +08:00
|
|
|
inputTy = input.getType().dyn_cast<RankedTensorType>();
|
|
|
|
}
|
|
|
|
auto inputElemTy = inputTy.getElementType();
|
|
|
|
if (!inputElemTy.isIntOrFloat()) {
|
|
|
|
return op.emitError(
|
|
|
|
"only floating-point or integer datatype legalization supported");
|
|
|
|
}
|
|
|
|
// Currently, (u)int8 dtype is not supported
|
|
|
|
if (inputElemTy.isa<mlir::IntegerType>() &&
|
|
|
|
inputElemTy.getIntOrFloatBitWidth() == 8) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "IntegerType with bitwidth 8 unsupported in convertion from "
|
2023-02-02 21:29:47 +08:00
|
|
|
"AtenSumOp to StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
SmallVector<int64_t> dims;
|
|
|
|
for (int64_t i = 0; i < inputTy.getRank(); i++) {
|
|
|
|
dims.push_back(i);
|
|
|
|
}
|
|
|
|
Value initValue =
|
|
|
|
createInitialValueForReduceOp(op, inputTy.getElementType(), rewriter);
|
2023-02-02 21:29:47 +08:00
|
|
|
if (!initValue)
|
|
|
|
return failure();
|
2022-08-03 10:47:52 +08:00
|
|
|
|
2022-11-23 15:02:41 +08:00
|
|
|
llvm::sort(dims.begin(), dims.end());
|
2023-02-02 21:29:47 +08:00
|
|
|
auto stablehloReduceOp = rewriter.create<stablehlo::ReduceOp>(
|
Bump stablehlo to openxla/stablehlo@fd52182f76cadb82f2064fe5fc49a4fb4347a826 (#2821)
With the recent LLVM integrate and changes from
https://github.com/llvm/llvm-project/pull/78260, we hit this build error
in Stablehlo (which is quite old).
```
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1020:14: error: no member named 'startRootUpdate' in 'mlir::PatternRewriter'
rewriter.startRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1026:16: error: no member named 'finalizeRootUpdate' in 'mlir::PatternRewriter'
rewriter.finalizeRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1029:16: error: no member named 'cancelRootUpdate' in 'mlir::PatternRewriter'
rewriter.cancelRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1108:14: error: no member named 'updateRootInPlace' in 'mlir::PatternRewriter'
rewriter.updateRootInPlace(op->getParentOp(), [&]() { return; });
~~~~~~~~ ^
4 errors generated.
Target @torch-mlir//:torch-mlir-opt failed to build
```
I'm still puzzled as to how this didn't fail with the CMake merge gating
CI (do we not test Stablehlo builds/tests?). In any case, bumping our
submodule to https://github.com/openxla/stablehlo/pull/1918 fixes it.
It exposes a new failing lit test in TorchToStablehlo though, that I
have looped stablehlo developers into
([here](https://discord.com/channels/999073994483433573/999074539138990131/1201235845391331419)).
```
bazel run @torch-mlir//test/Conversion:TorchToStablehlo/scatter.mlir.test
...external/torch-mlir/test/Conversion/TorchToStablehlo/scatter.mlir
within split at <stdin>:1 offset :33:8: error: unexpected error: Expects non-empty reduction block for type inference
%0 = torch.aten.scatter.src %arg0, %int0, %arg1, %arg2 : !torch.vtensor<[?,?],si64>, !torch.int, !torch.vtensor<[?,?],si64>, !torch.vtensor<[?,?],si64> -> !torch.vtensor<[?,?],si64>
^
LLVM ERROR: Failed to infer result type(s).
```
Bazel CI:
https://github.com/sjain-stanford/torch-mlir/actions/runs/7732673480/job/21083102228
2024-02-01 06:21:17 +08:00
|
|
|
op.getLoc(), input, initValue, rewriter.getDenseI64ArrayAttr(dims));
|
2022-08-03 10:47:52 +08:00
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
Block &block = stablehloReduceOp.getBody().emplaceBlock();
|
2022-08-03 10:47:52 +08:00
|
|
|
auto blockArgumentTy = RankedTensorType::get({}, inputTy.getElementType());
|
|
|
|
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
|
|
|
|
auto *firstArgument = block.args_begin();
|
|
|
|
auto secondArgument = block.args_rbegin();
|
|
|
|
|
|
|
|
{
|
|
|
|
OpBuilder::InsertionGuard guard(rewriter);
|
|
|
|
rewriter.setInsertionPointToStart(&block);
|
2023-02-02 21:29:47 +08:00
|
|
|
Value addResult = rewriter.create<stablehlo::AddOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), blockArgumentTy, *firstArgument, *secondArgument);
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.create<stablehlo::ReturnOp>(op->getLoc(), addResult);
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
2022-11-23 15:02:41 +08:00
|
|
|
rewriter.replaceOpWithNewOp<tensor::CastOp>(op, outTy,
|
2023-02-02 21:29:47 +08:00
|
|
|
stablehloReduceOp.getResults());
|
2022-08-03 10:47:52 +08:00
|
|
|
return success();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
// AtenMaxOp
|
|
|
|
namespace {
|
|
|
|
template <>
|
|
|
|
LogicalResult ConvertAtenReductionOp<AtenMaxOp>::matchAndRewrite(
|
|
|
|
AtenMaxOp op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const {
|
2022-12-08 04:20:41 +08:00
|
|
|
Value input = adaptor.getSelf();
|
2022-08-03 10:47:52 +08:00
|
|
|
auto inputTy = input.getType().dyn_cast<RankedTensorType>();
|
|
|
|
if (!inputTy) {
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "only Tensor types supported in StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
auto inputElemTy = inputTy.getElementType();
|
|
|
|
if (!inputElemTy.isIntOrFloat()) {
|
|
|
|
return op.emitError(
|
|
|
|
"only floating-point or integer datatype legalization supported");
|
|
|
|
}
|
|
|
|
// Currently, (u)int8 dtype is not supported
|
|
|
|
if (inputElemTy.isa<mlir::IntegerType>() &&
|
|
|
|
inputElemTy.getIntOrFloatBitWidth() == 8) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "IntegerType with bitwidth 8 unsupported in convertion from "
|
2023-02-02 21:29:47 +08:00
|
|
|
"AtenMaxOp to StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
SmallVector<int64_t> dims;
|
|
|
|
for (int64_t i = 0; i < inputTy.getRank(); i++) {
|
|
|
|
dims.push_back(i);
|
|
|
|
}
|
|
|
|
|
|
|
|
Value initValue =
|
|
|
|
createInitialValueForReduceOp(op, inputTy.getElementType(), rewriter);
|
2023-02-02 21:29:47 +08:00
|
|
|
if (!initValue)
|
|
|
|
return failure();
|
2022-11-23 15:02:41 +08:00
|
|
|
llvm::sort(dims.begin(), dims.end());
|
2023-02-02 21:29:47 +08:00
|
|
|
auto stablehloReduceOp = rewriter.create<stablehlo::ReduceOp>(
|
Bump stablehlo to openxla/stablehlo@fd52182f76cadb82f2064fe5fc49a4fb4347a826 (#2821)
With the recent LLVM integrate and changes from
https://github.com/llvm/llvm-project/pull/78260, we hit this build error
in Stablehlo (which is quite old).
```
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1020:14: error: no member named 'startRootUpdate' in 'mlir::PatternRewriter'
rewriter.startRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1026:16: error: no member named 'finalizeRootUpdate' in 'mlir::PatternRewriter'
rewriter.finalizeRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1029:16: error: no member named 'cancelRootUpdate' in 'mlir::PatternRewriter'
rewriter.cancelRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1108:14: error: no member named 'updateRootInPlace' in 'mlir::PatternRewriter'
rewriter.updateRootInPlace(op->getParentOp(), [&]() { return; });
~~~~~~~~ ^
4 errors generated.
Target @torch-mlir//:torch-mlir-opt failed to build
```
I'm still puzzled as to how this didn't fail with the CMake merge gating
CI (do we not test Stablehlo builds/tests?). In any case, bumping our
submodule to https://github.com/openxla/stablehlo/pull/1918 fixes it.
It exposes a new failing lit test in TorchToStablehlo though, that I
have looped stablehlo developers into
([here](https://discord.com/channels/999073994483433573/999074539138990131/1201235845391331419)).
```
bazel run @torch-mlir//test/Conversion:TorchToStablehlo/scatter.mlir.test
...external/torch-mlir/test/Conversion/TorchToStablehlo/scatter.mlir
within split at <stdin>:1 offset :33:8: error: unexpected error: Expects non-empty reduction block for type inference
%0 = torch.aten.scatter.src %arg0, %int0, %arg1, %arg2 : !torch.vtensor<[?,?],si64>, !torch.int, !torch.vtensor<[?,?],si64>, !torch.vtensor<[?,?],si64> -> !torch.vtensor<[?,?],si64>
^
LLVM ERROR: Failed to infer result type(s).
```
Bazel CI:
https://github.com/sjain-stanford/torch-mlir/actions/runs/7732673480/job/21083102228
2024-02-01 06:21:17 +08:00
|
|
|
op.getLoc(), input, initValue, rewriter.getDenseI64ArrayAttr(dims));
|
2022-08-03 10:47:52 +08:00
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
Block &block = stablehloReduceOp.getBody().emplaceBlock();
|
2022-08-03 10:47:52 +08:00
|
|
|
auto blockArgumentTy = RankedTensorType::get({}, inputTy.getElementType());
|
|
|
|
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
|
|
|
|
auto *firstArgument = block.args_begin();
|
|
|
|
auto secondArgument = block.args_rbegin();
|
|
|
|
|
|
|
|
{
|
|
|
|
OpBuilder::InsertionGuard guard(rewriter);
|
|
|
|
rewriter.setInsertionPointToStart(&block);
|
2023-02-02 21:29:47 +08:00
|
|
|
Value maxResult = rewriter.create<stablehlo::MaxOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), blockArgumentTy, *firstArgument, *secondArgument);
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.create<stablehlo::ReturnOp>(op->getLoc(), maxResult);
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
2022-11-23 15:02:41 +08:00
|
|
|
rewriter.replaceOpWithNewOp<tensor::CastOp>(
|
|
|
|
op, getTypeConverter()->convertType(op.getType()),
|
2023-02-02 21:29:47 +08:00
|
|
|
stablehloReduceOp.getResults());
|
2022-08-03 10:47:52 +08:00
|
|
|
return success();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
2023-08-30 01:12:41 +08:00
|
|
|
// AtenMinOp
|
|
|
|
namespace {
|
|
|
|
template <>
|
|
|
|
LogicalResult ConvertAtenReductionOp<AtenMinOp>::matchAndRewrite(
|
|
|
|
AtenMinOp op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const {
|
|
|
|
Value input = adaptor.getSelf();
|
|
|
|
auto inputTy = input.getType().dyn_cast<RankedTensorType>();
|
|
|
|
if (!inputTy) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "only Tensor types supported in StableHLO");
|
|
|
|
}
|
|
|
|
auto inputElemTy = inputTy.getElementType();
|
|
|
|
if (!inputElemTy.isIntOrFloat()) {
|
|
|
|
return op.emitError(
|
|
|
|
"only floating-point or integer datatype legalization supported");
|
|
|
|
}
|
|
|
|
// Currently, (u)int8 dtype is not supported
|
|
|
|
if (inputElemTy.isa<mlir::IntegerType>() &&
|
|
|
|
inputElemTy.getIntOrFloatBitWidth() == 8) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "IntegerType with bitwidth 8 unsupported in convertion from "
|
|
|
|
"AtenMinOp to StableHLO");
|
|
|
|
}
|
|
|
|
|
|
|
|
SmallVector<int64_t> dims;
|
|
|
|
for (int64_t i = 0; i < inputTy.getRank(); i++) {
|
|
|
|
dims.push_back(i);
|
|
|
|
}
|
|
|
|
|
|
|
|
Value initValue =
|
|
|
|
createInitialValueForReduceOp(op, inputTy.getElementType(), rewriter);
|
|
|
|
if (!initValue)
|
|
|
|
return failure();
|
|
|
|
llvm::sort(dims.begin(), dims.end());
|
|
|
|
auto stablehloReduceOp = rewriter.create<stablehlo::ReduceOp>(
|
Bump stablehlo to openxla/stablehlo@fd52182f76cadb82f2064fe5fc49a4fb4347a826 (#2821)
With the recent LLVM integrate and changes from
https://github.com/llvm/llvm-project/pull/78260, we hit this build error
in Stablehlo (which is quite old).
```
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1020:14: error: no member named 'startRootUpdate' in 'mlir::PatternRewriter'
rewriter.startRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1026:16: error: no member named 'finalizeRootUpdate' in 'mlir::PatternRewriter'
rewriter.finalizeRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1029:16: error: no member named 'cancelRootUpdate' in 'mlir::PatternRewriter'
rewriter.cancelRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1108:14: error: no member named 'updateRootInPlace' in 'mlir::PatternRewriter'
rewriter.updateRootInPlace(op->getParentOp(), [&]() { return; });
~~~~~~~~ ^
4 errors generated.
Target @torch-mlir//:torch-mlir-opt failed to build
```
I'm still puzzled as to how this didn't fail with the CMake merge gating
CI (do we not test Stablehlo builds/tests?). In any case, bumping our
submodule to https://github.com/openxla/stablehlo/pull/1918 fixes it.
It exposes a new failing lit test in TorchToStablehlo though, that I
have looped stablehlo developers into
([here](https://discord.com/channels/999073994483433573/999074539138990131/1201235845391331419)).
```
bazel run @torch-mlir//test/Conversion:TorchToStablehlo/scatter.mlir.test
...external/torch-mlir/test/Conversion/TorchToStablehlo/scatter.mlir
within split at <stdin>:1 offset :33:8: error: unexpected error: Expects non-empty reduction block for type inference
%0 = torch.aten.scatter.src %arg0, %int0, %arg1, %arg2 : !torch.vtensor<[?,?],si64>, !torch.int, !torch.vtensor<[?,?],si64>, !torch.vtensor<[?,?],si64> -> !torch.vtensor<[?,?],si64>
^
LLVM ERROR: Failed to infer result type(s).
```
Bazel CI:
https://github.com/sjain-stanford/torch-mlir/actions/runs/7732673480/job/21083102228
2024-02-01 06:21:17 +08:00
|
|
|
op.getLoc(), input, initValue, rewriter.getDenseI64ArrayAttr(dims));
|
2023-08-30 01:12:41 +08:00
|
|
|
|
|
|
|
Block &block = stablehloReduceOp.getBody().emplaceBlock();
|
|
|
|
auto blockArgumentTy = RankedTensorType::get({}, inputTy.getElementType());
|
|
|
|
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
|
|
|
|
auto *firstArgument = block.args_begin();
|
|
|
|
auto secondArgument = block.args_rbegin();
|
|
|
|
|
|
|
|
{
|
|
|
|
OpBuilder::InsertionGuard guard(rewriter);
|
|
|
|
rewriter.setInsertionPointToStart(&block);
|
|
|
|
Value minResult = rewriter.create<stablehlo::MinOp>(
|
|
|
|
op->getLoc(), blockArgumentTy, *firstArgument, *secondArgument);
|
|
|
|
rewriter.create<stablehlo::ReturnOp>(op->getLoc(), minResult);
|
|
|
|
}
|
|
|
|
|
|
|
|
rewriter.replaceOpWithNewOp<tensor::CastOp>(
|
|
|
|
op, getTypeConverter()->convertType(op.getType()),
|
|
|
|
stablehloReduceOp.getResults());
|
|
|
|
return success();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
2022-08-03 10:47:52 +08:00
|
|
|
// AtenSumDimIntListOp
|
|
|
|
namespace {
|
|
|
|
template <>
|
|
|
|
LogicalResult ConvertAtenReductionOp<AtenSumDimIntListOp>::matchAndRewrite(
|
|
|
|
AtenSumDimIntListOp op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const {
|
2022-12-08 04:20:41 +08:00
|
|
|
Value input = adaptor.getSelf();
|
2022-08-03 10:47:52 +08:00
|
|
|
auto inputTy = input.getType().dyn_cast<RankedTensorType>();
|
2022-11-23 15:02:41 +08:00
|
|
|
auto outTy = getTypeConverter()
|
|
|
|
->convertType(op.getType())
|
|
|
|
.template dyn_cast<RankedTensorType>();
|
2022-08-03 10:47:52 +08:00
|
|
|
if (!inputTy) {
|
2023-02-02 21:29:47 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "only Tensor types supported in StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
2022-11-23 15:02:41 +08:00
|
|
|
if (inputTy.getElementType() != outTy.getElementType()) {
|
|
|
|
// Use output element type as computation type.
|
|
|
|
auto dstElemTy = outTy.getElementType();
|
2023-02-02 21:29:47 +08:00
|
|
|
input =
|
|
|
|
rewriter.create<stablehlo::ConvertOp>(op->getLoc(), input, dstElemTy);
|
2022-08-03 10:47:52 +08:00
|
|
|
inputTy = input.getType().dyn_cast<RankedTensorType>();
|
|
|
|
}
|
|
|
|
auto inputElemTy = inputTy.getElementType();
|
|
|
|
if (!inputElemTy.isIntOrFloat()) {
|
|
|
|
return op.emitError(
|
|
|
|
"Only floating-point or integer datatype legalization supported");
|
|
|
|
}
|
|
|
|
|
|
|
|
// Currently, (u)int8 dtype is not supported
|
|
|
|
if (inputElemTy.isa<mlir::IntegerType>() &&
|
|
|
|
inputElemTy.getIntOrFloatBitWidth() == 8) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "IntegerType with bitwidth 8 unsupported in convertion from "
|
2023-02-02 21:29:47 +08:00
|
|
|
"AtenSumDimIntListOp to StableHLO");
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
SmallVector<int64_t> inputDims;
|
|
|
|
SmallVector<int64_t> dims;
|
2022-12-08 04:20:41 +08:00
|
|
|
if (!matchPattern(op.getDim(), m_TorchListOfConstantInts(inputDims))) {
|
2022-08-03 10:47:52 +08:00
|
|
|
return rewriter.notifyMatchFailure(op, "non-int dim list unsupported");
|
|
|
|
}
|
2022-08-23 16:47:21 +08:00
|
|
|
if (inputDims.size() == 0) {
|
|
|
|
inputDims = llvm::to_vector<4>(llvm::seq<int64_t>(0, inputTy.getRank()));
|
|
|
|
}
|
2022-08-03 10:47:52 +08:00
|
|
|
|
|
|
|
for (auto d : inputDims) {
|
|
|
|
d = toPositiveDim(d, inputTy.getRank());
|
|
|
|
// Drop invalid dims
|
|
|
|
if (isValidDim(d, inputTy.getRank())) {
|
|
|
|
dims.push_back(d);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
bool keepDim = false;
|
2022-12-08 04:20:41 +08:00
|
|
|
if (!matchPattern(op.getKeepdim(), m_TorchConstantBool(&keepDim))) {
|
2022-08-03 10:47:52 +08:00
|
|
|
return rewriter.notifyMatchFailure(op, "non-bool keepdim unsupported");
|
|
|
|
}
|
|
|
|
Value initValue =
|
|
|
|
createInitialValueForReduceOp(op, inputTy.getElementType(), rewriter);
|
2023-02-02 21:29:47 +08:00
|
|
|
if (!initValue)
|
|
|
|
return failure();
|
2022-08-03 10:47:52 +08:00
|
|
|
|
2022-11-23 15:02:41 +08:00
|
|
|
llvm::sort(dims.begin(), dims.end());
|
2023-02-02 21:29:47 +08:00
|
|
|
auto stablehloReduceOp = rewriter.create<stablehlo::ReduceOp>(
|
Bump stablehlo to openxla/stablehlo@fd52182f76cadb82f2064fe5fc49a4fb4347a826 (#2821)
With the recent LLVM integrate and changes from
https://github.com/llvm/llvm-project/pull/78260, we hit this build error
in Stablehlo (which is quite old).
```
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1020:14: error: no member named 'startRootUpdate' in 'mlir::PatternRewriter'
rewriter.startRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1026:16: error: no member named 'finalizeRootUpdate' in 'mlir::PatternRewriter'
rewriter.finalizeRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1029:16: error: no member named 'cancelRootUpdate' in 'mlir::PatternRewriter'
rewriter.cancelRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1108:14: error: no member named 'updateRootInPlace' in 'mlir::PatternRewriter'
rewriter.updateRootInPlace(op->getParentOp(), [&]() { return; });
~~~~~~~~ ^
4 errors generated.
Target @torch-mlir//:torch-mlir-opt failed to build
```
I'm still puzzled as to how this didn't fail with the CMake merge gating
CI (do we not test Stablehlo builds/tests?). In any case, bumping our
submodule to https://github.com/openxla/stablehlo/pull/1918 fixes it.
It exposes a new failing lit test in TorchToStablehlo though, that I
have looped stablehlo developers into
([here](https://discord.com/channels/999073994483433573/999074539138990131/1201235845391331419)).
```
bazel run @torch-mlir//test/Conversion:TorchToStablehlo/scatter.mlir.test
...external/torch-mlir/test/Conversion/TorchToStablehlo/scatter.mlir
within split at <stdin>:1 offset :33:8: error: unexpected error: Expects non-empty reduction block for type inference
%0 = torch.aten.scatter.src %arg0, %int0, %arg1, %arg2 : !torch.vtensor<[?,?],si64>, !torch.int, !torch.vtensor<[?,?],si64>, !torch.vtensor<[?,?],si64> -> !torch.vtensor<[?,?],si64>
^
LLVM ERROR: Failed to infer result type(s).
```
Bazel CI:
https://github.com/sjain-stanford/torch-mlir/actions/runs/7732673480/job/21083102228
2024-02-01 06:21:17 +08:00
|
|
|
op.getLoc(), input, initValue, rewriter.getDenseI64ArrayAttr(dims));
|
2022-08-03 10:47:52 +08:00
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
Region ®ion = stablehloReduceOp.getBody();
|
2022-08-03 10:47:52 +08:00
|
|
|
Block &block = region.emplaceBlock();
|
|
|
|
auto blockArgumentTy = RankedTensorType::get({}, inputTy.getElementType());
|
|
|
|
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
|
|
|
|
auto *firstArgument = block.args_begin();
|
|
|
|
auto secondArgument = block.args_rbegin();
|
|
|
|
|
|
|
|
{
|
|
|
|
OpBuilder::InsertionGuard guard(rewriter);
|
|
|
|
rewriter.setInsertionPointToStart(&block);
|
2023-02-02 21:29:47 +08:00
|
|
|
Value addResult = rewriter.create<stablehlo::AddOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op->getLoc(), blockArgumentTy, *firstArgument, *secondArgument);
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.create<stablehlo::ReturnOp>(op->getLoc(), addResult);
|
2022-08-03 10:47:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (keepDim) {
|
2022-09-01 10:36:02 +08:00
|
|
|
const auto &options = getOptions();
|
2023-02-02 21:29:47 +08:00
|
|
|
auto outShapeInfo =
|
|
|
|
hlo::getDimSizesOfTensor(rewriter, op, input, options.dimSizeIndexBits);
|
2022-08-03 10:47:52 +08:00
|
|
|
if (failed(outShapeInfo)) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "failed to get dimension sizes of the input");
|
|
|
|
}
|
|
|
|
auto outShapeVec = *outShapeInfo;
|
|
|
|
auto one = rewriter.create<mlir::arith::ConstantOp>(
|
2022-09-01 10:36:02 +08:00
|
|
|
op->getLoc(),
|
|
|
|
rewriter.getIntegerAttr(
|
|
|
|
rewriter.getIntegerType(options.dimSizeIndexBits), 1));
|
2022-08-03 10:47:52 +08:00
|
|
|
for (int64_t i : dims) {
|
|
|
|
outShapeVec[i] = one;
|
|
|
|
}
|
|
|
|
auto outShapeTensor = rewriter.create<mlir::tensor::FromElementsOp>(
|
|
|
|
op->getLoc(), outShapeVec);
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.replaceOpWithNewOp<stablehlo::DynamicReshapeOp>(
|
2022-08-03 10:47:52 +08:00
|
|
|
op, getTypeConverter()->convertType(op.getType()),
|
2023-02-02 21:29:47 +08:00
|
|
|
stablehloReduceOp.getResult(0), outShapeTensor);
|
2022-08-03 10:47:52 +08:00
|
|
|
return success();
|
|
|
|
}
|
2022-11-23 15:02:41 +08:00
|
|
|
rewriter.replaceOpWithNewOp<tensor::CastOp>(op, outTy,
|
2023-02-02 21:29:47 +08:00
|
|
|
stablehloReduceOp.getResults());
|
2022-08-03 10:47:52 +08:00
|
|
|
return success();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
2022-09-08 10:15:36 +08:00
|
|
|
// AtenFrobeniusNormDimOp
|
2023-02-02 21:29:47 +08:00
|
|
|
// aten.frobenius_norm.dim => stablehlo.reduce(calculate square sum along given
|
2023-03-21 05:14:27 +08:00
|
|
|
// dims) + stablehlo.sqrt
|
2022-09-08 10:15:36 +08:00
|
|
|
namespace {
|
|
|
|
template <>
|
|
|
|
LogicalResult ConvertAtenReductionOp<AtenFrobeniusNormDimOp>::matchAndRewrite(
|
|
|
|
AtenFrobeniusNormDimOp op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const {
|
2023-02-02 21:29:47 +08:00
|
|
|
const TorchToStablehloOptions &options = getOptions();
|
2022-09-08 10:15:36 +08:00
|
|
|
|
2022-12-08 04:20:41 +08:00
|
|
|
Value input = adaptor.getSelf();
|
2022-09-08 10:15:36 +08:00
|
|
|
auto inputType = input.getType().dyn_cast<RankedTensorType>();
|
|
|
|
if (!inputType) {
|
|
|
|
return op.emitError(
|
|
|
|
"only ranked tensor input supported in AtenFrobeniusNormDimOp");
|
|
|
|
}
|
|
|
|
auto inputRank = inputType.getRank();
|
|
|
|
auto inputElemType = inputType.getElementType();
|
|
|
|
if (!inputElemType.isa<mlir::FloatType>()) {
|
|
|
|
return op.emitError(
|
|
|
|
"only float dtype allowed in input tensor of AtenFrobeniusNormDimOp");
|
|
|
|
}
|
|
|
|
|
|
|
|
SmallVector<int64_t> dims;
|
2022-12-08 04:20:41 +08:00
|
|
|
if (!matchPattern(op.getDim(), m_TorchListOfConstantInts(dims))) {
|
2022-09-08 10:15:36 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "non-const integer `dim` is not supported");
|
|
|
|
}
|
|
|
|
for (auto &dim : dims) {
|
|
|
|
dim = toPositiveDim(dim, inputRank);
|
|
|
|
if (!isValidDim(dim, inputRank)) {
|
|
|
|
return rewriter.notifyMatchFailure(op,
|
|
|
|
"invalid dimension detected in `dim`");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
// Sort the dims in ascending order, making the conversion
|
2022-09-08 10:15:36 +08:00
|
|
|
// stable with unordered dims.
|
|
|
|
std::sort(dims.begin(), dims.end());
|
|
|
|
|
|
|
|
bool keepDim = false;
|
2022-12-08 04:20:41 +08:00
|
|
|
if (!matchPattern(op.getKeepdim(), m_TorchConstantBool(&keepDim))) {
|
2022-09-08 10:15:36 +08:00
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "non-const bool `keepdim` is not supported");
|
|
|
|
}
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
auto squareOp = rewriter.create<stablehlo::MulOp>(op->getLoc(), input, input);
|
2023-01-18 05:52:12 +08:00
|
|
|
|
2022-09-08 10:15:36 +08:00
|
|
|
auto initValue = createInitialValueForReduceOp(op, inputElemType, rewriter);
|
|
|
|
if (!initValue) {
|
|
|
|
return failure();
|
|
|
|
}
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
auto reduceOp = rewriter.create<stablehlo::ReduceOp>(
|
2023-01-18 05:52:12 +08:00
|
|
|
op->getLoc(), squareOp.getResult(), initValue,
|
Bump stablehlo to openxla/stablehlo@fd52182f76cadb82f2064fe5fc49a4fb4347a826 (#2821)
With the recent LLVM integrate and changes from
https://github.com/llvm/llvm-project/pull/78260, we hit this build error
in Stablehlo (which is quite old).
```
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1020:14: error: no member named 'startRootUpdate' in 'mlir::PatternRewriter'
rewriter.startRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1026:16: error: no member named 'finalizeRootUpdate' in 'mlir::PatternRewriter'
rewriter.finalizeRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1029:16: error: no member named 'cancelRootUpdate' in 'mlir::PatternRewriter'
rewriter.cancelRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1108:14: error: no member named 'updateRootInPlace' in 'mlir::PatternRewriter'
rewriter.updateRootInPlace(op->getParentOp(), [&]() { return; });
~~~~~~~~ ^
4 errors generated.
Target @torch-mlir//:torch-mlir-opt failed to build
```
I'm still puzzled as to how this didn't fail with the CMake merge gating
CI (do we not test Stablehlo builds/tests?). In any case, bumping our
submodule to https://github.com/openxla/stablehlo/pull/1918 fixes it.
It exposes a new failing lit test in TorchToStablehlo though, that I
have looped stablehlo developers into
([here](https://discord.com/channels/999073994483433573/999074539138990131/1201235845391331419)).
```
bazel run @torch-mlir//test/Conversion:TorchToStablehlo/scatter.mlir.test
...external/torch-mlir/test/Conversion/TorchToStablehlo/scatter.mlir
within split at <stdin>:1 offset :33:8: error: unexpected error: Expects non-empty reduction block for type inference
%0 = torch.aten.scatter.src %arg0, %int0, %arg1, %arg2 : !torch.vtensor<[?,?],si64>, !torch.int, !torch.vtensor<[?,?],si64>, !torch.vtensor<[?,?],si64> -> !torch.vtensor<[?,?],si64>
^
LLVM ERROR: Failed to infer result type(s).
```
Bazel CI:
https://github.com/sjain-stanford/torch-mlir/actions/runs/7732673480/job/21083102228
2024-02-01 06:21:17 +08:00
|
|
|
rewriter.getDenseI64ArrayAttr(dims));
|
2022-09-08 10:15:36 +08:00
|
|
|
|
2023-01-18 05:52:12 +08:00
|
|
|
Region ®ion = reduceOp.getBody();
|
2022-09-08 10:15:36 +08:00
|
|
|
Block &block = region.emplaceBlock();
|
|
|
|
auto blockArgumentTy = RankedTensorType::get({}, inputElemType);
|
|
|
|
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
|
2023-01-18 05:52:12 +08:00
|
|
|
auto firstArgument = *block.args_begin();
|
|
|
|
auto secondArgument = *block.args_rbegin();
|
2022-09-08 10:15:36 +08:00
|
|
|
|
|
|
|
{
|
|
|
|
OpBuilder::InsertionGuard guard(rewriter);
|
|
|
|
rewriter.setInsertionPointToStart(&block);
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
auto addResult = rewriter.create<stablehlo::AddOp>(
|
|
|
|
op->getLoc(), firstArgument, secondArgument);
|
|
|
|
rewriter.create<stablehlo::ReturnOp>(op->getLoc(), addResult.getResult());
|
2022-09-08 10:15:36 +08:00
|
|
|
}
|
|
|
|
|
2023-01-18 05:52:12 +08:00
|
|
|
auto output =
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.create<stablehlo::SqrtOp>(op->getLoc(), reduceOp.getResult(0));
|
2022-09-08 10:15:36 +08:00
|
|
|
|
|
|
|
if (keepDim) {
|
2023-02-02 21:29:47 +08:00
|
|
|
auto outShapeInfo =
|
|
|
|
hlo::getDimSizesOfTensor(rewriter, op, input, options.dimSizeIndexBits);
|
2022-09-08 10:15:36 +08:00
|
|
|
if (failed(outShapeInfo)) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "failed to get dimension sizes of the input");
|
|
|
|
}
|
|
|
|
auto outShapeVec = *outShapeInfo;
|
|
|
|
auto one = rewriter.create<mlir::arith::ConstantOp>(
|
2023-02-02 21:29:47 +08:00
|
|
|
op->getLoc(),
|
|
|
|
rewriter.getIntegerAttr(
|
|
|
|
rewriter.getIntegerType(options.dimSizeIndexBits), 1));
|
2022-09-08 10:15:36 +08:00
|
|
|
for (int64_t i : dims) {
|
|
|
|
outShapeVec[i] = one;
|
|
|
|
}
|
|
|
|
auto outShapeTensor = rewriter.create<mlir::tensor::FromElementsOp>(
|
|
|
|
op->getLoc(), outShapeVec);
|
2023-02-02 21:29:47 +08:00
|
|
|
rewriter.replaceOpWithNewOp<stablehlo::DynamicReshapeOp>(
|
2022-09-08 10:15:36 +08:00
|
|
|
op, getTypeConverter()->convertType(op.getType()), output,
|
|
|
|
outShapeTensor);
|
|
|
|
return success();
|
|
|
|
}
|
|
|
|
rewriter.replaceOp(op, output.getResult());
|
|
|
|
return success();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
2023-03-21 05:14:27 +08:00
|
|
|
// AtenLinalgVectorNormOp
|
|
|
|
namespace {
|
|
|
|
template <>
|
|
|
|
LogicalResult ConvertAtenReductionOp<AtenLinalgVectorNormOp>::matchAndRewrite(
|
|
|
|
AtenLinalgVectorNormOp op, OpAdaptor adaptor,
|
|
|
|
ConversionPatternRewriter &rewriter) const {
|
|
|
|
const TorchToStablehloOptions &options = getOptions();
|
|
|
|
|
|
|
|
Value input = adaptor.getSelf();
|
|
|
|
auto inputType = input.getType().dyn_cast<RankedTensorType>();
|
|
|
|
if (!inputType) {
|
|
|
|
return op.emitError(
|
|
|
|
"only ranked tensor input supported in AtenLinalgVectorNormOp");
|
|
|
|
}
|
|
|
|
int64_t inputRank = inputType.getRank();
|
|
|
|
|
|
|
|
auto outType =
|
|
|
|
getTypeConverter()->convertType(op.getType()).cast<RankedTensorType>();
|
|
|
|
auto outElemType = outType.getElementType();
|
|
|
|
if (!outElemType.isa<mlir::FloatType>()) {
|
|
|
|
return op.emitError("only float dtype allowed in AtenLinalgVectorNormOp");
|
|
|
|
}
|
|
|
|
|
|
|
|
if (inputType.getElementType() != outType.getElementType()) {
|
|
|
|
input =
|
|
|
|
rewriter.create<stablehlo::ConvertOp>(op->getLoc(), input, outElemType);
|
|
|
|
}
|
|
|
|
|
|
|
|
Value ord =
|
|
|
|
hlo::scalarToStablehloTensor(rewriter, op, adaptor.getOrd(), outElemType);
|
|
|
|
|
|
|
|
SmallVector<int64_t> dims;
|
|
|
|
if (failed(checkNotNone(rewriter, op, op.getDim()))) {
|
|
|
|
dims = llvm::to_vector<4>(llvm::seq<int64_t>(0, inputRank));
|
|
|
|
} else {
|
|
|
|
if (!matchPattern(op.getDim(), m_TorchListOfConstantInts(dims))) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "non-const integer `dim` is not supported");
|
|
|
|
}
|
|
|
|
|
|
|
|
for (auto &dim : dims) {
|
|
|
|
dim = toPositiveDim(dim, inputRank);
|
|
|
|
if (!isValidDim(dim, inputRank)) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "invalid dimension detected in `dim`");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Sort the dims in ascending order, making the conversion
|
|
|
|
// stable with unordered dims.
|
|
|
|
std::sort(dims.begin(), dims.end());
|
|
|
|
}
|
|
|
|
|
|
|
|
bool keepDim = false;
|
|
|
|
if (!matchPattern(op.getKeepdim(), m_TorchConstantBool(&keepDim))) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "non-const bool `keepdim` is not supported");
|
|
|
|
}
|
|
|
|
|
|
|
|
auto initValue = createInitialValueForReduceOp(op, outElemType, rewriter);
|
|
|
|
if (!initValue) {
|
|
|
|
return failure();
|
|
|
|
}
|
|
|
|
|
|
|
|
Value absValue = rewriter.create<stablehlo::AbsOp>(op->getLoc(), input);
|
|
|
|
Value powValue = rewriter.create<chlo::BroadcastPowOp>(op->getLoc(), absValue,
|
|
|
|
ord, nullptr);
|
|
|
|
|
|
|
|
auto reduceOp = rewriter.create<stablehlo::ReduceOp>(
|
Bump stablehlo to openxla/stablehlo@fd52182f76cadb82f2064fe5fc49a4fb4347a826 (#2821)
With the recent LLVM integrate and changes from
https://github.com/llvm/llvm-project/pull/78260, we hit this build error
in Stablehlo (which is quite old).
```
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1020:14: error: no member named 'startRootUpdate' in 'mlir::PatternRewriter'
rewriter.startRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1026:16: error: no member named 'finalizeRootUpdate' in 'mlir::PatternRewriter'
rewriter.finalizeRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1029:16: error: no member named 'cancelRootUpdate' in 'mlir::PatternRewriter'
rewriter.cancelRootUpdate(op);
~~~~~~~~ ^
external/stablehlo/stablehlo/transforms/StablehloRefineShapes.cpp:1108:14: error: no member named 'updateRootInPlace' in 'mlir::PatternRewriter'
rewriter.updateRootInPlace(op->getParentOp(), [&]() { return; });
~~~~~~~~ ^
4 errors generated.
Target @torch-mlir//:torch-mlir-opt failed to build
```
I'm still puzzled as to how this didn't fail with the CMake merge gating
CI (do we not test Stablehlo builds/tests?). In any case, bumping our
submodule to https://github.com/openxla/stablehlo/pull/1918 fixes it.
It exposes a new failing lit test in TorchToStablehlo though, that I
have looped stablehlo developers into
([here](https://discord.com/channels/999073994483433573/999074539138990131/1201235845391331419)).
```
bazel run @torch-mlir//test/Conversion:TorchToStablehlo/scatter.mlir.test
...external/torch-mlir/test/Conversion/TorchToStablehlo/scatter.mlir
within split at <stdin>:1 offset :33:8: error: unexpected error: Expects non-empty reduction block for type inference
%0 = torch.aten.scatter.src %arg0, %int0, %arg1, %arg2 : !torch.vtensor<[?,?],si64>, !torch.int, !torch.vtensor<[?,?],si64>, !torch.vtensor<[?,?],si64> -> !torch.vtensor<[?,?],si64>
^
LLVM ERROR: Failed to infer result type(s).
```
Bazel CI:
https://github.com/sjain-stanford/torch-mlir/actions/runs/7732673480/job/21083102228
2024-02-01 06:21:17 +08:00
|
|
|
op->getLoc(), powValue, initValue, rewriter.getDenseI64ArrayAttr(dims));
|
2023-03-21 05:14:27 +08:00
|
|
|
|
|
|
|
Region ®ion = reduceOp.getBody();
|
|
|
|
Block &block = region.emplaceBlock();
|
|
|
|
auto blockArgumentTy = RankedTensorType::get({}, outElemType);
|
|
|
|
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
block.addArgument(blockArgumentTy, op->getLoc());
|
|
|
|
|
|
|
|
auto firstArgument = *block.args_begin();
|
|
|
|
auto secondArgument = *block.args_rbegin();
|
|
|
|
|
|
|
|
{
|
|
|
|
OpBuilder::InsertionGuard guard(rewriter);
|
|
|
|
rewriter.setInsertionPointToStart(&block);
|
|
|
|
|
|
|
|
auto addResult = rewriter.create<stablehlo::AddOp>(
|
|
|
|
op->getLoc(), firstArgument, secondArgument);
|
|
|
|
rewriter.create<stablehlo::ReturnOp>(op->getLoc(), addResult.getResult());
|
|
|
|
}
|
|
|
|
auto constantOne = rewriter.create<stablehlo::ConstantOp>(
|
|
|
|
op->getLoc(), blockArgumentTy,
|
|
|
|
DenseElementsAttr::get(
|
|
|
|
blockArgumentTy,
|
|
|
|
APFloat(outElemType.cast<mlir::FloatType>().getFloatSemantics(), 1)));
|
|
|
|
auto reciprocalOrd = rewriter.create<stablehlo::DivOp>(
|
|
|
|
op->getLoc(), blockArgumentTy, constantOne, ord);
|
|
|
|
auto output = rewriter.create<chlo::BroadcastPowOp>(
|
|
|
|
op->getLoc(), reduceOp.getResult(0), reciprocalOrd, nullptr);
|
|
|
|
|
|
|
|
if (keepDim) {
|
|
|
|
auto outShapeInfo =
|
|
|
|
hlo::getDimSizesOfTensor(rewriter, op, input, options.dimSizeIndexBits);
|
|
|
|
if (failed(outShapeInfo)) {
|
|
|
|
return rewriter.notifyMatchFailure(
|
|
|
|
op, "failed to get dimension sizes of the input");
|
|
|
|
}
|
|
|
|
auto outShapeVec = *outShapeInfo;
|
|
|
|
auto one = rewriter.create<mlir::arith::ConstantOp>(
|
|
|
|
op->getLoc(),
|
|
|
|
rewriter.getIntegerAttr(
|
|
|
|
rewriter.getIntegerType(options.dimSizeIndexBits), 1));
|
|
|
|
for (int64_t i : dims) {
|
|
|
|
outShapeVec[i] = one;
|
|
|
|
}
|
|
|
|
auto outShapeTensor = rewriter.create<mlir::tensor::FromElementsOp>(
|
|
|
|
op->getLoc(), outShapeVec);
|
|
|
|
rewriter.replaceOpWithNewOp<stablehlo::DynamicReshapeOp>(
|
|
|
|
op, getTypeConverter()->convertType(op.getType()), output,
|
|
|
|
outShapeTensor);
|
|
|
|
return success();
|
|
|
|
}
|
|
|
|
|
|
|
|
rewriter.replaceOp(op, output.getResult());
|
|
|
|
return success();
|
|
|
|
}
|
|
|
|
} // namespace
|
|
|
|
|
2023-02-02 21:29:47 +08:00
|
|
|
void mlir::torch::torch_to_stablehlo::populateReductionOpPatternsAndLegality(
|
2022-08-03 10:47:52 +08:00
|
|
|
TypeConverter &typeConverter, RewritePatternSet &patterns,
|
2023-02-02 21:29:47 +08:00
|
|
|
ConversionTarget &target, const TorchToStablehloOptions &options) {
|
2022-08-03 10:47:52 +08:00
|
|
|
MLIRContext *context = patterns.getContext();
|
|
|
|
#define INSERT_ATEN_REDUCTION_OP_PATTERN(AtenOp) \
|
|
|
|
target.addIllegalOp<AtenOp>(); \
|
2022-09-01 10:36:02 +08:00
|
|
|
patterns.add<ConvertAtenReductionOp<AtenOp>>(typeConverter, context, options)
|
2022-08-03 10:47:52 +08:00
|
|
|
INSERT_ATEN_REDUCTION_OP_PATTERN(AtenArgmaxOp);
|
|
|
|
INSERT_ATEN_REDUCTION_OP_PATTERN(AtenMaxDimOp);
|
|
|
|
INSERT_ATEN_REDUCTION_OP_PATTERN(AtenSumDimIntListOp);
|
|
|
|
INSERT_ATEN_REDUCTION_OP_PATTERN(AtenSumOp);
|
|
|
|
INSERT_ATEN_REDUCTION_OP_PATTERN(AtenMaxOp);
|
2023-08-30 01:12:41 +08:00
|
|
|
INSERT_ATEN_REDUCTION_OP_PATTERN(AtenMinOp);
|
2022-09-08 10:15:36 +08:00
|
|
|
INSERT_ATEN_REDUCTION_OP_PATTERN(AtenFrobeniusNormDimOp);
|
2023-03-21 05:14:27 +08:00
|
|
|
INSERT_ATEN_REDUCTION_OP_PATTERN(AtenLinalgVectorNormOp);
|
2022-08-03 10:47:52 +08:00
|
|
|
#undef INSERT_ATEN_REDUCTION_OP_PATTERN
|
|
|
|
}
|