From 45a5a8499c8056a1542a5bb3d8ebb27aa931f691 Mon Sep 17 00:00:00 2001
From: GHEORGHE-TEOD BERCEA <Gheorghe-Teod.Bercea@ibm.com>
Date: Tue, 29 Oct 2019 13:57:56 -0400
Subject: [PATCH] Fix MLIR-enabled build. (#354)

* Add new build paths. Add Ranker or Unracked tensor types.

* Remove path to LLVM root folder, it is not needed anymore.

* Code clean-up.

* Clean-up code.

* update LLVM_PROJECT_SRC

* Update p9.sh

* Update MLIR.cmake
---
 MLIR.cmake           | 53 +++++++++++++++++++++++++-------------------
 src/builder/sgir.cpp |  6 ++---
 src/main.cpp         |  1 +
 3 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/MLIR.cmake b/MLIR.cmake
index ca7f413..4fbe8a0 100644
--- a/MLIR.cmake
+++ b/MLIR.cmake
@@ -1,34 +1,41 @@
 # Flags to link with LLVM/MLIR libraries
-if(DEFINED ENV{LLVM_PROJECT_ROOT})
-  set(LLVM_PROJECT_ROOT $ENV{LLVM_PROJECT_ROOT})
-  if(EXISTS ${LLVM_PROJECT_ROOT})
-    message(STATUS "LLVM_PROJECT_ROOT " ${LLVM_PROJECT_ROOT})
+
+# Path to LLVM source folder.
+if(DEFINED ENV{LLVM_SRC})
+  set(LLVM_SRC $ENV{LLVM_SRC})
+  if(EXISTS ${LLVM_SRC})
+    message(STATUS "LLVM_SRC " ${LLVM_SRC})
   else()
     message(
-      FATAL_ERROR "The path specified by LLVM_PROJECT_ROOT does not exist: "
-                  ${LLVM_PROJECT_ROOT})
+      FATAL_ERROR "The path specified by LLVM_SRC does not exist: "
+                  ${LLVM_SRC})
   endif()
 else()
-  message(FATAL_ERROR "env variable LLVM_PROJECT_ROOT not set")
+  message(FATAL_ERROR "env variable LLVM_SRC not set")
 endif()
 
-if(DEFINED ENV{LLVM_PROJECT_LIB})
-  set(LLVM_PROJECT_LIB $ENV{LLVM_PROJECT_LIB})
+# Path to LLVM build folder
+if(DEFINED ENV{LLVM_BUILD})
+  set(LLVM_BUILD $ENV{LLVM_BUILD})
+  if(EXISTS ${LLVM_BUILD})
+    message(STATUS "LLVM_BUILD " ${LLVM_BUILD})
+  else()
+    message(
+      FATAL_ERROR "The path specified by LLVM_BUILD does not exist: "
+                  ${LLVM_BUILD})
+  endif()
 else()
-  set(LLVM_PROJECT_LIB $ENV{LLVM_PROJECT_ROOT}/build/lib)
-endif()
-if(EXISTS ${LLVM_PROJECT_LIB})
-  message(STATUS "LLVM_PROJECT_LIB " ${LLVM_PROJECT_LIB})
-else()
-  message(FATAL_ERROR "The path specified by LLVM_PROJECT_LIB does not exist: "
-                      ${LLVM_PROJECT_LIB})
+  message(FATAL_ERROR "env variable LLVM_BUILD not set")
 endif()
 
