From 5ab94a00a7ca58a7ed38baa286461a9e42f978da Mon Sep 17 00:00:00 2001
From: River Riddle <riverriddle@google.com>
Date: Tue, 15 Dec 2020 21:27:33 -0800
Subject: [PATCH] [mlir][NFC] Replace usages or mlir/IR/StandardTypes.h with
 mlir/IR/BuiltinTypes.h

StandardTypes.h was moved to BuiltinTypes.h and is being removed.

PiperOrigin-RevId: 347751511
---
 include/mlir-hlo/Dialect/mhlo/IR/chlo_ops.h                     | 2 +-
 include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h                      | 2 +-
 include/mlir-hlo/Dialect/mhlo/IR/hlo_ops_base_structs.h         | 2 +-
 .../mlir-hlo/Dialect/mhlo/IR/infer_fusibility_op_interface.h    | 2 +-
 include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops.h                 | 2 +-
 include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops_structs.h         | 2 +-
 include/mlir-hlo/Dialect/mhlo/IR/lhlo_ops.h                     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/mlir-hlo/Dialect/mhlo/IR/chlo_ops.h b/include/mlir-hlo/Dialect/mhlo/IR/chlo_ops.h
index 05b2277..c1d7ffc 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/chlo_ops.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/chlo_ops.h
@@ -18,12 +18,12 @@ limitations under the License.
 
 #include "llvm/ADT/StringRef.h"
 #include "mlir-hlo/Dialect/mhlo/IR/infer_fusibility_op_interface.h"
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/DialectImplementation.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/TypeUtilities.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
diff --git a/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h b/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h
index 9bba3d3..2b1a18f 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops.h
@@ -21,13 +21,13 @@ limitations under the License.
 #include "llvm/ADT/StringRef.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Attributes.h"
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/DialectImplementation.h"
 #include "mlir/IR/Location.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"
diff --git a/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops_base_structs.h b/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops_base_structs.h
index 64c2f8f..70247d7 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops_base_structs.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/hlo_ops_base_structs.h
@@ -19,8 +19,8 @@ limitations under the License.
 #define TENSORFLOW_COMPILER_MLIR_HLO_INCLUDE_MLIR_HLO_DIALECT_MHLO_IR_HLO_OPS_BASE_STRUCTS_H_
 
 #include "mlir/IR/BuiltinAttributes.h"
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Identifier.h"
-#include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 
 // Order matters, this .inc header is not self-contained, and relies on the
diff --git a/include/mlir-hlo/Dialect/mhlo/IR/infer_fusibility_op_interface.h b/include/mlir-hlo/Dialect/mhlo/IR/infer_fusibility_op_interface.h
index 00de117..e26bf08 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/infer_fusibility_op_interface.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/infer_fusibility_op_interface.h
@@ -16,8 +16,8 @@ limitations under the License.
 #ifndef TENSORFLOW_COMPILER_MLIR_HLO_INCLUDE_MLIR_HLO_DIALECT_MHLO_IR_INFER_FUSIBILITY_OP_INTERFACE_H_
 #define TENSORFLOW_COMPILER_MLIR_HLO_INCLUDE_MLIR_HLO_DIALECT_MHLO_IR_INFER_FUSIBILITY_OP_INTERFACE_H_
 
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/OpDefinition.h"
-#include "mlir/IR/StandardTypes.h"
 
 namespace mlir {
 
diff --git a/include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops.h b/include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops.h
index 92b7f63..3214ec6 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops.h
@@ -25,12 +25,12 @@ limitations under the License.
 #include "mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops_enums.h"
 #include "mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops_structs.h"
 #include "mlir/IR/Attributes.h"
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Location.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Interfaces/CopyOpInterface.h"
 #include "mlir/Interfaces/InferTypeOpInterface.h"
diff --git a/include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops_structs.h b/include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops_structs.h
index 70f6f17..f34dccf 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops_structs.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/lhlo_gpu_ops_structs.h
@@ -19,8 +19,8 @@
 #define THIRD_PARTY_TENSORFLOW_COMPILER_MLIR_HLO_INCLUDE_MLIR_HLO_DIALECT_MHLO_IR_LHLO_GPU_OPS_STRUCTS_H_
 
 #include "mlir/IR/BuiltinAttributes.h"
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Identifier.h"
-#include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 
 // Order matters, this .inc header is not self-contained, and relies on the
diff --git a/include/mlir-hlo/Dialect/mhlo/IR/lhlo_ops.h b/include/mlir-hlo/Dialect/mhlo/IR/lhlo_ops.h
index 78e9c7e..7dfbfd6 100644
--- a/include/mlir-hlo/Dialect/mhlo/IR/lhlo_ops.h
+++ b/include/mlir-hlo/Dialect/mhlo/IR/lhlo_ops.h
@@ -22,12 +22,12 @@ limitations under the License.
 #include "mlir-hlo/Dialect/mhlo/IR/hlo_ops_base_structs.h"
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Attributes.h"
+#include "mlir/IR/BuiltinTypes.h"
 #include "mlir/IR/Dialect.h"
 #include "mlir/IR/Location.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/Operation.h"
-#include "mlir/IR/StandardTypes.h"
 #include "mlir/IR/Types.h"
 #include "mlir/Interfaces/CopyOpInterface.h"
 #include "mlir/Interfaces/SideEffectInterfaces.h"