Author: River Riddle Date: 2020-12-03T18:02:10-08:00 New Revision: e66c2e259f8140373ee73ceffe1e913483b711b5
URL: https://github.com/llvm/llvm-project/commit/e66c2e259f8140373ee73ceffe1e913483b711b5 DIFF: https://github.com/llvm/llvm-project/commit/e66c2e259f8140373ee73ceffe1e913483b711b5.diff LOG: [mlir][NFC] Remove Function.h and Module.h in favor of BuiltinOps.h The definitions of ModuleOp and FuncOp are now within BuiltinOps.h, making the individual files obsolete. Differential Revision: https://reviews.llvm.org/D92622 Added: Modified: mlir/include/mlir/Transforms/BufferUtils.h mlir/lib/Dialect/StandardOps/Transforms/DecomposeCallGraphTypes.cpp mlir/lib/Dialect/Vector/VectorTransferOpTransforms.cpp mlir/lib/Rewrite/ByteCode.cpp Removed: mlir/include/mlir/IR/Function.h mlir/include/mlir/IR/Module.h ################################################################################ diff --git a/mlir/include/mlir/IR/Function.h b/mlir/include/mlir/IR/Function.h deleted file mode 100644 index f11530164789..000000000000 --- a/mlir/include/mlir/IR/Function.h +++ /dev/null @@ -1,19 +0,0 @@ -//===- Function.h - MLIR Function Class -------------------------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// Functions are the basic unit of composition in MLIR. -// -//===----------------------------------------------------------------------===// - -#ifndef MLIR_IR_FUNCTION_H -#define MLIR_IR_FUNCTION_H - -// TODO: This is a temporary forward until Function.h is removed. -#include "mlir/IR/BuiltinOps.h" - -#endif // MLIR_IR_FUNCTION_H diff --git a/mlir/include/mlir/IR/Module.h b/mlir/include/mlir/IR/Module.h deleted file mode 100644 index 8fa27a1c72c5..000000000000 --- a/mlir/include/mlir/IR/Module.h +++ /dev/null @@ -1,19 +0,0 @@ -//===- Module.h - MLIR Module Class -----------------------------*- C++ -*-===// -// -// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. -// See https://llvm.org/LICENSE.txt for license information. -// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception -// -//===----------------------------------------------------------------------===// -// -// Module is the top-level container for code in an MLIR program. -// -//===----------------------------------------------------------------------===// - -#ifndef MLIR_IR_MODULE_H -#define MLIR_IR_MODULE_H - -// TODO: This is a temporary forward until Module.h is removed. -#include "mlir/IR/BuiltinOps.h" - -#endif // MLIR_IR_MODULE_H diff --git a/mlir/include/mlir/Transforms/BufferUtils.h b/mlir/include/mlir/Transforms/BufferUtils.h index d35163758cb0..70da6a025343 100644 --- a/mlir/include/mlir/Transforms/BufferUtils.h +++ b/mlir/include/mlir/Transforms/BufferUtils.h @@ -18,8 +18,8 @@ #include "mlir/Analysis/Liveness.h" #include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/IR/Builders.h" +#include "mlir/IR/BuiltinOps.h" #include "mlir/IR/Dominance.h" -#include "mlir/IR/Function.h" #include "mlir/IR/Operation.h" #include "mlir/Transforms/DialectConversion.h" diff --git a/mlir/lib/Dialect/StandardOps/Transforms/DecomposeCallGraphTypes.cpp b/mlir/lib/Dialect/StandardOps/Transforms/DecomposeCallGraphTypes.cpp index fdd73b21237a..52c3249df58b 100644 --- a/mlir/lib/Dialect/StandardOps/Transforms/DecomposeCallGraphTypes.cpp +++ b/mlir/lib/Dialect/StandardOps/Transforms/DecomposeCallGraphTypes.cpp @@ -8,7 +8,7 @@ #include "mlir/Dialect/StandardOps/Transforms/DecomposeCallGraphTypes.h" #include "mlir/Dialect/StandardOps/IR/Ops.h" -#include "mlir/IR/Function.h" +#include "mlir/IR/BuiltinOps.h" using namespace mlir; diff --git a/mlir/lib/Dialect/Vector/VectorTransferOpTransforms.cpp b/mlir/lib/Dialect/Vector/VectorTransferOpTransforms.cpp index fd3317ded246..8c00cadf7032 100644 --- a/mlir/lib/Dialect/Vector/VectorTransferOpTransforms.cpp +++ b/mlir/lib/Dialect/Vector/VectorTransferOpTransforms.cpp @@ -14,8 +14,8 @@ #include "mlir/Dialect/Vector/VectorOps.h" #include "mlir/Dialect/Vector/VectorTransforms.h" #include "mlir/Dialect/Vector/VectorUtils.h" +#include "mlir/IR/BuiltinOps.h" #include "mlir/IR/Dominance.h" -#include "mlir/IR/Function.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/Debug.h" diff --git a/mlir/lib/Rewrite/ByteCode.cpp b/mlir/lib/Rewrite/ByteCode.cpp index 481e7b6db1d1..451be3036767 100644 --- a/mlir/lib/Rewrite/ByteCode.cpp +++ b/mlir/lib/Rewrite/ByteCode.cpp @@ -14,7 +14,7 @@ #include "mlir/Analysis/Liveness.h" #include "mlir/Dialect/PDL/IR/PDLTypes.h" #include "mlir/Dialect/PDLInterp/IR/PDLInterp.h" -#include "mlir/IR/Function.h" +#include "mlir/IR/BuiltinOps.h" #include "mlir/IR/RegionGraphTraits.h" #include "llvm/ADT/IntervalMap.h" #include "llvm/ADT/PostOrderIterator.h" _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits