From 98e3f17d74141294c14f82e245441132a7b7741e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 18:29:20 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From df5e49b69ff80951646d8450e0f38afe572be1c3 Mon Sep 17 00:00:00 2001 From: Ali Erdinc Koroglu Date: Wed, 1 Nov 2023 10:51:14 +0200 Subject: [PATCH 2/9] Update to 4.0 --- ...e86cda95a469357a19ab8984ad8530372e75.patch | 45 ------------- meson-build.patch | 63 ------------------- sources | 2 +- x86-simd-sort.spec | 34 +++++----- 4 files changed, 15 insertions(+), 129 deletions(-) delete mode 100644 1735e86cda95a469357a19ab8984ad8530372e75.patch delete mode 100644 meson-build.patch diff --git a/1735e86cda95a469357a19ab8984ad8530372e75.patch b/1735e86cda95a469357a19ab8984ad8530372e75.patch deleted file mode 100644 index ced8705..0000000 --- a/1735e86cda95a469357a19ab8984ad8530372e75.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8b64740e323b12dfd7b410d152fde94d6d1b120b Mon Sep 17 00:00:00 2001 -From: Benson Muite -Date: Sun, 19 Mar 2023 12:55:27 +0300 -Subject: [PATCH 1/2] Need meson file in utils - ---- - utils/meson.build | 7 +++++++ - 1 file changed, 7 insertions(+) - create mode 100644 utils/meson.build - -diff --git a/utils/meson.build b/utils/meson.build -new file mode 100644 -index 0000000..5772e98 ---- /dev/null -+++ b/utils/meson.build -@@ -0,0 +1,7 @@ -+libcpuinfo = [] -+ -+libcpuinfo += static_library('cpuinfo', -+ files('cpuinfo.cpp'), -+ include_directories : [src], -+ cpp_args : ['-O3'], -+) - -From a4f58dc6d076544e25ce88141d957dd2af3961df Mon Sep 17 00:00:00 2001 -From: Benson Muite -Date: Mon, 20 Mar 2023 10:17:36 +0300 -Subject: [PATCH 2/2] src not needed - -Co-authored-by: Raghuveer Devulapalli ---- - utils/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/utils/meson.build b/utils/meson.build -index 5772e98..5f34453 100644 ---- a/utils/meson.build -+++ b/utils/meson.build -@@ -2,6 +2,5 @@ libcpuinfo = [] - - libcpuinfo += static_library('cpuinfo', - files('cpuinfo.cpp'), -- include_directories : [src], - cpp_args : ['-O3'], - ) diff --git a/meson-build.patch b/meson-build.patch deleted file mode 100644 index 7cfa1fe..0000000 --- a/meson-build.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/meson.build 2023-03-17 16:52:07.106254624 +0200 -+++ b/meson.build 2023-03-17 17:00:23.484367054 +0200 -@@ -3,12 +3,12 @@ - license : 'BSD 3-clause') - cc = meson.get_compiler('c') - cpp = meson.get_compiler('cpp') --src = include_directories('./src') --bench = include_directories('./benchmarks') --utils = include_directories('./utils') --tests = include_directories('./tests') -+src = include_directories('src') -+utils = include_directories('utils') -+tests = include_directories('tests') - gtest_dep = dependency('gtest', fallback : ['gtest', 'gtest_dep']) --subdir('./tests') -+subdir('src') -+subdir('tests') - - testexe = executable('testexe', 'tests/main.cpp', - dependencies : gtest_dep, -@@ -17,16 +17,18 @@ - ] - ) - --benchexe = executable('benchexe', 'benchmarks/main.cpp', -- include_directories : [ -- src, -- utils, -- bench, -- ], -- cpp_args : [ -- '-O3', -- '-march=icelake-client', -- ], -- dependencies : [], -- link_whole : [], -- ) -+test('test', testexe) -+ -+# -+# x86-simd-sort.pc generation -+# -+datadir = get_option('datadir') -+pkgconfig_dir = join_paths(get_option('prefix'), datadir, 'pkgconfig') -+ -+pkgconfig = import('pkgconfig') -+pkgconfig.generate(name : meson.project_name(), -+ description : 'x86-simd-sort headers', -+ version : meson.project_version(), -+ subdirs : 'x86-simd-sort', -+ install_dir : pkgconfig_dir, -+ variables : 'datadir=@0@'.format(join_paths('${prefix}', datadir))) ---- /dev/null -+++ b/src/meson.build -@@ -0,0 +1,8 @@ -+x86_simd_sort_headers = [ -+ 'avx512-16bit-qsort.hpp', -+ 'avx512-32bit-qsort.hpp', -+ 'avx512-64bit-qsort.hpp', -+ 'avx512-common-qsort.h', -+] -+ -+install_headers(x86_simd_sort_headers) diff --git a/sources b/sources index 2221b22..666ac2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x86-simd-sort-1.0.tar.gz) = d7c3c0bfc3eae53df248b0c690fcbecdbd96a04dbea165f783511c1d4ae0f1f1c74375422b9d893fa9ccbeb52a87b35de36dfc9bf312d777d9ae62adce9b429d +SHA512 (x86-simd-sort-4.0.tar.gz) = 2e95f026515f5616a43dfdb8d2b6a0e6da3027b74bb8e21db5f7db6710cb7bf290ab147a117093fd7bfba66de6c4c0fcfde16fbe8278bd4966031662bff34ba8 diff --git a/x86-simd-sort.spec b/x86-simd-sort.spec index c02886e..05969f7 100644 --- a/x86-simd-sort.spec +++ b/x86-simd-sort.spec @@ -1,18 +1,12 @@ -%global debug_package %{nil} - Name: x86-simd-sort -Version: 1.0 +Version: 4.0 Release: %autorelease -Summary: C++ header file library for high performance SIMD based sorting algorithms +Summary: C++ template library for high performance SIMD based sorting algorithms License: BSD-3-Clause URL: https://github.com/intel/x86-simd-sort Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: meson-build.patch -# https://github.com/intel/x86-simd-sort/commit/1735e86cda95a469357a19ab8984ad8530372e75 -Patch1: 1735e86cda95a469357a19ab8984ad8530372e75.patch - # C++ header file library for x86 processors. ExclusiveArch: x86_64 @@ -21,17 +15,14 @@ BuildRequires: gtest-devel BuildRequires: meson %description -C++ header file library for SIMD based 16-bit, 32-bit and 64-bit data type -sorting on x86 processors. Source header files are available in src directory. -We currently only have AVX-512 based implementation of quicksort. This -repository also includes a test suite which can be built and run to test the -sorting algorithms for correctness. It also has benchmarking code to compare -its performance relative to std::sort. +C++ template library for high performance SIMD based sorting routines for +16-bit, 32-bit and 64-bit data types. The sorting routines are accelerated +using AVX-512/AVX2 when available. The library auto picks the best version +depending on the processor it is run on. %package devel Summary: Development files for %{name} -BuildArch: noarch -Provides: %{name}-static = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -50,12 +41,15 @@ applications that use %{name}. %check %meson_test -v -%files devel +%files %license LICENSE.md %doc README.md -%{_includedir}/*.h -%{_includedir}/*.hpp -%{_datadir}/pkgconfig/%{name}.pc +%{_libdir}/libx86simdsortcpp.so.0 + +%files devel +%{_includedir}/x86simdsort.h +%{_libdir}/libx86simdsortcpp.so +%{_libdir}/pkgconfig/x86simdsortcpp.pc %changelog %autochangelog From a676365212e4c32af630871bcab6363e3a866546 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:17:49 +0000 Subject: [PATCH 3/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 823a724cd516ae6073cd5a26e2047ba03f5e1201 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 09:40:38 +0000 Subject: [PATCH 4/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From db33c6f0de07fe780f58784f764919079aaab578 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 15:23:20 +0000 Subject: [PATCH 5/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 21ded932327ff9dd6bfe0c8d1145b7be54b02119 Mon Sep 17 00:00:00 2001 From: Ali Erdinc Koroglu Date: Tue, 27 May 2025 19:31:09 +0300 Subject: [PATCH 6/9] Update to 7.0 --- sources | 2 +- x86-simd-sort.spec | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 666ac2c..bec2393 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (x86-simd-sort-4.0.tar.gz) = 2e95f026515f5616a43dfdb8d2b6a0e6da3027b74bb8e21db5f7db6710cb7bf290ab147a117093fd7bfba66de6c4c0fcfde16fbe8278bd4966031662bff34ba8 +SHA512 (x86-simd-sort-7.0.tar.gz) = de217d35a98da3b269454eaa8a2880b9aa36e4906670d0434799a45a8dcbe6d3fdf56cb16b683be510e34e0636b035e9de88a7b6e68b41e1eecceb5ecac4fe4a diff --git a/x86-simd-sort.spec b/x86-simd-sort.spec index 05969f7..30539f9 100644 --- a/x86-simd-sort.spec +++ b/x86-simd-sort.spec @@ -1,5 +1,5 @@ Name: x86-simd-sort -Version: 4.0 +Version: 7.0 Release: %autorelease Summary: C++ template library for high performance SIMD based sorting algorithms @@ -44,7 +44,7 @@ applications that use %{name}. %files %license LICENSE.md %doc README.md -%{_libdir}/libx86simdsortcpp.so.0 +%{_libdir}/libx86simdsortcpp.so.1 %files devel %{_includedir}/x86simdsort.h From 3a8a4de12b63145d26ae5ae5957dcdc9e5319881 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:36:33 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From d7d27de15d5535b314c223b9851d278d6479229d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 20:26:13 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From fdd02b9c038f76f8c68ba237e26d29c4d38ebf19 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:59:45 +0000 Subject: [PATCH 9/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild