diff --git a/cmake-16.0.6.src.tar.xz b/cmake-16.0.6.src.tar.xz deleted file mode 100644 index a879639e5bd3fe11d0e23a0ae2bc0eee7e76eb8f..0000000000000000000000000000000000000000 Binary files a/cmake-16.0.6.src.tar.xz and /dev/null differ diff --git a/cmake-17.0.6.src.tar.xz b/cmake-17.0.6.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..aeec995a7c0ddaa99a8549223bb1cb8ddab8ab32 Binary files /dev/null and b/cmake-17.0.6.src.tar.xz differ diff --git a/libomp.spec b/libomp.spec index aa45156e9800f63bbda452d0c35402c49a386bb9..65fa1ee52caa60c630f16d9e98a2f8f59741b5db 100644 --- a/libomp.spec +++ b/libomp.spec @@ -1,9 +1,9 @@ -%define anolis_release 2 +%define anolis_release 1 %global toolchain clang %undefine _include_frame_pointers -%global maj_ver 16 +%global maj_ver 17 %global libomp_version %{maj_ver}.0.6 %global libomp_srcdir openmp-%{libomp_version}.src %global cmake_srcdir cmake-%{libomp_version}.src @@ -18,9 +18,7 @@ Summary: OpenMP runtime for clang License: Apache-2.0 WITH LLVM-exception OR NCSA URL: http://openmp.llvm.org Source0: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}/%{libomp_srcdir}.tar.xz -Source3: run-lit-tests -Source4: lit.distro.cfg.py -Source5: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}/%{cmake_srcdir}.tar.xz +Source1: https://github.com/llvm/llvm-project/releases/download/llvmorg-%{libomp_version}/%{cmake_srcdir}.tar.xz BuildRequires: clang # For clang-offload-packager @@ -36,7 +34,7 @@ BuildRequires: libffi-devel BuildRequires: libxml2-devel # libomptarget needs the llvm cmake files -BuildRequires: llvm-devel +BuildRequires: llvm-devel llvm-googletest Requires: elfutils-libelf @@ -51,19 +49,8 @@ Requires: clang-resource-filesystem = %{version} %description devel OpenMP header files. -%package test -Summary: OpenMP regression tests -Requires: %{name} = %{version}-%{release} -Requires: %{name}-devel = %{version}-%{release} -Requires: clang -Requires: llvm -Requires: python3-lit - -%description test -OpenMP regression tests - %prep -%setup -T -q -b 5 -n %{cmake_srcdir} +%setup -T -q -b 1 -n %{cmake_srcdir} cd .. mv %{cmake_srcdir} cmake %autosetup -n %{libomp_srcdir} -p2 @@ -85,30 +72,6 @@ mv %{cmake_srcdir} cmake %install %cmake_install -# Test package setup -%global libomp_srcdir %{_datadir}/libomp/src/ -%global libomp_testdir %{libomp_srcdir}/runtime/test/ -%global lit_cfg %{libomp_testdir}/%{_arch}.site.cfg.py -%global lit_distro_cfg %{_datadir}/libomp/lit.distro.cfg.py - -install -d %{buildroot}%{libomp_srcdir}/runtime -cp -R runtime/test %{buildroot}%{libomp_srcdir}/runtime -cp -R runtime/src %{buildroot}%{libomp_srcdir}/runtime - -# Generate lit config files. Strip off the last line that initiates the -# test run, so we can customize the configuration. -head -n -1 %{_vpath_builddir}/runtime/test/lit.site.cfg >> %{buildroot}%{lit_cfg} - -# Install custom distro config file -cp %{SOURCE4} %{buildroot}%{lit_distro_cfg} - -# Patch lit config files to load custom distro config -echo "lit_config.load_config(config, '%{lit_distro_cfg}')" >> %{buildroot}%{lit_cfg} - -# Install test script -install -d %{buildroot}%{_libexecdir}/tests/libomp -install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/libomp - # Remove static libraries with equivalent shared libraries rm -rf %{buildroot}%{_libdir}/libarcher_static.a @@ -122,11 +85,8 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libdir}/libarcher.so %ifnarch loongarch64 %{_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} %endif %{_libdir}/libomptarget.so.%{maj_ver} @@ -138,22 +98,19 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a %{_libdir}/clang/%{maj_ver}/include/ompt-multiplex.h %ifnarch loongarch64 %{_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 -%files test -%{_datadir}/libomp -%{_libexecdir}/tests/libomp/ %changelog +* Thu Mar 28 2024 Xiaoping Liu - 17.0.6-1 +- update to 17.0.6 + * Tue Oct 31 2023 Wenlong Zhang - 16.0.6-2 - fix build error for loongarch64 diff --git a/lit.distro.cfg.py b/lit.distro.cfg.py deleted file mode 100644 index 10d1f1f5c726d6cb64c0cf0c49baff6b903f094f..0000000000000000000000000000000000000000 --- a/lit.distro.cfg.py +++ /dev/null @@ -1,15 +0,0 @@ -import tempfile - -compiler = '%(libomp_compiler)s' % lit_config.params -config.test_filecheck = '%(bindir)s/FileCheck' % lit_config.params -config.omp_header_directory = '%(includedir)s' % lit_config.params -config.libomp_obj_root = tempfile.mkdtemp() -config.library_dir = '%(libdir)s' % lit_config.params -test_root = '%(libomp_test_root)s' % lit_config.params - -# Lit will default to the compiler used to build openmp, which is gcc, but we -# want to run the tests using clang. -config.test_compiler_features = ['clang'] -config.test_c_compiler = 'clang' -config.test_cxx_compiler = 'clang++' -lit_config.load_config(config, '%(libomp_test_root)s/lit.cfg' % lit_config.params) diff --git a/openmp-16.0.6.src.tar.xz b/openmp-16.0.6.src.tar.xz deleted file mode 100644 index 513f59854a02191f4a03be765612b1f627d9b224..0000000000000000000000000000000000000000 Binary files a/openmp-16.0.6.src.tar.xz and /dev/null differ diff --git a/openmp-17.0.6.src.tar.xz b/openmp-17.0.6.src.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..b6cbb6a28cef0577407c0be6ddc67fd678fe1376 Binary files /dev/null and b/openmp-17.0.6.src.tar.xz differ diff --git a/run-lit-tests b/run-lit-tests deleted file mode 100644 index 18dbec562cc6324bbf88741c4cef1f85a482c6f5..0000000000000000000000000000000000000000 --- a/run-lit-tests +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/bash - -usage() { - echo "usage: `basename $0` [OPTIONS]" - echo " --threads NUM The number of threads to use for running tests." -} - - -threads_arg='' - -while [ $# -gt 0 ]; do - case $1 in - --threads) - shift - threads_arg="--threads $1" - ;; - --multilib-arch) - shift - ARCH=$1 - ;; - * ) - echo "unknown option: $1" - echo "" - usage - exit 1 - ;; - esac - shift -done - - -set -xe - -if [ -z "$ARCH" ]; then - ARCH=`rpm --eval '%_arch'` -fi - -case $ARCH in - arm) - ;& - i686) - LIB_DIR="/usr/lib/" - ;; - *) - LIB_DIR="/usr/lib64/" - ;; -esac - -BIN_DIR="/usr/bin/" -INCLUDE_DIR="/usr/include/" - -lit $threads_arg -v \ - --config-prefix $ARCH \ - -Dlibomp_compiler=clang \ - -Dbindir=$BIN_DIR \ - -Dlibdir=$LIB_DIR \ - -Dincludedir=$INCLUDE_DIR \ - -Dlibomp_test_root=/usr/share/libomp/src/runtime/test \ - /usr/share/libomp/src/runtime/test