Skip to content

Commit

Permalink
tools: libdeflate: backport fix for AVX-VNNI
Browse files Browse the repository at this point in the history
Trying to compile with new new enough GCC but older binutils that dont
support AVX-VNNI will error out on the assembler, so backport an upstream
fix for it.

Fixes: 338b463 ("tools: libdeflate: update to 1.20")
Signed-off-by: Robert Marko <[email protected]>
  • Loading branch information
robimarko committed Apr 15, 2024
1 parent 123282d commit 2116073
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tools/libdeflate/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

PKG_NAME:=libdeflate
PKG_VERSION:=1.20
PKG_RELEASE:=1
PKG_RELEASE:=2

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/ebiggers/libdeflate/releases/download/v$(PKG_VERSION)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
From e522b1d09d3536ddc15459b4259150f4a53ee65a Mon Sep 17 00:00:00 2001
From: Eric Biggers <[email protected]>
Date: Thu, 4 Apr 2024 20:16:33 -0400
Subject: [PATCH] lib/x86: increase AVX-VNNI gcc prerequisite to 12.1

Although gcc 11.1 supports AVX-VNNI, a popular distro pairs it with a
binutils version that does not. Require gcc 12 instead.

Resolves https://github.com/ebiggers/libdeflate/issues/365
---
lib/x86/adler32_impl.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)

--- a/lib/x86/adler32_impl.h
+++ b/lib/x86/adler32_impl.h
@@ -52,8 +52,15 @@
/*
* AVX-VNNI implementation. This is used on CPUs that have AVX2 and AVX-VNNI
* but don't have AVX-512, for example Intel Alder Lake.
+ *
+ * Unusually for a new CPU feature, gcc added support for the AVX-VNNI
+ * intrinsics (in gcc 11.1) slightly before binutils added support for
+ * assembling AVX-VNNI instructions (in binutils 2.36). Distros can reasonably
+ * have gcc 11 with binutils 2.35. Because of this issue, we check for gcc 12
+ * instead of gcc 11. (libdeflate supports direct compilation without a
+ * configure step, so checking the binutils version is not always an option.)
*/
-#if GCC_PREREQ(11, 1) || CLANG_PREREQ(12, 0, 13000000) || MSVC_PREREQ(1930)
+#if GCC_PREREQ(12, 1) || CLANG_PREREQ(12, 0, 13000000) || MSVC_PREREQ(1930)
# define adler32_x86_avx2_vnni adler32_x86_avx2_vnni
# define SUFFIX _avx2_vnni
# define ATTRIBUTES _target_attribute("avx2,avxvnni")

0 comments on commit 2116073

Please sign in to comment.