.gitignore

@@ -1,2 +1,2 @@
-SOURCES/openmp-17.0.6.src.tar.xz
-SOURCES/openmp-17.0.6.src.tar.xz.sig
+SOURCES/openmp-15.0.7.src.tar.xz
+SOURCES/release-keys.asc

.libomp.metadata

@@ -1,2 +1,2 @@
-d633a8e324689c7bf20528c99b3130ba1796fe1d SOURCES/openmp-17.0.6.src.tar.xz
-8354a371042267a121f2b4e27c03f74f9eeff994 SOURCES/openmp-17.0.6.src.tar.xz.sig
+d8a0b4314a65a4ad3a82fbcbc59876cfcf09c95b SOURCES/openmp-15.0.7.src.tar.xz
+347bdd5ee6d6b93c9644c268511815912c0fb2dc SOURCES/release-keys.asc

SOURCES/lit.fedora.cfg.py

@@ -0,0 +1,15 @@
+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', 'clang-11']
+config.test_c_compiler = 'clang'
+config.test_cxx_compiler = 'clang++'
+lit_config.load_config(config, '%(libomp_test_root)s/lit.cfg' % lit_config.params)

SOURCES/release-keys.asc

@@ -1,104 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-9RmlwZlOTFGcWBYl/cfRONn9qi9a6w==
-=Lvw+
------END PGP PUBLIC KEY BLOCK-----
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=tMzl
------END PGP PUBLIC KEY BLOCK-----

SOURCES/run-lit-tests

@@ -0,0 +1,63 @@
+#!/usr/bin/bash
+
+set -e
+
+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
+
+exit 0

SPECS/libomp.spec

@@ -1,26 +1,8 @@
-%bcond_with snapshot_build
-
-%if %{with snapshot_build}
-# Unlock LLVM Snapshot LUA functions
-%{llvm_sb}
-%endif
-
-%global maj_ver 17
-%global libomp_version %{maj_ver}.0.6
-#global rc_ver 4
+%global maj_ver 15
+%global libomp_version %{maj_ver}.0.7
+#global rc_ver 1
 %global libomp_srcdir openmp-%{libomp_version}%{?rc_ver:rc%{rc_ver}}.src
-%global so_suffix %{maj_ver}
 
-%if %{with snapshot_build}
-%undefine rc_ver
-%global maj_ver %{llvm_snapshot_version_major}
-%global libomp_version %{llvm_snapshot_version}
-%global so_suffix %{maj_ver}%{llvm_snapshot_version_suffix}
-%endif
-
-# 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
 
 %ifarch ppc64le
 %global libomp_arch ppc64
@@ -28,6 +10,12 @@
 %global libomp_arch %{_arch}
 %endif
 
+%ifarch %{ix86}
+%bcond_with testpkg
+%else
+%bcond_without testpkg
+%endif
+
 Name: libomp
 Version: %{libomp_version}%{?rc_ver:~rc%{rc_ver}}
 Release: 1%{?dist}
@@ -35,16 +23,13 @@ Summary: OpenMP runtime for clang
 
 License: NCSA
 URL: http://openmp.llvm.org
-%if %{with snapshot_build}
-Source0: %{llvm_snapshot_source_prefix}openmp-%{llvm_snapshot_yyyymmdd}.src.tar.xz
-%{llvm_snapshot_extra_source_tags}
-%else
 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
-%endif
+Source3: run-lit-tests
+Source4: lit.fedora.cfg.py
 
-BuildRequires: clang >= %{maj_ver}
+BuildRequires: clang
 # For clang-offload-packager
 BuildRequires: clang-tools-extra
 BuildRequires: cmake
@@ -60,14 +45,12 @@ BuildRequires: ncurses-devel
 # For gpg source verification
 BuildRequires:	gnupg2
 
+
 # libomptarget needs the llvm cmake files
 BuildRequires: llvm-devel
-BuildRequires: llvm-cmake-utils
 
 Requires: elfutils-libelf%{?isa}
 
-Obsoletes: libomp-test < 17.0.3
-
 # libomp does not support s390x.
 ExcludeArch: s390x
 
@@ -76,37 +59,49 @@ OpenMP runtime for clang.
 
 %package devel
 Summary: OpenMP header files
-Requires: %{name}%{?isa} = %{version}-%{release}
 Requires: clang-resource-filesystem%{?isa} = %{version}
 
 %description devel
 OpenMP header files.
 
-%prep
-%if %{without snapshot_build}
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
+%if %{with testpkg}
+
+%package test
+Summary: OpenMP regression tests
+Requires: %{name}%{?isa} = %{version}-%{release}
+Requires: %{name}-devel%{?isa} = %{version}-%{release}
+Requires: clang
+Requires: llvm
+Requires: gcc
+Requires: gcc-c++
+Requires: python3-lit
+
+%description test
+OpenMP regression tests
+
 %endif
+
+%prep
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -n %{libomp_srcdir} -p2
 
 %build
