diff --git a/mlir/include/mlir/Conversion/StandardToStandard/StandardToStandard.h b/mlir/include/mlir/Dialect/StandardOps/Transforms/FuncConversions.h rename from mlir/include/mlir/Conversion/StandardToStandard/StandardToStandard.h rename to mlir/include/mlir/Dialect/StandardOps/Transforms/FuncConversions.h --- a/mlir/include/mlir/Conversion/StandardToStandard/StandardToStandard.h +++ b/mlir/include/mlir/Dialect/StandardOps/Transforms/FuncConversions.h @@ -1,4 +1,4 @@ -//===- StandardToStandard.h - Std intra-dialect conversion -----*- C++ -*-===// +//===- FuncConversions.h - Patterns for converting std.funcs ----*- C++ -*-===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// // -// This files contains patterns for lowering within the Standard dialect. +// This files contains patterns for converting standard functions. // //===----------------------------------------------------------------------===// -#ifndef MLIR_CONVERSION_STANDARDTOSTANDARD_STANDARDTOSTANDARD_H_ -#define MLIR_CONVERSION_STANDARDTOSTANDARD_STANDARDTOSTANDARD_H_ +#ifndef MLIR_DIALECT_STANDARDOPS_TRANSFORMS_FUNCCONVERSIONS_H_ +#define MLIR_DIALECT_STANDARDOPS_TRANSFORMS_FUNCCONVERSIONS_H_ namespace mlir { @@ -28,4 +28,4 @@ } // end namespace mlir -#endif // MLIR_CONVERSION_STANDARDTOSTANDARD_STANDARDTOSTANDARD_H_ +#endif // MLIR_DIALECT_STANDARDOPS_TRANSFORMS_FUNCCONVERSIONS_H_ diff --git a/mlir/lib/Conversion/CMakeLists.txt b/mlir/lib/Conversion/CMakeLists.txt --- a/mlir/lib/Conversion/CMakeLists.txt +++ b/mlir/lib/Conversion/CMakeLists.txt @@ -11,6 +11,5 @@ add_subdirectory(LoopToStandard) add_subdirectory(StandardToLLVM) add_subdirectory(StandardToSPIRV) -add_subdirectory(StandardToStandard) add_subdirectory(VectorToLLVM) add_subdirectory(VectorToLoops) diff --git a/mlir/lib/Conversion/StandardToStandard/CMakeLists.txt b/mlir/lib/Conversion/StandardToStandard/CMakeLists.txt deleted file mode 100644 --- a/mlir/lib/Conversion/StandardToStandard/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -add_mlir_conversion_library(MLIRStandardToStandard - StandardToStandard.cpp - - ADDITIONAL_HEADER_DIRS - ${MLIR_MAIN_INCLUDE_DIR}/mlir/Conversion/StandardToStandard - ) -target_link_libraries(MLIRStandardToStandard - PUBLIC - MLIRIR - MLIRPass - MLIRStandardOps - MLIRTransforms - ) diff --git a/mlir/lib/Dialect/StandardOps/CMakeLists.txt b/mlir/lib/Dialect/StandardOps/CMakeLists.txt --- a/mlir/lib/Dialect/StandardOps/CMakeLists.txt +++ b/mlir/lib/Dialect/StandardOps/CMakeLists.txt @@ -19,3 +19,16 @@ MLIRViewLikeInterface LLVMSupport ) + +add_mlir_dialect_library(MLIRStandardTransforms + Transforms/FuncConversions.cpp + + ADDITIONAL_HEADER_DIRS + ${MLIR_MAIN_INCLUDE_DIR}/mlir/Dialect/StandardOps/Transforms + ) +target_link_libraries(MLIRStandardTransforms + PUBLIC + MLIRIR + MLIRStandardOps + MLIRTransforms + ) diff --git a/mlir/lib/Conversion/StandardToStandard/StandardToStandard.cpp b/mlir/lib/Dialect/StandardOps/Transforms/FuncConversions.cpp rename from mlir/lib/Conversion/StandardToStandard/StandardToStandard.cpp rename to mlir/lib/Dialect/StandardOps/Transforms/FuncConversions.cpp --- a/mlir/lib/Conversion/StandardToStandard/StandardToStandard.cpp +++ b/mlir/lib/Dialect/StandardOps/Transforms/FuncConversions.cpp @@ -1,4 +1,4 @@ -//===- StandardToStandard.cpp - Std intra-dialect lowering ----------------===// +//===- FuncConversions.cpp - Conversion Patterns for std functions --------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // See https://llvm.org/LICENSE.txt for license information. @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -#include "mlir/Conversion/StandardToStandard/StandardToStandard.h" +#include "mlir/Dialect/StandardOps/Transforms/FuncConversions.h" #include "mlir/Dialect/StandardOps/IR/Ops.h" #include "mlir/Transforms/DialectConversion.h" diff --git a/mlir/test/lib/Dialect/Test/CMakeLists.txt b/mlir/test/lib/Dialect/Test/CMakeLists.txt --- a/mlir/test/lib/Dialect/Test/CMakeLists.txt +++ b/mlir/test/lib/Dialect/Test/CMakeLists.txt @@ -32,7 +32,7 @@ MLIRLinalgTransforms MLIRPass MLIRStandardOps - MLIRStandardToStandard + MLIRStandardTransforms MLIRTransformUtils MLIRTransforms ) diff --git a/mlir/test/lib/Dialect/Test/TestPatterns.cpp b/mlir/test/lib/Dialect/Test/TestPatterns.cpp --- a/mlir/test/lib/Dialect/Test/TestPatterns.cpp +++ b/mlir/test/lib/Dialect/Test/TestPatterns.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// #include "TestDialect.h" -#include "mlir/Conversion/StandardToStandard/StandardToStandard.h" +#include "mlir/Dialect/StandardOps/Transforms/FuncConversions.h" #include "mlir/IR/PatternMatch.h" #include "mlir/Pass/Pass.h" #include "mlir/Transforms/DialectConversion.h" diff --git a/mlir/test/lib/Transforms/CMakeLists.txt b/mlir/test/lib/Transforms/CMakeLists.txt --- a/mlir/test/lib/Transforms/CMakeLists.txt +++ b/mlir/test/lib/Transforms/CMakeLists.txt @@ -45,7 +45,7 @@ MLIRLoopOps MLIRGPU MLIRPass - MLIRStandardToStandard + MLIRStandardTransforms MLIRTestDialect MLIRTransformUtils MLIRVectorToLoops