The package rpms/mlir.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/mlir.git/commit/?id=579338f8dc90e919... https://src.fedoraproject.org/cgit/rpms/mlir.git/commit/?id=53b54148fbcb5132... https://src.fedoraproject.org/cgit/rpms/mlir.git/commit/?id=22454e1cd550fe9c....
Change: +ExcludeArch: i686 -%ifarch %aarch64 +%ifarch %ix86
Thanks.
Full change: ============
commit a67f2a093a6806752e3d5f3525a03d37d5a108c5 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Thu Mar 23 15:49:11 2023 -0300
Update to LLVM 16.0.0
diff --git a/0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch b/0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch new file mode 100644 index 0000000..f4e0194 --- /dev/null +++ b/0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch @@ -0,0 +1,30 @@ +From 500300bc35937e7cd3d7ae3a4c91c29c4f98033a Mon Sep 17 00:00:00 2001 +From: Tulio Magno Quites Machado Filho tuliom@redhat.com +Date: Mon, 27 Mar 2023 10:25:05 -0300 +Subject: [PATCH] [mlir] Change LLVM_COMMON_CMAKE_UTILS usage + +Let LLVM_COMMON_CMAKE_UTILS store the directory where cmake modules are +available and stop assuming its directory structure. +--- + mlir/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt +index af83f8132405..fbc192e2c187 100644 +--- a/mlir/CMakeLists.txt ++++ b/mlir/CMakeLists.txt +@@ -2,9 +2,9 @@ + cmake_minimum_required(VERSION 3.13.4) + + if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) +- set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) ++ set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules) + endif() +-include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake ++include(${LLVM_COMMON_CMAKE_UTILS}/CMakePolicy.cmake + NO_POLICY_SCOPE) + + # Check if MLIR is built as a standalone project. +-- +2.39.2 + diff --git a/mlir.spec b/mlir.spec index a82175a..540ed1b 100644 --- a/mlir.spec +++ b/mlir.spec @@ -1,10 +1,9 @@ %global maj_ver 16 %global min_ver 0 %global patch_ver 0 -%global rc_ver 4 +#global rc_ver 4 %global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver} -%global mlir_srcdir llvm-project-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src -%global cmake_srcdir cmake-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src +%global mlir_srcdir mlir-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src
# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer # https://bugzilla.redhat.com/show_bug.cgi?id=2158587 @@ -20,8 +19,8 @@ URL: http://mlir.llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmaj_ver%7... Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmaj_ver%7... Source2: release-keys.asc -Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmlir_vers... -Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmlir_vers... + +Patch0: 0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
# Support for i686 upstream is unclear with lots of tests failling. ExcludeArch: i686 @@ -63,13 +62,7 @@ MLIR development files.
%prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' -%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE4}' --data='%{SOURCE3}' -%setup -T -q -b 3 -n %{cmake_srcdir} -# TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir}, -# but this is not a CACHED variable, so we can't actually set it externally :( -cd .. -mv %{cmake_srcdir} cmake -%autosetup -n %{mlir_srcdir}/%{name} -p2 +%autosetup -n %{mlir_srcdir} -p2
%build @@ -94,6 +87,7 @@ mv %{cmake_srcdir} cmake -DCMAKE_PREFIX_PATH=%{_libdir}/cmake/llvm/ \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ -DLLVM_THIRD_PARTY_DIR=%{_datadir}/llvm/src/utils \ + -DLLVM_COMMON_CMAKE_UTILS=%{_libdir}/cmake/llvm/ \ -DLLVM_BUILD_TOOLS:BOOL=ON \ -DLLVM_BUILD_UTILS:BOOL=ON \ -DMLIR_INCLUDE_DOCS:BOOL=ON \ @@ -198,6 +192,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_libdir}/cmake/mlir
%changelog +* Tue Mar 21 2023 Tulio Magno Quites Machado Filho tuliom@redhat.com - 16.0.0-1 +- Update to LLVM 16.0.0 + * Wed Mar 15 2023 Tulio Magno Quites Machado Filho tuliom@redhat.com - 16.0.0~rc4-1 - Update to LLVM 16.0.0 RC4
diff --git a/sources b/sources index 81eebf6..fbe06b7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (llvm-project-16.0.0rc4.src.tar.xz) = 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc -SHA512 (llvm-project-16.0.0rc4.src.tar.xz.sig) = 2af72e3d771e2361873007a944dcccfe81fbdbc3025a2101e03cbc15f1a173d39ceb94c4ae8966b1d7564bf004ee9a5ffa032e2334c0cf7154aea1090d04b00f +SHA512 (mlir-16.0.0.src.tar.xz) = 287230db7d20c98d06d65e165af418d52845819c392565c545d55f255b17900acc9e1306a32e024f6ce3a694bcc6a536f8937fbe1b38ecc347281f06954d0cba +SHA512 (mlir-16.0.0.src.tar.xz.sig) = b1a9ce057675ec883befa60fd2c24d43b83ef608a310d7c889221efebec650e38646fb54d29fd92ac853fbd3a18ec8430dda08581cb9bc9a4bd36bc95b7730e6
commit 579338f8dc90e919efb7640346a583c6df8f9829 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Tue Mar 21 08:13:29 2023 -0300
Stop building on i686
The test results have worsen recently and it's unclear if upstream has been actively supporting i686.
diff --git a/mlir.spec b/mlir.spec index 9bd1db3..a82175a 100644 --- a/mlir.spec +++ b/mlir.spec @@ -23,6 +23,8 @@ Source2: release-keys.asc Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmlir_vers... Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmlir_vers...
+# Support for i686 upstream is unclear with lots of tests failling. +ExcludeArch: i686
BuildRequires: gcc BuildRequires: gcc-c++
commit 806f38d805b1a5a65fbb9adda779fedc84c52fb2 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Thu Mar 16 09:17:37 2023 -0300
Update to LLVM 16.0.0 RC4
Start using LLVM_THIRD_PARTY_DIR in order to remove 0001-Changes-the-path-to-gtest.patch.
diff --git a/0001-Changes-the-path-to-gtest.patch b/0001-Changes-the-path-to-gtest.patch deleted file mode 100644 index 52d2f8e..0000000 --- a/0001-Changes-the-path-to-gtest.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fd28ef5af20028f233b2fd6de68f4ba7e4992da1 Mon Sep 17 00:00:00 2001 -From: Tulio Magno Quites Machado Filho tuliom@redhat.com -Date: Fri, 17 Feb 2023 19:13:35 -0300 -Subject: [PATCH] Changes the path to gtest - ---- - mlir/CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt -index c9b0d53bc3e9..af83f8132405 100644 ---- a/mlir/CMakeLists.txt -+++ b/mlir/CMakeLists.txt -@@ -184,7 +184,10 @@ add_subdirectory(lib/CAPI) - if (MLIR_INCLUDE_TESTS) - add_definitions(-DMLIR_INCLUDE_TESTS) - add_custom_target(MLIRUnitTests) -- if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h) -+ -+ # Check for gtest -+ set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/utils/unittest) -+ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h) - add_subdirectory(unittests) - else() - message(WARNING "gtest not found, unittests will not be available") --- -2.39.1 - diff --git a/mlir.spec b/mlir.spec index 3210e57..9bd1db3 100644 --- a/mlir.spec +++ b/mlir.spec @@ -1,7 +1,7 @@ %global maj_ver 16 %global min_ver 0 %global patch_ver 0 -%global rc_ver 3 +%global rc_ver 4 %global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver} %global mlir_srcdir llvm-project-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src %global cmake_srcdir cmake-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src @@ -23,12 +23,10 @@ Source2: release-keys.asc Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmlir_vers... Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmlir_vers...
-Patch0: 0001-Changes-the-path-to-gtest.patch
BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake -BuildRequires: gtest BuildRequires: ninja-build BuildRequires: zlib-devel BuildRequires: llvm-devel = %{version} @@ -93,6 +91,7 @@ mv %{cmake_srcdir} cmake -DLLVM_BUILD_LLVM_DYLIB=ON \ -DCMAKE_PREFIX_PATH=%{_libdir}/cmake/llvm/ \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ + -DLLVM_THIRD_PARTY_DIR=%{_datadir}/llvm/src/utils \ -DLLVM_BUILD_TOOLS:BOOL=ON \ -DLLVM_BUILD_UTILS:BOOL=ON \ -DMLIR_INCLUDE_DOCS:BOOL=ON \ @@ -197,6 +196,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_libdir}/cmake/mlir
%changelog +* Wed Mar 15 2023 Tulio Magno Quites Machado Filho tuliom@redhat.com - 16.0.0~rc4-1 +- Update to LLVM 16.0.0 RC4 + * Thu Feb 23 2023 Tulio Magno Quites Machado Filho tuliom@redhat.com - 16.0.0~rc3-1 - Update to LLVM 16.0.0 RC3
diff --git a/sources b/sources index 7598a5b..81eebf6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (llvm-project-15.0.7.src.tar.xz) = 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52 -SHA512 (llvm-project-15.0.7.src.tar.xz.sig) = fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2 +SHA512 (llvm-project-16.0.0rc4.src.tar.xz) = 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc +SHA512 (llvm-project-16.0.0rc4.src.tar.xz.sig) = 2af72e3d771e2361873007a944dcccfe81fbdbc3025a2101e03cbc15f1a173d39ceb94c4ae8966b1d7564bf004ee9a5ffa032e2334c0cf7154aea1090d04b00f
commit 53b54148fbcb513208320c96296d0f4fb39e07f7 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Wed Mar 15 16:53:33 2023 -0300
Tune dwz on aarch64
Reduce the dwz limits on aarch64 in order to reduce memory footprint and avoid OOMs.
diff --git a/mlir.spec b/mlir.spec index 39a4aac..3210e57 100644 --- a/mlir.spec +++ b/mlir.spec @@ -79,9 +79,12 @@ mv %{cmake_srcdir} cmake %global _lto_cflags %{nil} %endif
-%ifarch %aarch64 -%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') -%endif +# On aarch64, dwz can take very long to process all the files. It either fails +# reaching a timeout or consumes too much RAM. Restrict its resources in +# order to stop dwz early. We prefer to miss the DWARF optimization than not +# not being able to build this package on aarch64. +%global _dwz_low_mem_die_limit_aarch64 1 +%global _dwz_max_die_limit_aarch64 1000000
%cmake -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
commit 94faead4aa67b735afdf49f539b6f46fbfb5a14d Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Wed Mar 15 16:52:19 2023 -0300
Disable tests on i386
Some of these tests should not be executed on i386, but most of them need to be reviewed first if they are safe to run or not.
diff --git a/mlir.spec b/mlir.spec index 662ddad..39a4aac 100644 --- a/mlir.spec +++ b/mlir.spec @@ -128,6 +128,34 @@ rm test/IR/file-metadata-resources.mlir # 2. The cpu runner tests call mlir-opt without awareness of the host index size. # For this reason, skip mlir-cpu-runner tests on 32-bit. rm -rf test/mlir-cpu-runner + +# The following test requires AVX2. +rm -rf test/Dialect/Math/polynomial-approximation.mlir + +# TODO: Can these vector tests pass on i386? +rm -rf test/Conversion/MathToLibm/convert-to-libm.mlir +rm -rf test/Dialect/Vector/canonicalize.mlir +rm -rf test/Dialect/Vector/vector-unroll-options.mlir +rm -rf test/Dialect/SparseTensor/sparse_vector_ops.mlir + +# TODO: Investigate the following issues. +rm -rf test/mlir-pdll-lsp-server/compilation_database.test +rm -rf test/mlir-pdll-lsp-server/completion.test +rm -rf test/mlir-pdll-lsp-server/definition-split-file.test +rm -rf test/mlir-pdll-lsp-server/definition.test +rm -rf test/mlir-pdll-lsp-server/document-links.test +rm -rf test/mlir-pdll-lsp-server/document-symbols.test +rm -rf test/mlir-pdll-lsp-server/exit-eof.test +rm -rf test/mlir-pdll-lsp-server/exit-with-shutdown.test +rm -rf test/mlir-pdll-lsp-server/exit-without-shutdown.test +rm -rf test/mlir-pdll-lsp-server/hover.test +rm -rf test/mlir-pdll-lsp-server/initialize-params-invalid.test +rm -rf test/mlir-pdll-lsp-server/initialize-params.test +rm -rf test/mlir-pdll-lsp-server/inlay-hints.test +rm -rf test/mlir-pdll-lsp-server/references.test +rm -rf test/mlir-pdll-lsp-server/signature-help.test +rm -rf test/mlir-pdll-lsp-server/textdocument-didchange.test +rm -rf test/mlir-pdll-lsp-server/view-output.test %endif
# Test execution normally relies on RPATH, so set LD_LIBRARY_PATH instead.
commit 328986c9ebba3fcb57db1a052392cd43fecd22d3 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Thu Feb 23 16:51:10 2023 -0300
Update to LLVM 16.0.0 RC3
diff --git a/mlir.spec b/mlir.spec index 79af9e3..662ddad 100644 --- a/mlir.spec +++ b/mlir.spec @@ -1,7 +1,7 @@ %global maj_ver 16 %global min_ver 0 %global patch_ver 0 -%global rc_ver 1 +%global rc_ver 3 %global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver} %global mlir_srcdir llvm-project-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src %global cmake_srcdir cmake-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src @@ -166,6 +166,9 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_libdir}/cmake/mlir
%changelog +* Thu Feb 23 2023 Tulio Magno Quites Machado Filho tuliom@redhat.com - 16.0.0~rc3-1 +- Update to LLVM 16.0.0 RC3 + * Wed Feb 15 2023 Tulio Magno Quites Machado Filho tuliom@redhat.com - 16.0.0~rc1-1 - Update to LLVM 16.0.0 RC1
commit 8b50db1b5553bb1132067c778b77c61bfcf200c5 Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Thu Feb 23 16:12:57 2023 -0300
Remove many entries from .gitignore
Replace them with a new globs.
diff --git a/.gitignore b/.gitignore index bb40a05..b67dddf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,64 +1,3 @@ -/llvm-project-11.0.0rc2.tar.xz -/llvm-project-11.0.0rc2.tar.xz.sig -/llvm-project-11.0.0rc3.tar.xz -/llvm-project-11.0.0rc3.tar.xz.sig -/llvm-project-11.0.0rc5.tar.xz -/llvm-project-11.0.0rc5.tar.xz.sig -/llvm-project-11.0.0rc6.tar.xz -/llvm-project-11.0.0rc6.tar.xz.sig -/llvm-project-11.0.0.tar.xz.sig -/llvm-project-11.0.0.tar.xz -/llvm-project-11.0.1rc1.src.tar.xz -/llvm-project-11.0.1rc1.src.tar.xz.sig -/llvm-project-11.0.1rc2.src.tar.xz -/llvm-project-11.0.1rc2.src.tar.xz.sig -/llvm-project-11.0.1.src.tar.xz -/llvm-project-11.0.1.src.tar.xz.sig -/llvm-project-11.1.0rc1.src.tar.xz -/llvm-project-11.1.0rc1.src.tar.xz.sig -/llvm-project-11.1.0rc2.src.tar.xz -/llvm-project-11.1.0rc2.src.tar.xz.sig -/llvm-project-12.0.0rc1.src.tar.xz -/llvm-project-12.0.0rc1.src.tar.xz.sig -/llvm-project-12.0.0rc2.src.tar.xz -/llvm-project-12.0.0rc2.src.tar.xz.sig -/llvm-project-12.0.0rc3.src.tar.xz -/llvm-project-12.0.0rc3.src.tar.xz.sig -/llvm-project-12.0.0rc4.src.tar.xz -/llvm-project-12.0.0rc4.src.tar.xz.sig -/llvm-project-12.0.0rc5.src.tar.xz -/llvm-project-12.0.0rc5.src.tar.xz.sig -/llvm-project-12.0.0.src.tar.xz -/llvm-project-12.0.0.src.tar.xz.sig -/llvm-project-12.0.1rc1.src.tar.xz -/llvm-project-12.0.1rc1.src.tar.xz.sig -/llvm-project-12.0.1rc3.src.tar.xz -/llvm-project-12.0.1rc3.src.tar.xz.sig -/llvm-project-12.0.1.src.tar.xz -/llvm-project-12.0.1.src.tar.xz.sig -/llvm-project-13.0.0rc1.src.tar.xz -/llvm-project-13.0.0rc1.src.tar.xz.sig -/llvm-project-13.0.0rc3.src.tar.xz -/llvm-project-13.0.0rc3.src.tar.xz.sig -/llvm-project-13.0.0.src.tar.xz -/llvm-project-13.0.0.src.tar.xz.sig -/llvm-project-13.0.1rc1.src.tar.xz -/llvm-project-13.0.1rc1.src.tar.xz.sig -/llvm-project-13.0.1rc2.src.tar.xz -/llvm-project-13.0.1rc2.src.tar.xz.sig -/llvm-project-13.0.1rc3.src.tar.xz -/llvm-project-13.0.1rc3.src.tar.xz.sig -/llvm-project-13.0.1.src.tar.xz -/llvm-project-13.0.1.src.tar.xz.sig -/llvm-project-14.0.0.src.tar.xz -/llvm-project-14.0.0.src.tar.xz.sig -/llvm-project-14.0.5.src.tar.xz.sig -/llvm-project-14.0.5.src.tar.xz -/llvm-project-15.0.0.src.tar.xz -/llvm-project-15.0.0.src.tar.xz.sig -/llvm-project-15.0.4.src.tar.xz -/llvm-project-15.0.4.src.tar.xz.sig -/llvm-project-15.0.6.src.tar.xz -/llvm-project-15.0.6.src.tar.xz.sig -/llvm-project-15.0.7.src.tar.xz -/llvm-project-15.0.7.src.tar.xz.sig +/*.tar.xz +/*.tar.xz.sig +/*.src.rpm
commit 22454e1cd550fe9c20b42a4ca6fd449b368a891c Author: Tulio Magno Quites Machado Filho tuliom@redhat.com Date: Fri Feb 17 19:16:34 2023 -0300
Update to LLVM 16.0.0 RC1
diff --git a/0001-Changes-the-path-to-gtest.patch b/0001-Changes-the-path-to-gtest.patch new file mode 100644 index 0000000..52d2f8e --- /dev/null +++ b/0001-Changes-the-path-to-gtest.patch @@ -0,0 +1,28 @@ +From fd28ef5af20028f233b2fd6de68f4ba7e4992da1 Mon Sep 17 00:00:00 2001 +From: Tulio Magno Quites Machado Filho tuliom@redhat.com +Date: Fri, 17 Feb 2023 19:13:35 -0300 +Subject: [PATCH] Changes the path to gtest + +--- + mlir/CMakeLists.txt | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt +index c9b0d53bc3e9..af83f8132405 100644 +--- a/mlir/CMakeLists.txt ++++ b/mlir/CMakeLists.txt +@@ -184,7 +184,10 @@ add_subdirectory(lib/CAPI) + if (MLIR_INCLUDE_TESTS) + add_definitions(-DMLIR_INCLUDE_TESTS) + add_custom_target(MLIRUnitTests) +- if (EXISTS ${LLVM_THIRD_PARTY_DIR}/unittest/googletest/include/gtest/gtest.h) ++ ++ # Check for gtest ++ set(UNITTEST_DIR ${LLVM_THIRD_PARTY_DIR}/utils/unittest) ++ if(EXISTS ${UNITTEST_DIR}/googletest/include/gtest/gtest.h) + add_subdirectory(unittests) + else() + message(WARNING "gtest not found, unittests will not be available") +-- +2.39.1 + diff --git a/mlir.spec b/mlir.spec index b3da2ab..79af9e3 100644 --- a/mlir.spec +++ b/mlir.spec @@ -1,9 +1,10 @@ -%global maj_ver 15 +%global maj_ver 16 %global min_ver 0 -#global rc_ver 3 -%global patch_ver 7 +%global patch_ver 0 +%global rc_ver 1 %global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver} %global mlir_srcdir llvm-project-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src +%global cmake_srcdir cmake-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src
# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer # https://bugzilla.redhat.com/show_bug.cgi?id=2158587 @@ -11,7 +12,7 @@
Name: mlir Version: %{mlir_version}%{?rc_ver:~rc%{rc_ver}} -Release: 2%{?dist} +Release: 1%{?dist} Summary: Multi-Level Intermediate Representation Overview
License: Apache-2.0 WITH LLVM-exception @@ -19,13 +20,19 @@ URL: http://mlir.llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmaj_ver%7... Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmaj_ver%7... Source2: release-keys.asc +Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmlir_vers... +Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%%7Bmlir_vers... + +Patch0: 0001-Changes-the-path-to-gtest.patch
BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake +BuildRequires: gtest BuildRequires: ninja-build BuildRequires: zlib-devel BuildRequires: llvm-devel = %{version} +BuildRequires: llvm-googletest = %{version} BuildRequires: llvm-test = %{version} BuildRequires: python3-lit
@@ -56,12 +63,26 @@ MLIR development files.
%prep %{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}' +%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE4}' --data='%{SOURCE3}' +%setup -T -q -b 3 -n %{cmake_srcdir} +# TODO: It would be more elegant to set -DLLVM_COMMON_CMAKE_UTILS=%{_builddir}/%{cmake_srcdir}, +# but this is not a CACHED variable, so we can't actually set it externally :( +cd .. +mv %{cmake_srcdir} cmake %autosetup -n %{mlir_srcdir}/%{name} -p2 -# remove all but keep mlir -find ../* -maxdepth 0 ! -name '%{name}' -exec rm -rf {} +
%build + +%ifarch %ix86 +%global debug_package %{nil} +%global _lto_cflags %{nil} +%endif + +%ifarch %aarch64 +%global optflags %(echo %{optflags} | sed 's/-g /-g1 /') +%endif + %cmake -GNinja \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_SKIP_RPATH=ON \ @@ -77,6 +98,10 @@ find ../* -maxdepth 0 ! -name '%{name}' -exec rm -rf {} + -DBUILD_SHARED_LIBS=OFF \ -DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF \ -DMLIR_BUILD_MLIR_C_DYLIB=ON \ +%ifarch %ix86 + -DLLVM_PARALLEL_LINK_JOBS=1 \ + -DMLIR_RUN_X86VECTOR_TESTS:BOOL=OFF \ +%endif %if 0%{?__isa_bits} == 64 -DLLVM_LIBDIR_SUFFIX=64 %else @@ -114,6 +139,7 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_libdir}/libMLIR*.so.%{maj_ver}* %{_libdir}/libmlir_async_runtime.so.%{maj_ver}* %{_libdir}/libmlir_c_runner_utils.so.%{maj_ver}* +%{_libdir}/libmlir_float16_utils.so.%{maj_ver}* %{_libdir}/libmlir_runner_utils.so.%{maj_ver}*
%files static @@ -124,6 +150,7 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_bindir}/mlir-linalg-ods-yaml-gen %{_bindir}/mlir-lsp-server %{_bindir}/mlir-opt +%{_bindir}/mlir-pdll %{_bindir}/mlir-pdll-lsp-server %{_bindir}/mlir-reduce %{_bindir}/mlir-tblgen @@ -132,12 +159,16 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir} %{_libdir}/libMLIR*.so %{_libdir}/libmlir_async_runtime.so %{_libdir}/libmlir_c_runner_utils.so +%{_libdir}/libmlir_float16_utils.so %{_libdir}/libmlir_runner_utils.so %{_includedir}/mlir %{_includedir}/mlir-c %{_libdir}/cmake/mlir
%changelog +* Wed Feb 15 2023 Tulio Magno Quites Machado Filho tuliom@redhat.com - 16.0.0~rc1-1 +- Update to LLVM 16.0.0 RC1 + * Thu Jan 19 2023 Fedora Release Engineering releng@fedoraproject.org - 15.0.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
arch-excludes@lists.fedoraproject.org
-
githook-noreply＠fedoraproject.org