From bf030491714f87742dbd463d5d439b7b603cdcf0 Mon Sep 17 00:00:00 2001
From: River Riddle <riverriddle@google.com>
Date: Mon, 30 Nov 2020 13:20:49 -0800
Subject: [PATCH] [mlir][NFC] Replace usages of Function.h and Module.h with
 BuiltinOps.h

This is part of a larger refactoring cleaning up the BuiltinDialect of MLIR.

PiperOrigin-RevId: 344875425
---
 transforms/default_lowering_attributes.cc | 2 +-
 transforms/default_lowering_attributes.h  | 2 +-
 transforms/inline_trivial_ops.cc          | 2 +-
 transforms/introduce_loops.cc             | 2 +-
 transforms/introduce_memrefs.cc           | 2 +-
 transforms/lower_to_map.cc                | 2 +-
 transforms/lowering.cc                    | 3 +--
 transforms/lowering.h                     | 2 +-
 transforms/sair_from_linalg.cc            | 2 +-
 transforms/sair_from_linalg.h             | 2 +-
 10 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/transforms/default_lowering_attributes.cc b/transforms/default_lowering_attributes.cc
index 0ef19fb6..09c9beec 100644
--- a/transforms/default_lowering_attributes.cc
+++ b/transforms/default_lowering_attributes.cc
@@ -20,7 +20,7 @@
 #include "llvm/ADT/BitVector.h"
 #include "llvm/ADT/SmallVector.h"
 #include "mlir/IR/Attributes.h"
-#include "mlir/IR/Function.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
diff --git a/transforms/default_lowering_attributes.h b/transforms/default_lowering_attributes.h
index def4d7d1..7f879561 100644
--- a/transforms/default_lowering_attributes.h
+++ b/transforms/default_lowering_attributes.h
@@ -19,7 +19,7 @@
 
 #include "llvm/ADT/ArrayRef.h"
 #include "mlir/IR/Attributes.h"
-#include "mlir/IR/Function.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
 #include "sair_ops.h"
 
diff --git a/transforms/inline_trivial_ops.cc b/transforms/inline_trivial_ops.cc
index 110548a8..76f8407f 100644
--- a/transforms/inline_trivial_ops.cc
+++ b/transforms/inline_trivial_ops.cc
@@ -16,7 +16,7 @@
 
 #include "llvm/ADT/SmallVector.h"
 #include "mlir/IR/Builders.h"
-#include "mlir/IR/Function.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/Value.h"
 #include "mlir/IR/Visitors.h"
diff --git a/transforms/introduce_loops.cc b/transforms/introduce_loops.cc
index a383d235..444a18c6 100644
--- a/transforms/introduce_loops.cc
+++ b/transforms/introduce_loops.cc
@@ -22,8 +22,8 @@
 #include "mlir/Dialect/StandardOps/IR/Ops.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Diagnostics.h"
-#include "mlir/IR/Function.h"
 #include "mlir/IR/Location.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/OperationSupport.h"
diff --git a/transforms/introduce_memrefs.cc b/transforms/introduce_memrefs.cc
index 575766e7..c8b6503c 100644
--- a/transforms/introduce_memrefs.cc
+++ b/transforms/introduce_memrefs.cc
@@ -21,7 +21,7 @@
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/BlockAndValueMapping.h"
 #include "mlir/IR/Builders.h"
-#include "mlir/IR/Function.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/StandardTypes.h"
diff --git a/transforms/lower_to_map.cc b/transforms/lower_to_map.cc
index 7adb0595..9e1954cb 100644
--- a/transforms/lower_to_map.cc
+++ b/transforms/lower_to_map.cc
@@ -18,7 +18,7 @@
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/ADT/SmallVector.h"
 #include "mlir/IR/Builders.h"
-#include "mlir/IR/Function.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/OperationSupport.h"
 #include "mlir/Pass/Pass.h"
diff --git a/transforms/lowering.cc b/transforms/lowering.cc
index 65756c81..49255fb3 100644
--- a/transforms/lowering.cc
+++ b/transforms/lowering.cc
@@ -20,8 +20,7 @@
 #include "mlir/Conversion/StandardToLLVM/ConvertStandardToLLVM.h"
 #include "mlir/Dialect/LLVMIR/LLVMDialect.h"
 #include "mlir/IR/Attributes.h"
-#include "mlir/IR/Function.h"
-#include "mlir/IR/Module.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/PatternMatch.h"
 #include "mlir/IR/Value.h"
diff --git a/transforms/lowering.h b/transforms/lowering.h
index 51fd9537..731b1993 100644
--- a/transforms/lowering.h
+++ b/transforms/lowering.h
@@ -17,7 +17,7 @@
 
 #include <memory>
 
-#include "mlir/IR/Function.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
 #include "mlir/Pass/PassManager.h"
 
diff --git a/transforms/sair_from_linalg.cc b/transforms/sair_from_linalg.cc
index 387a0ae9..9edf85ed 100644
--- a/transforms/sair_from_linalg.cc
+++ b/transforms/sair_from_linalg.cc
@@ -21,7 +21,7 @@
 #include "mlir/IR/AffineMap.h"
 #include "mlir/IR/Attributes.h"
 #include "mlir/IR/Builders.h"
-#include "mlir/IR/Function.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/IR/MLIRContext.h"
 #include "mlir/IR/Operation.h"
 #include "mlir/IR/PatternMatch.h"
diff --git a/transforms/sair_from_linalg.h b/transforms/sair_from_linalg.h
index 92af8627..e989bedf 100644
--- a/transforms/sair_from_linalg.h
+++ b/transforms/sair_from_linalg.h
@@ -17,7 +17,7 @@
 
 #include <memory>
 
-#include "mlir/IR/Function.h"
+#include "mlir/IR/BuiltinOps.h"
 #include "mlir/Pass/Pass.h"
 
 namespace sair {