about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/x86_64
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2020-12-05 07:01:58 -0800
committerH.J. Lu <hjl.tools@gmail.com>2021-01-13 05:51:17 -0800
commitefbbd9c33adfa843d65860b1b02adebb8ecb57ce (patch)
tree79c61c55698036fc99ec936ea400c7a9975eef28 /sysdeps/unix/sysv/linux/x86_64
parent86a4d3fa7d1bda3c02cf713cf289d6f893970117 (diff)
downloadglibc-efbbd9c33adfa843d65860b1b02adebb8ecb57ce.tar.gz
glibc-efbbd9c33adfa843d65860b1b02adebb8ecb57ce.tar.xz
glibc-efbbd9c33adfa843d65860b1b02adebb8ecb57ce.zip
ldconfig/x86: Store ISA level in cache and aux cache
Store ISA level in the portion of the unused upper 32 bits of the hwcaps
field in cache and the unused pad field in aux cache.  ISA level is stored
and checked only for shared objects in glibc-hwcaps subdirectories.  The
shared objects in the default directories aren't checked since there are
no fallbacks for these shared objects.

Tested on x86-64-v2, x86-64-v3 and x86-64-v4 machines with
--disable-hardcoded-path-in-tests and --enable-hardcoded-path-in-tests.
Diffstat (limited to 'sysdeps/unix/sysv/linux/x86_64')
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/Makefile51
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c84
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/x86-64-isa-level-VALUE.c4
3 files changed, 139 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile
index 9b82155393..5e19202ebf 100644
--- a/sysdeps/unix/sysv/linux/x86_64/Makefile
+++ b/sysdeps/unix/sysv/linux/x86_64/Makefile
@@ -13,3 +13,54 @@ endif
 ifeq ($(subdir),misc)
 gen-as-const-headers += sigaltstack-offsets.sym
 endif
