From: Szabolcs Nagy <szabolcs.nagy@arm.com>
To: libc-alpha@sourceware.org
Subject: [PATCH v4 09/10] x86: Check ifunc resolver with CPU_FEATURE_USABLE [BZ #27072]
Date: Mon, 18 Jan 2021 16:25:50 +0000 [thread overview]
Message-ID: <9d9d859c0eb4060d631832291f927a9d8d9b52ba.1610986541.git.szabolcs.nagy@arm.com> (raw)
In-Reply-To: <cover.1610986541.git.szabolcs.nagy@arm.com>
From: "H.J. Lu" <hjl.tools@gmail.com>
Check ifunc resolver with CPU_FEATURE_USABLE and tunables in dynamic and
static executables to verify that CPUID features are initialized early in
static PIE.
---
sysdeps/x86/Makefile | 14 ++++
sysdeps/x86/tst-ifunc-isa-1-static.c | 1 +
sysdeps/x86/tst-ifunc-isa-1.c | 115 ++++++++++++++++++++++++++
sysdeps/x86/tst-ifunc-isa-2-static.c | 1 +
sysdeps/x86/tst-ifunc-isa-2.c | 119 +++++++++++++++++++++++++++
5 files changed, 250 insertions(+)
create mode 100644 sysdeps/x86/tst-ifunc-isa-1-static.c
create mode 100644 sysdeps/x86/tst-ifunc-isa-1.c
create mode 100644 sysdeps/x86/tst-ifunc-isa-2-static.c
create mode 100644 sysdeps/x86/tst-ifunc-isa-2.c
diff --git a/sysdeps/x86/Makefile b/sysdeps/x86/Makefile
index adaa2a92cd..f7969309bc 100644
--- a/sysdeps/x86/Makefile
+++ b/sysdeps/x86/Makefile
@@ -9,6 +9,16 @@ sysdep_headers += sys/platform/x86.h
tests += tst-get-cpu-features tst-get-cpu-features-static \
tst-cpu-features-cpuinfo tst-cpu-features-supports
tests-static += tst-get-cpu-features-static
+ifeq (yes,$(have-ifunc))
+tests += \
+ tst-ifunc-isa-1 \
+ tst-ifunc-isa-1-static \
+ tst-ifunc-isa-2 \
+ tst-ifunc-isa-2-static
+tests-static += \
+ tst-ifunc-isa-1-static \
+ tst-ifunc-isa-2-static
+endif
ifeq (yes,$(enable-x86-isa-level))
tests += tst-isa-level-1
modules-names += tst-isa-level-mod-1-baseline \
@@ -39,6 +49,10 @@ $(objpfx)tst-isa-level-1.out: $(objpfx)tst-isa-level-mod-1-baseline.so \
$(objpfx)tst-isa-level-mod-1-v3.so \
$(objpfx)tst-isa-level-mod-1-v4.so
endif
+ifneq ($(have-tunables),no)
+tst-ifunc-isa-2-ENV = GLIBC_TUNABLES=glibc.cpu.hwcaps=-SSE4_2,-AVX,-AVX2,-AVX512F
+tst-ifunc-isa-2-static-ENV = $(tst-ifunc-isa-2-ENV)
+endif
endif
ifeq ($(subdir),math)
diff --git a/sysdeps/x86/tst-ifunc-isa-1-static.c b/sysdeps/x86/tst-ifunc-isa-1-static.c
new file mode 100644
index 0000000000..0e94f6119b
--- /dev/null
+++ b/sysdeps/x86/tst-ifunc-isa-1-static.c
@@ -0,0 +1 @@
+#include "tst-ifunc-isa-1.c"
diff --git a/sysdeps/x86/tst-ifunc-isa-1.c b/sysdeps/x86/tst-ifunc-isa-1.c
new file mode 100644
index 0000000000..b3bc2a55a2
--- /dev/null
+++ b/sysdeps/x86/tst-ifunc-isa-1.c
@@ -0,0 +1,115 @@
+/* Check ifunc with CPU_FEATURE_USABLE.
+ Copyright (C) 2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdlib.h>
+#include <sys/platform/x86.h>
+
+enum isa
+{
+ none,
+ sse2,
+ sse4_2,
+ avx,
+ avx2,
+ avx512f
+};
+
+enum isa
+get_isa (void)
+{
+ if (CPU_FEATURE_USABLE (AVX512F))
+ return avx512f;
+ if (CPU_FEATURE_USABLE (AVX2))
+ return avx2;
+ if (CPU_FEATURE_USABLE (AVX))
+ return avx;
+ if (CPU_FEATURE_USABLE (SSE4_2))
+ return sse4_2;
+ if (CPU_FEATURE_USABLE (SSE2))
+ return sse2;
+ return none;
+}
+
+static int
+isa_sse2 (void)
+{
+ return sse2;
+}
+
+static int
+isa_sse4_2 (void)
+{
+ return sse4_2;
+}
+
+static int
+isa_avx (void)
+{
+ return avx;
+}
+
+static int
+isa_avx2 (void)
+{
+ return avx2;
+}
+
+static int
+isa_avx512f (void)
+{
+ return avx512f;
+}
+
+static int
+isa_none (void)
+{
+ return none;
+}
+
+int foo (void) __attribute__ ((ifunc ("foo_ifunc")));
+
+void *
+foo_ifunc (void)
+{
+ switch (get_isa ())
+ {
+ case avx512f:
+ return isa_avx512f;
+ case avx2:
+ return isa_avx2;
+ case avx:
+ return isa_avx;
+ case sse4_2:
+ return isa_sse4_2;
+ case sse2:
+ return isa_sse2;
+ default:
+ break;
+ }
+ return isa_none;
+}
+
+static int
+do_test (void)
+{
+ enum isa value = foo ();
+ enum isa expected = get_isa ();
+ return value == expected ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+#include <support/test-driver.c>
diff --git a/sysdeps/x86/tst-ifunc-isa-2-static.c b/sysdeps/x86/tst-ifunc-isa-2-static.c
new file mode 100644
index 0000000000..4a5af9a270
--- /dev/null
+++ b/sysdeps/x86/tst-ifunc-isa-2-static.c
@@ -0,0 +1 @@
+#include "tst-ifunc-isa-2.c"
diff --git a/sysdeps/x86/tst-ifunc-isa-2.c b/sysdeps/x86/tst-ifunc-isa-2.c
new file mode 100644
index 0000000000..bb0f76c3e4
--- /dev/null
+++ b/sysdeps/x86/tst-ifunc-isa-2.c
@@ -0,0 +1,119 @@
+/* Check ifunc with CPU_FEATURE_USABLE and tunables.
+ Copyright (C) 2021 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library 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
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+#include <stdlib.h>
+#include <sys/platform/x86.h>
+#include <support/test-driver.h>
+
+enum isa
+{
+ none,
+ sse2,
+ sse4_2,
+ avx,
+ avx2,
+ avx512f
+};
+
+enum isa
+get_isa (void)
+{
+ if (CPU_FEATURE_USABLE (AVX512F))
+ return avx512f;
+ if (CPU_FEATURE_USABLE (AVX2))
+ return avx2;
+ if (CPU_FEATURE_USABLE (AVX))
+ return avx;
+ if (CPU_FEATURE_USABLE (SSE4_2))
+ return sse4_2;
+ if (CPU_FEATURE_USABLE (SSE2))
+ return sse2;
+ return none;
+}
+
+static int
+isa_sse2 (void)
+{
+ return sse2;
+}
+
+static int
+isa_sse4_2 (void)
+{
+ return sse4_2;
+}
+
+static int
+isa_avx (void)
+{
+ return avx;
+}
+
+static int
+isa_avx2 (void)
+{
+ return avx2;
+}
+
+static int
+isa_avx512f (void)
+{
+ return avx512f;
+}
+
+static int
+isa_none (void)
+{
+ return none;
+}
+
+int foo (void) __attribute__ ((ifunc ("foo_ifunc")));
+
+void *
+foo_ifunc (void)
+{
+ switch (get_isa ())
+ {
+ case avx512f:
+ return isa_avx512f;
+ case avx2:
+ return isa_avx2;
+ case avx:
+ return isa_avx;
+ case sse4_2:
+ return isa_sse4_2;
+ case sse2:
+ return isa_sse2;
+ default:
+ break;
+ }
+ return isa_none;
+}
+
+static int
+do_test (void)
+{
+ /* CPU must support SSE2. */
+ if (!__builtin_cpu_supports ("sse2"))
+ return EXIT_UNSUPPORTED;
+ enum isa value = foo ();
+ /* All ISAs, but SSE2, are disabled by tunables. */
+ return value == sse2 ? EXIT_SUCCESS : EXIT_FAILURE;
+}
+
+#include <support/test-driver.c>
--
2.17.1
next prev parent reply other threads:[~2021-01-18 16:26 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-18 16:22 [PATCH v4 00/10] fix ifunc with static pie " Szabolcs Nagy
2021-01-18 16:23 ` [PATCH v4 01/10] configure: Require PI_STATIC_AND_HIDDEN for static pie Szabolcs Nagy
2021-01-18 16:23 ` [PATCH v4 02/10] libmvec: Add extra-test-objs to test-extras Szabolcs Nagy
2021-01-18 20:04 ` Adhemerval Zanella
2021-01-18 16:23 ` [PATCH v4 03/10] elf: Make the tunable struct definition internal only Szabolcs Nagy
2021-01-18 16:24 ` [PATCH v4 04/10] elf: Avoid RELATIVE relocs in __tunables_init Szabolcs Nagy
2021-01-18 16:24 ` [PATCH v4 05/10] Use hidden visibility for early static PIE code Szabolcs Nagy
2021-01-18 21:49 ` Adhemerval Zanella
2021-01-18 16:24 ` [PATCH v4 06/10] elf: Avoid RELATIVE relocation for _dl_sysinfo Szabolcs Nagy
2021-01-19 13:51 ` Adhemerval Zanella
2021-01-19 14:25 ` V2 " H.J. Lu
2021-01-19 14:35 ` Adhemerval Zanella
2021-01-18 16:25 ` [PATCH v4 07/10] Use <startup.h> in __libc_init_secure Szabolcs Nagy
2021-01-19 13:56 ` Adhemerval Zanella
2021-01-18 16:25 ` [PATCH v4 08/10] csu: Move static pie self relocation later [BZ #27072] Szabolcs Nagy
2021-01-19 14:07 ` Adhemerval Zanella
2021-01-19 14:35 ` Szabolcs Nagy
2021-01-19 14:36 ` Adhemerval Zanella
2021-01-19 14:48 ` H.J. Lu
2021-01-19 15:24 ` Szabolcs Nagy
2021-01-19 15:32 ` H.J. Lu
2021-01-19 16:47 ` H.J. Lu
2021-01-19 17:03 ` Szabolcs Nagy
2021-01-19 17:10 ` H.J. Lu
2021-01-19 17:25 ` Fāng-ruì Sòng
2021-01-19 17:33 ` H.J. Lu
2021-01-19 17:38 ` Fāng-ruì Sòng
2021-01-19 17:38 ` Szabolcs Nagy
2021-01-19 17:42 ` H.J. Lu
2021-01-19 17:47 ` Szabolcs Nagy
2021-01-19 17:53 ` H.J. Lu
2021-01-19 17:59 ` H.J. Lu
2021-01-18 16:25 ` Szabolcs Nagy [this message]
2021-01-19 14:11 ` [PATCH v4 09/10] x86: Check ifunc resolver with CPU_FEATURE_USABLE " Adhemerval Zanella
2021-01-19 14:37 ` V2 " H.J. Lu
2021-01-21 16:33 ` H.J. Lu
2021-01-18 16:26 ` [PATCH v4 10/10] Make libc symbols hidden in static PIE Szabolcs Nagy
2021-01-18 21:37 ` [PATCH v4 00/10] fix ifunc with static pie [BZ #27072] Adhemerval Zanella
2021-01-19 18:25 ` Szabolcs Nagy
2021-01-19 19:41 ` H.J. Lu
2021-01-19 20:16 ` Adhemerval Zanella
2021-01-19 21:38 ` H.J. Lu
2021-01-20 11:29 ` Adhemerval Zanella
2021-01-20 12:38 ` Szabolcs Nagy
2021-01-20 12:49 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9d9d859c0eb4060d631832291f927a9d8d9b52ba.1610986541.git.szabolcs.nagy@arm.com \
--to=szabolcs.nagy@arm.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).