Compare commits

..

No commits in common. "rawhide" and "f43" have entirely different histories.

4 changed files with 97 additions and 29 deletions

1
.gitignore vendored
View file

@ -7,4 +7,3 @@
/volk-3.1.1.tar.gz.asc
/volk-3.1.2.tar.gz.asc
/volk-3.2.0.tar.gz.asc
/volk-3.3.0.tar.gz.asc

View file

@ -0,0 +1,87 @@
From 080786fb620f30a2f22e7c8dd01ce2ae3818bf5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcus=20M=C3=BCller?= <mmueller@gnuradio.org>
Date: Sat, 9 Aug 2025 14:58:16 +0200
Subject: [PATCH] rotator2: disable SSE 4.1 kernels, wildly incorrect results
in ctest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
see https://github.com/gnuradio/volk/issues/794
Signed-off-by: Marcus Müller <mmueller@gnuradio.org>
---
kernels/volk/volk_32fc_s32fc_rotator2puppet_32fc.h | 4 ++--
kernels/volk/volk_32fc_s32fc_x2_rotator2_32fc.h | 4 ++--
kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/kernels/volk/volk_32fc_s32fc_rotator2puppet_32fc.h b/kernels/volk/volk_32fc_s32fc_rotator2puppet_32fc.h
index 1ae8ad9..9213065 100644
--- a/kernels/volk/volk_32fc_s32fc_rotator2puppet_32fc.h
+++ b/kernels/volk/volk_32fc_s32fc_rotator2puppet_32fc.h
@@ -55,7 +55,7 @@ static inline void volk_32fc_s32fc_rotator2puppet_32fc_neon(lv_32fc_t* outVector
#endif /* LV_HAVE_NEON */
-#ifdef LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1__DISABLED
#include <smmintrin.h>
static inline void
@@ -75,7 +75,7 @@ volk_32fc_s32fc_rotator2puppet_32fc_a_sse4_1(lv_32fc_t* outVector,
#endif /* LV_HAVE_SSE4_1 */
-#ifdef LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1__DISABLED
#include <smmintrin.h>
static inline void
volk_32fc_s32fc_rotator2puppet_32fc_u_sse4_1(lv_32fc_t* outVector,
diff --git a/kernels/volk/volk_32fc_s32fc_x2_rotator2_32fc.h b/kernels/volk/volk_32fc_s32fc_x2_rotator2_32fc.h
index e668e3c..0f63673 100644
--- a/kernels/volk/volk_32fc_s32fc_x2_rotator2_32fc.h
+++ b/kernels/volk/volk_32fc_s32fc_x2_rotator2_32fc.h
@@ -204,7 +204,7 @@ static inline void volk_32fc_s32fc_x2_rotator2_32fc_neon(lv_32fc_t* outVector,
#endif /* LV_HAVE_NEON */
-#ifdef LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1__DISABLED
#include <smmintrin.h>
static inline void volk_32fc_s32fc_x2_rotator2_32fc_a_sse4_1(lv_32fc_t* outVector,
@@ -307,7 +307,7 @@ static inline void volk_32fc_s32fc_x2_rotator2_32fc_a_sse4_1(lv_32fc_t* outVecto
#endif /* LV_HAVE_SSE4_1 for aligned */
-#ifdef LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1__DISABLED
#include <smmintrin.h>
static inline void volk_32fc_s32fc_x2_rotator2_32fc_u_sse4_1(lv_32fc_t* outVector,
diff --git a/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h b/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h
index c0def35..4603ecc 100644
--- a/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h
+++ b/kernels/volk/volk_32fc_s32fc_x2_rotator_32fc.h
@@ -113,7 +113,7 @@ static inline void volk_32fc_s32fc_x2_rotator_32fc_neon(lv_32fc_t* outVector,
#endif /* LV_HAVE_NEON */
-#ifdef LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1__DISABLED
static inline void volk_32fc_s32fc_x2_rotator_32fc_a_sse4_1(lv_32fc_t* outVector,
const lv_32fc_t* inVector,
@@ -128,7 +128,7 @@ static inline void volk_32fc_s32fc_x2_rotator_32fc_a_sse4_1(lv_32fc_t* outVector
#endif /* LV_HAVE_SSE4_1 for aligned */
-#ifdef LV_HAVE_SSE4_1
+#ifdef LV_HAVE_SSE4_1__DISABLED
static inline void volk_32fc_s32fc_x2_rotator_32fc_u_sse4_1(lv_32fc_t* outVector,
const lv_32fc_t* inVector,
--
2.50.1

View file

@ -1,2 +1,2 @@
SHA512 (volk-3.3.0.tar.gz) = 6a10a3eb33ecfbf61c87a41ae41013a297d41ec5a5fee3e0a2c4c2a82564aacce24532d32fb90e07b10abb3c2aefdfb8fb48226fc6d16bfe7f93f7f7b8a69e56
SHA512 (volk-3.3.0.tar.gz.asc) = 8f09a655e429ef2fff3fd78fbd6f89363ae6d7c9bd8ec8cbb02604b008d83735d6c8d710248662056b9112f71b27f1d1f3202ba8ee78c15149b12cabb4e603ab
SHA512 (volk-3.2.0.tar.gz) = 5d776a8760e5e26af0a07315b48f30b744f8ec4a0ce3ffad322d7f561b46910a5c504ae2712ecbab7b3b80d2d4044d67dad07040c2caca8780abcfba079f2a0e
SHA512 (volk-3.2.0.tar.gz.asc) = af53a4fa42fc4a5e81467ea741b73b42e4641e6eda1e71fbcbdecb7a470a0220acd078a6193f3eb67f761f1db96610d4685a14a0a262841b1b3aa69291fa7f4c

View file

@ -1,12 +1,15 @@
Name: volk
Version: 3.3.0
Release: 5%{?dist}
Version: 3.2.0
Release: 7%{?dist}
Summary: The Vector Optimized Library of Kernels
License: LGPL-3.0-or-later
URL: https://github.com/gnuradio/%{name}
Source0: https://github.com/gnuradio/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/gnuradio/volk/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
Source2: https://github.com/gnuradio/volk/releases/download/v2.4.1/gpg_volk_release_key.asc
# Patches:
# https://github.com/gnuradio/volk/issues/794
Patch1: 0001-rotator2-disable-SSE-4.1-kernels-wildly-incorrect-re.patch
BuildRequires: gnupg2
BuildRequires: make
@ -16,7 +19,6 @@ BuildRequires: gcc-c++
BuildRequires: python3-devel
BuildRequires: python3-mako
BuildRequires: orc-devel
BuildRequires: fmt-devel
BuildRequires: sed
%ifnarch s390x
BuildRequires: google-cpu_features-devel
@ -67,7 +69,9 @@ popd
%build
%cmake
%cmake_build
%cmake_build -t volk_doc
# Use make_build for EL8 compat
%make_build -C %{__cmake_builddir} volk_doc
%check
cd %{__cmake_builddir}
@ -103,28 +107,6 @@ cp -a %{__cmake_builddir}/html %{buildroot}%{_docdir}/%{name}
%changelog
* Wed Jul 22 2026 Python Maint <python-maint@redhat.com> - 3.3.0-5
- Rebuilt for Python 3.15.0b4 ABI change
* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
* Thu Jun 25 2026 František Zatloukal <fzatlouk@redhat.com> - 3.3.0-3
- Rebuilt for fmt/spdlog
* Wed Jun 03 2026 Python Maint <python-maint@redhat.com> - 3.3.0-2
- Rebuilt for Python 3.15
* Mon Feb 09 2026 Jaroslav Škarvada <jskarvad@redhat.com> - 3.3.0-1
- New version
Resolves: rhbz#2437661
* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Fri Sep 26 2025 Antonio Trande <sagitter@fedoraproject.org> - 3.2.0-8
- Rebuild for google-cpu_features-0.10.1
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 3.2.0-7
- Rebuilt for Python 3.14.0rc3 bytecode