Merge pull request #482 from Xilinx/matthias.bump_to_8b0bf2e2

[AutoBump] Merge with fixes of 8b0bf2e (Oct 30, requires LLVM bump) (97)

Author: mgehre-amd

externals/stablehlo

@@ -4016,10 +4016,9 @@ OpFoldResult AtenSliceTensorOp::fold(FoldAdaptor adaptor) {
     limit = limit < 0 ? limit + inType.getSizes()[dimInt] : limit;
     limit = limit < 0 ? -1 : limit;
     limit = std::min(limit, inType.getSizes()[dimInt]);
-    bool validIterArgs =
-        (stride > 0 && begin < limit) || (stride < 0 && begin > limit);
-    assert(validIterArgs &&
-           "aten.slice.Tensor iteration args are statically invalid.");
+    assert((stride > 0 && begin < limit) ||
+           (stride < 0 && begin > limit) &&
+               "aten.slice.Tensor iteration args are statically invalid.");
 
     int64_t inputRank = inType.getSizes().size();
     llvm::SmallVector<int64_t> inputStrides(inputRank, 1);

lib/Dialect/Torch/IR/TorchOps.cpp

@@ -57,16 +57,16 @@ static void setupTorchBoolToI1Conversion(ConversionTarget &target,
   typeConverter.addConversion([](Torch::BoolType type) -> std::optional<Type> {
     return IntegerType::get(type.getContext(), 1);
   });
-  typeConverter.addTargetMaterialization(
-      [](OpBuilder &builder, IntegerType type, ValueRange inputs,
-         Location loc) -> std::optional<Value> {
-        // Other builtin integer types could be handled by other materializers.
-        if (!(type.getWidth() == 1 && type.isSignless()))
-          return std::nullopt;
-        assert(inputs.size() == 1);
-        assert(isa<Torch::BoolType>(inputs[0].getType()));
-        return builder.create<ToI1Op>(loc, inputs[0]).getResult();
-      });
+  typeConverter.addTargetMaterialization([](OpBuilder &builder,
+                                            IntegerType type, ValueRange inputs,
+                                            Location loc) -> Value {
+    // Other builtin integer types could be handled by other materializers.
+    if (!(type.getWidth() == 1 && type.isSignless()))
+      return Value();
+    assert(inputs.size() == 1);
+    assert(isa<Torch::BoolType>(inputs[0].getType()));
+    return builder.create<ToI1Op>(loc, inputs[0]).getResult();
+  });
   auto sourceMaterialization = [](OpBuilder &builder, Torch::BoolType type,
                                   ValueRange inputs, Location loc) -> Value {
     assert(inputs.size() == 1);
@@ -83,19 +83,19 @@ static void setupTorchIntToI64Conversion(ConversionTarget &target,
   typeConverter.addConversion([](Torch::IntType type) -> std::optional<Type> {
     return IntegerType::get(type.getContext(), 64);
   });
-  typeConverter.addTargetMaterialization(
-      [](OpBuilder &builder, IntegerType type, ValueRange inputs,
-         Location loc) -> std::optional<Value> {
-        // Other builtin integer types could be handled by other materializers.
-        if (!(type.getWidth() == 64 && type.isSignless()))
-          return std::nullopt;
-        // Other input type to be converted to i64 are handled by other
-        // materializers.
-        if (!isa<Torch::IntType>(inputs[0].getType()))
-          return std::nullopt;
-        assert(inputs.size() == 1);
-        return builder.createOrFold<ToI64Op>(loc, inputs[0]);
-      });
+  typeConverter.addTargetMaterialization([](OpBuilder &builder,
+                                            IntegerType type, ValueRange inputs,
+                                            Location loc) -> Value {
+    // Other builtin integer types could be handled by other materializers.
+    if (!(type.getWidth() == 64 && type.isSignless()))
+      return Value();
+    // Other input type to be converted to i64 are handled by other
+    // materializers.
+    if (!isa<Torch::IntType>(inputs[0].getType()))
+      return Value();
+    assert(inputs.size() == 1);
+    return builder.createOrFold<ToI64Op>(loc, inputs[0]);
+  });
   auto sourceMaterialization = [](OpBuilder &builder, Torch::IntType type,
                                   ValueRange inputs, Location loc) -> Value {
     assert(inputs.size() == 1);
@@ -112,13 +112,13 @@ static void setupTorchFloatToF64Conversion(ConversionTarget &target,
   typeConverter.addConversion([](Torch::FloatType type) -> std::optional<Type> {
     return Float64Type::get(type.getContext());
   });
-  typeConverter.addTargetMaterialization(
-      [](OpBuilder &builder, Float64Type type, ValueRange inputs,
-         Location loc) -> std::optional<Value> {
-        assert(inputs.size() == 1);
-        assert(isa<Torch::FloatType>(inputs[0].getType()));
-        return builder.create<ToF64Op>(loc, inputs[0]).getResult();
-      });
+  typeConverter.addTargetMaterialization([](OpBuilder &builder,
+                                            Float64Type type, ValueRange inputs,
+                                            Location loc) -> Value {
+    assert(inputs.size() == 1);
+    assert(isa<Torch::FloatType>(inputs[0].getType()));
+    return builder.create<ToF64Op>(loc, inputs[0]).getResult();
+  });
   auto sourceMaterialization = [](OpBuilder &builder, Torch::FloatType type,
                                   ValueRange inputs, Location loc) -> Value {
     assert(inputs.size() == 1);
@@ -137,19 +137,19 @@ static void setupTorchGeneratorToI64Conversion(ConversionTarget &target,
       [](Torch::GeneratorType type) -> std::optional<Type> {
         return IntegerType::get(type.getContext(), 64);
       });
-  typeConverter.addTargetMaterialization(
-      [](OpBuilder &builder, IntegerType type, ValueRange inputs,
-         Location loc) -> std::optional<Value> {
-        // Other builtin integer types could be handled by other materializers.
-        if (!(type.getWidth() == 64 && type.isSignless()))
-          return std::nullopt;
-        // Other input type to be converted to i64 are handled by other
-        // materializers.
-        if (!isa<Torch::GeneratorType>(inputs[0].getType()))
-          return std::nullopt;
-        assert(inputs.size() == 1);
-        return builder.create<GeneratorToI64Op>(loc, inputs[0]).getResult();
-      });
+  typeConverter.addTargetMaterialization([](OpBuilder &builder,
+                                            IntegerType type, ValueRange inputs,
+                                            Location loc) -> Value {
+    // Other builtin integer types could be handled by other materializers.
+    if (!(type.getWidth() == 64 && type.isSignless()))
+      return Value();
+    // Other input type to be converted to i64 are handled by other
+    // materializers.
+    if (!isa<Torch::GeneratorType>(inputs[0].getType()))
+      return Value();
+    assert(inputs.size() == 1);
+    return builder.create<GeneratorToI64Op>(loc, inputs[0]).getResult();
+  });
   auto sourceMaterialization = [](OpBuilder &builder, Torch::GeneratorType type,
                                   ValueRange inputs, Location loc) -> Value {
     assert(inputs.size() == 1);

lib/Dialect/TorchConversion/Transforms/BackendTypeConversion.cpp

@@ -506,7 +506,10 @@
     "MeshgridIndexingIJ_basic",
     "MeshgridIndexingXY_basic",
     "Meshgrid_basic",
+    "OneHotModule_basic",
     # RuntimeError: cannot mutate tensors with frozen storage
+    "ElementwiseRreluTrainModule_basic",
+    "ElementwiseRreluTrainStaticModule_basic",
     "ElementwiseRreluWithNoiseTrainModule_basic",
     "ElementwiseRreluWithNoiseTrainStaticModule_basic",
     "BernoulliFloatModule_basic",
@@ -522,6 +525,8 @@
         "ChunkListUnpackUnevenDynamic_Module_basic",
         "ChunkListUnpackUneven_Module_basic",
         "ChunkListUnpack_Module_basic",
+        "ElementwiseRreluTrainModule_basic",
+        "ElementwiseRreluTrainStaticModule_basic",
         "ElementwiseRreluWithNoiseTrainModule_basic",
         "ElementwiseRreluWithNoiseTrainStaticModule_basic",
         "SplitTensorGetItem_Module_basic",
@@ -550,6 +555,7 @@
         "MeshgridIndexingIJ_basic",
         "MeshgridIndexingXY_basic",
         "Meshgrid_basic",
+        "OneHotModule_basic",
         "UniformModule_basic",
         "UniformStaticShapeModule_basic",
     }
@@ -739,7 +745,6 @@
     "DiagonalModule_with_offset",
     "DivFloatModule_basic",
     "DivIntModule_basic",
-    "ElementwiseAddScalar_NumToTensorFloat_Module_basic",
     "ElementwiseDequantizePerChannelModule_basic",
     "ElementwiseDequantizePerTensorModule_basic",
     "ElementwiseErfIntModule_basic",
@@ -841,8 +846,6 @@
     "NormScalarComplexModule_basic",
     "NormScalarModule_basic",
     "NormalFunctionalModule_basic",
-    "NumToTensorFloatModule_basic",
-    "NumToTensorIntModule_basic",
     "NumelModule_basic",
     "NumelZeroRankModule_basic",
     "PowIntFloatModule_basic",
@@ -878,7 +881,6 @@
     "ReplicationPad2dModule_left0",
     "ReplicationPad2dModule_right0",
     "ReplicationPad2dModule_top0",
-    "RsubInt0d_NumToTensor_Module_basic",
     "ScalarImplicitFloatModule_basic",
     # REMOVE WHEN ENABLE_GQA IS ADDED
     "ScatterReduceFloatMaxModule",
@@ -1013,6 +1015,11 @@
     "UpSampleNearest2dStaticFactor_basic",
     "UpSampleNearest2dStaticSize_basic",
     "UpSampleNearest2d_basic",
+    # RuntimeError: cannot mutate tensors with frozen storage
+    "ElementwiseRreluTrainModule_basic",
+    "ElementwiseRreluTrainStaticModule_basic",
+    "ElementwiseRreluWithNoiseTrainModule_basic",
+    "ElementwiseRreluWithNoiseTrainStaticModule_basic",
 }
 
 FX_IMPORTER_STABLEHLO_CRASHING_SET = {
@@ -3675,7 +3682,6 @@
     "IndexPutImpl3DFloatAccumulateModule_basic",
     "IndexPutImpl3DFloatNonAccumulateModule_basic",
     "IndexPutImplIndexWithNoneModule_basic",
-    "IndexSelectRank0IdxModule_basic",
     "InterpolateDynamicModule_sizes_bilinear",
     "InterpolateDynamicModule_sizes_nearest",
     "InterpolateStaticModule_scales_bilinear_align_corners",
@@ -4005,7 +4011,6 @@
         "GridSamplerBasic2_basic",
         "GridSamplerBasic3_basic",
         "GridSamplerBasic4_basic",
-        "IndexSelectRank0IdxModule_basic",
         "IouOfModule_basic",
         "MaxPool1dEmptyStrideStaticModule_basic",
         "MaxPool1dStaticCeilModeTrueModule_basic",

projects/pt1/e2e_testing/xfail_sets.py

@@ -1 +1 @@
-160d421a40e934ac8183e47f9cbc8618a4bd97dd
+c787213d413e85c66bdad0d8c9cde1c5ced34b1b