From cdefcafa378dcd57f06883511a712713e5286f5dbd703b09bb8737a7d454dad8 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 27 May 2021 19:26:46 +0000 Subject: [PATCH] Accepting request 895836 from home:Andreas_Schwab:Factory - tst-cpu-features-amx.patch: x86: tst-cpu-features-supports.c: Update AMX check OBS-URL: https://build.opensuse.org/request/show/895836 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=595 --- glibc.changes | 6 ++++++ glibc.spec | 3 +++ tst-cpu-features-amx.patch | 31 +++++++++++++++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 tst-cpu-features-amx.patch diff --git a/glibc.changes b/glibc.changes index 0d970d0..9212086 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 27 18:05:05 UTC 2021 - Andreas Schwab + +- tst-cpu-features-amx.patch: x86: tst-cpu-features-supports.c: Update AMX + check + ------------------------------------------------------------------- Wed May 26 09:55:50 UTC 2021 - Andreas Schwab diff --git a/glibc.spec b/glibc.spec index b32ee95..aa85ab4 100644 --- a/glibc.spec +++ b/glibc.spec @@ -261,6 +261,8 @@ Patch1005: select-modify-timeout.patch Patch1006: nptl-db-libpthread-load-order.patch # PATCH-FIX-UPSTREAM: string: Work around GCC PR 98512 in rawmemchr Patch1007: rawmemchr-warning.patch +# PATCH-FIX-UPSTREAM: x86: tst-cpu-features-supports.c: Update AMX check +Patch1008: tst-cpu-features-amx.patch ### # Patches awaiting upstream approval @@ -486,6 +488,7 @@ Internal usrmerge bootstrap helper %patch1005 -p1 %patch1006 -p1 %patch1007 -p1 +%patch1008 -p1 %patch2000 -p1 %patch2001 -p1 diff --git a/tst-cpu-features-amx.patch b/tst-cpu-features-amx.patch new file mode 100644 index 0000000..3a8eab6 --- /dev/null +++ b/tst-cpu-features-amx.patch @@ -0,0 +1,31 @@ +From 7fc9152e831fb24091c0ceabdcecb9b07dd29dd6 Mon Sep 17 00:00:00 2001 +From: "H.J. Lu" +Date: Wed, 21 Apr 2021 18:40:08 -0700 +Subject: [PATCH] x86: tst-cpu-features-supports.c: Update AMX check + +Pass "amx-bf16", "amx-int8" and "amx-tile", instead of "amx_bf16", +"amx_int8" and "amx_tile", to __builtin_cpu_supports for GCC 11. +--- + sysdeps/x86/tst-cpu-features-supports.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sysdeps/x86/tst-cpu-features-supports.c b/sysdeps/x86/tst-cpu-features-supports.c +index ce78a7d8bc..a2cabc90be 100644 +--- a/sysdeps/x86/tst-cpu-features-supports.c ++++ b/sysdeps/x86/tst-cpu-features-supports.c +@@ -59,9 +59,9 @@ do_test (int argc, char **argv) + fails += CHECK_SUPPORTS (aes, AES); + #endif + #if __GNUC_PREREQ (11, 1) +- fails += CHECK_SUPPORTS (amx_bf16, AMX_BF16); +- fails += CHECK_SUPPORTS (amx_int8, AMX_INT8); +- fails += CHECK_SUPPORTS (amx_tile, AMX_TILE); ++ fails += CHECK_SUPPORTS (amx-bf16, AMX_BF16); ++ fails += CHECK_SUPPORTS (amx-int8, AMX_INT8); ++ fails += CHECK_SUPPORTS (amx-tile, AMX_TILE); + #endif + fails += CHECK_SUPPORTS (avx, AVX); + fails += CHECK_SUPPORTS (avx2, AVX2); +-- +2.31.1 +