diff --git a/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp --- a/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch2/mlir/MLIRGen.cpp @@ -15,7 +15,7 @@ #include "toy/AST.h" #include "toy/Dialect.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" diff --git a/mlir/examples/toy/Ch2/toyc.cpp b/mlir/examples/toy/Ch2/toyc.cpp --- a/mlir/examples/toy/Ch2/toyc.cpp +++ b/mlir/examples/toy/Ch2/toyc.cpp @@ -15,7 +15,7 @@ #include "toy/Parser.h" #include -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Module.h" #include "mlir/Parser.h" diff --git a/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp --- a/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch3/mlir/MLIRGen.cpp @@ -15,7 +15,7 @@ #include "toy/AST.h" #include "toy/Dialect.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" diff --git a/mlir/examples/toy/Ch3/toyc.cpp b/mlir/examples/toy/Ch3/toyc.cpp --- a/mlir/examples/toy/Ch3/toyc.cpp +++ b/mlir/examples/toy/Ch3/toyc.cpp @@ -14,7 +14,7 @@ #include "toy/MLIRGen.h" #include "toy/Parser.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Module.h" #include "mlir/Parser.h" diff --git a/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp --- a/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch4/mlir/MLIRGen.cpp @@ -15,7 +15,7 @@ #include "toy/AST.h" #include "toy/Dialect.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" diff --git a/mlir/examples/toy/Ch4/toyc.cpp b/mlir/examples/toy/Ch4/toyc.cpp --- a/mlir/examples/toy/Ch4/toyc.cpp +++ b/mlir/examples/toy/Ch4/toyc.cpp @@ -15,7 +15,7 @@ #include "toy/Parser.h" #include "toy/Passes.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Module.h" #include "mlir/Parser.h" diff --git a/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp --- a/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch5/mlir/MLIRGen.cpp @@ -15,7 +15,7 @@ #include "toy/AST.h" #include "toy/Dialect.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" diff --git a/mlir/examples/toy/Ch5/toyc.cpp b/mlir/examples/toy/Ch5/toyc.cpp --- a/mlir/examples/toy/Ch5/toyc.cpp +++ b/mlir/examples/toy/Ch5/toyc.cpp @@ -15,7 +15,7 @@ #include "toy/Parser.h" #include "toy/Passes.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/MLIRContext.h" #include "mlir/IR/Module.h" #include "mlir/InitAllDialects.h" diff --git a/mlir/examples/toy/Ch6/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch6/mlir/MLIRGen.cpp --- a/mlir/examples/toy/Ch6/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch6/mlir/MLIRGen.cpp @@ -15,7 +15,7 @@ #include "toy/AST.h" #include "toy/Dialect.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" diff --git a/mlir/examples/toy/Ch6/toyc.cpp b/mlir/examples/toy/Ch6/toyc.cpp --- a/mlir/examples/toy/Ch6/toyc.cpp +++ b/mlir/examples/toy/Ch6/toyc.cpp @@ -15,7 +15,7 @@ #include "toy/Parser.h" #include "toy/Passes.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/ExecutionEngine/ExecutionEngine.h" #include "mlir/ExecutionEngine/OptUtils.h" #include "mlir/IR/MLIRContext.h" diff --git a/mlir/examples/toy/Ch7/mlir/MLIRGen.cpp b/mlir/examples/toy/Ch7/mlir/MLIRGen.cpp --- a/mlir/examples/toy/Ch7/mlir/MLIRGen.cpp +++ b/mlir/examples/toy/Ch7/mlir/MLIRGen.cpp @@ -15,7 +15,7 @@ #include "toy/AST.h" #include "toy/Dialect.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Builders.h" #include "mlir/IR/Function.h" diff --git a/mlir/examples/toy/Ch7/toyc.cpp b/mlir/examples/toy/Ch7/toyc.cpp --- a/mlir/examples/toy/Ch7/toyc.cpp +++ b/mlir/examples/toy/Ch7/toyc.cpp @@ -15,7 +15,7 @@ #include "toy/Parser.h" #include "toy/Passes.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/ExecutionEngine/ExecutionEngine.h" #include "mlir/ExecutionEngine/OptUtils.h" #include "mlir/IR/MLIRContext.h" diff --git a/mlir/include/mlir/Analysis/Dominance.h b/mlir/include/mlir/IR/Dominance.h rename from mlir/include/mlir/Analysis/Dominance.h rename to mlir/include/mlir/IR/Dominance.h diff --git a/mlir/include/mlir/Analysis/Verifier.h b/mlir/include/mlir/IR/Verifier.h rename from mlir/include/mlir/Analysis/Verifier.h rename to mlir/include/mlir/IR/Verifier.h diff --git a/mlir/lib/Analysis/Dominance.cpp b/mlir/lib/IR/Dominance.cpp rename from mlir/lib/Analysis/Dominance.cpp rename to mlir/lib/IR/Dominance.cpp --- a/mlir/lib/Analysis/Dominance.cpp +++ b/mlir/lib/IR/Dominance.cpp @@ -11,7 +11,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Analysis/Dominance.h" +#include "mlir/IR/Dominance.h" #include "mlir/IR/Operation.h" #include "llvm/ADT/DenseMap.h" #include "llvm/Support/GenericDomTreeConstruction.h" diff --git a/mlir/lib/Analysis/Verifier.cpp b/mlir/lib/IR/Verifier.cpp rename from mlir/lib/Analysis/Verifier.cpp rename to mlir/lib/IR/Verifier.cpp --- a/mlir/lib/Analysis/Verifier.cpp +++ b/mlir/lib/IR/Verifier.cpp @@ -24,8 +24,8 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Analysis/Verifier.h" -#include "mlir/Analysis/Dominance.h" +#include "mlir/IR/Verifier.h" +#include "mlir/IR/Dominance.h" #include "mlir/IR/Attributes.h" #include "mlir/IR/Dialect.h" #include "mlir/IR/Operation.h" diff --git a/mlir/lib/Parser/CMakeLists.txt b/mlir/lib/Parser/CMakeLists.txt --- a/mlir/lib/Parser/CMakeLists.txt +++ b/mlir/lib/Parser/CMakeLists.txt @@ -9,4 +9,4 @@ target_link_libraries(MLIRParser PUBLIC MLIRIR - MLIRAnalysis) + ) diff --git a/mlir/lib/Parser/Parser.cpp b/mlir/lib/Parser/Parser.cpp --- a/mlir/lib/Parser/Parser.cpp +++ b/mlir/lib/Parser/Parser.cpp @@ -12,7 +12,7 @@ #include "mlir/Parser.h" #include "Lexer.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/AffineExpr.h" #include "mlir/IR/AffineMap.h" #include "mlir/IR/Attributes.h" diff --git a/mlir/lib/Pass/Pass.cpp b/mlir/lib/Pass/Pass.cpp --- a/mlir/lib/Pass/Pass.cpp +++ b/mlir/lib/Pass/Pass.cpp @@ -12,7 +12,7 @@ #include "mlir/Pass/Pass.h" #include "PassDetail.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/Diagnostics.h" #include "mlir/IR/Dialect.h" #include "mlir/IR/Module.h" diff --git a/mlir/lib/Transforms/CSE.cpp b/mlir/lib/Transforms/CSE.cpp --- a/mlir/lib/Transforms/CSE.cpp +++ b/mlir/lib/Transforms/CSE.cpp @@ -12,7 +12,7 @@ //===----------------------------------------------------------------------===// #include "PassDetail.h" -#include "mlir/Analysis/Dominance.h" +#include "mlir/IR/Dominance.h" #include "mlir/Pass/Pass.h" #include "mlir/Transforms/Passes.h" #include "mlir/Transforms/Utils.h" diff --git a/mlir/lib/Transforms/MemRefDataFlowOpt.cpp b/mlir/lib/Transforms/MemRefDataFlowOpt.cpp --- a/mlir/lib/Transforms/MemRefDataFlowOpt.cpp +++ b/mlir/lib/Transforms/MemRefDataFlowOpt.cpp @@ -15,7 +15,7 @@ #include "PassDetail.h" #include "mlir/Analysis/AffineAnalysis.h" -#include "mlir/Analysis/Dominance.h" +#include "mlir/IR/Dominance.h" #include "mlir/Analysis/Utils.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/Dialect/StandardOps/IR/Ops.h" diff --git a/mlir/lib/Transforms/Utils/Utils.cpp b/mlir/lib/Transforms/Utils/Utils.cpp --- a/mlir/lib/Transforms/Utils/Utils.cpp +++ b/mlir/lib/Transforms/Utils/Utils.cpp @@ -15,7 +15,7 @@ #include "mlir/Analysis/AffineAnalysis.h" #include "mlir/Analysis/AffineStructures.h" -#include "mlir/Analysis/Dominance.h" +#include "mlir/IR/Dominance.h" #include "mlir/Analysis/Utils.h" #include "mlir/Dialect/Affine/IR/AffineOps.h" #include "mlir/IR/Builders.h" diff --git a/mlir/lib/Translation/Translation.cpp b/mlir/lib/Translation/Translation.cpp --- a/mlir/lib/Translation/Translation.cpp +++ b/mlir/lib/Translation/Translation.cpp @@ -11,7 +11,7 @@ //===----------------------------------------------------------------------===// #include "mlir/Translation.h" -#include "mlir/Analysis/Verifier.h" +#include "mlir/IR/Verifier.h" #include "mlir/IR/Module.h" #include "mlir/Parser.h" #include "mlir/Support/LLVM.h"