Revert "[mlir][tosa] Add several level checks" #129602
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 3c90c90.
Jerry-Ge
approved these changes
Mar 3, 2025
|
@llvm/pr-subscribers-mlir-tosa Author: TatWai Chong (tatwaichong) ChangesReverts llvm/llvm-project#129580 There is a lit test failure reported in https://lab.llvm.org/buildbot/#/builders/116/builds/11023 Patch is 67.83 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/129602.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp b/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp
index 96fb054d75b66..b4d2dfb7fc760 100644
--- a/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp
+++ b/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp
@@ -61,22 +61,17 @@ struct TosaLevel {
int32_t MAX_KERNEL = 0;
int32_t MAX_STRIDE = 0;
int32_t MAX_SCALE = 0;
- int32_t MAX_LOG2_SIZE = 0;
- int32_t MAX_NESTING = 0;
- int32_t MAX_TENSOR_LIST_SIZE = 0;
+
+ // @todo: MAX_LOG2_SIZE value and checks
bool operator==(const TosaLevel &rhs) {
return MAX_RANK == rhs.MAX_RANK && MAX_KERNEL == rhs.MAX_KERNEL &&
- MAX_STRIDE == rhs.MAX_STRIDE && MAX_SCALE == rhs.MAX_SCALE &&
- MAX_LOG2_SIZE == rhs.MAX_LOG2_SIZE &&
- MAX_NESTING == rhs.MAX_NESTING &&
- MAX_TENSOR_LIST_SIZE == rhs.MAX_TENSOR_LIST_SIZE;
+ MAX_STRIDE == rhs.MAX_STRIDE && MAX_SCALE == rhs.MAX_SCALE;
}
};
-static constexpr TosaLevel TOSA_LEVEL_EIGHTK = {6, 8192, 8192, 256, 31, 6, 64};
-static constexpr TosaLevel TOSA_LEVEL_NONE = {32, 2147483647, 2147483647, 2048,
- 63, 256, 256};
+static constexpr TosaLevel TOSA_LEVEL_EIGHTK = {6, 8192, 8192, 256};
+static constexpr TosaLevel TOSA_LEVEL_NONE = {0, 0, 0, 0};
//===----------------------------------------------------------------------===//
// TOSA Validation Pass.
@@ -116,7 +111,8 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
constCheckers.emplace_back(checkConstantOperandPad);
}
- bool levelCheckKernel(Operation *op, int32_t v, const StringRef checkDesc) {
+ bool levelCheckKernel(Operation *op, int32_t v,
+ const std::string &checkDesc) {
if (v > tosaLevel.MAX_KERNEL) {
op->emitOpError() << "failed level check: " << checkDesc;
return false;
@@ -124,7 +120,8 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
return true;
}
- bool levelCheckStride(Operation *op, int32_t v, const StringRef checkDesc) {
+ bool levelCheckStride(Operation *op, int32_t v,
+ const std::string &checkDesc) {
if (v > tosaLevel.MAX_STRIDE) {
op->emitOpError() << "failed level check: " << checkDesc;
return false;
@@ -132,7 +129,7 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
return true;
}
- bool levelCheckScale(Operation *op, int32_t v, const StringRef checkDesc) {
+ bool levelCheckScale(Operation *op, int32_t v, const std::string &checkDesc) {
if (v > tosaLevel.MAX_SCALE) {
op->emitOpError() << "failed level check: " << checkDesc;
return false;
@@ -140,80 +137,110 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
return true;
}
- bool levelCheckListSize(Operation *op, int32_t v, const StringRef checkDesc) {
- if (v > tosaLevel.MAX_TENSOR_LIST_SIZE) {
- op->emitOpError() << "failed level check for MAX_TENSOR_LIST_SIZE: "
- << checkDesc;
- return false;
- }
- return true;
- }
-
- template <typename T>
- bool levelCheckRank(Operation *op, const T &v,
- const StringRef operandOrResult, int32_t highest_rank) {
+ bool levelCheckRank(Operation *op, const Value &v,
+ const std::string &checkDesc) {
if (ShapedType type = dyn_cast<ShapedType>(v.getType())) {
if (!type.hasRank()) {
op->emitOpError() << "failed level check: unranked tensor";
return false;
}
- if (type.getRank() > highest_rank) {
- op->emitOpError() << "failed level check: " << operandOrResult
- << " rank(shape) <= MAX_RANK";
+ if (type.getRank() > tosaLevel.MAX_RANK) {
+ op->emitOpError() << "failed level check: " << checkDesc;
return false;
}
}
return true;
}
- // Perform the Level tensor size check on the input tensor.
- bool levelCheckSize(Operation *op, const Value &v,
- const StringRef operandOrResult);
-
- // Level check sizes of all operands and results of the operation.
template <typename T>
- bool levelCheckSizes(T tosaOp) {
- auto op = tosaOp.getOperation();
- for (auto v : op->getOperands()) {
- if (!levelCheckSize(op, v, "operand"))
- return false;
- }
-
- for (auto v : op->getResults()) {
- if (!levelCheckSize(op, v, "result"))
- return false;
+ bool levelCheckRanksFor(Operation *op) {
+ if (dyn_cast<T>(op)) {
+ // level check ranks of all operands and results
+ for (auto v : op->getOperands()) {
+ if (!levelCheckRank(op, v, "operand rank(shape) <= MAX_RANK"))
+ return false;
+ }
+ for (auto v : op->getResults()) {
+ if (!levelCheckRank(op, v, "result rank(shape) <= MAX_RANK"))
+ return false;
+ }
}
return true;
}
- // Level check ranks of all operands, attribute and results of the operation.
- template <typename T>
- bool levelCheckRanks(T tosaOp) {
- auto op = tosaOp.getOperation();
- for (auto v : op->getOperands()) {
- if (!levelCheckRank(op, v, "operand", tosaLevel.MAX_RANK))
- return false;
- }
-
- if (!op->getAttrs().empty()) {
- for (NamedAttribute attr : op->getAttrs()) {
- if (auto elemAttr = dyn_cast<ElementsAttr>(attr.getValue())) {
- if (!levelCheckRank(op, elemAttr, "attribute", tosaLevel.MAX_RANK))
- return false;
- }
- }
- }
+ bool levelCheckRanks(Operation *op) {
+#define CHECK_RANKS_FOR(tosaOp) \
+ if (!levelCheckRanksFor<tosaOp##Op>(op)) \
+ return false;
- for (auto v : op->getResults()) {
- if (!levelCheckRank(op, v, "result", tosaLevel.MAX_RANK))
- return false;
- }
+ // tensor operators:
+ CHECK_RANKS_FOR(ArgMax);
+ // all activation functions:
+ CHECK_RANKS_FOR(Clamp);
+ CHECK_RANKS_FOR(Sigmoid);
+ CHECK_RANKS_FOR(Tanh);
+ // all elementwise binary operators:
+ CHECK_RANKS_FOR(Add);
+ CHECK_RANKS_FOR(ArithmeticRightShift);
+ CHECK_RANKS_FOR(BitwiseAnd);
+ CHECK_RANKS_FOR(BitwiseOr);
+ CHECK_RANKS_FOR(BitwiseXor);
+ CHECK_RANKS_FOR(IntDiv);
+ CHECK_RANKS_FOR(LogicalAnd);
+ CHECK_RANKS_FOR(LogicalLeftShift);
+ CHECK_RANKS_FOR(LogicalRightShift);
+ CHECK_RANKS_FOR(LogicalOr);
+ CHECK_RANKS_FOR(LogicalXor);
+ CHECK_RANKS_FOR(Maximum);
+ CHECK_RANKS_FOR(Minimum);
+ CHECK_RANKS_FOR(Mul);
+ CHECK_RANKS_FOR(Pow);
+ CHECK_RANKS_FOR(Sub);
+ CHECK_RANKS_FOR(Table);
+ // all elementwise unary operators:
+ CHECK_RANKS_FOR(Abs);
+ CHECK_RANKS_FOR(BitwiseNot);
+ CHECK_RANKS_FOR(Ceil);
+ CHECK_RANKS_FOR(Clz);
+ CHECK_RANKS_FOR(Exp);
+ CHECK_RANKS_FOR(Floor);
+ CHECK_RANKS_FOR(Log);
+ CHECK_RANKS_FOR(LogicalNot);
+ CHECK_RANKS_FOR(Negate);
+ CHECK_RANKS_FOR(Reciprocal);
+ CHECK_RANKS_FOR(Rsqrt);
+ // all elementwise ternary operators:
+ CHECK_RANKS_FOR(Select);
+ // all comparison operators:
+ CHECK_RANKS_FOR(Equal);
+ CHECK_RANKS_FOR(Greater);
+ CHECK_RANKS_FOR(GreaterEqual);
+ // all reduction operators:
+ CHECK_RANKS_FOR(ReduceAll);
+ CHECK_RANKS_FOR(ReduceAny);
+ CHECK_RANKS_FOR(ReduceMax);
+ CHECK_RANKS_FOR(ReduceMin);
+ CHECK_RANKS_FOR(ReduceProduct);
+ CHECK_RANKS_FOR(ReduceSum);
+ // all data layout operators:
+ CHECK_RANKS_FOR(Concat);
+ CHECK_RANKS_FOR(Pad);
+ CHECK_RANKS_FOR(Reshape);
+ CHECK_RANKS_FOR(Reverse);
+ CHECK_RANKS_FOR(Slice);
+ CHECK_RANKS_FOR(Tile);
+ CHECK_RANKS_FOR(Transpose);
+ // all type conversion operators:
+ CHECK_RANKS_FOR(Cast);
+ CHECK_RANKS_FOR(Rescale);
+ // all data nodes operators:
+ CHECK_RANKS_FOR(Const);
+ CHECK_RANKS_FOR(Identity);
+
+#undef CHECK_RANKS_FOR
return true;
}
- // Level check ranks and sizes.
- bool levelCheckRanksAndSizes(Operation *op);
-
// Pool Op: level check kernel/stride/pad values
template <typename T>
bool levelCheckPool(Operation *op) {
@@ -359,32 +386,6 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
return true;
}
- bool levelCheckListSize(Operation *op) {
- if (auto concat = dyn_cast<tosa::ConcatOp>(op)) {
- return levelCheckListSize(op, concat.getInput1().size(), "input1");
- }
- if (auto custom = dyn_cast<tosa::CustomOp>(op)) {
- if (!levelCheckListSize(op, custom.getInputList().size(), "input_list") ||
- !levelCheckListSize(op, custom.getOutputList().size(),
- "output_list")) {
- return false;
- }
- }
- if (auto condIf = dyn_cast<tosa::IfOp>(op)) {
- if (!levelCheckListSize(op, condIf.getInputs().size(), "inputs") ||
- !levelCheckListSize(op, condIf.getOutput().size(), "outputs")) {
- return false;
- }
- }
- if (auto w = dyn_cast<tosa::WhileOp>(op)) {
- if (!levelCheckListSize(op, w.getInputs().size(), "inputs") ||
- !levelCheckListSize(op, w.getOutput().size(), "outputs")) {
- return false;
- }
- }
- return true;
- }
-
// configure profile and level values from pass options profileName and
// levelName
void configLevelAndProfile() {
@@ -432,191 +433,16 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
tosa::TargetEnv targetEnv;
};
-template <>
-bool TosaValidation::levelCheckRanks(tosa::ArgMaxOp tosaOp) {
- auto op = tosaOp.getOperation();
- if (!levelCheckRank(op, tosaOp.getInput(), "operand", tosaLevel.MAX_RANK))
- return false;
-
- // rank(output) = rank(input) - 1
- if (!levelCheckRank(op, tosaOp.getOutput(), "result", tosaLevel.MAX_RANK - 1))
- return false;
-
- return true;
-}
-
-template <>
-bool TosaValidation::levelCheckRanks(tosa::IfOp tosaOp) {
- auto op = tosaOp.getOperation();
-
- // Only the condition input has rank limitation.
- if (!levelCheckRank(op, tosaOp.getCond(), "operand", tosaLevel.MAX_RANK))
- return false;
-
- return true;
-}
-
-bool TosaValidation::levelCheckRanksAndSizes(Operation *op) {
-#define CHECK_RANKS_AND_SIZES(tosaOp) \
- if (isa<tosa::tosaOp##Op>(op)) { \
- if (!levelCheckRanks(cast<tosa::tosaOp##Op>(op))) \
- return false; \
- if (!levelCheckSizes(cast<tosa::tosaOp##Op>(op))) \
- return false; \
- }
-
-#define CHECK_SIZES(tosaOp) \
- if (isa<tosa::tosaOp##Op>(op)) { \
- if (!levelCheckSizes(cast<tosa::tosaOp##Op>(op))) \
- return false; \
- }
-
- // Tensor Operators
- CHECK_RANKS_AND_SIZES(ArgMax);
- // Activation Functions
- CHECK_RANKS_AND_SIZES(Clamp);
- CHECK_RANKS_AND_SIZES(Erf);
- CHECK_RANKS_AND_SIZES(Sigmoid);
- CHECK_RANKS_AND_SIZES(Tanh);
- // Elementwise Binary Operators
- CHECK_RANKS_AND_SIZES(Add);
- CHECK_RANKS_AND_SIZES(ArithmeticRightShift);
- CHECK_RANKS_AND_SIZES(BitwiseAnd);
- CHECK_RANKS_AND_SIZES(BitwiseOr);
- CHECK_RANKS_AND_SIZES(BitwiseXor);
- CHECK_RANKS_AND_SIZES(IntDiv);
- CHECK_RANKS_AND_SIZES(LogicalAnd);
- CHECK_RANKS_AND_SIZES(LogicalLeftShift);
- CHECK_RANKS_AND_SIZES(LogicalRightShift);
- CHECK_RANKS_AND_SIZES(LogicalOr);
- CHECK_RANKS_AND_SIZES(LogicalXor);
- CHECK_RANKS_AND_SIZES(Maximum);
- CHECK_RANKS_AND_SIZES(Minimum);
- CHECK_RANKS_AND_SIZES(Mul);
- CHECK_RANKS_AND_SIZES(Pow);
- CHECK_RANKS_AND_SIZES(Sub);
- CHECK_RANKS_AND_SIZES(Table);
- // Elementwise Unary Operators
- CHECK_RANKS_AND_SIZES(Abs);
- CHECK_RANKS_AND_SIZES(BitwiseNot);
- CHECK_RANKS_AND_SIZES(Ceil);
- CHECK_RANKS_AND_SIZES(Clz);
- CHECK_RANKS_AND_SIZES(Cos);
- CHECK_RANKS_AND_SIZES(Exp);
- CHECK_RANKS_AND_SIZES(Floor);
- CHECK_RANKS_AND_SIZES(Log);
- CHECK_RANKS_AND_SIZES(LogicalNot);
- CHECK_RANKS_AND_SIZES(Negate);
- CHECK_RANKS_AND_SIZES(Reciprocal);
- CHECK_RANKS_AND_SIZES(Rsqrt);
- CHECK_RANKS_AND_SIZES(Sin);
- // Elementwise Ternary Operators
- CHECK_RANKS_AND_SIZES(Select);
- // Comparison Operators
- CHECK_RANKS_AND_SIZES(Equal);
- CHECK_RANKS_AND_SIZES(Greater);
- CHECK_RANKS_AND_SIZES(GreaterEqual);
- // Reduction Operators
- CHECK_RANKS_AND_SIZES(ReduceAll);
- CHECK_RANKS_AND_SIZES(ReduceAny);
- CHECK_RANKS_AND_SIZES(ReduceMax);
- CHECK_RANKS_AND_SIZES(ReduceMin);
- CHECK_RANKS_AND_SIZES(ReduceProduct);
- CHECK_RANKS_AND_SIZES(ReduceSum);
- // Data Layout Operators
- CHECK_RANKS_AND_SIZES(Concat);
- CHECK_RANKS_AND_SIZES(Pad);
- CHECK_RANKS_AND_SIZES(Reshape);
- CHECK_RANKS_AND_SIZES(Reverse);
- CHECK_RANKS_AND_SIZES(Slice);
- CHECK_RANKS_AND_SIZES(Tile);
- CHECK_RANKS_AND_SIZES(Transpose);
- // Type Conversion
- CHECK_RANKS_AND_SIZES(Cast);
- CHECK_RANKS_AND_SIZES(Rescale);
- // Control Flow Operators
- CHECK_RANKS_AND_SIZES(If);
- // Variable Operators
- CHECK_RANKS_AND_SIZES(Variable);
- CHECK_RANKS_AND_SIZES(VariableWrite);
- CHECK_RANKS_AND_SIZES(VariableRead);
- // Data Nodes
- CHECK_RANKS_AND_SIZES(Const);
- CHECK_RANKS_AND_SIZES(Identity);
-
- // For the following operators, check whether the size of each tensor
- // operand is valid in a given Level.
-
- // Tensor Operators
- CHECK_SIZES(AvgPool2d);
- CHECK_SIZES(Conv2D);
- CHECK_SIZES(Conv3D);
- CHECK_SIZES(DepthwiseConv2D);
- CHECK_SIZES(TransposeConv2D);
- CHECK_SIZES(FFT2d);
- CHECK_SIZES(MatMul);
- CHECK_SIZES(MaxPool2d);
- CHECK_SIZES(RFFT2d);
- // Scatter/Gather Operators
- CHECK_SIZES(Gather);
- CHECK_SIZES(Scatter);
- // Image Operators
- CHECK_SIZES(Resize);
- // Custom Operators
- CHECK_SIZES(Custom);
- // Control Flow Operators
- CHECK_SIZES(While);
- // Shape Operators
- CHECK_SIZES(ConstShape);
-
-#undef CHECK_RANKS_AND_SIZES
-#undef CHECK_SIZES
- return true;
-}
-
-// Perform the Level tensor size check
-bool TosaValidation::levelCheckSize(Operation *op, const Value &v,
- const StringRef operandOrResult) {
- if (ShapedType type = dyn_cast<ShapedType>(v.getType())) {
- if (!type.hasRank()) {
- op->emitOpError() << "failed level check: unranked tensor";
- return false;
- }
- auto shape = type.getShape();
- for (auto dim : shape) {
- if (mlir::ShapedType::isDynamic(dim)) {
- op->emitOpError() << "failed level check: " << operandOrResult
- << " shape dimension cannot be dynamic";
- return false;
- }
- }
-
- int64_t element_bits = type.getElementTypeBitWidth();
- int64_t element_bytes = std::max(INT64_C(1), element_bits / 8);
- int64_t size = element_bytes * type.getNumElements();
-
- // According to 1.11. Tensor Definitions of Tosa spec, the value of
- // tensor_size_t is 1 << MAX_LOG2_SIZE) - 1 where MAX_LOG2_SIZE is
- // defined in 1.7. Levels.
- // For each tensor, the number of tensor elements multiplied by the
- // element size in bytes must be representable as a tensor_size_t.
- const int64_t max_size = (INT64_C(1) << tosaLevel.MAX_LOG2_SIZE) - 1;
- if (size > max_size) {
- op->emitOpError()
- << "failed level check: " << operandOrResult
- << " tensor size (in bytes) <= (1 << MAX_LOG2_SIZE - 1)";
- return false;
- }
- }
- return true;
-}
-
LogicalResult TosaValidation::applyLevelCheck(Operation *op) {
if (tosaLevel == TOSA_LEVEL_NONE) {
// no need to do level checks
return success();
}
+ if (!levelCheckRanks(op)) {
+ return failure();
+ }
+
// additional level checks from spec 0.70
if (!levelCheckPool<tosa::AvgPool2dOp>(op) ||
!levelCheckConv<tosa::Conv2DOp>(op) ||
@@ -629,15 +455,6 @@ LogicalResult TosaValidation::applyLevelCheck(Operation *op) {
return failure();
}
- if (!levelCheckRanksAndSizes(op)) {
- return failure();
- }
-
- // level check MAX_TENSOR_LIST_SIZE
- if (!levelCheckListSize(op)) {
- return failure();
- }
-
return success();
}
diff --git a/mlir/test/Dialect/Tosa/level_check.mlir b/mlir/test/Dialect/Tosa/level_check.mlir
index 9862ccb0b2f3b..19584103d40c7 100644
--- a/mlir/test/Dialect/Tosa/level_check.mlir
+++ b/mlir/test/Dialect/Tosa/level_check.mlir
@@ -1,6 +1,10 @@
-// RUN: mlir-opt %s -split-input-file -verify-diagnostics --tosa-validate
+//--------------------------------------------------------------------------------------------------
+// Enable all supported profiles and extensions to focus the verification of expected level errors.
+//--------------------------------------------------------------------------------------------------
-func.func @test_argmax_rank_invalid(%arg0: tensor<1x1x1x1x29x29x4xf32>) -> tensor<1x1x1x1x29x4xi32> {
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics --tosa-validate="profile=pro_int,pro_fp extension=int16,int4,bf16,fp8e4m3,fp8e5m2,fft,variable,controlflow"
+
+func.func @test_argmax(%arg0: tensor<1x1x1x1x29x29x4xf32>) -> tensor<1x1x1x1x29x4xi32> {
// expected-error@+1 {{'tosa.argmax' op failed level check: operand rank(shape) <= MAX_RANK}}
%0 = "tosa.argmax"(%arg0) {axis = 4 : i32} : (tensor<1x1x1x1x29x29x4xf32>) -> tensor<1x1x1x1x29x4xi32>
return %0 : tensor<1x1x1x1x29x4xi32>
@@ -8,312 +12,7 @@ func.func @test_argmax_rank_invalid(%arg0: tensor<1x1x1x1x29x29x4xf32>) -> tenso
// -----
-func.func @test_clamp_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.clamp' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.clamp %arg0 {min_val = -3.40282347E+38 : f32, max_val = 3.40282347E+38 : f32} : (tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_erf_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.erf' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.erf %arg0 : (tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_sigmoid_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.sigmoid' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.sigmoid %arg0 : (tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_tanh_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.tanh' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.tanh %arg0 : (tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_add_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>, %arg1: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.add' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.add %arg0, %arg1 : (tensor<1x1x1x1x13x21x3xf32>, tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_arithmetic_right_shift_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>, %arg1: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.arithmetic_right_shift' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.arithmetic_right_shift %arg0, %arg1 {round = false} : (tensor<1x1x1x1x13x21x3xf32>, tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_bitwise_and_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xi32>, %arg1: tensor<1x1x1x1x13x21x3xi32>) -> tensor<1x1x1x1x13x21x3xi32> {
- // expected-error@+1 {{'tosa.bitwise_and' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.bitwise_and %a...
[truncated]
|
|
@llvm/pr-subscribers-mlir Author: TatWai Chong (tatwaichong) ChangesReverts llvm/llvm-project#129580 There is a lit test failure reported in https://lab.llvm.org/buildbot/#/builders/116/builds/11023 Patch is 67.83 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/129602.diff 2 Files Affected:
diff --git a/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp b/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp
index 96fb054d75b66..b4d2dfb7fc760 100644
--- a/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp
+++ b/mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp
@@ -61,22 +61,17 @@ struct TosaLevel {
int32_t MAX_KERNEL = 0;
int32_t MAX_STRIDE = 0;
int32_t MAX_SCALE = 0;
- int32_t MAX_LOG2_SIZE = 0;
- int32_t MAX_NESTING = 0;
- int32_t MAX_TENSOR_LIST_SIZE = 0;
+
+ // @todo: MAX_LOG2_SIZE value and checks
bool operator==(const TosaLevel &rhs) {
return MAX_RANK == rhs.MAX_RANK && MAX_KERNEL == rhs.MAX_KERNEL &&
- MAX_STRIDE == rhs.MAX_STRIDE && MAX_SCALE == rhs.MAX_SCALE &&
- MAX_LOG2_SIZE == rhs.MAX_LOG2_SIZE &&
- MAX_NESTING == rhs.MAX_NESTING &&
- MAX_TENSOR_LIST_SIZE == rhs.MAX_TENSOR_LIST_SIZE;
+ MAX_STRIDE == rhs.MAX_STRIDE && MAX_SCALE == rhs.MAX_SCALE;
}
};
-static constexpr TosaLevel TOSA_LEVEL_EIGHTK = {6, 8192, 8192, 256, 31, 6, 64};
-static constexpr TosaLevel TOSA_LEVEL_NONE = {32, 2147483647, 2147483647, 2048,
- 63, 256, 256};
+static constexpr TosaLevel TOSA_LEVEL_EIGHTK = {6, 8192, 8192, 256};
+static constexpr TosaLevel TOSA_LEVEL_NONE = {0, 0, 0, 0};
//===----------------------------------------------------------------------===//
// TOSA Validation Pass.
@@ -116,7 +111,8 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
constCheckers.emplace_back(checkConstantOperandPad);
}
- bool levelCheckKernel(Operation *op, int32_t v, const StringRef checkDesc) {
+ bool levelCheckKernel(Operation *op, int32_t v,
+ const std::string &checkDesc) {
if (v > tosaLevel.MAX_KERNEL) {
op->emitOpError() << "failed level check: " << checkDesc;
return false;
@@ -124,7 +120,8 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
return true;
}
- bool levelCheckStride(Operation *op, int32_t v, const StringRef checkDesc) {
+ bool levelCheckStride(Operation *op, int32_t v,
+ const std::string &checkDesc) {
if (v > tosaLevel.MAX_STRIDE) {
op->emitOpError() << "failed level check: " << checkDesc;
return false;
@@ -132,7 +129,7 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
return true;
}
- bool levelCheckScale(Operation *op, int32_t v, const StringRef checkDesc) {
+ bool levelCheckScale(Operation *op, int32_t v, const std::string &checkDesc) {
if (v > tosaLevel.MAX_SCALE) {
op->emitOpError() << "failed level check: " << checkDesc;
return false;
@@ -140,80 +137,110 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
return true;
}
- bool levelCheckListSize(Operation *op, int32_t v, const StringRef checkDesc) {
- if (v > tosaLevel.MAX_TENSOR_LIST_SIZE) {
- op->emitOpError() << "failed level check for MAX_TENSOR_LIST_SIZE: "
- << checkDesc;
- return false;
- }
- return true;
- }
-
- template <typename T>
- bool levelCheckRank(Operation *op, const T &v,
- const StringRef operandOrResult, int32_t highest_rank) {
+ bool levelCheckRank(Operation *op, const Value &v,
+ const std::string &checkDesc) {
if (ShapedType type = dyn_cast<ShapedType>(v.getType())) {
if (!type.hasRank()) {
op->emitOpError() << "failed level check: unranked tensor";
return false;
}
- if (type.getRank() > highest_rank) {
- op->emitOpError() << "failed level check: " << operandOrResult
- << " rank(shape) <= MAX_RANK";
+ if (type.getRank() > tosaLevel.MAX_RANK) {
+ op->emitOpError() << "failed level check: " << checkDesc;
return false;
}
}
return true;
}
- // Perform the Level tensor size check on the input tensor.
- bool levelCheckSize(Operation *op, const Value &v,
- const StringRef operandOrResult);
-
- // Level check sizes of all operands and results of the operation.
template <typename T>
- bool levelCheckSizes(T tosaOp) {
- auto op = tosaOp.getOperation();
- for (auto v : op->getOperands()) {
- if (!levelCheckSize(op, v, "operand"))
- return false;
- }
-
- for (auto v : op->getResults()) {
- if (!levelCheckSize(op, v, "result"))
- return false;
+ bool levelCheckRanksFor(Operation *op) {
+ if (dyn_cast<T>(op)) {
+ // level check ranks of all operands and results
+ for (auto v : op->getOperands()) {
+ if (!levelCheckRank(op, v, "operand rank(shape) <= MAX_RANK"))
+ return false;
+ }
+ for (auto v : op->getResults()) {
+ if (!levelCheckRank(op, v, "result rank(shape) <= MAX_RANK"))
+ return false;
+ }
}
return true;
}
- // Level check ranks of all operands, attribute and results of the operation.
- template <typename T>
- bool levelCheckRanks(T tosaOp) {
- auto op = tosaOp.getOperation();
- for (auto v : op->getOperands()) {
- if (!levelCheckRank(op, v, "operand", tosaLevel.MAX_RANK))
- return false;
- }
-
- if (!op->getAttrs().empty()) {
- for (NamedAttribute attr : op->getAttrs()) {
- if (auto elemAttr = dyn_cast<ElementsAttr>(attr.getValue())) {
- if (!levelCheckRank(op, elemAttr, "attribute", tosaLevel.MAX_RANK))
- return false;
- }
- }
- }
+ bool levelCheckRanks(Operation *op) {
+#define CHECK_RANKS_FOR(tosaOp) \
+ if (!levelCheckRanksFor<tosaOp##Op>(op)) \
+ return false;
- for (auto v : op->getResults()) {
- if (!levelCheckRank(op, v, "result", tosaLevel.MAX_RANK))
- return false;
- }
+ // tensor operators:
+ CHECK_RANKS_FOR(ArgMax);
+ // all activation functions:
+ CHECK_RANKS_FOR(Clamp);
+ CHECK_RANKS_FOR(Sigmoid);
+ CHECK_RANKS_FOR(Tanh);
+ // all elementwise binary operators:
+ CHECK_RANKS_FOR(Add);
+ CHECK_RANKS_FOR(ArithmeticRightShift);
+ CHECK_RANKS_FOR(BitwiseAnd);
+ CHECK_RANKS_FOR(BitwiseOr);
+ CHECK_RANKS_FOR(BitwiseXor);
+ CHECK_RANKS_FOR(IntDiv);
+ CHECK_RANKS_FOR(LogicalAnd);
+ CHECK_RANKS_FOR(LogicalLeftShift);
+ CHECK_RANKS_FOR(LogicalRightShift);
+ CHECK_RANKS_FOR(LogicalOr);
+ CHECK_RANKS_FOR(LogicalXor);
+ CHECK_RANKS_FOR(Maximum);
+ CHECK_RANKS_FOR(Minimum);
+ CHECK_RANKS_FOR(Mul);
+ CHECK_RANKS_FOR(Pow);
+ CHECK_RANKS_FOR(Sub);
+ CHECK_RANKS_FOR(Table);
+ // all elementwise unary operators:
+ CHECK_RANKS_FOR(Abs);
+ CHECK_RANKS_FOR(BitwiseNot);
+ CHECK_RANKS_FOR(Ceil);
+ CHECK_RANKS_FOR(Clz);
+ CHECK_RANKS_FOR(Exp);
+ CHECK_RANKS_FOR(Floor);
+ CHECK_RANKS_FOR(Log);
+ CHECK_RANKS_FOR(LogicalNot);
+ CHECK_RANKS_FOR(Negate);
+ CHECK_RANKS_FOR(Reciprocal);
+ CHECK_RANKS_FOR(Rsqrt);
+ // all elementwise ternary operators:
+ CHECK_RANKS_FOR(Select);
+ // all comparison operators:
+ CHECK_RANKS_FOR(Equal);
+ CHECK_RANKS_FOR(Greater);
+ CHECK_RANKS_FOR(GreaterEqual);
+ // all reduction operators:
+ CHECK_RANKS_FOR(ReduceAll);
+ CHECK_RANKS_FOR(ReduceAny);
+ CHECK_RANKS_FOR(ReduceMax);
+ CHECK_RANKS_FOR(ReduceMin);
+ CHECK_RANKS_FOR(ReduceProduct);
+ CHECK_RANKS_FOR(ReduceSum);
+ // all data layout operators:
+ CHECK_RANKS_FOR(Concat);
+ CHECK_RANKS_FOR(Pad);
+ CHECK_RANKS_FOR(Reshape);
+ CHECK_RANKS_FOR(Reverse);
+ CHECK_RANKS_FOR(Slice);
+ CHECK_RANKS_FOR(Tile);
+ CHECK_RANKS_FOR(Transpose);
+ // all type conversion operators:
+ CHECK_RANKS_FOR(Cast);
+ CHECK_RANKS_FOR(Rescale);
+ // all data nodes operators:
+ CHECK_RANKS_FOR(Const);
+ CHECK_RANKS_FOR(Identity);
+
+#undef CHECK_RANKS_FOR
return true;
}
- // Level check ranks and sizes.
- bool levelCheckRanksAndSizes(Operation *op);
-
// Pool Op: level check kernel/stride/pad values
template <typename T>
bool levelCheckPool(Operation *op) {
@@ -359,32 +386,6 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
return true;
}
- bool levelCheckListSize(Operation *op) {
- if (auto concat = dyn_cast<tosa::ConcatOp>(op)) {
- return levelCheckListSize(op, concat.getInput1().size(), "input1");
- }
- if (auto custom = dyn_cast<tosa::CustomOp>(op)) {
- if (!levelCheckListSize(op, custom.getInputList().size(), "input_list") ||
- !levelCheckListSize(op, custom.getOutputList().size(),
- "output_list")) {
- return false;
- }
- }
- if (auto condIf = dyn_cast<tosa::IfOp>(op)) {
- if (!levelCheckListSize(op, condIf.getInputs().size(), "inputs") ||
- !levelCheckListSize(op, condIf.getOutput().size(), "outputs")) {
- return false;
- }
- }
- if (auto w = dyn_cast<tosa::WhileOp>(op)) {
- if (!levelCheckListSize(op, w.getInputs().size(), "inputs") ||
- !levelCheckListSize(op, w.getOutput().size(), "outputs")) {
- return false;
- }
- }
- return true;
- }
-
// configure profile and level values from pass options profileName and
// levelName
void configLevelAndProfile() {
@@ -432,191 +433,16 @@ struct TosaValidation : public tosa::impl::TosaValidationBase<TosaValidation> {
tosa::TargetEnv targetEnv;
};
-template <>
-bool TosaValidation::levelCheckRanks(tosa::ArgMaxOp tosaOp) {
- auto op = tosaOp.getOperation();
- if (!levelCheckRank(op, tosaOp.getInput(), "operand", tosaLevel.MAX_RANK))
- return false;
-
- // rank(output) = rank(input) - 1
- if (!levelCheckRank(op, tosaOp.getOutput(), "result", tosaLevel.MAX_RANK - 1))
- return false;
-
- return true;
-}
-
-template <>
-bool TosaValidation::levelCheckRanks(tosa::IfOp tosaOp) {
- auto op = tosaOp.getOperation();
-
- // Only the condition input has rank limitation.
- if (!levelCheckRank(op, tosaOp.getCond(), "operand", tosaLevel.MAX_RANK))
- return false;
-
- return true;
-}
-
-bool TosaValidation::levelCheckRanksAndSizes(Operation *op) {
-#define CHECK_RANKS_AND_SIZES(tosaOp) \
- if (isa<tosa::tosaOp##Op>(op)) { \
- if (!levelCheckRanks(cast<tosa::tosaOp##Op>(op))) \
- return false; \
- if (!levelCheckSizes(cast<tosa::tosaOp##Op>(op))) \
- return false; \
- }
-
-#define CHECK_SIZES(tosaOp) \
- if (isa<tosa::tosaOp##Op>(op)) { \
- if (!levelCheckSizes(cast<tosa::tosaOp##Op>(op))) \
- return false; \
- }
-
- // Tensor Operators
- CHECK_RANKS_AND_SIZES(ArgMax);
- // Activation Functions
- CHECK_RANKS_AND_SIZES(Clamp);
- CHECK_RANKS_AND_SIZES(Erf);
- CHECK_RANKS_AND_SIZES(Sigmoid);
- CHECK_RANKS_AND_SIZES(Tanh);
- // Elementwise Binary Operators
- CHECK_RANKS_AND_SIZES(Add);
- CHECK_RANKS_AND_SIZES(ArithmeticRightShift);
- CHECK_RANKS_AND_SIZES(BitwiseAnd);
- CHECK_RANKS_AND_SIZES(BitwiseOr);
- CHECK_RANKS_AND_SIZES(BitwiseXor);
- CHECK_RANKS_AND_SIZES(IntDiv);
- CHECK_RANKS_AND_SIZES(LogicalAnd);
- CHECK_RANKS_AND_SIZES(LogicalLeftShift);
- CHECK_RANKS_AND_SIZES(LogicalRightShift);
- CHECK_RANKS_AND_SIZES(LogicalOr);
- CHECK_RANKS_AND_SIZES(LogicalXor);
- CHECK_RANKS_AND_SIZES(Maximum);
- CHECK_RANKS_AND_SIZES(Minimum);
- CHECK_RANKS_AND_SIZES(Mul);
- CHECK_RANKS_AND_SIZES(Pow);
- CHECK_RANKS_AND_SIZES(Sub);
- CHECK_RANKS_AND_SIZES(Table);
- // Elementwise Unary Operators
- CHECK_RANKS_AND_SIZES(Abs);
- CHECK_RANKS_AND_SIZES(BitwiseNot);
- CHECK_RANKS_AND_SIZES(Ceil);
- CHECK_RANKS_AND_SIZES(Clz);
- CHECK_RANKS_AND_SIZES(Cos);
- CHECK_RANKS_AND_SIZES(Exp);
- CHECK_RANKS_AND_SIZES(Floor);
- CHECK_RANKS_AND_SIZES(Log);
- CHECK_RANKS_AND_SIZES(LogicalNot);
- CHECK_RANKS_AND_SIZES(Negate);
- CHECK_RANKS_AND_SIZES(Reciprocal);
- CHECK_RANKS_AND_SIZES(Rsqrt);
- CHECK_RANKS_AND_SIZES(Sin);
- // Elementwise Ternary Operators
- CHECK_RANKS_AND_SIZES(Select);
- // Comparison Operators
- CHECK_RANKS_AND_SIZES(Equal);
- CHECK_RANKS_AND_SIZES(Greater);
- CHECK_RANKS_AND_SIZES(GreaterEqual);
- // Reduction Operators
- CHECK_RANKS_AND_SIZES(ReduceAll);
- CHECK_RANKS_AND_SIZES(ReduceAny);
- CHECK_RANKS_AND_SIZES(ReduceMax);
- CHECK_RANKS_AND_SIZES(ReduceMin);
- CHECK_RANKS_AND_SIZES(ReduceProduct);
- CHECK_RANKS_AND_SIZES(ReduceSum);
- // Data Layout Operators
- CHECK_RANKS_AND_SIZES(Concat);
- CHECK_RANKS_AND_SIZES(Pad);
- CHECK_RANKS_AND_SIZES(Reshape);
- CHECK_RANKS_AND_SIZES(Reverse);
- CHECK_RANKS_AND_SIZES(Slice);
- CHECK_RANKS_AND_SIZES(Tile);
- CHECK_RANKS_AND_SIZES(Transpose);
- // Type Conversion
- CHECK_RANKS_AND_SIZES(Cast);
- CHECK_RANKS_AND_SIZES(Rescale);
- // Control Flow Operators
- CHECK_RANKS_AND_SIZES(If);
- // Variable Operators
- CHECK_RANKS_AND_SIZES(Variable);
- CHECK_RANKS_AND_SIZES(VariableWrite);
- CHECK_RANKS_AND_SIZES(VariableRead);
- // Data Nodes
- CHECK_RANKS_AND_SIZES(Const);
- CHECK_RANKS_AND_SIZES(Identity);
-
- // For the following operators, check whether the size of each tensor
- // operand is valid in a given Level.
-
- // Tensor Operators
- CHECK_SIZES(AvgPool2d);
- CHECK_SIZES(Conv2D);
- CHECK_SIZES(Conv3D);
- CHECK_SIZES(DepthwiseConv2D);
- CHECK_SIZES(TransposeConv2D);
- CHECK_SIZES(FFT2d);
- CHECK_SIZES(MatMul);
- CHECK_SIZES(MaxPool2d);
- CHECK_SIZES(RFFT2d);
- // Scatter/Gather Operators
- CHECK_SIZES(Gather);
- CHECK_SIZES(Scatter);
- // Image Operators
- CHECK_SIZES(Resize);
- // Custom Operators
- CHECK_SIZES(Custom);
- // Control Flow Operators
- CHECK_SIZES(While);
- // Shape Operators
- CHECK_SIZES(ConstShape);
-
-#undef CHECK_RANKS_AND_SIZES
-#undef CHECK_SIZES
- return true;
-}
-
-// Perform the Level tensor size check
-bool TosaValidation::levelCheckSize(Operation *op, const Value &v,
- const StringRef operandOrResult) {
- if (ShapedType type = dyn_cast<ShapedType>(v.getType())) {
- if (!type.hasRank()) {
- op->emitOpError() << "failed level check: unranked tensor";
- return false;
- }
- auto shape = type.getShape();
- for (auto dim : shape) {
- if (mlir::ShapedType::isDynamic(dim)) {
- op->emitOpError() << "failed level check: " << operandOrResult
- << " shape dimension cannot be dynamic";
- return false;
- }
- }
-
- int64_t element_bits = type.getElementTypeBitWidth();
- int64_t element_bytes = std::max(INT64_C(1), element_bits / 8);
- int64_t size = element_bytes * type.getNumElements();
-
- // According to 1.11. Tensor Definitions of Tosa spec, the value of
- // tensor_size_t is 1 << MAX_LOG2_SIZE) - 1 where MAX_LOG2_SIZE is
- // defined in 1.7. Levels.
- // For each tensor, the number of tensor elements multiplied by the
- // element size in bytes must be representable as a tensor_size_t.
- const int64_t max_size = (INT64_C(1) << tosaLevel.MAX_LOG2_SIZE) - 1;
- if (size > max_size) {
- op->emitOpError()
- << "failed level check: " << operandOrResult
- << " tensor size (in bytes) <= (1 << MAX_LOG2_SIZE - 1)";
- return false;
- }
- }
- return true;
-}
-
LogicalResult TosaValidation::applyLevelCheck(Operation *op) {
if (tosaLevel == TOSA_LEVEL_NONE) {
// no need to do level checks
return success();
}
+ if (!levelCheckRanks(op)) {
+ return failure();
+ }
+
// additional level checks from spec 0.70
if (!levelCheckPool<tosa::AvgPool2dOp>(op) ||
!levelCheckConv<tosa::Conv2DOp>(op) ||
@@ -629,15 +455,6 @@ LogicalResult TosaValidation::applyLevelCheck(Operation *op) {
return failure();
}
- if (!levelCheckRanksAndSizes(op)) {
- return failure();
- }
-
- // level check MAX_TENSOR_LIST_SIZE
- if (!levelCheckListSize(op)) {
- return failure();
- }
-
return success();
}
diff --git a/mlir/test/Dialect/Tosa/level_check.mlir b/mlir/test/Dialect/Tosa/level_check.mlir
index 9862ccb0b2f3b..19584103d40c7 100644
--- a/mlir/test/Dialect/Tosa/level_check.mlir
+++ b/mlir/test/Dialect/Tosa/level_check.mlir
@@ -1,6 +1,10 @@
-// RUN: mlir-opt %s -split-input-file -verify-diagnostics --tosa-validate
+//--------------------------------------------------------------------------------------------------
+// Enable all supported profiles and extensions to focus the verification of expected level errors.
+//--------------------------------------------------------------------------------------------------
-func.func @test_argmax_rank_invalid(%arg0: tensor<1x1x1x1x29x29x4xf32>) -> tensor<1x1x1x1x29x4xi32> {
+// RUN: mlir-opt %s -split-input-file -verify-diagnostics --tosa-validate="profile=pro_int,pro_fp extension=int16,int4,bf16,fp8e4m3,fp8e5m2,fft,variable,controlflow"
+
+func.func @test_argmax(%arg0: tensor<1x1x1x1x29x29x4xf32>) -> tensor<1x1x1x1x29x4xi32> {
// expected-error@+1 {{'tosa.argmax' op failed level check: operand rank(shape) <= MAX_RANK}}
%0 = "tosa.argmax"(%arg0) {axis = 4 : i32} : (tensor<1x1x1x1x29x29x4xf32>) -> tensor<1x1x1x1x29x4xi32>
return %0 : tensor<1x1x1x1x29x4xi32>
@@ -8,312 +12,7 @@ func.func @test_argmax_rank_invalid(%arg0: tensor<1x1x1x1x29x29x4xf32>) -> tenso
// -----
-func.func @test_clamp_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.clamp' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.clamp %arg0 {min_val = -3.40282347E+38 : f32, max_val = 3.40282347E+38 : f32} : (tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_erf_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.erf' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.erf %arg0 : (tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_sigmoid_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.sigmoid' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.sigmoid %arg0 : (tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_tanh_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.tanh' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.tanh %arg0 : (tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_add_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>, %arg1: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.add' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.add %arg0, %arg1 : (tensor<1x1x1x1x13x21x3xf32>, tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_arithmetic_right_shift_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xf32>, %arg1: tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32> {
- // expected-error@+1 {{'tosa.arithmetic_right_shift' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.arithmetic_right_shift %arg0, %arg1 {round = false} : (tensor<1x1x1x1x13x21x3xf32>, tensor<1x1x1x1x13x21x3xf32>) -> tensor<1x1x1x1x13x21x3xf32>
- return %0 : tensor<1x1x1x1x13x21x3xf32>
-}
-
-// -----
-
-func.func @test_bitwise_and_rank_invalid(%arg0: tensor<1x1x1x1x13x21x3xi32>, %arg1: tensor<1x1x1x1x13x21x3xi32>) -> tensor<1x1x1x1x13x21x3xi32> {
- // expected-error@+1 {{'tosa.bitwise_and' op failed level check: operand rank(shape) <= MAX_RANK}}
- %0 = tosa.bitwise_and %a...
[truncated]
|
jph-13
pushed a commit
to jph-13/llvm-project
that referenced
this pull request
Mar 21, 2025
Reverts llvm#129580 There is a lit test failure reported in https://lab.llvm.org/buildbot/#/builders/116/builds/11023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #129580
There is a lit test failure reported in https://lab.llvm.org/buildbot/#/builders/116/builds/11023