Compare commits

..

9 Commits

Author SHA1 Message Date
David Abdurachmanov b987cb0720
Package more installed files on riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-11-27 20:01:15 +02:00
David Abdurachmanov 3784a10056
Disable LTO on riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-11-27 19:27:36 +02:00
David Abdurachmanov fd8dee1228
Merge remote-tracking branch 'up/f37' into f37-riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-11-27 19:27:01 +02:00
Jesus Checa Hidalgo 1f3202069b Migrate tests to tests/libomp repo 2022-11-10 16:10:08 +01:00
Nikita Popov 34515bc997 Update to LLVM 15.0.4 2022-11-09 09:06:46 +01:00
David Abdurachmanov 06e12f39f1
Bootstrap on riscv64
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
2022-10-08 12:36:21 +03:00
Nikita Popov 46a42ecce9 Re-enable LTO build
This issue doesn't seem to exist anymore
2022-09-15 09:26:18 +02:00
Nikita Popov 752f56f598 Add explicit requires from libomp-devel to libomp
Now that we have version-dependent symlinks, we need to require
a libomp package of matching version.

This should resolve the rpmdeps failure.
2022-09-15 09:26:17 +02:00
Nikita Popov 977c73c910 Update to LLVM 15.0.0 2022-09-08 15:17:39 +02:00
3 changed files with 124 additions and 81 deletions

100
.gitignore vendored
View File

