diff --git a/0001-PATCH-mlir-Support-building-MLIR-standalone.patch b/0001-PATCH-mlir-Support-building-MLIR-standalone.patch deleted file mode 100644 index abacfd52600334b2624916c02062763818e61fea..0000000000000000000000000000000000000000 --- a/0001-PATCH-mlir-Support-building-MLIR-standalone.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 9deba96d8f15d948e92c49e40a671fbedc328457 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= -Date: Tue, 2 Feb 2021 13:09:45 -0600 -Subject: [PATCH 1/2] [PATCH][mlir] Support building MLIR standalone - -Add the necessary bits to CMakeLists to make it possible to configure -MLIR against installed LLVM, and build it with minimal need for LLVM -source tree. The latter is only necessary to run unittests, and if it -is missing then unittests are skipped with a warning. - -This change includes the necessary changes to tests, in particular -adding some missing substitutions and defining missing variables -for lit.site.cfg.py substitution. - -Reviewed By: stephenneuendorffer - -Differential Revision: https://reviews.llvm.org/D85464 - -Co-authored-by: Isuru Fernando ---- - mlir/CMakeLists.txt | 33 ++++++++++++++++++++++++++++++++- - mlir/cmake/modules/AddMLIR.cmake | 1 + - mlir/test/CMakeLists.txt | 5 ++++- - mlir/test/lit.cfg.py | 4 ++++ - 4 files changed, 41 insertions(+), 2 deletions(-) - -diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt -index cbae5fd..baacbdd3 100644 ---- a/mlir/CMakeLists.txt -+++ b/mlir/CMakeLists.txt -@@ -1,10 +1,37 @@ - # MLIR project. -+ -+# Check if MLIR is built as a standalone project. -+if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) -+ project(mlir) -+ cmake_minimum_required(VERSION 3.13.4) -+ -+ find_package(LLVM CONFIG REQUIRED) -+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR}) -+ include(HandleLLVMOptions) -+ include(AddLLVM) -+ include(TableGen) -+ -+ include_directories(${LLVM_INCLUDE_DIRS}) -+ -+ set(LLVM_MAIN_SRC_DIR ${CMAKE_SOURCE_DIR}/../llvm CACHE PATH -+ "Path to LLVM source tree") -+ set(UNITTEST_DIR ${LLVM_MAIN_SRC_DIR}/utils/unittest) -+ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h) -+ add_subdirectory(${UNITTEST_DIR} utils/unittest) -+ endif() -+ -+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY -+ "${CMAKE_CURRENT_BINARY_DIR}/lib${LLVM_LIBDIR_SUFFIX}") -+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/bin") -+endif() -+ - set(MLIR_MAIN_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR} ) - set(MLIR_MAIN_INCLUDE_DIR ${MLIR_MAIN_SRC_DIR}/include ) - - set(MLIR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) - set(MLIR_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) - set(MLIR_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) -+set(MLIR_TOOLS_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") - -@@ -106,7 +133,11 @@ add_subdirectory(lib) - add_subdirectory(lib/CAPI) - if (MLIR_INCLUDE_TESTS) - add_definitions(-DMLIR_INCLUDE_TESTS) -- add_subdirectory(unittests) -+ if (TARGET gtest) -+ add_subdirectory(unittests) -+ else() -+ message(WARNING "gtest not found, unittests will not be available") -+ endif() - add_subdirectory(test) - endif() - if (MLIR_INCLUDE_INTEGRATION_TESTS) -diff --git a/mlir/cmake/modules/AddMLIR.cmake b/mlir/cmake/modules/AddMLIR.cmake -index 4cfd351..4a814ea 100644 ---- a/mlir/cmake/modules/AddMLIR.cmake -+++ b/mlir/cmake/modules/AddMLIR.cmake -@@ -2,6 +2,7 @@ function(mlir_tablegen ofn) - tablegen(MLIR ${ARGV}) - set(TABLEGEN_OUTPUT ${TABLEGEN_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR}/${ofn} - PARENT_SCOPE) -+ include_directories(${CMAKE_CURRENT_BINARY_DIR}) - endfunction() - - # Declare a dialect in the include directory -diff --git a/mlir/test/CMakeLists.txt b/mlir/test/CMakeLists.txt -index 293d932..5feedd5 100644 ---- a/mlir/test/CMakeLists.txt -+++ b/mlir/test/CMakeLists.txt -@@ -43,7 +43,6 @@ configure_lit_site_cfg( - - set(MLIR_TEST_DEPENDS - FileCheck count not -- MLIRUnitTests - mlir-capi-ir-test - mlir-capi-pass-test - mlir-cpu-runner -@@ -61,6 +60,10 @@ set(MLIR_TEST_DEPENDS - mlir_async_runtime - ) - -+if(TARGET gtest) -+ list(APPEND MLIR_TEST_DEPENDS MLIRUnitTests) -+endif() -+ - if(LLVM_BUILD_EXAMPLES) - list(APPEND MLIR_TEST_DEPENDS - toyc-ch1 -diff --git a/mlir/test/lit.cfg.py b/mlir/test/lit.cfg.py -index 482513b..bff47851 100644 ---- a/mlir/test/lit.cfg.py -+++ b/mlir/test/lit.cfg.py -@@ -61,6 +61,10 @@ tools = [ - 'mlir-capi-ir-test', - 'mlir-capi-pass-test', - 'mlir-edsc-builder-api-test', -+ 'mlir-cpu-runner', -+ 'mlir-linalg-ods-gen', -+ 'mlir-reduce', -+ 'mlir-sdbm-api-test', - ] - - # The following tools are optional --- -1.8.3.1 - diff --git a/0002-PATCH-mlir-Fix-building-unittests-in-in-tree-build.patch b/0002-PATCH-mlir-Fix-building-unittests-in-in-tree-build.patch deleted file mode 100644 index d37c64d3eab977fb5b5a6a24146913a8735e787a..0000000000000000000000000000000000000000 --- a/0002-PATCH-mlir-Fix-building-unittests-in-in-tree-build.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e09b298273994b20cc8747765a567d716e241fd2 Mon Sep 17 00:00:00 2001 -From: Isuru Fernando -Date: Thu, 4 Feb 2021 01:59:08 +0000 -Subject: [PATCH 2/2] [PATCH][mlir] Fix building unittests in in-tree build - -Reviewed By: mehdi_amini - -Differential Revision: https://reviews.llvm.org/D95978 ---- - mlir/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt -index baacbdd3..5d21312 100644 ---- a/mlir/CMakeLists.txt -+++ b/mlir/CMakeLists.txt -@@ -133,7 +133,7 @@ add_subdirectory(lib) - add_subdirectory(lib/CAPI) - if (MLIR_INCLUDE_TESTS) - add_definitions(-DMLIR_INCLUDE_TESTS) -- if (TARGET gtest) -+ if (EXISTS ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include/gtest/gtest.h) - add_subdirectory(unittests) - else() - message(WARNING "gtest not found, unittests will not be available") --- -1.8.3.1 - diff --git a/llvm-mlir.spec b/llvm-mlir.spec deleted file mode 100644 index 99be824327bb24b8d1263d6ae7cda2d2935d157a..0000000000000000000000000000000000000000 --- a/llvm-mlir.spec +++ /dev/null @@ -1,136 +0,0 @@ -%bcond_without sys_llvm -%bcond_without check - -%global maj_ver 15 -%global min_ver 0 -%global patch_ver 7 -%global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver} -%global mlir_srcdir llvm-project-%{mlir_version}.src - -%if %{with sys_llvm} -%global pkg_name mlir -%global install_prefix %{_prefix} -%else -%global pkg_name mlir%{maj_ver} -%global install_prefix %{_libdir}/llvm%{maj_ver} -%endif - -%global install_bindir %{install_prefix}/bin -%if 0%{?__isa_bits} == 64 -%global install_libdir %{install_prefix}/lib64 -%else -%global install_libdir %{install_prefix}/lib -%endif -%global install_includedir %{install_prefix}/include - -Name: %{pkg_name} -Version: %{mlir_version} -Release: 1 -Summary: The MLIR project is a novel approach to building reusable and extensible compiler infrastructure. -License: Apache 2.0 -URL: https://mlir.llvm.org/ - -Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{mlir_version}/%{mlir_srcdir}.tar.xz -Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{mlir_version}/%{mlir_srcdir}.tar.xz.sig - - -#Patch0: 0001-PATCH-mlir-Support-building-MLIR-standalone.patch -#Patch1: 0002-PATCH-mlir-Fix-building-unittests-in-in-tree-build.patch - -BuildRequires: gcc gcc-c++ cmake ninja-build zlib-devel python3-lit -BuildRequires: llvm-devel = %{version} -BuildRequires: llvm-test = %{version} - -%description -The MLIR project is a novel approach to building reusable and extensible compiler infrastructure. -MLIR aims to address software fragmentation, improve compilation for heterogeneous hardware, -significantly reduce the cost of building domain specific compilers, and aid in connecting -existing compilers together. - -%package static -Summary: MLIR static files -Requires: %{name} = %{version} - -%description static -MLIR static files. - -%package devel -Summary: MLIR development files -Requires: %{name} = %{version}-%{release} -Requires: %{name}-static = %{version}-%{release} - -%description devel -MLIR development files. - -%prep -%autosetup -n %{mlir_srcdir}/%{name} -p2 -# remove all but keep mlir -find ../* -maxdepth 0 ! -name "%{name}" -exec rm -rf {} + - -%build -%cmake -G Ninja \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_SKIP_RPATH=ON \ - -DLLVM_LINK_LLVM_DYLIB:BOOL=ON \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DCMAKE_PREFIX_PATH=%{install_libdir}/cmake/llvm/ \ - -DLLVM_EXTERNAL_LIT=%{install_bindir}/lit \ - -DLLVM_BUILD_UTILS:BOOL=ON \ - -DMLIR_INCLUDE_DOCS:BOOL=ON \ - -DMLIR_INCLUDE_TESTS:BOOL=OFF \ - -DMLIR_INCLUDE_INTEGRATION_TESTS:BOOL=OFF \ - -DBUILD_SHARED_LIBS=OFF \ - -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF \ - -DMLIR_BUILD_MLIR_C_DYLIB=ON \ -%if 0%{?__isa_bits} == 64 - -DLLVM_LIBDIR_SUFFIX=64 \ -%else - -DLLVM_LIBDIR_SUFFIX= -%endif -%ifarch %ix86 x86_64 - -DLLVM_TARGETS_TO_BUILD="X86" -%endif -%ifarch aarch64 - -DLLVM_TARGETS_TO_BUILD="AArch64" -%endif - -%ninja_build - -%install -%ninja_install - -%check -%if %{with check} -# build process .exe tools normally use rpath or static linkage -%cmake_build --target check-mlir || true -%endif - -%files -%license LICENSE.TXT -%{install_libdir}/libMLIR*.so.* -%{install_libdir}/libmlir_runner_utils.so.* -%{install_libdir}/libmlir_c_runner_utils.so.* -%{install_libdir}/libmlir_async_runtime.so.* - -%files static -%{install_libdir}/libMLIR*.a - -%files devel -%{install_bindir}/mlir-tblgen -%{install_libdir}/libMLIR*.so -%{install_libdir}/libmlir_runner_utils.so -%{install_libdir}/libmlir_c_runner_utils.so -%{install_libdir}/libmlir_async_runtime.so -%{install_includedir}/mlir -%{install_includedir}/mlir-c -%{install_libdir}/cmake/mlir - -%changelog -* Sun Jun 25 2023 cf-zhao - 15.0.7-1 -- Update to 15.0.7 - -* Wed Nov 16 2022 liyancheng <412998149@qq.com> - 12.0.1-0 -- Type:Init -- ID:NA -- SUG:NA -- DESC:Init llvm-mlir repository diff --git a/llvm-project-15.0.7.src.tar.xz b/llvm-project-15.0.7.src.tar.xz deleted file mode 100644 index 7bc21504b4b3827c22e460f5c3ecd78b5b4bf67d..0000000000000000000000000000000000000000 Binary files a/llvm-project-15.0.7.src.tar.xz and /dev/null differ diff --git a/llvm-project-15.0.7.src.tar.xz.sig b/llvm-project-15.0.7.src.tar.xz.sig deleted file mode 100644 index 1560fd7e6b48361ab574b2605aad86dc5ab14bdf..0000000000000000000000000000000000000000 Binary files a/llvm-project-15.0.7.src.tar.xz.sig and /dev/null differ