Skip to content

Commit

Permalink
[TOSA] Don't run validation pass on non TOSA operations
Browse files Browse the repository at this point in the history
This commit ensures the validation pass is not run on operations
from other dialects. In doing so, operations from other dialects
that, for example, use types not supported by TOSA don't result
in an error.

Change-Id: If1efde2036f2d3e13b8c8588fea6344922453c2b
Signed-off-by: Luke Hutton <luke.hutton@arm.com>
  • Loading branch information
lhutton1 committed Dec 17, 2024
1 parent fbdbb13 commit cb055ae
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
4 changes: 4 additions & 0 deletions mlir/lib/Dialect/Tosa/Transforms/TosaValidation.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -543,6 +543,10 @@ bool TosaValidation::isValidElementType(Type type) {
void TosaValidation::runOnOperation() {
configLevelAndProfile();
getOperation().walk([&](Operation *op) {
if (!op->getDialect() ||
op->getDialect()->getNamespace() != TosaDialect::getDialectNamespace())
return;

for (Value operand : op->getOperands()) {
auto elementTy = getElementTypeOrSelf(operand);
if (!isValidElementType(elementTy)) {
Expand Down
12 changes: 10 additions & 2 deletions mlir/test/Dialect/Tosa/invalid.mlir
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,6 @@ func.func @test_mul_invalid_shift(%arg0: tensor<13x21x3xf32>, %arg1: tensor<13x1
func.func @test_unsupported_int64_data_type(%arg0: tensor<1x13x13x5xf32>) -> tensor<1x13x13xi64> {
// expected-error@+1 {{'tosa.argmax' op is not profile-aligned: element type 'i64' is not legal}}
%0 = tosa.argmax %arg0 {axis = 3 : i32} : (tensor<1x13x13x5xf32>) -> tensor<1x13x13xi64>
// expected-error@+1 {{'func.return' op is not profile-aligned: element type 'i64' is not legal}}
return %0 : tensor<1x13x13xi64>
}

Expand Down Expand Up @@ -879,4 +878,13 @@ func.func @test_mismatch_in_out_shape_logical_not(%arg0: tensor<1x21x3xi1>) -> t
// expected-error@+1 {{'tosa.logical_not' op requires the same shape for all operands and results}}
%0 = tosa.logical_not %arg0 : (tensor<1x21x3xi1>) -> tensor<13x21x3xi1>
return %0 : tensor<13x21x3xi1>
}
}

// -----

// Check validate pass doesn't run on non TOSA ops
func.func @test_non_tosa_ops() {
%0 = arith.constant 6 : index
%2 = tensor.empty(%0) : tensor<?x27xi64>
return
}

0 comments on commit cb055ae

Please sign in to comment.