-# include path
-set(LLVM_SRC_INCLUDE_PATH ${LLVM_PROJECT_ROOT}/llvm/include)
-set(LLVM_BIN_INCLUDE_PATH ${LLVM_PROJECT_ROOT}/build/include)
-set(MLIR_SRC_INCLUDE_PATH ${LLVM_PROJECT_ROOT}/llvm/projects/mlir/include)
-set(MLIR_BIN_INCLUDE_PATH ${LLVM_PROJECT_ROOT}/build/projects/mlir/include)
+# LLVM project lib folder
+set(LLVM_PROJECT_LIB ${LLVM_BUILD}/lib)
+
+# Include paths for MLIR
+set(LLVM_SRC_INCLUDE_PATH ${LLVM_SRC}/include)
+set(LLVM_BIN_INCLUDE_PATH ${LLVM_BUILD}/include)
+set(MLIR_SRC_INCLUDE_PATH ${LLVM_SRC}/projects/mlir/include)
+set(MLIR_BIN_INCLUDE_PATH ${LLVM_BUILD}/projects/mlir/include)
 
 set(MLIR_INCLUDE_PATHS
     ${LLVM_SRC_INCLUDE_PATH};${LLVM_BIN_INCLUDE_PATH};${MLIR_SRC_INCLUDE_PATH};${MLIR_BIN_INCLUDE_PATH})
@@ -85,7 +92,7 @@ set(MLIRLIBS
     ${LLVMLIBSUPPORT})
 
 # Set up TableGen environment.
-include(${LLVM_PROJECT_ROOT}/build/lib/cmake/llvm/TableGen.cmake)
+include(${LLVM_BUILD}/lib/cmake/llvm/TableGen.cmake)
 
 function(onnf_tablegen ofn)
   tablegen(MLIR
@@ -103,5 +110,5 @@ endfunction()
 add_executable(mlir-tblgen IMPORTED)
 set_property(TARGET mlir-tblgen
              PROPERTY IMPORTED_LOCATION
-                      ${LLVM_PROJECT_ROOT}/build/bin/mlir-tblgen)
+                      ${LLVM_BUILD}/bin/mlir-tblgen)
 set(MLIR_TABLEGEN_EXE mlir-tblgen)
diff --git a/src/builder/sgir.cpp b/src/builder/sgir.cpp
index 64eb0ef..2a63548 100644
--- a/src/builder/sgir.cpp
+++ b/src/builder/sgir.cpp
@@ -131,7 +131,7 @@ class SGIRGenImpl {
       mlir::Type elementType =
           TypeConvert(input.type().tensor_type().elem_type());
       llvm::ArrayRef<int64_t> llvmdimsAR(dims.data(), dims.size());
-      auto dataType = builder_.getTensorType(llvmdimsAR, elementType);
+      auto dataType = mlir::RankedTensorType::get(llvmdimsAR, elementType);
       mlir::OperationState result(
           UnknownLoc(), "sgir.input " + input_tensor_legalized_name);
       result.addTypes(dataType);
@@ -152,7 +152,7 @@ class SGIRGenImpl {
     }
     mlir::OperationState result(UnknownLoc(), "SGIR." + node.op_type());
     for (auto item : node.output()) {
-      result.addTypes(builder_.getTensorType(builder_.getF32Type()));
+      result.addTypes(mlir::UnrankedTensorType::get(builder_.getF32Type()));
     }
     result.addOperands(inputs);
     auto op = builder_.createOperation(result);
@@ -167,7 +167,7 @@ class SGIRGenImpl {
   void ImportOutputTensor(onnx::ValueInfoProto& output) {
     if (sgir_symbols_.ContainKey(legalize_name(output.name()))) {
       mlir::OperationState result(UnknownLoc(), "sgir.output " + output.name());
-      result.addTypes(builder_.getTensorType(builder_.getF32Type()));
+      result.addTypes(mlir::UnrankedTensorType::get(builder_.getF32Type()));
       result.addOperands(sgir_symbols_.GetTensorByOnnxName(output.name()));
       builder_.createOperation(result);
     } else {
diff --git a/src/main.cpp b/src/main.cpp
index 7e22aea..ca92bc0 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -25,6 +25,7 @@
 #include "mlir/IR/Module.h"
 
 using namespace std;
+using namespace onnf;
 
 int main(int ac, char* av[]) {
   namespace po = boost::program_options;