Control: tags 1096377 + patch Control: tags 1096377 + pending Dear maintainer,
I've prepared an NMU for blis (versioned as 1.1-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diffstat for blis-1.1 blis-1.1 changelog | 7 + patches/0001-Blacklist-KNL-with-GCC-15-844.patch | 37 +++++ patches/0002-Apply-temporary-fix-for-gcc-15.-874.patch | 110 +++++++++++++++++ patches/series | 2 4 files changed, 156 insertions(+) diff -Nru blis-1.1/debian/changelog blis-1.1/debian/changelog --- blis-1.1/debian/changelog 2025-01-27 01:37:36.000000000 +0200 +++ blis-1.1/debian/changelog 2025-09-20 17:06:05.000000000 +0300 @@ -1,3 +1,10 @@ +blis (1.1-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * Backport upstream fixes for FTBFS with GCC 15. (Closes: #1096377) + + -- Adrian Bunk <[email protected]> Sat, 20 Sep 2025 17:06:05 +0300 + blis (1.1-2) unstable; urgency=medium * Add patch to alias *gemmt_ as *gemmtr_. diff -Nru blis-1.1/debian/patches/0001-Blacklist-KNL-with-GCC-15-844.patch blis-1.1/debian/patches/0001-Blacklist-KNL-with-GCC-15-844.patch --- blis-1.1/debian/patches/0001-Blacklist-KNL-with-GCC-15-844.patch 1970-01-01 02:00:00.000000000 +0200 +++ blis-1.1/debian/patches/0001-Blacklist-KNL-with-GCC-15-844.patch 2025-09-20 17:06:05.000000000 +0300 @@ -0,0 +1,37 @@ +From d35d300f84e940a1cafeff0b3017b654fed7c9aa Mon Sep 17 00:00:00 2001 +From: Dave Love <[email protected]> +Date: Fri, 24 Jan 2025 21:44:32 +0000 +Subject: Blacklist KNL with GCC 15+ (#844) + +Details: +- GCC 15 drops support for Xeon Phi architectures such as KNL. +- This PR blacklists the `knl` configuration for GCC 15+. +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 6e1c112c..c6acad01 100755 +--- a/configure ++++ b/configure +@@ -1684,7 +1684,7 @@ check_compiler() + # Specific: + # + # skx: icc 15.0.1+, gcc 6.0+, clang 3.9+ +- # knl: icc 14.0.1+, gcc 5.0+, clang 3.9+ ++ # knl: icc 14.0.1+, gcc 5.0-14, clang 3.9+ + # haswell: any + # sandybridge: any + # penryn: any +@@ -1736,7 +1736,7 @@ check_compiler() + blacklistcc_add "zen" + fi + fi +- if [[ ${cc_major} -lt 5 ]]; then ++ if [[ ${cc_major} -lt 5 ]] || [[ ${cc_major} -gt 14 ]]; then + blacklistcc_add "knl" + fi + if [[ ${cc_major} -lt 6 ]]; then +-- +2.30.2 + diff -Nru blis-1.1/debian/patches/0002-Apply-temporary-fix-for-gcc-15.-874.patch blis-1.1/debian/patches/0002-Apply-temporary-fix-for-gcc-15.-874.patch --- blis-1.1/debian/patches/0002-Apply-temporary-fix-for-gcc-15.-874.patch 1970-01-01 02:00:00.000000000 +0200 +++ blis-1.1/debian/patches/0002-Apply-temporary-fix-for-gcc-15.-874.patch 2025-09-20 17:06:05.000000000 +0300 @@ -0,0 +1,110 @@ +From e4d7c2f46d8bbfc9b310cd62ec0ea84939b389dc Mon Sep 17 00:00:00 2001 +From: Devin Matthews <[email protected]> +Date: Tue, 24 Jun 2025 15:38:15 -0500 +Subject: Apply temporary fix for gcc 15. (#874) + +Details: +- As reported in #845, gcc 15 fails to build the haswell + gemmsup kernels due to the use of rbp. +- As a temporary fix, disable slp-tree-vectorization in just + the affected files. +- Thanks @loveshack for reporting and @chillenb for the suggested + fix. +- Eventually, the kernels should be rewritten to avoid using rbp. + +(cherry picked from commit 36effd70b6a323856d98b17dda9cc3afd181b658) +--- + CREDITS | 1 + + kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8m.c | 7 +++++++ + kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8n.c | 7 +++++++ + kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16m.c | 7 +++++++ + kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16n.c | 7 +++++++ + 5 files changed, 29 insertions(+) + +diff --git a/CREDITS b/CREDITS +index 0969974d..3809ee0b 100644 +--- a/CREDITS ++++ b/CREDITS +@@ -52,6 +52,7 @@ but many others have contributed code, ideas, and feedback, including + Jean-Michel Hautbois @jhautbois + Ian Henriksen @insertinterestingnamehere (The University of Texas at Austin) + Greg Henry (Intel) ++ Christopher Hillenbrand @chillenb + Minh Quan Ho @hominhquan + Matthew Honnibal @honnibal + Stefan Husmann @stefanhusmann +diff --git a/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8m.c b/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8m.c +index c5927c3d..0a68285c 100644 +--- a/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8m.c ++++ b/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8m.c +@@ -33,6 +33,13 @@ + + */ + ++// This avoids a known issue with GCC15 ("error: bp cannot be used in asm here", #845). ++// Only check for version 15 since this may be fixed in 16 (**fingers crossed**), and also ++// make sure the compiler isn't clang since it also confusingly defines __GNUC__ ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ == 15 ++#pragma GCC optimize("-fno-tree-slp-vectorize") ++#endif ++ + #include "blis.h" + + #define BLIS_ASM_SYNTAX_ATT +diff --git a/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8n.c b/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8n.c +index cb784d6a..a794e6a3 100644 +--- a/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8n.c ++++ b/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_d6x8n.c +@@ -33,6 +33,13 @@ + + */ + ++// This avoids a known issue with GCC15 ("error: bp cannot be used in asm here", #845). ++// Only check for version 15 since this may be fixed in 16 (**fingers crossed**), and also ++// make sure the compiler isn't clang since it also confusingly defines __GNUC__ ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ == 15 ++#pragma GCC optimize("-fno-tree-slp-vectorize") ++#endif ++ + #include "blis.h" + + #define BLIS_ASM_SYNTAX_ATT +diff --git a/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16m.c b/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16m.c +index de2b71c4..eaf7b7bd 100644 +--- a/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16m.c ++++ b/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16m.c +@@ -33,6 +33,13 @@ + + */ + ++// This avoids a known issue with GCC15 ("error: bp cannot be used in asm here", #845). ++// Only check for version 15 since this may be fixed in 16 (**fingers crossed**), and also ++// make sure the compiler isn't clang since it also confusingly defines __GNUC__ ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ == 15 ++#pragma GCC optimize("-fno-tree-slp-vectorize") ++#endif ++ + #include "blis.h" + + #define BLIS_ASM_SYNTAX_ATT +diff --git a/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16n.c b/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16n.c +index 456866b2..16c90d40 100644 +--- a/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16n.c ++++ b/kernels/haswell/3/sup/bli_gemmsup_rv_haswell_asm_s6x16n.c +@@ -33,6 +33,13 @@ + + */ + ++// This avoids a known issue with GCC15 ("error: bp cannot be used in asm here", #845). ++// Only check for version 15 since this may be fixed in 16 (**fingers crossed**), and also ++// make sure the compiler isn't clang since it also confusingly defines __GNUC__ ++#if !defined(__clang__) && defined(__GNUC__) && __GNUC__ == 15 ++#pragma GCC optimize("-fno-tree-slp-vectorize") ++#endif ++ + #include "blis.h" + + #define BLIS_ASM_SYNTAX_ATT +-- +2.30.2 + diff -Nru blis-1.1/debian/patches/series blis-1.1/debian/patches/series --- blis-1.1/debian/patches/series 2025-01-25 05:46:56.000000000 +0200 +++ blis-1.1/debian/patches/series 2025-09-20 17:06:05.000000000 +0300 @@ -1,2 +1,4 @@ libblas-provider.patch rename-gemmt-as-gemmtr.patch +0001-Blacklist-KNL-with-GCC-15-844.patch +0002-Apply-temporary-fix-for-gcc-15.-874.patch
