From 705c209284731b80e2d8e926e180eb6794543ee6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Wed, 2 Mar 2022 10:35:14 +0100 Subject: [PATCH] Update to 14.0.0 --- ...lir-Support-building-MLIR-standalone.patch | 134 ------------------ ...-building-unittests-in-in-tree-build.patch | 28 ---- mlir.spec | 20 ++- 3 files changed, 8 insertions(+), 174 deletions(-) delete mode 100644 0001-PATCH-mlir-Support-building-MLIR-standalone.patch delete mode 100644 0002-PATCH-mlir-Fix-building-unittests-in-in-tree-build.patch 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 abacfd5..0000000 --- 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 d37c64d..0000000 --- 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/mlir.spec b/mlir.spec index c0c4375..676a3b5 100644 --- a/mlir.spec +++ b/mlir.spec @@ -1,7 +1,7 @@ -#global rc_ver 3 -%global maj_ver 13 +%global maj_ver 14 %global min_ver 0 -%global patch_ver 1 +#global rc_ver 1 +%global patch_ver 0 %global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver} %global mlir_srcdir llvm-project-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src @@ -16,9 +16,6 @@ Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ve Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{mlir_srcdir}.tar.xz.sig Source2: tstellar-gpg-key.asc -#Patch0: 0001-PATCH-mlir-Support-building-MLIR-standalone.patch -#Patch1: 0002-PATCH-mlir-Fix-building-unittests-in-in-tree-build.patch - BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake @@ -70,6 +67,8 @@ find ../* -maxdepth 0 ! -name '%{name}' -exec rm -rf {} + -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 @@ -89,9 +88,6 @@ export LD_LIBRARY_PATH=%{_builddir}/%{mlir_srcdir}/%{name}/%{_build}/%{_lib} %files %license LICENSE.TXT -%{_libdir}/libmlir_runner_utils.so.%{maj_ver}* -%{_libdir}/libmlir_c_runner_utils.so.%{maj_ver}* -%{_libdir}/libmlir_async_runtime.so.%{maj_ver}* %{_libdir}/libMLIR*.so.%{maj_ver}* %files static @@ -100,14 +96,14 @@ export LD_LIBRARY_PATH=%{_builddir}/%{mlir_srcdir}/%{name}/%{_build}/%{_lib} %files devel %{_bindir}/mlir-tblgen %{_libdir}/libMLIR*.so -%{_libdir}/libmlir_runner_utils.so -%{_libdir}/libmlir_c_runner_utils.so -%{_libdir}//libmlir_async_runtime.so %{_includedir}/mlir %{_includedir}/mlir-c %{_libdir}/cmake/mlir %changelog +* Thu Mar 24 2022 Timm Bäder - 14.0.0-1 +- Update to 14.0.0 + * Mon Feb 07 2022 Nikita Popov - 13.0.1-2 - Reenable build on armv7hl