[med-svn] [Git][med-team/vg][master] 9 commits: Build each SIMD variant with exactly the ISA it advertises
Andreas Tille (@tille)
gitlab at salsa.debian.org
Sun Nov 8 15:18:24 GMT 2026
Andreas Tille pushed to branch master at Debian Med / vg
Commits:
480e19bc by Andreas Tille at 2026-11-07T15:17:36+01:00
Build each SIMD variant with exactly the ISA it advertises
libdozeu 0.0~git20260825.d0e9ba6-3 pre-includes the complete <immintrin.h>
before enabling the SIMDe native aliases when only SSE2 is available, so
dozeu.h no longer collides with GCC 16's own intrinsic declarations.
Drop the -msse4.1 that was added to every variant and to the -plain build
as a workaround. This also restores the intent of the packaging: vg-plain
is the fallback used by debian/bin/simd-dispatch on CPUs that support none
of the dispatched variants, so it must remain at the amd64 SSE2 baseline
instead of silently requiring SSE4.1.
Bump the libdozeu-dev Build-Depends accordingly.
Assisted-By: deepseek-v4.1-flash-free
- - - - -
ff1a9e1a by Andreas Tille at 2026-11-07T15:17:46+01:00
Exclude snarl distance index tests for the newer libbdsg
Debian's libbdsg (0.3+git20261016.485b32b) already contains the snarl
decomposition interface from libbdsg PR #247, which landed about an hour
after the vg 1.78.0 tag. Six test cases in src/unittest/snarl_distance_index.cpp
still assert the previous root/chain traversal behaviour and therefore fail
against the packaged libbdsg.
Upstream adapts vg to the new interface in vg PR #5057 (merged after
1.78.0), including a large rewrite of the tip-flag computation and the
affected tests. Backporting that is not appropriate for this packaging
update, so exclude the six test cases by name from the autopkgtest command
and document the reason in debian/tests/control. Catch2 can only filter
whole test cases, hence the exclusions are broader than the individual
failing assertions.
Remove the exclusions when packaging a vg release that contains PR #5057.
Assisted-By: deepseek-v4.1-flash-free
- - - - -
977bbe35 by Andreas Tille at 2026-11-08T10:15:23+01:00
autopkgtest: Exercise every installed SIMD variant
vg ships one binary per SIMD ISA on amd64/i386 and /usr/bin/vg merely
dispatches to the best one the CPU supports, so the previous test only
covered a single variant. Run 'vg test' for every installed variant,
skip those the CPU cannot execute, keep going after a failure, and name
the failing variant in the output.
Closes: #987184
- - - - -
ebb27f69 by Andreas Tille at 2026-11-08T10:19:34+01:00
Close the arm64 FTBFS bug #976511
The +ds tarball no longer contains deps/, so the bundled sdsl-lite and
vowpal_wabbit configure runs that failed on arm64 cannot happen any more.
The relevant libraries are now taken from Debian packages, and Debian's
own arm64 build of the previous upload succeeded.
- - - - -
8bf55b44 by Andreas Tille at 2026-11-08T10:21:16+01:00
Explicitly disable LTO: vg does not build with link time optimization enabled. Closes: #1015699
- - - - -
6adeae24 by Andreas Tille at 2026-11-08T10:22:22+01:00
Shorten chaneglog entries
- - - - -
f187754c by Andreas Tille at 2026-11-08T12:35:46+01:00
Upload to unstable
- - - - -
7a00b70d by Andreas Tille at 2026-11-08T15:53:43+01:00
Drop unused lintian-overrides
- - - - -
48e7b33e by Andreas Tille at 2026-11-08T16:14:12+01:00
d/copyright: Cleanup from unused license paragraphs
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/copyright
- debian/rules
- − debian/source/lintian-overrides
- debian/tests/control
- + debian/tests/run-unit-test
- − debian/vg.lintian-overrides
Changes:
=====================================
debian/changelog
=====================================
@@ -1,4 +1,12 @@
-vg (1.78.0+ds-1) UNRELEASED; urgency=medium
+vg (1.78.0+ds-2) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Drop unused lintian-overrides
+ * d/copyright: Cleanup from unused license paragraphs
+
+ -- Andreas Tille <tille at debian.org> Sun, 08 Nov 2026 15:52:15 +0100
+
+vg (1.78.0+ds-1) unstable; urgency=medium
* Team upload.
* New upstream version
@@ -16,6 +24,7 @@ vg (1.78.0+ds-1) UNRELEASED; urgency=medium
* Link against the Debian-packaged libhandlegraph, libbdsg, libvgio,
libsdsl, libstructures and libtabixpp instead of building the bundled
copies.
+ Closes: #976511
* Use the Debian-packaged libxg and its installed headers.
* Use the Debian-packaged sonLib.
* Use the Debian-packaged pinchesAndCacti and its installed headers.
@@ -28,10 +37,9 @@ vg (1.78.0+ds-1) UNRELEASED; urgency=medium
Debian's libsonlib leaves unresolved (neighbour_joining_buildtree and
friends), used by vg's tree code. (FIXME!)
* Build micro-libraries (sha1 and lru_cache) from debian/missing-sources.
- * Build all SIMD variants and the -plain binary at at least -msse4.1:
- the patched gssw.h/dozeu.h use the compiler's own intrinsics there, and
- the SIMDe native-alias fallback collides with the SSE intrinsics GCC 16
- defines natively.
+ * Do not force -msse4.1 on every SIMD variant
+ * debian/tests/control: Exclude the snarl distance index test cases that
+ still expect the pre-interface-change libbdsg behaviour
* Update lintian-overrides
* d/copyright: Completely remove deps dir
* Add myself to debian/ dir copyright
@@ -39,8 +47,13 @@ vg (1.78.0+ds-1) UNRELEASED; urgency=medium
Architecture: amd64 arm64
* Drop bsdmainutils from ored Build-Depends
* d/salsa-ci.yml: Do not build on i386
+ * debian/tests: Test every installed SIMD variant
+ Closes: #987184
+ * Explicitly disable LTO: vg does not build with link time optimization
+ enabled.
+ Closes: #1015699
- -- Andreas Tille <tille at debian.org> Wed, 21 Oct 2026 13:50:19 +0200
+ -- Andreas Tille <tille at debian.org> Sun, 08 Nov 2026 10:34:51 +0100
vg (1.59.0+ds-0.1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -28,7 +28,7 @@ Build-Depends:
libcpp-progress-bar-dev (>= 0.0~git20210121.487bb7c-2),
libdeflate-dev,
libdivsufsort-dev,
- libdozeu-dev (>= 0.0~git20260825.d0e9ba6-2),
+ libdozeu-dev (>= 0.0~git20260825.d0e9ba6-3),
libdw-dev,
libelf-dev,
libfastahack-dev,
=====================================
debian/copyright
=====================================
@@ -115,100 +115,6 @@ Comment:
On Debian systems, you can find the LGPL license version 3 in
‘/usr/share/common-licenses/LGPL-3’.
-License: Apache-2
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
- .
- https://www.apache.org/licenses/LICENSE-2.0
- .
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
- .
- On Debian systems, the complete text of the Apache version 2.0 license
- can be found in "/usr/share/common-licenses/Apache-2.0".
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- .
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- * Neither the name of the original author; nor the names of any contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
- OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: Python
- PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
- --------------------------------------------
- .
- 1. This LICENSE AGREEMENT is between the Python Software Foundation
- ("PSF"), and the Individual or Organization ("Licensee") accessing and
- otherwise using this software ("Python") in source or binary form and
- its associated documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, PSF hereby
- grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
- analyze, test, perform and/or display publicly, prepare derivative works,
- distribute, and otherwise use Python alone or in any derivative version,
- provided, however, that PSF's License Agreement and PSF's notice of copyright,
- i.e., "Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
- 2011, 2012, 2013, 2014, 2015, 2016 Python Software Foundation; All Rights
- Reserved" are retained in Python alone or in any derivative version prepared by
- Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on
- or incorporates Python or any part thereof, and wants to make
- the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to Python.
- .
- 4. PSF is making Python available to Licensee on an "AS IS"
- basis. PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
- INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
- FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
- A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
- OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between PSF and
- Licensee. This License Agreement does not grant permission to use PSF
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
- .
- 8. By copying, installing or otherwise using Python, Licensee
- agrees to be bound by the terms and conditions of this License
- Agreement.
-
License: BSL-1.0
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
@@ -231,20 +137,3 @@ License: BSL-1.0
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-
-License: GPL-3+
- This program is free software: you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the Free
- Software Foundation, either version 3 of the License, or (at your option)
- any later version.
- .
- This program is distributed in the hope that it will be useful, but WITHOUT
- ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- more details.
- .
- You should have received a copy of the GNU General Public License along
- with this program. If not, see <http://www.gnu.org/licenses/>.
-Comment:
- On Debian systems, you can find the GPL license version 3 in
- ‘/usr/share/common-licenses/GPL-3’.
=====================================
debian/rules
=====================================
@@ -4,7 +4,9 @@ DH_VERBOSE := 1
export LC_ALL=C.UTF-8
include /usr/share/dpkg/default.mk
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+# vg does not build with link time optimization enabled (Debian bug #1015699).
+# Opt out explicitly instead of relying on LTO not being the default yet.
+export DEB_BUILD_MAINT_OPTIONS=hardening=+all optimize=-lto
export DEB_CFLAGS_MAINT_APPEND+=-DSIMDE_ENABLE_OPENMP -fopenmp-simd -O3
export DEB_CXXFLAGS_MAINT_APPEND+=-DSIMDE_ENABLE_OPENMP -fopenmp-simd -O3
export CFLAGS=$(shell dpkg-buildflags --get CFLAGS)
@@ -35,17 +37,19 @@ override_dh_auto_build-arch:
ifneq (,$(filter $(DEB_HOST_ARCH),amd64 i386))
mkdir -p $(prefix)
mkdir -p $(libexecdir)
- # All variants (including -plain and the ssse3/sse3 benchmarks) are
- # compiled at least at -msse4.1: dozeu.h and gssw.h use the compiler's own
- # intrinsics on SSE4.1-capable x86, and without -msse4.1 they fall back to
- # SIMDe native aliases, which collide with the SSE intrinsics GCC 16
- # defines natively and break the build.
+ # Each variant is compiled with exactly the ISA it advertises. libdozeu
+ # (>= 0.0~git20260825.d0e9ba6-3) pre-includes the native intrinsic headers
+ # before enabling the SIMDe native aliases, so the SSE2/SSE3/SSSE3 builds
+ # no longer collide with GCC 16's intrinsic headers. In particular do not
+ # add -msse4.1 here: vg-plain is the fallback for CPUs without any of the
+ # variants listed in debian/bin/simd-dispatch and must stay at the amd64
+ # SSE2 baseline.
for SIMD in $(AMD64_SIMDE) ; do \
- export CXXFLAGS="$(CXXFLAGS) -msse4.1 -m$${SIMD}" && export CFLAGS="$(CFLAGS) -msse4.1 -m$${SIMD}" && \
+ export CXXFLAGS="$(CXXFLAGS) -m$${SIMD}" && export CFLAGS="$(CFLAGS) -m$${SIMD}" && \
make clean ; \
dh_auto_build -- SFX=-$${SIMD} all test/build_graph bin/shuf ; \
done
- CXXFLAGS="$(CXXFLAGS) -msse4.1" CFLAGS="$(CFLAGS) -msse4.1" dh_auto_build -- SFX=-plain all test/build_graph bin/shuf
+ dh_auto_build -- SFX=-plain all test/build_graph bin/shuf
cp bin/vg-plain debian/help/vg
ifeq (i386,$(DEB_HOST_ARCH))
for SIMD in $(I386_SIMDE) ; do \
=====================================
debian/source/lintian-overrides deleted
=====================================
@@ -1,2 +0,0 @@
-# false positive, there are truly some long lines; not minified code
-vg source: source-is-missing [deps/xg/deps/atomic_queue/html/benchmarks.js]
=====================================
debian/tests/control
=====================================
@@ -1,4 +1,7 @@
-Test-Command: vg test
-Depends: vg, libvcflib-tools
+# On amd64/i386 every SIMD variant is tested individually by
+# debian/tests/run-unit-test (Debian bug #987184). See that file for the
+# explanation of the excluded snarl distance index test cases.
+Tests: run-unit-test
+Depends: @, libvcflib-tools
Restrictions: allow-stderr
Architecture: amd64 arm64
=====================================
debian/tests/run-unit-test
=====================================
@@ -0,0 +1,67 @@
+#!/bin/bash
+# On amd64/i386 the package installs one binary per SIMD ISA and /usr/bin/vg is
+# only a dispatcher that picks the best one the CPU can run. Running
+# "vg test" therefore exercises a single variant. Test every installed
+# variant explicitly so a regression in one of the other binaries is caught
+# (Debian bug #987184).
+set -u
+shopt -s nullglob
+
+# vg 1.78.0 predates the new snarl decomposition interface in libbdsg
+# (https://github.com/vgteam/libbdsg/pull/247), which Debian's libbdsg already
+# provides. Six test cases still assert the old root/chain traversal
+# behaviour; upstream adapts them in
+# https://github.com/vgteam/vg/pull/5057, which is not part of 1.78.0.
+# Remove these exclusions when packaging a vg release containing that work.
+exclusions=(
+ "~Snarl decomposition can deal with multiple connected components"
+ "~Snarl decomposition can allow traversal of a simple net graph"
+ "~Distance index's snarl functions return expected answers"
+ "~Distance index can deal with chains that loop at the root"
+ "~Distance index can deal with edges in the root"
+ "~top level chain subgraph"
+)
+
+# CPU feature each variant needs, spelled as in /proc/cpuinfo.
+declare -A cpu_need=(
+ [plain]=""
+ [sse]="sse"
+ [sse2]="sse2"
+ [sse3]="pni"
+ [ssse3]="ssse3"
+ [sse4.1]="sse4_1"
+ [avx]="avx"
+ [avx2]="avx2"
+)
+
+cpuflags=" $(sed -n 's/^flags[[:space:]]*:[[:space:]]*//p' /proc/cpuinfo 2>/dev/null \
+ | head -n1 | tr 'A-Z' 'a-z') "
+
+status=0
+variants=(/usr/lib/vg/vg-*)
+# Non-x86 architectures install the binary directly.
+[ ${#variants[@]} -eq 0 ] && variants=(/usr/bin/vg)
+
+for bin in "${variants[@]}"; do
+ [ -x "$bin" ] || continue
+ isa=${bin##*/vg-}
+ [ "$bin" = /usr/bin/vg ] && isa=plain
+ need=${cpu_need[$isa]-}
+ if [ -n "$need" ] && [[ "$cpuflags" != *" $need "* ]]; then
+ echo "SKIP: $(basename "$bin") (CPU lacks $need)"
+ continue
+ fi
+ echo "RUN: $(basename "$bin")"
+ if ! "$bin" test "${exclusions[@]}"; then
+ echo "FAIL: $(basename "$bin")" >&2
+ status=1
+ fi
+done
+
+# /usr/bin/vg is normally the dispatcher; make sure it can still start.
+if [ -L /usr/bin/vg ]; then
+ echo "RUN: dispatcher /usr/bin/vg"
+ /usr/bin/vg version || { echo "FAIL: dispatcher" >&2; status=1; }
+fi
+
+exit "$status"
=====================================
debian/vg.lintian-overrides deleted
=====================================
@@ -1,6 +0,0 @@
-# spelling false positive
-vg: spelling-error-in-binary boun bound [usr/lib/vg/vg-*]
-vg: spelling-error-in-binary defaulH default [usr/lib/vg/vg-*]
-vg: spelling-error-in-binary lengH length [usr/lib/vg/vg-*]
-vg: spelling-error-in-binary perfec perfect [usr/lib/vg/vg-*]
-vg: spelling-error-in-binary wiThe with [usr/lib/vg/vg-*]
View it on GitLab: https://salsa.debian.org/med-team/vg/-/compare/87ab3350cc376edf21c06b1e326f2a0f1e150b55...48e7b33e2c645f203209da729ec5810de221907d
--
View it on GitLab: https://salsa.debian.org/med-team/vg/-/compare/87ab3350cc376edf21c06b1e326f2a0f1e150b55...48e7b33e2c645f203209da729ec5810de221907d
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20261108/8ab5db3e/attachment-0001.htm>
More information about the debian-med-commit
mailing list