Merge pull request #332 from Xilinx/jrickert.remove_torch

Remove torch-mlir related code and add option to control the  building of conversion passes

Author: jorickert

.github/actions/build-with-llvm/Dockerfile

@@ -2,8 +2,7 @@
 # (c) Copyright 2022 - 2024 Advanced Micro Devices, Inc. All Rights reserved.
 
 # Container image that runs your code
-FROM ghcr.io/stephenneuendorffer/torch-mlir:main
-#FROM ghcr.io/stephenneuendorffer/mlir-xten-llvm:main
+FROM ghcr.io/stephenneuendorffer/mlir-xten-llvm:main
 
 # Copies your code file from your action repository to the filesystem path `/` of the container
 COPY entrypoint.sh /entrypoint.sh

.github/actions/build-with-llvm/entrypoint.sh

@@ -13,21 +13,11 @@ ls
 #apt-get install python3-dev
 #pip3 install pybind11
 
-# cd /build
-# git clone https://github.com/llvm/torch-mlir.git
-# cd torch-mlir
-# git checkout 077e55d7565e22113
-# cmake -B build -S . -G Ninja \
-#     -DMLIR_DIR=/build/build/lib/cmake/mlir
-# ninja
-# cd ${GITHUB_WORKSPACE}
 
 #pybind11_DIR=/build/.pyenv/versions/3.7.0/lib/python3.7/site-packages/pybind11/share/cmake/pybind11
 #pybind11_DIR=/usr/local/lib/python3.8/dist-packages/pybind11/share/cmake/pybind11
 cmake -B build -S . -G Ninja \
-    -DMLIR_DIR=/build/build/lib/cmake/mlir \
-    -DTORCH_MLIR_BINARY_DIR=/build/torch-mlir-build \
-    -DTORCH_MLIR_SOURCE_DIR=/build/torch-mlir
+    -DMLIR_DIR=/build/build/lib/cmake/mlir
 
 #https://github.com/Xilinx/mlir-xten.git
 #    -Dpybind11_DIR=${pybind11_DIR}

.github/workflows/buildAndTest.yml

@@ -66,6 +66,6 @@ jobs:
               -DCMAKE_C_COMPILER_LAUNCHER=sccache \
               -DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
               -DLLVM_EXTERNAL_PROJECTS=mlir-xten \
-              -DMLIR_XTEN_ENABLE_TORCH=OFF \
-              -DLLVM_EXTERNAL_MLIR_XTEN_SOURCE_DIR="$PWD"
+              -DLLVM_EXTERNAL_MLIR_XTEN_SOURCE_DIR="$PWD" \
+              -DMLIR_XTEN_ENABLE_CONVERSION_PASSES=ON
         ninja -C build check-xten-all

CMakeLists.txt

@@ -31,7 +31,8 @@ set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_VERBOSE_MAKEFILE ON)
 
-option(MLIR_XTEN_ENABLE_TORCH "Enable torch-mlir" ON)
+option(MLIR_XTEN_ENABLE_CONVERSION_PASSES
+       "Build XTen conversion passes and register them in aten-opt" OFF)
 
 function(detect_pybind11_install)
   if(pybind11_DIR)
@@ -78,7 +79,6 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   include(AddMLIR)
   include(HandleLLVMOptions)
 
-  link_directories(${TORCH_MLIR_LIB_DIR})
 else()
   message(STATUS "Building MLIR-XTEN in-tree")
   # Build via external projects mechanism
@@ -90,11 +90,6 @@ else()
   list(APPEND CMAKE_MODULE_PATH ${MLIR_MAIN_SRC_DIR}/cmake/modules)
   list(APPEND CMAKE_MODULE_PATH ${LLVM_MAIN_SRC_DIR}/cmake)
 
-  if (MLIR_XTEN_ENABLE_TORCH)
-    set(TORCH_MLIR_INCLUDE_DIRS
-      ${LLVM_EXTERNAL_TORCH_MLIR_SOURCE_DIR}/include
-      ${LLVM_BINARY_DIR}/tools/torch-mlir/include)
-  endif()
 endif()
 
 # Define the default arguments to use with 'lit', and an option for the user to
@@ -118,10 +113,6 @@ include_directories(${MLIR_INCLUDE_DIRS})
 include_directories(${XTEN_SOURCE_DIR}/include)
 include_directories(${XTEN_BINARY_DIR}/include)
 
-if(MLIR_XTEN_ENABLE_TORCH)
-  include_directories(${TORCH_MLIR_INCLUDE_DIRS})
-endif()
-
 add_definitions(${LLVM_DEFINITIONS})
 
 # Create a general check-all command to run both lit and unittests

README.md

@@ -1,11 +1,11 @@
 <!--- (c) Copyright 2021 Xilinx, Inc. All Rights reserved.--->
 <!--- (c) Copyright 2022 - 2024 Advanced Micro Devices, Inc. All Rights reserved.--->
 
