Rebase main.

llvm · Oct 31, 2024 · 824d0cd · 824d0cd
1 parent 611a58d
commit 824d0cd
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/lib/Conversion/TorchToTosa/TorchToTosa.cpp b/lib/Conversion/TorchToTosa/TorchToTosa.cpp
@@ -6826,14 +6826,15 @@ void torch::populateTorchToTosaConversionIllegalOps(ConversionTarget &target) {
       AtenAnyOp, AtenSumOp, AtenSqueezeOp, AtenSqueezeDimOp, AtenMatmulOp,
       AtenMmOp, AtenBmmOp, AtenLinearOp, AtenAdaptiveAvgPool2dOp,
       AtenMaxPool2dOp, AtenAvgPool2dOp, AtenOnesOp, AtenZerosOp,
-      AtenEmptyMemoryFormatOp, AtenFill_ScalarOp, AtenMaskedFillScalarOp,
-      AtenMaskedFillTensorOp, AtenTanhOp, AtenSigmoidOp, AtenErfOp,
-      AtenHardtanhBackwardOp, AtenReluOp, AtenLeakyReluOp, AtenArgmaxOp,
-      AtenPowTensorScalarOp, AtenPowTensorTensorOp, AtenPowScalarOp,
-      AtenRsubScalarOp, AtenConvolutionOp, ValueTensorLiteralOp, AtenReshapeOp,
-      AtenBatchNormOp, AtenNativeLayerNormOp, AtenFlattenUsingIntsOp,
-      AtenUnflattenIntOp, AtenPermuteOp, AtenLog2Op, AtenThresholdOp,
-      AtenUnsqueezeOp, AtenContiguousOp, AtenDropoutOp, AtenViewOp, AtenGeluOp,
+      AtenEmptyMemoryFormatOp, AtenFill_ScalarOp, AtenFillScalarOp,
+      AtenFillTensorOp, AtenMaskedFillScalarOp, AtenMaskedFillTensorOp,
+      AtenTanhOp, AtenSigmoidOp, AtenErfOp, AtenHardtanhBackwardOp, AtenReluOp,
+      AtenLeakyReluOp, AtenArgmaxOp, AtenPowTensorScalarOp,
+      AtenPowTensorTensorOp, AtenPowScalarOp, AtenRsubScalarOp,
+      AtenConvolutionOp, ValueTensorLiteralOp, AtenReshapeOp, AtenBatchNormOp,
+      AtenNativeLayerNormOp, AtenFlattenUsingIntsOp, AtenUnflattenIntOp,
+      AtenPermuteOp, AtenLog2Op, AtenThresholdOp, AtenUnsqueezeOp,
+      AtenContiguousOp, AtenDropoutOp, AtenViewOp, AtenGeluOp,
       AtenGeluBackwardOp, AtenEmbeddingOp, AtenTransposeIntOp, AtenMaxDimOp,
       AtenMinDimOp, AtenSliceTensorOp, AtenBroadcastToOp, AtenGatherOp,
       AtenIndexPutHackedTwinOp, AtenIndexTensorHackedTwinOp, AtenAbsOp,
@@ -6842,7 +6843,7 @@ void torch::populateTorchToTosaConversionIllegalOps(ConversionTarget &target) {
       AtenRemainderScalarOp, AtenRemainderTensorOp, AtenFmodScalarOp,
       AtenFmodTensorOp, AtenCatOp, AtenSqrtOp, AtenIscloseOp,
       Aten__InterpolateSizeListScaleListOp, AtenTrilOp, AtenDiagonalOp,
-      AtenCloneOp>();
+      AtenIndexSelectOp, AtenFlipOp, AtenRoundOp, AtenCloneOp>();
 }
 
 void torch::populateTorchToTosaConversionPatterns(TypeConverter &typeConverter,
@@ -7013,8 +7014,9 @@ void torch::populateTorchToTosaConversionPatterns(TypeConverter &typeConverter,
 
 #define INSERT_FILL_PATTERN(AtenOp)                                            \
   patterns.add<ConvertAtenFillOp<AtenOp>>(typeConverter, context);
-    INSERT_FILL_PATTERN(AtenFillScalarOp);
-    INSERT_FILL_PATTERN(AtenFillTensorOp);
+  INSERT_FILL_PATTERN(AtenFill_ScalarOp);
+  INSERT_FILL_PATTERN(AtenFillScalarOp);
+  INSERT_FILL_PATTERN(AtenFillTensorOp);
 #undef INSERT_FILL_PATTERN
 
 #define INSERT_MASKED_FILL_PATTERN(AtenOp)                                     \
@@ -7082,12 +7084,12 @@ void torch::populateTorchToTosaConversionPatterns(TypeConverter &typeConverter,
   INSERT_ATENOP_PATTERN(Aten__InterpolateSizeListScaleListOp);
   INSERT_ATENOP_PATTERN(AtenTrilOp);
   INSERT_ATENOP_PATTERN(AtenDiagonalOp);
-    INSERT_ATENOP_PATTERN(AtenIndexSelectOp);
-    INSERT_ATENOP_PATTERN(AtenFlipOp);
-    INSERT_ATENOP_PATTERN(AtenRoundOp);
-    INSERT_ATENOP_PATTERN(AtenScatterSrcOp);
-    INSERT_ATENOP_PATTERN(AtenSliceScatterOp);
-    INSERT_ATENOP_PATTERN(AtenDiagEmbedOp);
+  INSERT_ATENOP_PATTERN(AtenIndexSelectOp);
+  INSERT_ATENOP_PATTERN(AtenFlipOp);
+  INSERT_ATENOP_PATTERN(AtenRoundOp);
+  INSERT_ATENOP_PATTERN(AtenScatterSrcOp);
+  INSERT_ATENOP_PATTERN(AtenSliceScatterOp);
+  INSERT_ATENOP_PATTERN(AtenDiagEmbedOp);
     INSERT_ATENOP_PATTERN(AtenUniformOp);
     INSERT_ATENOP_PATTERN(AtenThresholdBackwardOp);
 #undef INSERT_ATENOP_PATTERN