@ -1,3 +1,97 @@
/*.tar.xz
/*.tar.xz.sig
/*.src.rpm
/openmp-5.0.0.src.tar.xz
/openmp-5.0.1.src.tar.xz
/openmp-6.0.0rc1.src.tar.xz
/openmp-6.0.0rc2.src.tar.xz
/openmp-6.0.0.src.tar.xz
/openmp-6.0.1rc1.src.tar.xz
/openmp-6.0.1.src.tar.xz
/openmp-7.0.0rc1.src.tar.xz
/openmp-7.0.0rc3.src.tar.xz
/openmp-7.0.0.src.tar.xz
/openmp-7.0.1.src.tar.xz
/openmp-8.0.0rc1.src.tar.xz
/openmp-8.0.0rc2.src.tar.xz
/openmp-8.0.0rc4.src.tar.xz
/openmp-8.0.0.src.tar.xz
/openmp-9.0.0rc3.src.tar.xz
/openmp-9.0.0.src.tar.xz
/openmp-9.0.1.src.tar.xz
/openmp-10.0.0rc1.src.tar.xz
/openmp-10.0.0rc1.src.tar.xz.sig
/openmp-10.0.0rc2.src.tar.xz
/openmp-10.0.0rc2.src.tar.xz.sig
/openmp-10.0.0rc3.src.tar.xz
/openmp-10.0.0rc3.src.tar.xz.sig
/openmp-10.0.0rc4.src.tar.xz
/openmp-10.0.0rc4.src.tar.xz.sig
/openmp-10.0.0rc5.src.tar.xz
/openmp-10.0.0rc5.src.tar.xz.sig
/openmp-10.0.0rc6.src.tar.xz
/openmp-10.0.0rc6.src.tar.xz.sig
/openmp-10.0.0.src.tar.xz
/openmp-10.0.0.src.tar.xz.sig
/openmp-11.0.0rc1.src.tar.xz.sig
/openmp-11.0.0rc1.src.tar.xz
/openmp-11.0.0rc2.src.tar.xz
/openmp-11.0.0rc2.src.tar.xz.sig
/libomp-10.0.0-0.3.rc3.fc33.src.rpm
/libomp-8.0.0-0.3.rc3.fc29.src.rpm
/openmp-11.0.0rc3.src.tar.xz
/openmp-11.0.0rc3.src.tar.xz.sig
/openmp-8.0.0rc3.src.tar.xz
/openmp-11.0.0rc5.src.tar.xz
/openmp-11.0.0rc5.src.tar.xz.sig
/openmp-11.0.0rc6.src.tar.xz
/openmp-11.0.0rc6.src.tar.xz.sig
/openmp-11.0.0.src.tar.xz
/openmp-11.0.0.src.tar.xz.sig
/openmp-11.0.1rc1.src.tar.xz
/openmp-11.0.1rc1.src.tar.xz.sig
/openmp-11.0.1rc2.src.tar.xz
/openmp-11.0.1rc2.src.tar.xz.sig
/openmp-11.0.1.src.tar.xz
/openmp-11.0.1.src.tar.xz.sig
/openmp-11.1.0rc1.src.tar.xz
/openmp-11.1.0rc1.src.tar.xz.sig
/openmp-11.1.0rc2.src.tar.xz
/openmp-11.1.0rc2.src.tar.xz.sig
/openmp-12.0.0rc1.src.tar.xz
/openmp-12.0.0rc1.src.tar.xz.sig
/openmp-12.0.0rc2.src.tar.xz
/openmp-12.0.0rc2.src.tar.xz.sig
/openmp-12.0.0rc3.src.tar.xz
/openmp-12.0.0rc3.src.tar.xz.sig
/openmp-12.0.0rc4.src.tar.xz
/openmp-12.0.0rc4.src.tar.xz.sig
/openmp-12.0.0rc5.src.tar.xz
/openmp-12.0.0rc5.src.tar.xz.sig
/openmp-12.0.0.src.tar.xz
/openmp-12.0.0.src.tar.xz.sig
/openmp-12.0.1rc1.src.tar.xz
/openmp-12.0.1rc1.src.tar.xz.sig
/openmp-12.0.1rc3.src.tar.xz
/openmp-12.0.1rc3.src.tar.xz.sig
/openmp-12.0.1.src.tar.xz
/openmp-12.0.1.src.tar.xz.sig
/openmp-13.0.0rc1.src.tar.xz
/openmp-13.0.0rc1.src.tar.xz.sig
/openmp-13.0.0rc3.src.tar.xz
/openmp-13.0.0rc3.src.tar.xz.sig
/openmp-13.0.0.src.tar.xz
/openmp-13.0.0.src.tar.xz.sig
/openmp-13.0.1rc1.src.tar.xz
/openmp-13.0.1rc1.src.tar.xz.sig
/openmp-13.0.1rc2.src.tar.xz
/openmp-13.0.1rc2.src.tar.xz.sig
/openmp-13.0.1rc3.src.tar.xz
/openmp-13.0.1rc3.src.tar.xz.sig
/openmp-13.0.1.src.tar.xz
/openmp-13.0.1.src.tar.xz.sig
/openmp-14.0.0.src.tar.xz
/openmp-14.0.0.src.tar.xz.sig
/openmp-14.0.5.src.tar.xz
/openmp-14.0.5.src.tar.xz.sig
/openmp-15.0.0.src.tar.xz
/openmp-15.0.0.src.tar.xz.sig
/openmp-15.0.4.src.tar.xz
/openmp-15.0.4.src.tar.xz.sig

View File

@ -1,14 +1,9 @@
%global toolchain clang
# Opt out of https://fedoraproject.org/wiki/Changes/fno-omit-frame-pointer
# https://bugzilla.redhat.com/show_bug.cgi?id=2158587
%undefine _include_frame_pointers
%global maj_ver 16
%global libomp_version %{maj_ver}.0.1
#global rc_ver 4
%global maj_ver 15
%global libomp_version %{maj_ver}.0.4
#global rc_ver 3
%global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
%global cmake_srcdir cmake-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
%ifarch ppc64le
@ -19,18 +14,16 @@
Name: libomp
Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
Release: 3%{?dist}
Release: 1.1.riscv64%{?dist}
Summary: OpenMP runtime for clang
License: Apache-2.0 WITH LLVM-exception OR NCSA
License: NCSA
URL: http://openmp.llvm.org
Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz
Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{libomp_srcdir}.tar.xz.sig
Source2: release-keys.asc
Source3: run-lit-tests
Source4: lit.fedora.cfg.py
Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz
Source6: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}%{?rc_ver:-rc%{rc_ver}}/%{cmake_srcdir}.tar.xz.sig
BuildRequires: clang
# For clang-offload-packager
@ -78,28 +71,25 @@ OpenMP regression tests
%prep
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE6}' --data='%{SOURCE5}'
%setup -T -q -b 5 -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 %{libomp_srcdir} -p2
%build
# TODO: LIBOMP_HAVE_VERSION_SCRIPT_FLAG should be set automatically.
%ifarch riscv64
%define _lto_cflags %{nil}
%endif
%cmake -GNinja \
-DLIBOMP_INSTALL_ALIASES=OFF \
-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
-DLLVM_DIR=%{_libdir}/cmake/llvm \
-DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/clang/%{maj_ver}/include \
-DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/clang/%{libomp_version}/include \
%if 0%{?__isa_bits} == 64
-DOPENMP_LIBDIR_SUFFIX=64 \
%else
-DOPENMP_LIBDIR_SUFFIX= \
%endif
-DCMAKE_SKIP_RPATH:BOOL=ON \
-DLIBOMP_HAVE_VERSION_SCRIPT_FLAG:BOOL=ON
-DCMAKE_SKIP_RPATH:BOOL=ON
%cmake_build
@ -144,82 +134,43 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
%ifnarch %{arm}
%{_libdir}/libarcher.so
%endif
%ifnarch %{ix86} %{arm}
# libomptarget is not supported on 32-bit systems.
%ifnarch %{ix86} %{arm} riscv64
%{_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver}
%{_libdir}/libomptarget.rtl.amdgpu.nextgen.so.%{maj_ver}
%{_libdir}/libomptarget.rtl.cuda.so.%{maj_ver}
%{_libdir}/libomptarget.rtl.cuda.nextgen.so.%{maj_ver}
%{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver}
%{_libdir}/libomptarget.rtl.%{libomp_arch}.nextgen.so.%{maj_ver}
%{_libdir}/libomptarget.so.%{maj_ver}
%endif
%{_libdir}/libomptarget.so.%{maj_ver}
%files devel
%{_libdir}/clang/%{maj_ver}/include/omp.h
%{_libdir}/clang/%{libomp_version}/include/omp.h
%{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
%ifnarch %{arm}
%{_libdir}/clang/%{maj_ver}/include/omp-tools.h
%{_libdir}/clang/%{maj_ver}/include/ompt.h
%{_libdir}/clang/%{maj_ver}/include/ompt-multiplex.h
%{_libdir}/clang/%{libomp_version}/include/omp-tools.h
%{_libdir}/clang/%{libomp_version}/include/ompt.h
%{_libdir}/clang/%{libomp_version}/include/ompt-multiplex.h
%endif
%ifnarch %{ix86} %{arm}
# libomptarget is not supported on 32-bit systems.
%ifnarch riscv64
%{_libdir}/libomptarget.rtl.amdgpu.so
%{_libdir}/libomptarget.rtl.amdgpu.nextgen.so
%{_libdir}/libomptarget.rtl.cuda.so
%{_libdir}/libomptarget.rtl.cuda.nextgen.so
%{_libdir}/libomptarget.rtl.%{libomp_arch}.so
%{_libdir}/libomptarget.rtl.%{libomp_arch}.nextgen.so
%endif
%{_libdir}/libomptarget.devicertl.a
%{_libdir}/libomptarget-amdgpu-*.bc
%{_libdir}/libomptarget-nvptx-*.bc
%{_libdir}/libomptarget.so
%endif
%{_libdir}/libomptarget.so
%files test
%{_datadir}/libomp
%{_libexecdir}/tests/libomp/
%changelog
* Wed Apr 19 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.1-3
- Bump the release. Fix rhbz#2187642.
* Sun Nov 27 2022 David Abdurachmanov <davidlt@rivosinc.com> - 15.0.4-1.1.riscv64
- Package more files on riscv64
* Tue Apr 18 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.1-2
- Be explicit about libomp-devel denpending on libomp. Fix rhbz#2187642.
* Thu Apr 13 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.1-1
- Update to LLVM 16.0.1
* 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
* Thu Feb 23 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc3-1
- Update to LLVM 16.0.0 RC3
* Tue Feb 14 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 16.0.0~rc1-1
- Update to LLVM 16.0.0 RC1
* Tue Jan 31 2023 Tulio Magno Quites Machado Filho <tuliom@redhat.com> - 15.0.7-5
- Include the Apache license adopted in 2019.
* Fri Jan 20 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-4
- Omit frame pointers when building
* Fri Jan 20 2023 Nikita Popov <npopov@redhat.com> - 15.0.7-3
- Fix build against GCC 13
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 15.0.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Jan 13 2023 Nikita Popov <npopov@redhat.com> - 15.0.7-1
- Update to LLVM 15.0.7
* Tue Dec 06 2022 Nikita Popov <npopov@redhat.com> - 15.0.6-1
- Update to LLVM 15.0.6
* Sun Nov 27 2022 David Abdurachmanov <davidlt@rivosinc.com> - 15.0.4-1.0.riscv64
- Enable riscv64
* Mon Nov 07 2022 Nikita Popov <npopov@redhat.com> - 15.0.4-1
- Update to LLVM 15.0.4

View File

@ -1,4 +1,2 @@
SHA512 (cmake-16.0.1.src.tar.xz) = 7a0f01a82660a953e06b1df267918542205ac46f151d284dca74255c36fe5ccd995266638a85ce502a81cdd5e76ff3311e5f8488e09d0abbf22ee07cec186f5f
SHA512 (cmake-16.0.1.src.tar.xz.sig) = 8d49050e9b04df253a5bb2fa3b27796f204d085610432826bef6bb6cab876990d67e7fd5267fc89fadf21d88da73c535c82ae6ea0e1c867f7cd5efac244b0fa2
SHA512 (openmp-16.0.1.src.tar.xz) = 9c22ce1c7a2d12d266d5ce88d610d5bbbbf1da9ce9ad27be10f875ad238c5353b8cac7a64a84b7b0477387f3f60577eff49cde8b4521ab66509c9cd3d90c881f
SHA512 (openmp-16.0.1.src.tar.xz.sig) = b625b5a9394109bbb46763997914b0ba8bfe80b702c8685e7ffcec19126732a8cce7b959507682bacd6c5db3d4f6b6974cc9ba9daab68504058badd5fb1e305d
SHA512 (openmp-15.0.4.src.tar.xz) = e87d2051721fd16ca21bbea8f365dc1874f308338320e003b62142006864c2d79d196f6d49c6fac0193d13a914e6ebe2d110b3313cabcfb961e667afb68b2b5b
SHA512 (openmp-15.0.4.src.tar.xz.sig) = 0ec87f22f9d208b560a4d2ecb01587e0ff22afaa1db811e9f1557de9cb47d43025152f7464686b725927e143072699605670228d0d1b2af9a12694a77a6f4f2b