-# Extensions to Torch-MLIR
+# Extensions to MLIR
 
 ![](https://mlir.llvm.org//mlir-logo.png)
 
-This repository contains Xilinx extensions to the torch-mlir ATen dialect to enable expressing the input and output of partial results. Using these extensions, a prototype streaming dataflow exploration tool scans the design space for compute/memory/computation balanced partitioning of CNNs on the AIE array of Xilinx' Versal devices.
+This repository contains Xilinx extensions to the ONNX-MLIR and TOSA dialect to enable expressing the input and output of partial results. Using these extensions, a prototype streaming dataflow exploration tool scans the design space for compute/memory/computation balanced partitioning of CNNs on the AIE array of Xilinx' Versal devices.
 
 [Full Documentation](https://xilinx.github.io/mlir-xten/)
 

docs/Building.md

@@ -9,21 +9,10 @@
 cmake 3.20.6 or higher
 ninja 1.8.2
 clang/llvm 14+ from source https://github.com/llvm/llvm-project
-llvm/torch-mlir from https://github.com/llvm/torch-mlir
 ```
 
 ## Building on X86
 
-NOTE: this initial version of mlir-xten currently fails to build against head torch-mlir. Fixes in progress.
-
-### Compile torch-mlir
-
-Clone torch-mlir from https://github.com/llvm/torch-mlir and follow the build instructions.  This process builds torch-mlir integrated with LLVM/MLIR.  We recommend adding the additional CMake flags: `-DLLVM_BUILD_LLVM_DYLIB=ON -DLLVM_LINK_LLVM_DYLIB=ON` to build and link with libLLVM.so.
-
-```sh
-cmake --build build
-```
-
 ### Compile mlir-xten
 
 ```sh
@@ -32,10 +21,8 @@ mkdir build; cd build
 cmake ..\
     -DCMAKE_C_COMPILER=clang \
     -DCMAKE_CXX_COMPILER=clang++ \
-    -DLLVM_DIR=${absolute path to torchMlirBuild}/cmake/llvm \
-    -DMLIR_DIR=${absolute path to torchMlirBuild}/cmake/mlir \
-    -DTORCH_MLIR_SOURCE_DIR=${absolute path to torchMlirSource} \
-    -DTORCH_MLIR_BINARY_DIR=${absolute path to torchMlirBuild}
+    -DLLVM_DIR=${absolute path to llvm build}/cmake/llvm \
+    -DMLIR_DIR=${absolute path to mlir build}/cmake/mlir
 ```
 
 ## Environment setup

docs/README.md

@@ -1,6 +1,6 @@
 <!--- (c) Copyright 2022 - 2024 Advanced Micro Devices, Inc. All Rights reserved.--->
 
-# Extensions to Torch-MLIR
+# Extensions to MLIR
 
 ![](https://mlir.llvm.org//mlir-logo.png)
 

include/xten/CMakeLists.txt

@@ -8,4 +8,6 @@
 # (c) Copyright 2022 - 2024 Advanced Micro Devices, Inc. All Rights reserved.
 
 add_subdirectory(Dialect)
-add_subdirectory(Conversion)
+if(MLIR_XTEN_ENABLE_CONVERSION_PASSES)
+  add_subdirectory(Conversion)
+endif()

include/xten/Conversion/CMakeLists.txt

@@ -10,10 +10,5 @@
 set(LLVM_TARGET_DEFINITIONS Passes.td)
 mlir_tablegen(Passes.h.inc -gen-pass-decls -name XTenConversion)
 
-if(MLIR_XTEN_ENABLE_TORCH)
-  set(LLVM_TARGET_DEFINITIONS PassesTorch.td)
-  mlir_tablegen(PassesTorch.h.inc -gen-pass-decls -name XTenConversion)
-endif()
-
 add_mlir_doc(Passes XTenConversionPasses ./ -gen-pass-doc)
 add_public_tablegen_target(XTenConversionIncGen)

include/xten/Conversion/Passes.h

@@ -16,7 +16,6 @@
 
 #include "xten/Conversion/TosaToXTenNNPass.h"
 #include "xten/Conversion/XTenNNToLinalgPass.h"
-#include "xten/Conversion/XTenNNToTorchPass.h"
 #include "xten/Conversion/XTenNNToTosaPass.h"
 
 namespace xilinx {
@@ -27,14 +26,6 @@ namespace xten {
 
 #include "xten/Conversion/Passes.h.inc"
 
-#ifdef MLIR_XTEN_ENABLE_TORCH
-namespace torch {
-#define GEN_PASS_DECL
-#define GEN_PASS_REGISTRATION
-#include "xten/Conversion/PassesTorch.h.inc"
-}
-#endif
-
 void registerConversionPasses();
 
 } // namespace xten