Author: Mehdi Amini Date: 2024-03-31T23:25:12+02:00 New Revision: 9c70ea959872a607dd7ddea24fc642db938c7f82
URL: https://github.com/llvm/llvm-project/commit/9c70ea959872a607dd7ddea24fc642db938c7f82 DIFF: https://github.com/llvm/llvm-project/commit/9c70ea959872a607dd7ddea24fc642db938c7f82.diff LOG: Revert "[mlir]Fix dialect conversion drop uses (#86991)" This reverts commit 0030fc4ac74a9ce645adb9d59e108da4d4d11818. Added: Modified: mlir/lib/Transforms/Utils/DialectConversion.cpp mlir/test/Conversion/TosaToLinalg/tosa-to-linalg-invalid.mlir Removed: ################################################################################ diff --git a/mlir/lib/Transforms/Utils/DialectConversion.cpp b/mlir/lib/Transforms/Utils/DialectConversion.cpp index 3c72c8789e8ec5..2ec0b964b304f6 100644 --- a/mlir/lib/Transforms/Utils/DialectConversion.cpp +++ b/mlir/lib/Transforms/Utils/DialectConversion.cpp @@ -279,13 +279,11 @@ class CreateBlockRewrite : public BlockRewrite { auto &blockOps = block->getOperations(); while (!blockOps.empty()) blockOps.remove(blockOps.begin()); - block->dropAllDefinedValueUses(); - if (block->getParent()) { + block->dropAllUses(); + if (block->getParent()) block->erase(); - } else { - block->dropAllDefinedValueUses(); + else delete block; - } } }; diff --git a/mlir/test/Conversion/TosaToLinalg/tosa-to-linalg-invalid.mlir b/mlir/test/Conversion/TosaToLinalg/tosa-to-linalg-invalid.mlir index 6494e1b2719487..17eec593691860 100644 --- a/mlir/test/Conversion/TosaToLinalg/tosa-to-linalg-invalid.mlir +++ b/mlir/test/Conversion/TosaToLinalg/tosa-to-linalg-invalid.mlir @@ -15,16 +15,3 @@ func.func @tensor_with_unknown_rank(%arg0: tensor<*xi8>) -> tensor<*xi8> { %0 = "tosa.abs"(%arg0) : (tensor<*xi8>) -> tensor<*xi8> return %0 : tensor<*xi8> } - -// ----- - -// CHECK-LABEL: @unranked_add -func.func @unranked_add(%arg0 : tensor<10x10xf32> , %arg1 : tensor<10x10xf32>, %arg2 : tensor<*xf32>) -> (tensor<10x10xf32>) { - // expected-error@+3 {{failed to legalize operation 'tosa.add'}} - %reduce = tosa.reduce_max %arg0 {axis = 1 : i32} : (tensor<10x10xf32>) -> tensor<10x1xf32> - %1 = tosa.add %reduce, %arg1 : (tensor<10x1xf32>, tensor<10x10xf32>) -> tensor<10x10xf32> - %0 = tosa.add %1, %arg2 : (tensor<10x10xf32>, tensor<*xf32>) -> tensor<*xf32> - %2 = tosa.reshape %0 {new_shape = array<i64: 10, 10>} : (tensor<*xf32>) -> tensor<10x10xf32> - return %2 : tensor<10x10xf32> -} - _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
