Compare commits
10 Commits
579338f8dc
...
663734e1ae
Author | SHA1 | Date | |
---|---|---|---|
663734e1ae | |||
|
34e5ccbe26 | ||
|
daf8afb754 | ||
|
7eacdb93c8 | ||
|
751fb3fb46 | ||
|
eb160436fa | ||
|
c47520ce45 | ||
|
5f0584640a | ||
|
e01cab0851 | ||
|
a67f2a093a |
30
0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
Normal file
30
0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
Normal file
@ -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
|
||||||
|
|
71
mlir.spec
71
mlir.spec
@ -1,10 +1,14 @@
|
|||||||
|
%global toolchain clang
|
||||||
%global maj_ver 16
|
%global maj_ver 16
|
||||||
%global min_ver 0
|
%global min_ver 0
|
||||||
%global patch_ver 0
|
%global patch_ver 5
|
||||||
%global rc_ver 4
|
#global rc_ver 4
|
||||||
%global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver}
|
%global mlir_version %{maj_ver}.%{min_ver}.%{patch_ver}
|
||||||
%global mlir_srcdir llvm-project-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src
|
%global mlir_srcdir mlir-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src
|
||||||
%global cmake_srcdir cmake-%{mlir_version}%{?rc_ver:rc%{rc_ver}}.src
|
|
||||||
|
%ifarch riscv64
|
||||||
|
%global _lto_cflags %{nil}
|
||||||
|
%endif
|
||||||
|
|
||||||
# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
|
# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
|
# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
|
||||||
@ -12,7 +16,7 @@
|
|||||||
|
|
||||||
Name: mlir
|
Name: mlir
|
||||||
Version: %{mlir_version}%{?rc_ver:~rc%{rc_ver}}
|
Version: %{mlir_version}%{?rc_ver:~rc%{rc_ver}}
|
||||||
Release: 1%{?dist}
|
Release: 1.0.riscv64%{?dist}
|
||||||
Summary: Multi-Level Intermediate Representation Overview
|
Summary: Multi-Level Intermediate Representation Overview
|
||||||
|
|
||||||
License: Apache-2.0 WITH LLVM-exception
|
License: Apache-2.0 WITH LLVM-exception
|
||||||
@ -20,14 +24,13 @@ URL: http://mlir.llvm.org
|
|||||||
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{mlir_srcdir}.tar.xz
|
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:-rc%{rc_ver}}/%{mlir_srcdir}.tar.xz
|
||||||
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
|
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: release-keys.asc
|
Source2: release-keys.asc
|
||||||
Source3: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{mlir_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
|
|
||||||
Source4: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{mlir_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
|
Patch0: 0001-mlir-Change-LLVM_COMMON_CMAKE_UTILS-usage.patch
|
||||||
|
|
||||||
# Support for i686 upstream is unclear with lots of tests failling.
|
# Support for i686 upstream is unclear with lots of tests failling.
|
||||||
ExcludeArch: i686
|
ExcludeArch: i686
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: clang
|
||||||
BuildRequires: gcc-c++
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
@ -63,13 +66,7 @@ MLIR development files.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
|
||||||
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE4}' --data='%{SOURCE3}'
|
%autosetup -n %{mlir_srcdir} -p2
|
||||||
%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
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -86,6 +83,12 @@ mv %{cmake_srcdir} cmake
|
|||||||
%global _dwz_low_mem_die_limit_aarch64 1
|
%global _dwz_low_mem_die_limit_aarch64 1
|
||||||
%global _dwz_max_die_limit_aarch64 1000000
|
%global _dwz_max_die_limit_aarch64 1000000
|
||||||
|
|
||||||
|
# On s390x, dwz 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_s390x 1
|
||||||
|
%global _dwz_max_die_limit_s390x 1000000
|
||||||
|
|
||||||
%cmake -GNinja \
|
%cmake -GNinja \
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DCMAKE_SKIP_RPATH=ON \
|
-DCMAKE_SKIP_RPATH=ON \
|
||||||
@ -94,6 +97,7 @@ mv %{cmake_srcdir} cmake
|
|||||||
-DCMAKE_PREFIX_PATH=%{_libdir}/cmake/llvm/ \
|
-DCMAKE_PREFIX_PATH=%{_libdir}/cmake/llvm/ \
|
||||||
-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
|
-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
|
||||||
-DLLVM_THIRD_PARTY_DIR=%{_datadir}/llvm/src/utils \
|
-DLLVM_THIRD_PARTY_DIR=%{_datadir}/llvm/src/utils \
|
||||||
|
-DLLVM_COMMON_CMAKE_UTILS=%{_libdir}/cmake/llvm/ \
|
||||||
-DLLVM_BUILD_TOOLS:BOOL=ON \
|
-DLLVM_BUILD_TOOLS:BOOL=ON \
|
||||||
-DLLVM_BUILD_UTILS:BOOL=ON \
|
-DLLVM_BUILD_UTILS:BOOL=ON \
|
||||||
-DMLIR_INCLUDE_DOCS:BOOL=ON \
|
-DMLIR_INCLUDE_DOCS:BOOL=ON \
|
||||||
@ -102,8 +106,10 @@ mv %{cmake_srcdir} cmake
|
|||||||
-DBUILD_SHARED_LIBS=OFF \
|
-DBUILD_SHARED_LIBS=OFF \
|
||||||
-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF \
|
-DMLIR_INSTALL_AGGREGATE_OBJECTS=OFF \
|
||||||
-DMLIR_BUILD_MLIR_C_DYLIB=ON \
|
-DMLIR_BUILD_MLIR_C_DYLIB=ON \
|
||||||
%ifarch %ix86
|
%ifarch %ix86 ppc64le
|
||||||
-DLLVM_PARALLEL_LINK_JOBS=1 \
|
-DLLVM_PARALLEL_LINK_JOBS=1 \
|
||||||
|
%endif
|
||||||
|
%ifarch %ix86
|
||||||
-DMLIR_RUN_X86VECTOR_TESTS:BOOL=OFF \
|
-DMLIR_RUN_X86VECTOR_TESTS:BOOL=OFF \
|
||||||
%endif
|
%endif
|
||||||
%if 0%{?__isa_bits} == 64
|
%if 0%{?__isa_bits} == 64
|
||||||
@ -198,6 +204,37 @@ export LD_LIBRARY_PATH=%{buildroot}/%{_libdir}
|
|||||||
%{_libdir}/cmake/mlir
|
%{_libdir}/cmake/mlir
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jun 25 2023 David Abdurachmanov <davidlt@rivosinc.com> - 16.0.5-1.0.riscv64
|
||||||
|
- Disable LTO on riscv64
|
||||||
|
|
||||||
|
* Tue Jun 06 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.5-1
|
||||||
|
- Update to LLVM 16.0.5
|
||||||
|
|
||||||
|
* Fri May 19 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.4-1
|
||||||
|
- Update to LLVM 16.0.4
|
||||||
|
|
||||||
|
* Wed May 10 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.3-1
|
||||||
|
- Update to LLVM 16.0.3
|
||||||
|
|
||||||
|
* Thu Apr 27 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.2-1
|
||||||
|
- Update to LLVM 16.0.2
|
||||||
|
|
||||||
|
* Thu Apr 13 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.1-1
|
||||||
|
- Update to LLVM 16.0.1
|
||||||
|
|
||||||
|
* Thu Apr 06 2023 Nikita Popov <npopov@redhat.com> - 16.0.0-4
|
||||||
|
- Build with clang
|
||||||
|
|
||||||
|
* Mon Apr 03 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0-3
|
||||||
|
- Re-enable s390x builds
|
||||||
|
- Link ppc64le serially in order to avoid hitting memory limits
|
||||||
|
|
||||||
|
* Mon Apr 03 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0-2
|
||||||
|
- Disable s390x builds temporarily
|
||||||
|
|
||||||
|
* 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
|
* Wed Mar 15 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc4-1
|
||||||
- Update to LLVM 16.0.0 RC4
|
- Update to LLVM 16.0.0 RC4
|
||||||
|
|
||||||
|
4
sources
4
sources
@ -1,2 +1,2 @@
|
|||||||
SHA512 (llvm-project-16.0.0rc4.src.tar.xz) = 8d628205c5b93fe6683b67b97b5c7f98bae945bd87cccebcdac00ddd4362108bd171f077a5196242be0fb909c795592b34bfa1c96c50a744fb68f287fd9781cc
|
SHA512 (mlir-16.0.5.src.tar.xz) = 237a305a11366666587b3f2e69975f0ae11969bb93f1801ed1bee26fabfcff36bdbac9a3747ff691fe4874a9ee7ca10d8524f956abcb49e153565a916555c600
|
||||||
SHA512 (llvm-project-16.0.0rc4.src.tar.xz.sig) = 2af72e3d771e2361873007a944dcccfe81fbdbc3025a2101e03cbc15f1a173d39ceb94c4ae8966b1d7564bf004ee9a5ffa032e2334c0cf7154aea1090d04b00f
|
SHA512 (mlir-16.0.5.src.tar.xz.sig) = 9ea0ef1cd81a02920ce99f5dc9af92f8453520c73c55600e816cb92bf9a5cfcb580d26338e213b18819f7992a1b29d153ad33eb88a324793dc1137e3ea65a0b3
|
||||||
|
Loading…
Reference in New Issue
Block a user