Merge pull request #2 from doru1004/flatten-src-folder-structure

flatten src directory structure

Author: tjingrant

CMakeLists.txt

@@ -24,9 +24,6 @@ add_subdirectory(third_party/benchmark)
 add_subdirectory(third_party/pybind11)
 
 set(CMAKE_CXX_STANDARD 14)
-add_subdirectory(src/builder)
-add_subdirectory(src/compiler)
-add_subdirectory(src/runtime)
 add_subdirectory(src)
 
 add_subdirectory(test)

MLIR.cmake

@@ -153,10 +153,10 @@ set(MLIRWholeArchiveLibs
 function(whole_archive_link target lib_dir)
   get_property(link_flags TARGET ${target} PROPERTY LINK_FLAGS)
   if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
-    set(link_flags "${link_flags} -L${lib_dir} ")
+    set(link_flags "${link_flags} -L${lib_dir}  ")
     foreach(LIB ${ARGN})
       string(CONCAT link_flags ${link_flags}
-              "-Wl,-force_load ${lib_dir}/lib${LIB}.a ")
+              "-Wl,-force_load, ${lib_dir}/lib${LIB}.a ")
     endforeach(LIB)
   elseif(MSVC)
     foreach(LIB ${ARGN})
@@ -177,9 +177,9 @@ function(whole_archive_link_mlir target)
 endfunction(whole_archive_link_mlir)
 
 function(whole_archive_link_onnf target)
-  foreach(LIB ${ARGN})
-    add_dependencies(${target} ${LIB})
-  endforeach(LIB)
+  foreach(lib_target ${ARGN})
+    add_dependencies(${target} ${lib_target})
+  endforeach(lib_target)
   whole_archive_link(${target} ${CMAKE_BINARY_DIR}/lib ${ARGN})
 endfunction(whole_archive_link_onnf)
 

src/CMakeLists.txt

@@ -1,8 +1,78 @@
+add_library(compiler
+        dialect/krnl/krnl_ops.cpp
+        dialect/krnl/krnl_ops.hpp
+        dialect/krnl/krnl_types.cpp
+        dialect/krnl/krnl_types.hpp
+        dialect/onnx/onnx_ops.cpp
+        dialect/onnx/onnx_ops.hpp
+        dialect/krnl/krnl_helper.cpp
+        dialect/krnl/krnl_helper.hpp
+        pass/shape_inference_pass.cpp
+        pass/shape_inference_interface.hpp
+        dialect/onnx/onnxop.inc
+        pass/onnx_combine.cpp
+        pass/lower_frontend_to_krnl.cpp
+        pass/passes.hpp)
+
+# Include root src directory.
+target_include_directories(compiler PRIVATE ${ONNF_SRC_ROOT})
+
+# Include tablegen generated header files.
+target_include_directories(compiler PRIVATE ${ONNF_BIN_ROOT})
+
+target_link_libraries(compiler
+        ${CMAKE_THREAD_LIBS_INIT}
+        ${CMAKE_DL_LIBS}
+        ${MLIRLibs}
+        curses)
+
+set(LLVM_TARGET_DEFINITIONS pass/shape_inference_interface.td)
+onnf_tablegen(shape_inference.hpp.inc -gen-op-interface-decls)
+onnf_tablegen(shape_inference.cpp.inc -gen-op-interface-defs)
+add_public_tablegen_target(gen_shape_inference)
+add_dependencies(compiler gen_shape_inference)
+
+set(LLVM_TARGET_DEFINITIONS pass/onnx_combine.td)
+onnf_tablegen(onnx_combine.inc -gen-rewriters)
+add_public_tablegen_target(gen_onnx_combine)
+add_dependencies(compiler gen_onnx_combine)
+
+set(LLVM_TARGET_DEFINITIONS dialect/onnx/onnx.td)
+onnf_tablegen(onnx.hpp.inc -gen-op-decls "-I${CMAKE_SOURCE_DIR}/compiler/pass")
+onnf_tablegen(onnx.cpp.inc -gen-op-defs "-I${CMAKE_SOURCE_DIR}/compiler/pass")
+add_public_tablegen_target(gen_onnx)
+add_dependencies(compiler gen_onnx)
+
+set(LLVM_TARGET_DEFINITIONS dialect/krnl/krnl_ops.td)
+onnf_tablegen(krnl.hpp.inc -gen-op-decls)
+onnf_tablegen(krnl.cpp.inc -gen-op-defs)
+add_public_tablegen_target(gen_krnl_ops)
+add_dependencies(compiler gen_krnl_ops)
+
+add_library(onnf_shape_inference pass/shape_inference_pass.cpp)
+target_include_directories(onnf_shape_inference
+        PRIVATE ${ONNF_SRC_ROOT} ${ONNF_BIN_ROOT}
+        ${ONNF_SRC_ROOT})
+target_link_libraries(onnf_shape_inference ${MLIRLibs})
+add_dependencies(onnf_shape_inference gen_krnl_ops)
+
+add_library(onnf_lower_frontend pass/lower_frontend_to_krnl.cpp)
+target_include_directories(onnf_lower_frontend
+        PRIVATE ${ONNF_SRC_ROOT} ${ONNF_BIN_ROOT}
+        ${ONNF_SRC_ROOT})
+target_link_libraries(onnf_lower_frontend ${MLIRLibs})
+add_dependencies(onnf_lower_frontend gen_krnl_ops)
+
+add_subdirectory(transform)
+add_subdirectory(tool)
+add_subdirectory(builder)
+add_subdirectory(runtime)
+
 add_executable(onnf main.cpp)
 
