[MLIR] Move MLIR compiler files to contrib/mlir/compiler (#3530)

We'll add contrib/mlir/tools directory in subsequent PRs for ngrpah-opt
and other tools.

src/contrib/mlir/CMakeLists.txt

@@ -14,103 +14,4 @@
 # limitations under the License.
 # ******************************************************************************
 
-set(SRC
-    dialect/dialect.cpp
-    dialect/type.cpp
-    dialect/ops.cpp
-    compiler.cpp
-    lowerer.cpp
-    memory_manager.cpp
-    pass/mlir_subgraph_extraction.cpp
-    pass/mlir_subgraph_extraction.hpp
-)
-if (NGRAPH_MLIR_ENABLE)
-
-    add_library(mlir_backend SHARED ${SRC})
-
-    message(STATUS "LLVM Directory: ${LLVM_DIR}")
-    # Link LLVM and MLIR
-    find_package(LLVM REQUIRED CONFIG)
-    
-    set(MLIR_LLVM_INCLUDEPATH ${LLVM_INCLUDE_DIRS})
-
-    message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
-    message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
-    message(STATUS "LLVM RTTI is ${LLVM_ENABLE_RTTI}")
-    add_definitions(${LLVM_DEFINITIONS})
-   
-    target_include_directories(mlir_backend PRIVATE ${LLVM_INCLUDE_DIRS})
-    
-    message(STATUS "MLIR Headers at : ${MLIR_INCLUDE_PATHS}")
-    message(STATUS "LLVM Headers at : ${MLIR_LLVM_INCLUDEPATH}")
-
-    target_include_directories(mlir_backend PRIVATE ${MLIR_INCLUDE_PATHS}) 
-    
-    llvm_map_components_to_libnames(llvm_libs support core irreader)
-    
-    # Link MLIR libs
-    target_link_libraries(
-        mlir_backend PRIVATE 
-        MLIRAnalysis
-        MLIREDSC
-        MLIRExecutionEngine
-        MLIRIR
-        MLIRLLVMIR
-        MLIRStandardToLLVM
-        MLIRParser
-        MLIRPass
-        MLIRTargetLLVMIR
-        MLIRTransforms
-        MLIRSupport
-    )
-    # some libs need whole archive linkage because of Globals static initialization
-    function(whole_archive_link target)
-        if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-            set(link_flags "-Llib -Wl,-all_load ")
-            FOREACH(LIB ${ARGN})
-                string(CONCAT link_flags ${link_flags} "${LIB}")
-            ENDFOREACH(LIB)
-        else()
-            set(link_flags "-Llib -Wl,--whole-archive,")
-            FOREACH(LIB ${ARGN})
-                string(CONCAT link_flags ${link_flags} "${LIB},")
-            ENDFOREACH(LIB)
-            string(CONCAT link_flags ${link_flags} "--no-whole-archive")
-        endif()
-        message(STATUS "MLIR Ops link flag: ${link_flags}" )
-
-        set_target_properties(${target} PROPERTIES LINK_FLAGS ${link_flags})
-    endfunction(whole_archive_link)
-
-    whole_archive_link(mlir_backend
-        ${LLVM_BUILD_LIBRARY_DIR}/libMLIRAffineOps.a
-        ${LLVM_BUILD_LIBRARY_DIR}/libMLIRStandardOps.a
-    )
-    # Link LLVM libs
-    target_link_libraries(
-        mlir_backend PRIVATE 
-        ${llvm_libs}
-    )
-
-    # Link ngraph 
-    target_link_libraries(mlir_backend PUBLIC ngraph)
-
-    # table-gen dialect ops
-    # include table-gen helpers
-    include(${LLVM_DIR}/TableGen.cmake)
-
-    function(ngraph_tablegen ofn)
-        tablegen(MLIR ${ARGV} "-I${MLIR_SRC_INCLUDE_PATH}" "-I${MLIR_BIN_INCLUDE_PATH}")
-        set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn} PARENT_SCOPE)
-    endfunction()
-
-    set(MLIR_TABLEGEN_EXE mlir-tblgen)
-    set(LLVM_TARGET_DEFINITIONS dialect/ops.td)
-
-    ngraph_tablegen(ops.h.inc -gen-op-decls)
-    ngraph_tablegen(ops.cpp.inc -gen-op-defs)
-
-    add_public_tablegen_target(ngraph_ops_gen)
-    add_dependencies(mlir_backend ngraph_ops_gen)
-    target_include_directories(mlir_backend PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-endif()
+add_subdirectory(compiler)

src/contrib/mlir/compiler/CMakeLists.txt

+# ******************************************************************************
+# Copyright 2017-2019 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ******************************************************************************
+
+set(SRC
+    dialect/dialect.cpp
+    dialect/type.cpp
+    dialect/ops.cpp
+    compiler.cpp
+    lowerer.cpp
+    memory_manager.cpp
+    pass/mlir_subgraph_extraction.cpp
+    pass/mlir_subgraph_extraction.hpp
+)
+
+add_library(mlir_backend SHARED ${SRC})
+
+message(STATUS "LLVM Directory: ${LLVM_DIR}")
+# Link LLVM and MLIR
+find_package(LLVM REQUIRED CONFIG)
+
+set(MLIR_LLVM_INCLUDEPATH ${LLVM_INCLUDE_DIRS})
+
+message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+message(STATUS "LLVM RTTI is ${LLVM_ENABLE_RTTI}")
+add_definitions(${LLVM_DEFINITIONS})
+
+target_include_directories(mlir_backend PRIVATE ${LLVM_INCLUDE_DIRS})
+
+message(STATUS "MLIR Headers at : ${MLIR_INCLUDE_PATHS}")
+message(STATUS "LLVM Headers at : ${MLIR_LLVM_INCLUDEPATH}")
+
+target_include_directories(mlir_backend PRIVATE ${MLIR_INCLUDE_PATHS}) 
+
+llvm_map_components_to_libnames(llvm_libs support core irreader)
+
+# Link MLIR libs
+target_link_libraries(
+    mlir_backend PRIVATE 
+    MLIRAnalysis
+    MLIREDSC
+    MLIRExecutionEngine
+    MLIRIR
+    MLIRLLVMIR
+    MLIRStandardToLLVM
+    MLIRParser
+    MLIRPass
+    MLIRTargetLLVMIR
+    MLIRTransforms
+    MLIRSupport
+)
+# some libs need whole archive linkage because of Globals static initialization
+function(whole_archive_link target)
+    if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
+        set(link_flags "-Llib -Wl,-all_load ")
+        FOREACH(LIB ${ARGN})
+            string(CONCAT link_flags ${link_flags} "${LIB}")
+        ENDFOREACH(LIB)
+    else()
+        set(link_flags "-Llib -Wl,--whole-archive,")
+        FOREACH(LIB ${ARGN})
+            string(CONCAT link_flags ${link_flags} "${LIB},")
+        ENDFOREACH(LIB)
+        string(CONCAT link_flags ${link_flags} "--no-whole-archive")
+    endif()
+    message(STATUS "MLIR Ops link flag: ${link_flags}" )
+
+    set_target_properties(${target} PROPERTIES LINK_FLAGS ${link_flags})
+endfunction(whole_archive_link)
+
+whole_archive_link(mlir_backend
+    ${LLVM_BUILD_LIBRARY_DIR}/libMLIRAffineOps.a
+    ${LLVM_BUILD_LIBRARY_DIR}/libMLIRStandardOps.a
+)
+# Link LLVM libs
+target_link_libraries(
+    mlir_backend PRIVATE 
+    ${llvm_libs}
+)
+
+# Link ngraph 
+target_link_libraries(mlir_backend PUBLIC ngraph)
+
+# table-gen dialect ops
+# include table-gen helpers
+include(${LLVM_DIR}/TableGen.cmake)
+
+function(ngraph_tablegen ofn)
+    tablegen(MLIR ${ARGV} "-I${MLIR_SRC_INCLUDE_PATH}" "-I${MLIR_BIN_INCLUDE_PATH}")
+    set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn} PARENT_SCOPE)
+endfunction()
+
+set(MLIR_TABLEGEN_EXE mlir-tblgen)
+set(LLVM_TARGET_DEFINITIONS dialect/ops.td)
+
+ngraph_tablegen(ops.h.inc -gen-op-decls)
+ngraph_tablegen(ops.cpp.inc -gen-op-defs)
+
+add_public_tablegen_target(ngraph_ops_gen)
+add_dependencies(mlir_backend ngraph_ops_gen)
+target_include_directories(mlir_backend PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

src/contrib/mlir/lowerer.hpp → src/contrib/mlir/compiler/lowerer.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "contrib/mlir/compiler.hpp"
+#include "contrib/mlir/compiler/compiler.hpp"
 
 #include <mlir/Pass/Pass.h>
 

src/contrib/mlir/pass/mlir_subgraph_extraction.cpp → src/contrib/mlir/compiler/pass/mlir_subgraph_extraction.cpp

@@ -533,5 +533,5 @@ bool MLIRSubgraphExtractionPass::check_cycles(std::shared_ptr<Node> node,
 
 const std::set<std::type_index> MLIRSubgraphExtractionPass::m_supported_ops{
 #define MLIR_OP(OP) TI(ngraph::op::OP),
-#include "contrib/mlir/ops_supported.inc"
+#include "contrib/mlir/compiler/ops_supported.inc"
 };

src/ngraph/runtime/cpu/CMakeLists.txt

@@ -229,7 +229,7 @@ if (NGRAPH_CPU_ENABLE)
         # TODO: can we get away without LLVM/MLIR include path. 
         # Currently mlir backend compiler.hpp include LLVM/MLIR files
         get_directory_property(MLIR_LLVM_INCLUDEPATH
-                               DIRECTORY ${NGRAPH_MLIR_SOURCE_DIR}
+                               DIRECTORY ${NGRAPH_MLIR_SOURCE_DIR}/compiler
                                DEFINITION MLIR_LLVM_INCLUDEPATH)
         
         message(STATUS "Building CPU backend with MLIR")

src/ngraph/runtime/cpu/builder/mlir_cpu_compiled_kernel.cpp

@@ -16,7 +16,7 @@
 
 #include "ngraph/runtime/cpu/cpu_builder.hpp"
 
-#include "contrib/mlir/compiler.hpp"
+#include "contrib/mlir/compiler/compiler.hpp"
 #include "ngraph/op/experimental/compiled_kernel.hpp"
 #include "ngraph/runtime/cpu/cpu_runtime_context.hpp"
 

src/ngraph/runtime/cpu/cpu_backend.cpp

@@ -29,7 +29,7 @@
 #include "ngraph/util.hpp"
 
 #ifdef NGRAPH_MLIR_ENABLE
-#include "contrib/mlir/compiler.hpp"
+#include "contrib/mlir/compiler/compiler.hpp"
 #endif
 
 using namespace ngraph;

src/ngraph/runtime/cpu/cpu_builder.cpp

@@ -112,7 +112,7 @@
 #include "ngraph/util.hpp"
 
 #ifdef NGRAPH_MLIR_ENABLE
-#include "contrib/mlir/compiler.hpp"
+#include "contrib/mlir/compiler/compiler.hpp"
 #endif
 
 using namespace std;

src/ngraph/runtime/cpu/cpu_external_function.cpp

@@ -34,7 +34,7 @@
 #endif
 
 #ifdef NGRAPH_MLIR_ENABLE
-#include "contrib/mlir/pass/mlir_subgraph_extraction.hpp"
+#include "contrib/mlir/compiler/pass/mlir_subgraph_extraction.hpp"
 #endif
 
 #include "ngraph/descriptor/input.hpp"

src/ngraph/runtime/cpu/cpu_runtime_context.hpp

@@ -28,7 +28,7 @@
 #include "ngraph/op/experimental/compiled_kernel.hpp"
 
 #ifdef NGRAPH_MLIR_ENABLE
-#include "contrib/mlir/compiler.hpp"
+#include "contrib/mlir/compiler/compiler.hpp"
 #endif
 
 namespace mkldnn