Cleanup build rule names in compiler/mlir/hlo to remove the redundant/obsolete xla_ prefix
PiperOrigin-RevId: 320320140
diff --git a/build_tools/third_party/tensorflow/tensorflow/compiler/mlir/hlo/CMakeLists.txt b/build_tools/third_party/tensorflow/tensorflow/compiler/mlir/hlo/CMakeLists.txt
index 7bcaf34..bf06af4 100644
--- a/build_tools/third_party/tensorflow/tensorflow/compiler/mlir/hlo/CMakeLists.txt
+++ b/build_tools/third_party/tensorflow/tensorflow/compiler/mlir/hlo/CMakeLists.txt
@@ -45,7 +45,7 @@
"lib/Dialect/mhlo/transforms/materialize_broadcasts.cc"
"lib/Dialect/mhlo/transforms/unfuse_batch_norm.cc"
"lib/Dialect/mhlo/transforms/mhlo_fusion.cc"
- "lib/Dialect/mhlo/transforms/xla_legalize_to_linalg.cc"
+ "lib/Dialect/mhlo/transforms/legalize_to_linalg.cc"
"lib/utils/broadcast_utils.cc"
"lib/utils/convert_op_folder.cc"
"lib/utils/cycle_detector.cc"
@@ -55,7 +55,7 @@
"include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
"include/mlir-hlo/Dialect/mhlo/IR/infer_fusibility_op_interface.h"
"include/mlir-hlo/Dialect/mhlo/IR/lhlo_ops.h"
- "include/mlir-hlo/Dialect/mhlo/transforms/map_xla_to_scalar_op.h"
+ "include/mlir-hlo/Dialect/mhlo/transforms/map_lmhlo_to_scalar_op.h"
"include/mlir-hlo/Dialect/mhlo/transforms/passes.h"
"include/mlir-hlo/Dialect/mhlo/transforms/rewriters.h"
"include/mlir-hlo/utils/broadcast_utils.h"
diff --git a/iree/compiler/Conversion/HLOToLinalg/BUILD b/iree/compiler/Conversion/HLOToLinalg/BUILD
index bf9c788..8b28945 100644
--- a/iree/compiler/Conversion/HLOToLinalg/BUILD
+++ b/iree/compiler/Conversion/HLOToLinalg/BUILD
@@ -45,7 +45,7 @@
"@llvm-project//mlir:Support",
"@llvm-project//mlir:Transforms",
"@org_tensorflow//tensorflow/compiler/mlir/hlo",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:map_xla_to_scalar_op",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_legalize_to_linalg",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:legalize_to_linalg",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:map_lmhlo_to_scalar_op",
],
)
diff --git a/iree/compiler/Conversion/HLOToLinalg/HLOToLinalgOnBuffers.cpp b/iree/compiler/Conversion/HLOToLinalg/HLOToLinalgOnBuffers.cpp
index c8d7c99..99f7eb1 100644
--- a/iree/compiler/Conversion/HLOToLinalg/HLOToLinalgOnBuffers.cpp
+++ b/iree/compiler/Conversion/HLOToLinalg/HLOToLinalgOnBuffers.cpp
@@ -41,7 +41,7 @@
#include "mlir/Pass/Pass.h"
#include "mlir/Transforms/DialectConversion.h"
#include "tensorflow/compiler/mlir/hlo/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h"
-#include "tensorflow/compiler/mlir/hlo/include/mlir-hlo/Dialect/mhlo/transforms/map_xla_to_scalar_op.h"
+#include "tensorflow/compiler/mlir/hlo/include/mlir-hlo/Dialect/mhlo/transforms/map_lmhlo_to_scalar_op.h"
namespace mlir {
namespace iree_compiler {
@@ -934,7 +934,7 @@
OpTy>::ReduceRegionOpConversion;
static Operation *apply(OpTy op, ArrayRef<Value> operands,
ConversionPatternRewriter &rewriter) {
- Value result = lmhlo::XlaOpToStdScalarOp::map<OpTy>(
+ Value result = lmhlo::HloOpToStdScalarOp::map<OpTy>(
op, operands[0].getType(), operands, &rewriter);
return result.getDefiningOp();
}
diff --git a/iree/compiler/Conversion/HLOToLinalg/HLOToLinalgOnTensors.cpp b/iree/compiler/Conversion/HLOToLinalg/HLOToLinalgOnTensors.cpp
index 5b23c5e..7c0500b 100644
--- a/iree/compiler/Conversion/HLOToLinalg/HLOToLinalgOnTensors.cpp
+++ b/iree/compiler/Conversion/HLOToLinalg/HLOToLinalgOnTensors.cpp
@@ -15,7 +15,7 @@
//===- XLAToLinalgOnTensors.cpp - Pass to convert XLA to Linalg on tensors-===//
//
// Pass to convert from XLA to linalg on tensers. Uses the patterns from
-// tensorflow/compiler/mlir/xla/transforms/xla_legalize_to_linalg.cc along with
+// tensorflow/compiler/mlir/xla/transforms/legalize_to_linalg.cc along with
// some IREE specific patterns.
//
//===----------------------------------------------------------------------===//
diff --git a/iree/compiler/Conversion/LinalgToSPIRV/BUILD b/iree/compiler/Conversion/LinalgToSPIRV/BUILD
index 619c5ed..1145719 100644
--- a/iree/compiler/Conversion/LinalgToSPIRV/BUILD
+++ b/iree/compiler/Conversion/LinalgToSPIRV/BUILD
@@ -65,6 +65,6 @@
"@llvm-project//mlir:Transforms",
"@llvm-project//mlir:VectorOps",
"@org_tensorflow//tensorflow/compiler/mlir/hlo",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_legalize_to_linalg",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:legalize_to_linalg",
],
)
diff --git a/iree/compiler/Dialect/Flow/Transforms/BUILD b/iree/compiler/Dialect/Flow/Transforms/BUILD
index d676356..55f3a82 100644
--- a/iree/compiler/Dialect/Flow/Transforms/BUILD
+++ b/iree/compiler/Dialect/Flow/Transforms/BUILD
@@ -65,9 +65,9 @@
"@llvm-project//mlir:Transforms",
"@org_tensorflow//tensorflow/compiler/mlir/hlo",
"@org_tensorflow//tensorflow/compiler/mlir/hlo:chlo_legalize_to_hlo",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_legalize_control_flow",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_lower",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_materialize_broadcasts",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_unfuse_batch_norm",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:legalize_control_flow",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:materialize_broadcasts",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:mhlo_to_mhlo_lowering_patterns",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:unfuse_batch_norm",
],
)
diff --git a/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/BUILD b/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/BUILD
index 50d9f1f..3fc3828 100644
--- a/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/BUILD
+++ b/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/BUILD
@@ -39,6 +39,6 @@
"@llvm-project//mlir:StandardOps",
"@llvm-project//mlir:Transforms",
"@org_tensorflow//tensorflow/compiler/mlir/hlo",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_legalize_to_standard",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:legalize_to_standard",
],
)
diff --git a/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/ConvertHLOToVMLA.cpp b/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/ConvertHLOToVMLA.cpp
index de1d14f..d213051 100644
--- a/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/ConvertHLOToVMLA.cpp
+++ b/iree/compiler/Dialect/VMLA/Conversion/HLOToVMLA/ConvertHLOToVMLA.cpp
@@ -692,7 +692,7 @@
// We rely on some additional HLO->std patterns and assume they
// have been run already. In case they haven't we provide them here (useful
// for standalone conversion testing).
- mhlo::PopulateXlaToStdPatterns(&patterns, context);
+ mhlo::PopulateMhloToStdPatterns(&patterns, context);
// mhlo.convolution.
populateHLOConvToVMLAPatterns(context, patterns, typeConverter);
diff --git a/iree/samples/custom_modules/dialect/BUILD b/iree/samples/custom_modules/dialect/BUILD
index c1b64b5..d52e576 100644
--- a/iree/samples/custom_modules/dialect/BUILD
+++ b/iree/samples/custom_modules/dialect/BUILD
@@ -129,7 +129,7 @@
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TransformUtils",
"@org_tensorflow//tensorflow/compiler/mlir/hlo",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_legalize_control_flow",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:legalize_control_flow",
],
)
diff --git a/iree/tools/BUILD b/iree/tools/BUILD
index 649ea10..9c3ab4c 100644
--- a/iree/tools/BUILD
+++ b/iree/tools/BUILD
@@ -214,7 +214,7 @@
"@llvm-project//mlir:Support",
"@llvm-project//mlir:TransformUtils",
"@org_tensorflow//tensorflow/compiler/mlir/hlo",
- "@org_tensorflow//tensorflow/compiler/mlir/hlo:xla_legalize_control_flow",
+ "@org_tensorflow//tensorflow/compiler/mlir/hlo:legalize_control_flow",
],
)