+
+ifeq ($(subdir),elf)
+ifeq (yes,$(enable-x86-isa-level))
+tests += \
+  tst-glibc-hwcaps-2
+ifeq (no,$(build-hardcoded-path-in-tests))
+# This is an ld.so.cache test, and RPATH/RUNPATH in the executable
+# interferes with its test objectives.
+tests-container += \
+  tst-glibc-hwcaps-2-cache
+endif
+modules-names += \
+  libx86-64-isa-level-1 \
+  libx86-64-isa-level-2 \
+  libx86-64-isa-level-3 \
+  libx86-64-isa-level-4
+
+$(objpfx)tst-glibc-hwcaps-2: $(objpfx)libx86-64-isa-level.so
+
+$(objpfx)tst-glibc-hwcaps-2.out: \
+  $(objpfx)glibc-hwcaps/x86-64-v2/libx86-64-isa-level.so \
+  $(objpfx)glibc-hwcaps/x86-64-v4/libx86-64-isa-level.so \
+  $(objpfx)glibc-hwcaps/x86-64-v3/libx86-64-isa-level.so
+$(objpfx)glibc-hwcaps/x86-64-v2/libx86-64-isa-level.so: \
+  $(objpfx)libx86-64-isa-level-2.so
+	$(make-target-directory)
+	cp $< $@
+$(objpfx)glibc-hwcaps/x86-64-v3/libx86-64-isa-level.so: \
+  $(objpfx)libx86-64-isa-level-3.so
+	$(make-target-directory)
+	cp $< $@
+$(objpfx)glibc-hwcaps/x86-64-v4/libx86-64-isa-level.so: \
+  $(objpfx)libx86-64-isa-level-4.so
+	$(make-target-directory)
+	cp $< $@
+
+CFLAGS-libx86-64-isa-level-1.os += -march=x86-64
+CFLAGS-libx86-64-isa-level-2.os += -march=x86-64
+CFLAGS-libx86-64-isa-level-3.os += -march=x86-64
+CFLAGS-libx86-64-isa-level-4.os += -march=x86-64
+
+# The test modules are parameterized by preprocessor macros.
+LDFLAGS-libx86-64-isa-level-1.so += -Wl,-soname,libx86-64-isa-level.so
+LDFLAGS-libx86-64-isa-level-4.so += -Wl,-soname,libx86-64-isa-level.so
+$(objpfx)libx86-64-isa-level%.os: $(..)/sysdeps/unix/sysv/linux/x86_64/x86-64-isa-level-VALUE.c
+	$(compile-command.c) -DVALUE=$(lastword $(subst -, ,$*)) \
+	  -DISA_LEVEL="(1 << ($(lastword $(subst -, ,$*)) - 1))"
+$(objpfx)libx86-64-isa-level.so: $(objpfx)libx86-64-isa-level-1.so
+	cp $< $@
+endif
+endif # $(subdir) == elf
diff --git a/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c b/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c
new file mode 100644
index 0000000000..fe91bfd224
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/tst-glibc-hwcaps-2.c
@@ -0,0 +1,84 @@
+/* Check ISA level on shared object in glibc-hwcaps subdirectories.
+   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 <stdbool.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <elf.h>
+#include <get-isa-level.h>
+#include <support/check.h>
+#include <support/test-driver.h>
+
+extern int dso_isa_level (void);
+
+static int
+do_test (void)
+{
+  const struct cpu_features *cpu_features
+    = __x86_get_cpu_features (COMMON_CPUID_INDEX_MAX);
+  unsigned int isa_level = get_isa_level (cpu_features);
+  bool has_isa_baseline = ((isa_level & GNU_PROPERTY_X86_ISA_1_BASELINE)
+			   == GNU_PROPERTY_X86_ISA_1_BASELINE);
+  bool has_isa_v2 = ((isa_level & GNU_PROPERTY_X86_ISA_1_V2)
+			   == GNU_PROPERTY_X86_ISA_1_V2);
+  bool has_isa_v3 = ((isa_level & GNU_PROPERTY_X86_ISA_1_V3)
+			   == GNU_PROPERTY_X86_ISA_1_V3);
+  bool has_isa_v4 = ((isa_level & GNU_PROPERTY_X86_ISA_1_V4)
+			   == GNU_PROPERTY_X86_ISA_1_V4);
+
+  if (!has_isa_baseline)
+    return EXIT_FAILURE;
+
+  int level = dso_isa_level ();
+  int ret;
+  switch (level)
+    {
+    case 1:
+    case 2:
+      /* The default libx86-64-isa-level.so is used.  */
+      printf ("The default shared library is used.\n");
+      if (has_isa_v3 || has_isa_v4 || !has_isa_v2)
+	ret = EXIT_FAILURE;
+      else
+	ret = EXIT_SUCCESS;
+      break;
+    case 3:
+      /* libx86-64-isa-level.so marked as x86-64 ISA level 3 needed in
+	 x86-64-v2 should be ignored on lesser CPU.  */
+      printf ("x86-64 ISA level 3 shared library is used.\n");
+      if (has_isa_v4 || !has_isa_v3)
+	ret = EXIT_FAILURE;
+      else
+	ret = EXIT_SUCCESS;
+      break;
+    case 4:
+      /* libx86-64-isa-level.so marked as x86-64 ISA level 4 needed in
+	 x86-64-v3 should be ignored on lesser CPU.  */
+      printf ("x86-64 ISA level 4 shared library is used.\n");
+      if (has_isa_v4)
+	ret = EXIT_SUCCESS;
+      else
+	ret = EXIT_FAILURE;
+      break;
+    default:
+      abort ();
+    }
+  return ret;
+}
+
+#include <support/test-driver.c>
diff --git a/sysdeps/unix/sysv/linux/x86_64/x86-64-isa-level-VALUE.c b/sysdeps/unix/sysv/linux/x86_64/x86-64-isa-level-VALUE.c
new file mode 100644
index 0000000000..2813d627cc
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/x86_64/x86-64-isa-level-VALUE.c
@@ -0,0 +1,4 @@
+#define INCLUDE_X86_ISA_LEVEL
+#define MARKER dso_isa_level
+#include <isa-level.c>
+#include <markermodMARKER-VALUE.c>