Merge commit '2341f207' into matthias.update_torch_stable

Xilinx · Dec 12, 2024 · 35789a6 · 35789a6
2 parents e98c52f + 2341f20
commit 35789a6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/externals/llvm-project b/externals/llvm-project
diff --git a/lib/Conversion/TorchToTosa/TorchToTosa.cpp b/lib/Conversion/TorchToTosa/TorchToTosa.cpp
@@ -1084,24 +1084,26 @@ LogicalResult ConvertAtenOp<AtenPowTensorTensorOp>::matchAndRewrite(
     ConversionPatternRewriter &rewriter) const {
 
   Value self = adaptor.getSelf();
-  auto selfTy = cast<RankedTensorType>(self.getType());
+  auto selfTy = dyn_cast<RankedTensorType>(self.getType());
+  auto outType =
+      dyn_cast<RankedTensorType>(getTypeConverter()->convertType(op.getType()));
+  Value expTensor = adaptor.getExponent();
+  auto expTensorTy = dyn_cast<RankedTensorType>(expTensor.getType());
 
-  if (!selfTy)
+  if (!selfTy || !outType || !expTensorTy) {
     return rewriter.notifyMatchFailure(
         op, "Only ranked tensor types supported in TOSA Pow");
+  }
 
-  if (!isa<mlir::FloatType>(selfTy.getElementType()))
+  if (!isa<mlir::FloatType>(selfTy.getElementType())) {
     return rewriter.notifyMatchFailure(
         op, "Only floating-point datatype legalization supported");
+  }
 
-  auto outType =
-      cast<TensorType>(getTypeConverter()->convertType(op.getType()));
-
-  Value expTensor = adaptor.getExponent();
-  if (expTensor.getType() != selfTy) {
+  if (expTensorTy.getElementType() != selfTy.getElementType()) {
     expTensor = rewriter.createOrFold<tosa::CastOp>(
         op->getLoc(),
-        RankedTensorType::get(outType.getShape(), selfTy.getElementType()),
+        RankedTensorType::get(expTensorTy.getShape(), selfTy.getElementType()),
         expTensor);
   }
 

diff --git a/projects/pt1/e2e_testing/xfail_sets.py b/projects/pt1/e2e_testing/xfail_sets.py
@@ -1993,6 +1993,7 @@
     "ElementwisePowTensorBroadcastModule_basic",
     "ElementwisePowTensorBroadcastStaticModule_basic",
     "ElementwisePowTensorModule_basic",
+    "ElementwisePowTensorStaticModule_basic",
     "ElementwisePreluModule_basic",
     "ElementwisePreluStaticModule_basic",
     "ElementwiseRad2DegModule_basic",
+3 −3		mlir/include/mlir/Dialect/Affine/Utils.h
+2 −2		mlir/include/mlir/Dialect/Tosa/IR/CMakeLists.txt
+27 −31		mlir/include/mlir/Dialect/Tosa/IR/TosaOps.td
+45 −17		mlir/include/mlir/Dialect/Tosa/IR/TosaTypesBase.td
+13 −0		mlir/include/mlir/Dialect/Tosa/Utils/ConversionUtils.h
+12 −9		mlir/lib/Conversion/TosaToLinalg/TosaToLinalgNamed.cpp
+4 −4		mlir/lib/Dialect/Affine/Utils/Utils.cpp
+0 −17		mlir/lib/Dialect/Tensor/IR/TensorTilingInterfaceImpl.cpp
+54 −22		mlir/lib/Dialect/Tosa/IR/TosaCanonicalizations.cpp
+75 −60		mlir/lib/Dialect/Tosa/IR/TosaOps.cpp
+5 −5		mlir/test/Conversion/TosaToLinalg/tosa-to-linalg-named.mlir
+3 −1		mlir/test/Conversion/TosaToLinalg/tosa-to-linalg-pipeline.mlir
+0 −41		mlir/test/Dialect/Tensor/tiling.mlir
+8 −0		mlir/test/Dialect/Tosa/canonicalize.mlir
+2 −2		mlir/test/Dialect/Tosa/constant-op-fold.mlir
+74 −16		mlir/test/Dialect/Tosa/invalid.mlir
+16 −0		mlir/test/Dialect/Tosa/ops.mlir