Merge remote-tracking branch 'upstream/master'

onnx · Apr 1, 2020 · c1509dc · c1509dc
2 parents fc29506 + b65e773
commit c1509dc
Show file tree

Hide file tree

Showing 32 changed files with 2,001 additions and 1,910 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -18,7 +18,7 @@ jobs:
             git submodule update --init --recursive
       # Use cached mlir installation if possible.
       - restore_cache:
-          key: V9-LLVM-PROJECT-{{ arch }}
+          key: V10-1-LLVM-PROJECT-{{ arch }}
       - run:
           name: Install MLIR
           command: |
@@ -29,7 +29,7 @@ jobs:
               source onnx-mlir/utils/install-mlir.sh
             fi
       - save_cache:
-          key: V9-LLVM-PROJECT-{{ arch }}
+          key: V10-1-LLVM-PROJECT-{{ arch }}
           paths:
             - llvm-project
       - run:

diff --git a/MLIR.cmake b/MLIR.cmake
@@ -54,9 +54,11 @@ function(find_mlir_lib lib)
           NO_DEFAULT_PATH)
 endfunction(find_mlir_lib)
 
-find_mlir_lib(MLIRAffineOps)
+find_mlir_lib(MLIRAffine)
 find_mlir_lib(MLIRAffineToStandard)
 find_mlir_lib(MLIRAnalysis)
+find_mlir_lib(MLIRCallInterfaces)
+find_mlir_lib(MLIRControlFlowInterfaces)
 find_mlir_lib(MLIRDialect)
 find_mlir_lib(MLIREDSC)
 find_mlir_lib(MLIRExecutionEngine)
@@ -65,28 +67,33 @@ find_mlir_lib(MLIRLLVMIR)
 find_mlir_lib(MLIRLoopAnalysis)
 find_mlir_lib(MLIRLoopToStandard)
 find_mlir_lib(MLIRLoopOps)
+find_mlir_lib(MLIRLoopLikeInterface)
+find_mlir_lib(MLIRLLVMIRTransforms)
+find_mlir_lib(MLIRMlirOptMain)
 find_mlir_lib(MLIRParser)
 find_mlir_lib(MLIRPass)
 find_mlir_lib(MLIRStandardOps)
 find_mlir_lib(MLIRStandardToLLVM)
+find_mlir_lib(MLIRSideEffects)
 find_mlir_lib(MLIRTargetLLVMIR)
 find_mlir_lib(MLIRTransforms)
 find_mlir_lib(MLIRTransformUtils)
 find_mlir_lib(MLIRSupport)
-find_mlir_lib(MLIRMlirOptMain)
+find_mlir_lib(MLIROpenMP)
 find_mlir_lib(MLIROptLib)
 find_mlir_lib(MLIRTargetLLVMIRModuleTranslation)
 find_mlir_lib(MLIRTargetLLVMIR)
 find_mlir_lib(MLIRTransformUtils)
 find_mlir_lib(MLIRTranslation)
-find_mlir_lib(MLIRVectorOps)
+find_mlir_lib(MLIRVector)
 
 find_mlir_lib(LLVMCore)
 find_mlir_lib(LLVMSupport)
 find_mlir_lib(LLVMAsmParser)
 find_mlir_lib(LLVMBinaryFormat)
 find_mlir_lib(LLVMRemarks)
 find_mlir_lib(LLVMIRReader)
+find_mlir_lib(LLVMMLIRTableGen)
 find_mlir_lib(LLVMTransformUtils)
 find_mlir_lib(LLVMBitstreamReader)
 find_mlir_lib(LLVMAnalysis)
@@ -97,6 +104,7 @@ find_mlir_lib(LLVMMCParser)
 find_mlir_lib(LLVMObject)
 find_mlir_lib(LLVMProfileData)
 find_mlir_lib(LLVMDemangle)
+find_mlir_lib(LLVMFrontendOpenMP)
 
 
 set(MLIRLibsOnce
@@ -107,30 +115,38 @@ set(MLIRLibsOnce
         ${LLVMBitstreamReader}
         ${LLVMBitWriter}
         ${LLVMCore}
+        ${LLVMFrontendOpenMP}
         ${LLVMIRReader}
         ${LLVMMC}
         ${LLVMMCParser}
+        ${LLVMMLIRTableGen}        
         ${LLVMObject}
         ${LLVMRemarks}
         ${LLVMSupport}
         ${LLVMTransformUtils}
         ${LLVMProfileData}
         ${LLVMDemangle}
-        ${MLIRAffineOps}
+        ${MLIRAffine}
         ${MLIRAffineToStandard}
         ${MLIRAnalysis}
+        ${MLIRCallInterfaces}
+        ${MLIRControlFlowInterfaces}
         ${MLIRDialect}
         ${MLIREDSC}
         ${MLIRExecutionEngine}
         ${MLIRIR}
         ${MLIRLLVMIR}
+        ${MLIRLLVMIRTransforms}        
         ${MLIRLoopToStandard}
         ${MLIRLoopOps}
         ${MLIRLoopAnalysis}
+        ${MLIRLoopLikeInterface}
+        ${MLIROpenMP}
         ${MLIRMlirOptMain}
         ${MLIROptLib}
         ${MLIRParser}
         ${MLIRPass}
+        ${MLIRSideEffects}        
         ${MLIRStandardOps}
         ${MLIRStandardToLLVM}
         ${MLIRSupport}
@@ -147,13 +163,13 @@ set(MLIRLibs
 
 set(MLIRWholeArchiveLibs
         MLIRAffineToStandard
-        MLIRAffineOps
+        MLIRAffine
         MLIRLLVMIR
         MLIRStandardOps
         MLIRStandardToLLVM
         MLIRTransforms
         MLIRLoopToStandard
-        MLIRVectorOps
+        MLIRVector
         MLIRLoopOps)
 
 function(whole_archive_link target lib_dir)

diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ Firstly, install MLIR (as a part of LLVM-Project):
 ``` bash
 git clone https://github.com/llvm/llvm-project.git
 # Check out a specific branch that is known to work with ONNX MLIR.
-cd llvm-project && git checkout 076475713c236081a3247a53e9dbab9043c3eac2 && cd ..
+cd llvm-project && git checkout 07e462526d0cbae40b320e1a4307ce11e197fb0a && cd ..
 mkdir llvm-project/build
 cd llvm-project/build
 cmake -G Ninja ../llvm \