Integrate StableHLO at openxla/stablehlo@f7f8e4e3

PiperOrigin-RevId: 681168444
openxla · Oct 2, 2024 · 35a0cfb · 35a0cfb
1 parent 93be085
commit 35a0cfb
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 908 deletions.
diff --git a/third_party/stablehlo/temporary.patch b/third_party/stablehlo/temporary.patch
diff --git a/third_party/stablehlo/workspace.bzl b/third_party/stablehlo/workspace.bzl
@@ -4,8 +4,8 @@ load("//third_party:repo.bzl", "tf_http_archive", "tf_mirror_urls")
 
 def repo():
     # LINT.IfChange
-    STABLEHLO_COMMIT = "9d9290dc2308c1850cea69ea05f8c94017e484ee"
-    STABLEHLO_SHA256 = "29803fc8a3a96f9e5469c7ab51f2ff4292dc2419c17bd0466f5d15a448cf6815"
+    STABLEHLO_COMMIT = "f7f8e4e35296deeff2e12e39421ac8d9599ba340"
+    STABLEHLO_SHA256 = "c92b55d5512e58d6fefba62c58e60d7762adb184dc3ad489521de562f6ca7aeb"
     # LINT.ThenChange(Google-internal path)
 
     tf_http_archive(

diff --git a/xla/mlir_hlo/BUILD b/xla/mlir_hlo/BUILD
@@ -1147,7 +1147,7 @@ cc_library(
     srcs = [
         "stablehlo_ext/transforms/chlo_recompose_ops.cpp",
         "stablehlo_ext/transforms/stablehlo_canonicalize_dynamism.cpp",
-        "stablehlo_ext/transforms/stablehlo_create_compatibility_expander.cpp",
+        "stablehlo_ext/transforms/stablehlo_compatibility_expander.cpp",
         "stablehlo_ext/transforms/stablehlo_refine_shapes.cpp",
     ],
     hdrs = [

diff --git a/xla/mlir_hlo/stablehlo_ext/transforms/passes.h b/xla/mlir_hlo/stablehlo_ext/transforms/passes.h
@@ -35,7 +35,7 @@ void createChloLegalizeToStablehloPipeline(OpPassManager &pm);
 // Expand backward compatibility with the given StableHLO version by decomposing
 // newer StableHLO operations into equivalent operations supported by that older
 // version.
-std::unique_ptr<Pass> createStablehloCreateCompatibilityExpanderPass(
+std::unique_ptr<Pass> createStablehloCompatibilityExpanderPass(
     std::string targetVersionOption);
 
 }  // namespace stablehlo_ext

diff --git a/...ablehlo_create_compatibility_expander.cpp → ...orms/stablehlo_compatibility_expander.cpp b/...ablehlo_create_compatibility_expander.cpp → ...orms/stablehlo_compatibility_expander.cpp
@@ -25,9 +25,9 @@ namespace stablehlo_ext {
 
 // TODO(b/369406385): remove this method (and file) once issue is resolved.
 
-std::unique_ptr<::mlir::Pass> createStablehloCreateCompatibilityExpanderPass(
+std::unique_ptr<::mlir::Pass> createStablehloCompatibilityExpanderPass(
     std::string targetVersionOption) {
-  return mlir::stablehlo::createStablehloCreateCompatibilityExpanderPass(
+  return mlir::stablehlo::createStablehloCompatibilityExpanderPass(
       {std::move(targetVersionOption)});
 }
 

diff --git a/xla/pjrt/mlir_to_hlo.cc b/xla/pjrt/mlir_to_hlo.cc
@@ -199,7 +199,7 @@ absl::StatusOr<std::string> SerializeUsingVersionedStablehlo(
   pm.addNestedPass<mlir::func::FuncOp>(
       mlir::stablehlo::createChloLegalizeToStablehloPass());
   pm.addNestedPass<mlir::func::FuncOp>(
-      mlir::stablehlo::createStablehloCreateCompatibilityExpanderPass(
+      mlir::stablehlo::createStablehloCompatibilityExpanderPass(
           {std::string(target)}));
   pm.addNestedPass<mlir::func::FuncOp>(
       mlir::stablehlo::createChloLegalizeToStablehloPass());