-target_link_libraries(onnf builder compiler ${MLIRLibs} onnf_transform)
-whole_archive_link_mlir(onnf ${MLIRWholeArchiveLibs})
+target_link_libraries(onnf builder ${MLIRLibs} onnf_transform)
 set_target_properties(onnf PROPERTIES LINK_FLAGS "-lz")
+whole_archive_link_mlir(onnf ${MLIRWholeArchiveLibs})
 
 target_include_directories(onnf PRIVATE ${CMAKE_SOURCE_DIR})
 target_include_directories(onnf PRIVATE ${CMAKE_BINARY_DIR})

src/builder/frontend_dialect_transformer.cpp

@@ -35,7 +35,7 @@
 #include "llvm/ADT/ScopedHashTable.h"
 #include "llvm/Support/raw_ostream.h"
 
-#include "src/compiler/dialect/onnx/onnx_ops.hpp"
+#include "src/dialect/onnx/onnx_ops.hpp"
 
 #include "frontend_dialect_transformer.hpp"
 

src/compiler/CMakeLists.txt

@@ -1,7 +1,7 @@
 #include "mlir/Dialect/AffineOps/AffineOps.h"
 #include "mlir/IR/AffineExpr.h"
 
-#include "src/compiler/dialect/krnl/krnl_ops.hpp"
+#include "src/dialect/krnl/krnl_ops.hpp"
 
 #include "krnl_helper.hpp"
 

src/compiler/analysis/CMakeLists.txt

@@ -24,7 +24,7 @@
 #include "llvm/ADT/SetVector.h"
 #include "llvm/ADT/SmallBitVector.h"
 
-#include "src/compiler/dialect/krnl/krnl_helper.hpp"
+#include "krnl_helper.hpp"
 
 #include "krnl_ops.hpp"
 
@@ -35,7 +35,7 @@ KrnlOpsDialect::KrnlOpsDialect(MLIRContext *context)
     : Dialect(getDialectNamespace(), context) {
   addOperations<
 #define GET_OP_LIST
-#include "src/compiler/krnl.cpp.inc"
+#include "src/krnl.cpp.inc"
       >();
   addTypes<LoopType>();
 }
@@ -373,5 +373,5 @@ void KrnlEntryPointOp::build(mlir::Builder *builder, OperationState &state,
 }
 
 #define GET_OP_CLASSES
-#include "src/compiler/krnl.cpp.inc"
+#include "src/krnl.cpp.inc"
 } // namespace mlir

src/compiler/dialect/krnl/krnl_helper.cpp renamed to src/dialect/krnl/krnl_helper.cpp

@@ -15,8 +15,8 @@
 #include "mlir/IR/OpDefinition.h"
 #include "mlir/IR/StandardTypes.h"
 
-#include "src/compiler/dialect/krnl/krnl_helper.hpp"
-#include "src/compiler/dialect/krnl/krnl_types.hpp"
+#include "src/dialect/krnl/krnl_helper.hpp"
+#include "src/dialect/krnl/krnl_types.hpp"
 
 namespace mlir {
 class KrnlOpsDialect : public Dialect {
@@ -43,5 +43,5 @@ class KrnlOpsDialect : public Dialect {
 };
 
 #define GET_OP_CLASSES
-#include "src/compiler/krnl.hpp.inc"
+#include "src/krnl.hpp.inc"
 } // namespace mlir