-%undefine __cmake_in_source_build
-
 # LTO causes build failures in this package.  Disable LTO for now
 # https://bugzilla.redhat.com/show_bug.cgi?id=1988155
 %define _lto_cflags %{nil}
 
-%cmake -GNinja \
+mkdir -p %{_vpath_builddir}
+cd %{_vpath_builddir}
+
+%cmake ..  -GNinja \
 	-DLIBOMP_INSTALL_ALIASES=OFF \
-	-DCMAKE_MODULE_PATH=%{_datadir}/llvm/cmake/Modules \
+	-DCMAKE_MODULE_PATH=%{_libdir}/cmake/llvm \
 	-DLLVM_DIR=%{_libdir}/cmake/llvm \
-	-DCMAKE_INSTALL_INCLUDEDIR=%{_prefix}/lib/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
-%if %{with snapshot_build}
-	-DLLVM_VERSION_SUFFIX="%{llvm_snapshot_version_suffix}" \
 %endif
 	-DCMAKE_SKIP_RPATH:BOOL=ON
 
@@ -114,12 +109,41 @@ OpenMP header files.
 
 
 %install
+cd %{_vpath_builddir}
 %cmake_install
 
+%if %{with testpkg}
+# 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_fedora_cfg %{_datadir}/libomp/lit.fedora.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 runtime/test/lit.site.cfg >> %{buildroot}%{lit_cfg}
+
+# Install custom fedora config file
+cp %{SOURCE4} %{buildroot}%{lit_fedora_cfg}
+
+# Patch lit config files to load custom fedora config
+echo "lit_config.load_config(config, '%{lit_fedora_cfg}')" >> %{buildroot}%{lit_cfg}
+
+# Install test script
+install -d %{buildroot}%{_libexecdir}/tests/libomp
+install -m 0755 %{SOURCE3} %{buildroot}%{_libexecdir}/tests/libomp
+
+%endif
+
 # Remove static libraries with equivalent shared libraries
 rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 
 %check
+cd %{_vpath_builddir}
 %cmake_build --target check-openmp || true
 
 %files
@@ -130,51 +154,37 @@ rm -rf %{buildroot}%{_libdir}/libarcher_static.a
 %{_libdir}/libarcher.so
 %endif
 %ifnarch %{ix86} %{arm}
-# libomptarget is not supported on 32-bit systems.
-%{_libdir}/libomptarget.rtl.amdgpu.so.%{so_suffix}
-%{_libdir}/libomptarget.rtl.cuda.so.%{so_suffix}
-%{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{so_suffix}
-%{_libdir}/libomptarget.so.%{so_suffix}
+%{_libdir}/libomptarget.rtl.amdgpu.so.%{maj_ver}
+%{_libdir}/libomptarget.rtl.cuda.so.%{maj_ver}
+%{_libdir}/libomptarget.rtl.%{libomp_arch}.so.%{maj_ver}
 %endif
+%{_libdir}/libomptarget.so.%{maj_ver}
 
 %files devel
-%{_prefix}/lib/clang/%{maj_ver}/include/omp.h
-%ifnarch %{arm}
-%{_prefix}/lib/clang/%{maj_ver}/include/omp-tools.h
-%{_prefix}/lib/clang/%{maj_ver}/include/ompt.h
-%{_prefix}/lib/clang/%{maj_ver}/include/ompt-multiplex.h
-%endif
+%{_libdir}/clang/%{libomp_version}/include/omp.h
 %{_libdir}/cmake/openmp/FindOpenMPTarget.cmake
+%ifnarch %{arm}
+%{_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.
 %{_libdir}/libomptarget.rtl.amdgpu.so
 %{_libdir}/libomptarget.rtl.cuda.so
 %{_libdir}/libomptarget.rtl.%{libomp_arch}.so
 %{_libdir}/libomptarget.devicertl.a
 %{_libdir}/libomptarget-amdgpu-*.bc
 %{_libdir}/libomptarget-nvptx-*.bc
+%endif
 %{_libdir}/libomptarget.so
+
+%if %{with testpkg}
+%files test
+%{_datadir}/libomp
+%{_libexecdir}/tests/libomp/
 %endif
 
 %changelog
-* Wed Nov 29 2023 Nikita Popov <npopov@redhat.com> - 17.0.6-1
-- Update to LLVM 17.0.6
-
-* Wed Oct 04 2023 Nikita Popov <npopov@redhat.com> - 17.0.2-1
-- Update to LLVM 17.0.2
-
-* Sat Jul 15 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-3
-- Remove duplicated installed binaries
-
-* Wed Jul 05 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-2
-- Add explict libomp requres to libomp-devel
-
-* Fri Jun 23 2023 Tom Stellard <tstellar@redhat.com> - 16.0.6-1
-- 16.0.6 Release
-
-* Fri Apr 28 2023 Tom Stellard <tstellar@redhat.com> - 16.0.0-1
-- Release 16.0.0
-
 * Thu Jan 19 2023 Tom Stellard <tstellar@redhat.com> - 15.0.7-1
 - Update to LLVM 15.0.7