Integrate LLVM at llvm/llvm-project@dd3addf954ac (#2758)

fixes #2751

Author: sdasgup3

BUILD.bazel

@@ -1578,9 +1578,8 @@ cc_library(
     srcs = [
         "stablehlo/conversions/tosa/transforms/StablehloLegalizeToTosa.cpp",
         "stablehlo/conversions/tosa/transforms/StablehloPrepareForTosa.cpp",
-        # TODO: un-comment the following once #2751 is fixed
-        # "stablehlo/conversions/tosa/transforms/StablehloQuantLegalizeToTosaRescale.cpp",
-        # "stablehlo/conversions/tosa/transforms/TosaRescaleLegalizeToStablehlo.cpp",
+        "stablehlo/conversions/tosa/transforms/StablehloQuantLegalizeToTosaRescale.cpp",
+        "stablehlo/conversions/tosa/transforms/TosaRescaleLegalizeToStablehlo.cpp",
     ],
     hdrs = [
         "stablehlo/conversions/tosa/transforms/Passes.h",

WORKSPACE.bazel

@@ -17,9 +17,9 @@ workspace(name = "stablehlo")
 
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
-LLVM_COMMIT = "0230d63b4a8b9f420b0aaac373891df1199715a8"
+LLVM_COMMIT = "dd3addf954ac7e704fccc7d011217ba10461c883"
 
-LLVM_SHA256 = "27641dbb2ee0fecb6f084a4300b0c27ac692c2d1214fad236dc5e19dd7962693"
+LLVM_SHA256 = "f2f7ef9a6eb597b8a53186878122269d673fca742470f3bdb5bac18a47e9b8be"
 
 http_archive(
     name = "llvm-raw",

build_tools/llvm_version.txt

@@ -1 +1 @@
-0230d63b4a8b9f420b0aaac373891df1199715a8
+dd3addf954ac7e704fccc7d011217ba10461c883

docs/generated/stablehlo_tosa_passes.md

@@ -10,3 +10,17 @@ _Prepare StableHLO for legalization to TOSA_
 
 This pass adds rewriters to make StableHLO ops more compatible with TOSA ops.
 Currently simplifies stablehlo.dot_general into stablehlo.dot for easier lowering.
+
+### `-stablehlo-quant-legalize-to-tosa-rescale`
+
+_Legalize StableHLO Quantized operations to TOSA rescale operations_
+
+This pass rewrites StableHLO quantized operations to integer operations
+by inserting TOSA rescale operations at the inputs and outputs of the
+integer operations.
+
+### `-tosa-rescale-legalize-to-stablehlo`
+
+_Legalize TOSA rescales to StableHlo primitive math operations_
+
+This pass rewrites TOSA rescale operations to StableHLO primitive math operations.

stablehlo/conversions/tosa/tests/BUILD.bazel

@@ -55,18 +55,7 @@ RUNFILES_DIR = LITE_CFG_PY.parents[4].absolute().as_posix()''',
         tags = ["stablehlo_tosa_tests"],
         deps = ["@rules_python//python/runfiles"],
     )
-    # TODO: remove the following excludes once #2751 is fixed.
-    for src in glob(
-        ["**/*.mlir"],
-        exclude = [
-            "legalize_quant_ops_to_tosa_rescale.mlir",
-            "legalize_tosa_rescale_to_stablehlo.mlir",
-            "rescale_interpreter.mlir",
-            "binary.mlir",
-            "nullary.mlir",
-            "unary.mlir",
-        ],
-    )
+    for src in glob(["**/*.mlir"])
 ]
 
 test_suite(

stablehlo/conversions/tosa/tests/lit.cfg.py

@@ -25,8 +25,6 @@
 config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell)
 config.suffixes = ['.mlir']
 config.test_source_root = os.path.dirname(__file__)
-# TODO: remove the following once #2751 is fixed.
-config.excludes = ['legalize_quant_ops_to_tosa_rescale.mlir', 'legalize_tosa_rescale_to_stablehlo.mlir', 'rescale_interpreter.mlir', 'binary.mlir', 'nullary.mlir', 'unary.mlir']
 
 # Disallow reusing variables across CHECK-LABEL matches.
 # A variable can eschew this (be made "global") by prefixing its name with $.

stablehlo/conversions/tosa/transforms/CMakeLists.txt

@@ -25,11 +25,9 @@ add_mlir_pdll_library(StablehloTOSAPDLLPatternsIncGen
 add_mlir_library(StablehloTOSATransforms
   StablehloLegalizeToTosa.cpp
   StablehloPrepareForTosa.cpp
-  # TODO: un-comment the following once #2751 is fixed.
-  # StablehloQuantLegalizeToTosaRescale.cpp
-  # TosaRescaleLegalizeToStablehlo.cpp
+  StablehloQuantLegalizeToTosaRescale.cpp
+  TosaRescaleLegalizeToStablehlo.cpp
 
-  PARTIAL_SOURCES_INTENDED
   DEPENDS
   StablehloTOSATransformsPassIncGen
   StablehloTOSAPDLLPatternsIncGen

stablehlo/conversions/tosa/transforms/Passes.td

@@ -33,25 +33,24 @@ def StablehloPrepareForTosaPass : Pass<"stablehlo-prepare-for-tosa", "mlir::func
   let dependentDialects = ["::mlir::tosa::TosaDialect"];
 }
 
-// TODO: un-comment the following once #2751 is fixed.
-// def StablehloQuantLegalizeToTosaRescalePass : Pass<"stablehlo-quant-legalize-to-tosa-rescale", "mlir::func::FuncOp"> {
-//   let summary = "Legalize StableHLO Quantized operations to TOSA rescale operations";
-//   let description = [{
-//     This pass rewrites StableHLO quantized operations to integer operations
-//     by inserting TOSA rescale operations at the inputs and outputs of the
-//     integer operations.
-//   }];
-//   let dependentDialects = [
-//     "::mlir::tosa::TosaDialect",
-//   ];
-// }
-//
-// def TosaRescaleLegalizeToStablehloPass : Pass<"tosa-rescale-legalize-to-stablehlo", "mlir::func::FuncOp"> {
-//   let summary = "Legalize TOSA rescales to StableHlo primitive math operations";
-//   let description = [{
-//     This pass rewrites TOSA rescale operations to StableHLO primitive math operations.
-//   }];
-//   let dependentDialects = [
-//     "::mlir::stablehlo::StablehloDialect"
-//   ];
-// }
+def StablehloQuantLegalizeToTosaRescalePass : Pass<"stablehlo-quant-legalize-to-tosa-rescale", "mlir::func::FuncOp"> {
+  let summary = "Legalize StableHLO Quantized operations to TOSA rescale operations";
+  let description = [{
+    This pass rewrites StableHLO quantized operations to integer operations
+    by inserting TOSA rescale operations at the inputs and outputs of the
+    integer operations.
+  }];
+  let dependentDialects = [
+    "::mlir::tosa::TosaDialect",
+  ];
+}
+
+def TosaRescaleLegalizeToStablehloPass : Pass<"tosa-rescale-legalize-to-stablehlo", "mlir::func::FuncOp"> {
+  let summary = "Legalize TOSA rescales to StableHlo primitive math operations";
+  let description = [{
+    This pass rewrites TOSA rescale operations to StableHLO primitive math operations.
+  }];
+  let dependentDialects = [
+    "::mlir::stablehlo::StablehloDialect"
+  ];
+}