e354a5
commit 0f09154c64005e78b61484ae87b5ea2028051ea0
e354a5
Author: H.J. Lu <hjl.tools@gmail.com>
e354a5
Date:   Sat Jul 4 06:35:49 2020 -0700
e354a5
e354a5
    x86: Initialize CPU info via IFUNC relocation [BZ 26203]
e354a5
    
e354a5
    X86 CPU features in ld.so are initialized by init_cpu_features, which is
e354a5
    invoked by DL_PLATFORM_INIT from _dl_sysdep_start.  But when ld.so is
e354a5
    loaded by static executable, DL_PLATFORM_INIT is never called.  Also
e354a5
    x86 cache info in libc.o and libc.a is initialized by a constructor
e354a5
    which may be called too late.  Since some fields in _rtld_global_ro
e354a5
    in ld.so are initialized by dynamic relocation, we can also initialize
e354a5
    x86 CPU features in _rtld_global_ro in ld.so and cache info in libc.so
e354a5
    by initializing dummy function pointers in ld.so and libc.so via IFUNC
e354a5
    relocation.
e354a5
    
e354a5
    Key points:
e354a5
    
e354a5
    1. IFUNC is always supported, independent of --enable-multi-arch or
e354a5
    --disable-multi-arch.  Linker generates IFUNC relocations from input
e354a5
    IFUNC objects and ld.so performs IFUNC relocations.
e354a5
    2. There are no IFUNC dependencies in ld.so before dynamic relocation
e354a5
    have been performed,
e354a5
    3. The x86 CPU features in ld.so is initialized by DL_PLATFORM_INIT
e354a5
    in dynamic executable and by IFUNC relocation in dlopen in static
e354a5
    executable.
e354a5
    4. The x86 cache info in libc.o is initialized by IFUNC relocation.
e354a5
    5. In libc.a, both x86 CPU features and cache info are initialized from
e354a5
    ARCH_INIT_CPU_FEATURES, not by IFUNC relocation, before __libc_early_init
e354a5
    is called.
e354a5
    
e354a5
    Note: _dl_x86_init_cpu_features can be called more than once from
e354a5
    DL_PLATFORM_INIT and during relocation in ld.so.
e354a5
e354a5
Conflicts:
e354a5
	sysdeps/x86/cacheinfo.c
e354a5
	  (Copyright year difference, and AMD Zen cache computation
e354a5
	   backports downstream.  These changes were reapplied to
e354a5
	   sysdeps/x86/cacheinfo.h, mirroring the upstream refactoring
e354a5
	   in the backported commit.)
e354a5
	sysdeps/x86/dl-get-cpu-features.c
e354a5
	  (Copyright year difference.)
e354a5
e354a5
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
e354a5
index 8c959e39457c8c41..e5776ef7bc8ad749 100644
e354a5
--- a/sysdeps/i386/dl-machine.h
e354a5
+++ b/sysdeps/i386/dl-machine.h
e354a5
@@ -25,7 +25,6 @@
e354a5
 #include <sysdep.h>
e354a5
 #include <tls.h>
e354a5
 #include <dl-tlsdesc.h>
e354a5
-#include <cpu-features.c>
e354a5
 
e354a5
 /* Return nonzero iff ELF header is compatible with the running host.  */
e354a5
 static inline int __attribute__ ((unused))
e354a5
@@ -248,9 +247,9 @@ static inline void __attribute__ ((unused))
e354a5
 dl_platform_init (void)
e354a5
 {
e354a5
 #if IS_IN (rtld)
e354a5
-  /* init_cpu_features has been called early from __libc_start_main in
e354a5
-     static executable.  */
e354a5
-  init_cpu_features (&GLRO(dl_x86_cpu_features));
e354a5
+  /* _dl_x86_init_cpu_features is a wrapper for init_cpu_features which
e354a5
+     has been called early from __libc_start_main in static executable.  */
e354a5
+  _dl_x86_init_cpu_features ();
e354a5
 #else
e354a5
   if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
e354a5
     /* Avoid an empty string which would disturb us.  */
e354a5
diff --git a/sysdeps/x86/cacheinfo.c b/sysdeps/x86/cacheinfo.c
e354a5
index fdfe2684759d968c..84b10f6dd8d23a51 100644
e354a5
--- a/sysdeps/x86/cacheinfo.c
e354a5
+++ b/sysdeps/x86/cacheinfo.c
e354a5
@@ -1,5 +1,5 @@
e354a5
-/* x86_64 cache info.
e354a5
-   Copyright (C) 2003-2018 Free Software Foundation, Inc.
e354a5
+/* x86 cache info.
e354a5
+   Copyright (C) 2003-2020 Free Software Foundation, Inc.
e354a5
    This file is part of the GNU C Library.
e354a5
 
e354a5
    The GNU C Library is free software; you can redistribute it and/or
e354a5
@@ -19,473 +19,10 @@
e354a5
 #if IS_IN (libc)
e354a5
 
e354a5
 #include <assert.h>
e354a5
-#include <stdbool.h>
e354a5
-#include <stdlib.h>
e354a5
 #include <unistd.h>
e354a5
 #include <cpuid.h>
e354a5
-#include <init-arch.h>
e354a5
-
e354a5
-static const struct intel_02_cache_info
e354a5
-{
e354a5
-  unsigned char idx;
e354a5
-  unsigned char assoc;
e354a5
-  unsigned char linesize;
e354a5
-  unsigned char rel_name;
e354a5
-  unsigned int size;
e354a5
-} intel_02_known [] =
e354a5
-  {
e354a5
-#define M(sc) ((sc) - _SC_LEVEL1_ICACHE_SIZE)
e354a5
-    { 0x06,  4, 32, M(_SC_LEVEL1_ICACHE_SIZE),    8192 },
e354a5
-    { 0x08,  4, 32, M(_SC_LEVEL1_ICACHE_SIZE),   16384 },
e354a5
-    { 0x09,  4, 32, M(_SC_LEVEL1_ICACHE_SIZE),   32768 },
e354a5
-    { 0x0a,  2, 32, M(_SC_LEVEL1_DCACHE_SIZE),    8192 },
e354a5
-    { 0x0c,  4, 32, M(_SC_LEVEL1_DCACHE_SIZE),   16384 },
e354a5
-    { 0x0d,  4, 64, M(_SC_LEVEL1_DCACHE_SIZE),   16384 },
e354a5
-    { 0x0e,  6, 64, M(_SC_LEVEL1_DCACHE_SIZE),   24576 },
e354a5
-    { 0x21,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
-    { 0x22,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),   524288 },
e354a5
-    { 0x23,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  1048576 },
e354a5
-    { 0x25,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
-    { 0x29,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
-    { 0x2c,  8, 64, M(_SC_LEVEL1_DCACHE_SIZE),   32768 },
e354a5
-    { 0x30,  8, 64, M(_SC_LEVEL1_ICACHE_SIZE),   32768 },
e354a5
-    { 0x39,  4, 64, M(_SC_LEVEL2_CACHE_SIZE),   131072 },
e354a5
-    { 0x3a,  6, 64, M(_SC_LEVEL2_CACHE_SIZE),   196608 },
e354a5
-    { 0x3b,  2, 64, M(_SC_LEVEL2_CACHE_SIZE),   131072 },
e354a5
-    { 0x3c,  4, 64, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
-    { 0x3d,  6, 64, M(_SC_LEVEL2_CACHE_SIZE),   393216 },
e354a5
-    { 0x3e,  4, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
-    { 0x3f,  2, 64, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
-    { 0x41,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),   131072 },
e354a5
-    { 0x42,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
-    { 0x43,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
-    { 0x44,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
-    { 0x45,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),  2097152 },
e354a5
-    { 0x46,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
-    { 0x47,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  8388608 },
e354a5
-    { 0x48, 12, 64, M(_SC_LEVEL2_CACHE_SIZE),  3145728 },
e354a5
-    { 0x49, 16, 64, M(_SC_LEVEL2_CACHE_SIZE),  4194304 },
e354a5
-    { 0x4a, 12, 64, M(_SC_LEVEL3_CACHE_SIZE),  6291456 },
e354a5
-    { 0x4b, 16, 64, M(_SC_LEVEL3_CACHE_SIZE),  8388608 },
e354a5
-    { 0x4c, 12, 64, M(_SC_LEVEL3_CACHE_SIZE), 12582912 },
e354a5
-    { 0x4d, 16, 64, M(_SC_LEVEL3_CACHE_SIZE), 16777216 },
e354a5
-    { 0x4e, 24, 64, M(_SC_LEVEL2_CACHE_SIZE),  6291456 },
e354a5
-    { 0x60,  8, 64, M(_SC_LEVEL1_DCACHE_SIZE),   16384 },
e354a5
-    { 0x66,  4, 64, M(_SC_LEVEL1_DCACHE_SIZE),    8192 },
e354a5
-    { 0x67,  4, 64, M(_SC_LEVEL1_DCACHE_SIZE),   16384 },
e354a5
-    { 0x68,  4, 64, M(_SC_LEVEL1_DCACHE_SIZE),   32768 },
e354a5
-    { 0x78,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
-    { 0x79,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   131072 },
e354a5
-    { 0x7a,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
-    { 0x7b,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
-    { 0x7c,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
-    { 0x7d,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),  2097152 },
e354a5
-    { 0x7f,  2, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
-    { 0x80,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
-    { 0x82,  8, 32, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
-    { 0x83,  8, 32, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
-    { 0x84,  8, 32, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
-    { 0x85,  8, 32, M(_SC_LEVEL2_CACHE_SIZE),  2097152 },
e354a5
-    { 0x86,  4, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
-    { 0x87,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
-    { 0xd0,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),   524288 },
e354a5
-    { 0xd1,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),  1048576 },
e354a5
-    { 0xd2,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
-    { 0xd6,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  1048576 },
e354a5
-    { 0xd7,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
-    { 0xd8,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
-    { 0xdc, 12, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
-    { 0xdd, 12, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
-    { 0xde, 12, 64, M(_SC_LEVEL3_CACHE_SIZE),  8388608 },
e354a5
-    { 0xe2, 16, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
-    { 0xe3, 16, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
-    { 0xe4, 16, 64, M(_SC_LEVEL3_CACHE_SIZE),  8388608 },
e354a5
-    { 0xea, 24, 64, M(_SC_LEVEL3_CACHE_SIZE), 12582912 },
e354a5
-    { 0xeb, 24, 64, M(_SC_LEVEL3_CACHE_SIZE), 18874368 },
e354a5
-    { 0xec, 24, 64, M(_SC_LEVEL3_CACHE_SIZE), 25165824 },
e354a5
-  };
e354a5
-
e354a5
-#define nintel_02_known (sizeof (intel_02_known) / sizeof (intel_02_known [0]))
e354a5
-
e354a5
-static int
e354a5
-intel_02_known_compare (const void *p1, const void *p2)
e354a5
-{
e354a5
-  const struct intel_02_cache_info *i1;
e354a5
-  const struct intel_02_cache_info *i2;
e354a5
-
e354a5
-  i1 = (const struct intel_02_cache_info *) p1;
e354a5
-  i2 = (const struct intel_02_cache_info *) p2;
e354a5
-
e354a5
-  if (i1->idx == i2->idx)
e354a5
-    return 0;
e354a5
-
e354a5
-  return i1->idx < i2->idx ? -1 : 1;
e354a5
-}
e354a5
-
e354a5
-
e354a5
-static long int
e354a5
-__attribute__ ((noinline))
e354a5
-intel_check_word (int name, unsigned int value, bool *has_level_2,
e354a5
-		  bool *no_level_2_or_3,
e354a5
-		  const struct cpu_features *cpu_features)
e354a5
-{
e354a5
-  if ((value & 0x80000000) != 0)
e354a5
-    /* The register value is reserved.  */
e354a5
-    return 0;
e354a5
-
e354a5
-  /* Fold the name.  The _SC_ constants are always in the order SIZE,
e354a5
-     ASSOC, LINESIZE.  */
e354a5
-  int folded_rel_name = (M(name) / 3) * 3;
e354a5
-
e354a5
-  while (value != 0)
e354a5
-    {
e354a5
-      unsigned int byte = value & 0xff;
e354a5
-
e354a5
-      if (byte == 0x40)
e354a5
-	{
e354a5
-	  *no_level_2_or_3 = true;
e354a5
-
e354a5
-	  if (folded_rel_name == M(_SC_LEVEL3_CACHE_SIZE))
e354a5
-	    /* No need to look further.  */
e354a5
-	    break;
e354a5
-	}
e354a5
-      else if (byte == 0xff)
e354a5
-	{
e354a5
-	  /* CPUID leaf 0x4 contains all the information.  We need to
e354a5
-	     iterate over it.  */
e354a5
-	  unsigned int eax;
e354a5
-	  unsigned int ebx;
e354a5
-	  unsigned int ecx;
e354a5
-	  unsigned int edx;
e354a5
-
e354a5
-	  unsigned int round = 0;
e354a5
-	  while (1)
e354a5
-	    {
e354a5
-	      __cpuid_count (4, round, eax, ebx, ecx, edx);
e354a5
-
e354a5
-	      enum { null = 0, data = 1, inst = 2, uni = 3 } type = eax & 0x1f;
e354a5
-	      if (type == null)
e354a5
-		/* That was the end.  */
e354a5
-		break;
e354a5
-
e354a5
-	      unsigned int level = (eax >> 5) & 0x7;
e354a5
-
e354a5
-	      if ((level == 1 && type == data
e354a5
-		   && folded_rel_name == M(_SC_LEVEL1_DCACHE_SIZE))
e354a5
-		  || (level == 1 && type == inst
e354a5
-		      && folded_rel_name == M(_SC_LEVEL1_ICACHE_SIZE))
e354a5
-		  || (level == 2 && folded_rel_name == M(_SC_LEVEL2_CACHE_SIZE))
e354a5
-		  || (level == 3 && folded_rel_name == M(_SC_LEVEL3_CACHE_SIZE))
e354a5
-		  || (level == 4 && folded_rel_name == M(_SC_LEVEL4_CACHE_SIZE)))
e354a5
-		{
e354a5
-		  unsigned int offset = M(name) - folded_rel_name;
e354a5
-
e354a5
-		  if (offset == 0)
e354a5
-		    /* Cache size.  */
e354a5
-		    return (((ebx >> 22) + 1)
e354a5
-			    * (((ebx >> 12) & 0x3ff) + 1)
e354a5
-			    * ((ebx & 0xfff) + 1)
e354a5
-			    * (ecx + 1));
e354a5
-		  if (offset == 1)
e354a5
-		    return (ebx >> 22) + 1;
e354a5
-
e354a5
-		  assert (offset == 2);
e354a5
-		  return (ebx & 0xfff) + 1;
e354a5
-		}
e354a5
-
e354a5
-	      ++round;
e354a5
-	    }
e354a5
-	  /* There is no other cache information anywhere else.  */
e354a5
-	  break;
e354a5
-	}
e354a5
-      else
e354a5
-	{
e354a5
-	  if (byte == 0x49 && folded_rel_name == M(_SC_LEVEL3_CACHE_SIZE))
e354a5
-	    {
e354a5
-	      /* Intel reused this value.  For family 15, model 6 it
e354a5
-		 specifies the 3rd level cache.  Otherwise the 2nd
e354a5
-		 level cache.  */
e354a5
-	      unsigned int family = cpu_features->basic.family;
e354a5
-	      unsigned int model = cpu_features->basic.model;
e354a5
-
e354a5
-	      if (family == 15 && model == 6)
e354a5
-		{
e354a5
-		  /* The level 3 cache is encoded for this model like
e354a5
-		     the level 2 cache is for other models.  Pretend
e354a5
-		     the caller asked for the level 2 cache.  */
e354a5
-		  name = (_SC_LEVEL2_CACHE_SIZE
e354a5
-			  + (name - _SC_LEVEL3_CACHE_SIZE));
e354a5
-		  folded_rel_name = M(_SC_LEVEL2_CACHE_SIZE);
e354a5
-		}
e354a5
-	    }
e354a5
-
e354a5
-	  struct intel_02_cache_info *found;
e354a5
-	  struct intel_02_cache_info search;
e354a5
-
e354a5
-	  search.idx = byte;
e354a5
-	  found = bsearch (&search, intel_02_known, nintel_02_known,
e354a5
-			   sizeof (intel_02_known[0]), intel_02_known_compare);
e354a5
-	  if (found != NULL)
e354a5
-	    {
e354a5
-	      if (found->rel_name == folded_rel_name)
e354a5
-		{
e354a5
-		  unsigned int offset = M(name) - folded_rel_name;
e354a5
-
e354a5
-		  if (offset == 0)
e354a5
-		    /* Cache size.  */
e354a5
-		    return found->size;
e354a5
-		  if (offset == 1)
e354a5
-		    return found->assoc;
e354a5
-
e354a5
-		  assert (offset == 2);
e354a5
-		  return found->linesize;
e354a5
-		}
e354a5
-
e354a5
-	      if (found->rel_name == M(_SC_LEVEL2_CACHE_SIZE))
e354a5
-		*has_level_2 = true;
e354a5
-	    }
e354a5
-	}
e354a5
-
e354a5
-      /* Next byte for the next round.  */
e354a5
-      value >>= 8;
e354a5
-    }
e354a5
-
e354a5
-  /* Nothing found.  */
e354a5
-  return 0;
e354a5
-}
e354a5
-
e354a5
-
e354a5
-static long int __attribute__ ((noinline))
e354a5
-handle_intel (int name, const struct cpu_features *cpu_features)
e354a5
-{
e354a5
-  unsigned int maxidx = cpu_features->basic.max_cpuid;
e354a5
-
e354a5
-  /* Return -1 for older CPUs.  */
e354a5
-  if (maxidx < 2)
e354a5
-    return -1;
e354a5
-
e354a5
-  /* OK, we can use the CPUID instruction to get all info about the
e354a5
-     caches.  */
e354a5
-  unsigned int cnt = 0;
e354a5
-  unsigned int max = 1;
e354a5
-  long int result = 0;
e354a5
-  bool no_level_2_or_3 = false;
e354a5
-  bool has_level_2 = false;
e354a5
-
e354a5
-  while (cnt++ < max)
e354a5
-    {
e354a5
-      unsigned int eax;
e354a5
-      unsigned int ebx;
e354a5
-      unsigned int ecx;
e354a5
-      unsigned int edx;
e354a5
-      __cpuid (2, eax, ebx, ecx, edx);
e354a5
-
e354a5
-      /* The low byte of EAX in the first round contain the number of
e354a5
-	 rounds we have to make.  At least one, the one we are already
e354a5
-	 doing.  */
e354a5
-      if (cnt == 1)
e354a5
-	{
e354a5
-	  max = eax & 0xff;
e354a5
-	  eax &= 0xffffff00;
e354a5
-	}
e354a5
-
e354a5
-      /* Process the individual registers' value.  */
e354a5
-      result = intel_check_word (name, eax, &has_level_2,
e354a5
-				 &no_level_2_or_3, cpu_features);
e354a5
-      if (result != 0)
e354a5
-	return result;
e354a5
-
e354a5
-      result = intel_check_word (name, ebx, &has_level_2,
e354a5
-				 &no_level_2_or_3, cpu_features);
e354a5
-      if (result != 0)
e354a5
-	return result;
e354a5
-
e354a5
-      result = intel_check_word (name, ecx, &has_level_2,
e354a5
-				 &no_level_2_or_3, cpu_features);
e354a5
-      if (result != 0)
e354a5
-	return result;
e354a5
-
e354a5
-      result = intel_check_word (name, edx, &has_level_2,
e354a5
-				 &no_level_2_or_3, cpu_features);
e354a5
-      if (result != 0)
e354a5
-	return result;
e354a5
-    }
e354a5
-
e354a5
-  if (name >= _SC_LEVEL2_CACHE_SIZE && name <= _SC_LEVEL3_CACHE_LINESIZE
e354a5
-      && no_level_2_or_3)
e354a5
-    return -1;
e354a5
-
e354a5
-  return 0;
e354a5
-}
e354a5
-
e354a5
-
e354a5
-static long int __attribute__ ((noinline))
e354a5
-handle_amd (int name)
e354a5
-{
e354a5
-  unsigned int eax;
e354a5
-  unsigned int ebx;
e354a5
-  unsigned int ecx;
e354a5
-  unsigned int edx;
e354a5
-  __cpuid (0x80000000, eax, ebx, ecx, edx);
e354a5
-
e354a5
-  /* No level 4 cache (yet).  */
e354a5
-  if (name > _SC_LEVEL3_CACHE_LINESIZE)
e354a5
-    return 0;
e354a5
-
e354a5
-  unsigned int fn = 0x80000005 + (name >= _SC_LEVEL2_CACHE_SIZE);
e354a5
-  if (eax < fn)
e354a5
-    return 0;
e354a5
-
e354a5
-  __cpuid (fn, eax, ebx, ecx, edx);
e354a5
-
e354a5
-  if (name < _SC_LEVEL1_DCACHE_SIZE)
e354a5
-    {
e354a5
-      name += _SC_LEVEL1_DCACHE_SIZE - _SC_LEVEL1_ICACHE_SIZE;
e354a5
-      ecx = edx;
e354a5
-    }
e354a5
-
e354a5
-  switch (name)
e354a5
-    {
e354a5
-    case _SC_LEVEL1_DCACHE_SIZE:
e354a5
-      return (ecx >> 14) & 0x3fc00;
e354a5
-
e354a5
-    case _SC_LEVEL1_DCACHE_ASSOC:
e354a5
-      ecx >>= 16;
e354a5
-      if ((ecx & 0xff) == 0xff)
e354a5
-	/* Fully associative.  */
e354a5
-	return (ecx << 2) & 0x3fc00;
e354a5
-      return ecx & 0xff;
e354a5
-
e354a5
-    case _SC_LEVEL1_DCACHE_LINESIZE:
e354a5
-      return ecx & 0xff;
e354a5
-
e354a5
-    case _SC_LEVEL2_CACHE_SIZE:
e354a5
-      return (ecx & 0xf000) == 0 ? 0 : (ecx >> 6) & 0x3fffc00;
e354a5
-
e354a5
-    case _SC_LEVEL2_CACHE_ASSOC:
e354a5
-      switch ((ecx >> 12) & 0xf)
e354a5
-	{
e354a5
-	case 0:
e354a5
-	case 1:
e354a5
-	case 2:
e354a5
-	case 4:
e354a5
-	  return (ecx >> 12) & 0xf;
e354a5
-	case 6:
e354a5
-	  return 8;
e354a5
-	case 8:
e354a5
-	  return 16;
e354a5
-	case 10:
e354a5
-	  return 32;
e354a5
-	case 11:
e354a5
-	  return 48;
e354a5
-	case 12:
e354a5
-	  return 64;
e354a5
-	case 13:
e354a5
-	  return 96;
e354a5
-	case 14:
e354a5
-	  return 128;
e354a5
-	case 15:
e354a5
-	  return ((ecx >> 6) & 0x3fffc00) / (ecx & 0xff);
e354a5
-	default:
e354a5
-	  return 0;
e354a5
-	}
e354a5
-      /* NOTREACHED */
e354a5
-
e354a5
-    case _SC_LEVEL2_CACHE_LINESIZE:
e354a5
-      return (ecx & 0xf000) == 0 ? 0 : ecx & 0xff;
e354a5
-
e354a5
-    case _SC_LEVEL3_CACHE_SIZE:
e354a5
-      return (edx & 0xf000) == 0 ? 0 : (edx & 0x3ffc0000) << 1;
e354a5
-
e354a5
-    case _SC_LEVEL3_CACHE_ASSOC:
e354a5
-      switch ((edx >> 12) & 0xf)
e354a5
-	{
e354a5
-	case 0:
e354a5
-	case 1:
e354a5
-	case 2:
e354a5
-	case 4:
e354a5
-	  return (edx >> 12) & 0xf;
e354a5
-	case 6:
e354a5
-	  return 8;
e354a5
-	case 8:
e354a5
-	  return 16;
e354a5
-	case 10:
e354a5
-	  return 32;
e354a5
-	case 11:
e354a5
-	  return 48;
e354a5
-	case 12:
e354a5
-	  return 64;
e354a5
-	case 13:
e354a5
-	  return 96;
e354a5
-	case 14:
e354a5
-	  return 128;
e354a5
-	case 15:
e354a5
-	  return ((edx & 0x3ffc0000) << 1) / (edx & 0xff);
e354a5
-	default:
e354a5
-	  return 0;
e354a5
-	}
e354a5
-      /* NOTREACHED */
e354a5
-
e354a5
-    case _SC_LEVEL3_CACHE_LINESIZE:
e354a5
-      return (edx & 0xf000) == 0 ? 0 : edx & 0xff;
e354a5
-
e354a5
-    default:
e354a5
-      assert (! "cannot happen");
e354a5
-    }
e354a5
-  return -1;
e354a5
-}
e354a5
-
e354a5
-
e354a5
-static long int __attribute__ ((noinline))
e354a5
-handle_zhaoxin (int name)
e354a5
-{
e354a5
-  unsigned int eax;
e354a5
-  unsigned int ebx;
e354a5
-  unsigned int ecx;
e354a5
-  unsigned int edx;
e354a5
-
e354a5
-  int folded_rel_name = (M(name) / 3) * 3;
e354a5
-
e354a5
-  unsigned int round = 0;
e354a5
-  while (1)
e354a5
-    {
e354a5
-      __cpuid_count (4, round, eax, ebx, ecx, edx);
e354a5
-
e354a5
-      enum { null = 0, data = 1, inst = 2, uni = 3 } type = eax & 0x1f;
e354a5
-      if (type == null)
e354a5
-        break;
e354a5
-
e354a5
-      unsigned int level = (eax >> 5) & 0x7;
e354a5
-
e354a5
-      if ((level == 1 && type == data
e354a5
-        && folded_rel_name == M(_SC_LEVEL1_DCACHE_SIZE))
e354a5
-        || (level == 1 && type == inst
e354a5
-            && folded_rel_name == M(_SC_LEVEL1_ICACHE_SIZE))
e354a5
-        || (level == 2 && folded_rel_name == M(_SC_LEVEL2_CACHE_SIZE))
e354a5
-        || (level == 3 && folded_rel_name == M(_SC_LEVEL3_CACHE_SIZE)))
e354a5
-        {
e354a5
-          unsigned int offset = M(name) - folded_rel_name;
e354a5
-
e354a5
-          if (offset == 0)
e354a5
-            /* Cache size.  */
e354a5
-            return (((ebx >> 22) + 1)
e354a5
-                * (((ebx >> 12) & 0x3ff) + 1)
e354a5
-                * ((ebx & 0xfff) + 1)
e354a5
-                * (ecx + 1));
e354a5
-          if (offset == 1)
e354a5
-            return (ebx >> 22) + 1;
e354a5
-
e354a5
-          assert (offset == 2);
e354a5
-          return (ebx & 0xfff) + 1;
e354a5
-        }
e354a5
-
e354a5
-      ++round;
e354a5
-    }
e354a5
-
e354a5
-  /* Nothing found.  */
e354a5
-  return 0;
e354a5
-}
e354a5
-
e354a5
+#include <ldsodefs.h>
e354a5
+#include <dl-cacheinfo.h>
e354a5
 
e354a5
 /* Get the value of the system variable NAME.  */
e354a5
 long int
e354a5
@@ -509,409 +46,18 @@ __cache_sysconf (int name)
e354a5
   return 0;
e354a5
 }
e354a5
 
e354a5
+# ifdef SHARED
e354a5
+/* NB: In libc.a, cacheinfo.h is included in libc-start.c.  In libc.so,
e354a5
+   cacheinfo.h is included here and call init_cacheinfo by initializing
e354a5
+   a dummy function pointer via IFUNC relocation after CPU features in
e354a5
+   ld.so have been initialized by DL_PLATFORM_INIT or IFUNC relocation.  */
e354a5
+# include <cacheinfo.h>
e354a5
+# include <ifunc-init.h>
e354a5
 
e354a5
-/* Data cache size for use in memory and string routines, typically
e354a5
-   L1 size, rounded to multiple of 256 bytes.  */
e354a5
-long int __x86_data_cache_size_half attribute_hidden = 32 * 1024 / 2;
e354a5
-long int __x86_data_cache_size attribute_hidden = 32 * 1024;
e354a5
-/* Similar to __x86_data_cache_size_half, but not rounded.  */
e354a5
-long int __x86_raw_data_cache_size_half attribute_hidden = 32 * 1024 / 2;
e354a5
-/* Similar to __x86_data_cache_size, but not rounded.  */
e354a5
-long int __x86_raw_data_cache_size attribute_hidden = 32 * 1024;
e354a5
-/* Shared cache size for use in memory and string routines, typically
e354a5
-   L2 or L3 size, rounded to multiple of 256 bytes.  */
e354a5
-long int __x86_shared_cache_size_half attribute_hidden = 1024 * 1024 / 2;
e354a5
-long int __x86_shared_cache_size attribute_hidden = 1024 * 1024;
e354a5
-/* Similar to __x86_shared_cache_size_half, but not rounded.  */
e354a5
-long int __x86_raw_shared_cache_size_half attribute_hidden = 1024 * 1024 / 2;
e354a5
-/* Similar to __x86_shared_cache_size, but not rounded.  */
e354a5
-long int __x86_raw_shared_cache_size attribute_hidden = 1024 * 1024;
e354a5
-
e354a5
-/* Threshold to use non temporal store.  */
e354a5
-long int __x86_shared_non_temporal_threshold attribute_hidden;
e354a5
-
e354a5
-/* Threshold to use Enhanced REP MOVSB.  */
e354a5
-long int __x86_rep_movsb_threshold attribute_hidden = 2048;
e354a5
-
e354a5
-/* Threshold to use Enhanced REP STOSB.  */
e354a5
-long int __x86_rep_stosb_threshold attribute_hidden = 2048;
e354a5
-
e354a5
-
e354a5
-static void
e354a5
-get_common_cache_info (long int *shared_ptr, unsigned int *threads_ptr,
e354a5
-                long int core)
e354a5
-{
e354a5
-  unsigned int eax;
e354a5
-  unsigned int ebx;
e354a5
-  unsigned int ecx;
e354a5
-  unsigned int edx;
e354a5
-
e354a5
-  /* Number of logical processors sharing L2 cache.  */
e354a5
-  int threads_l2;
e354a5
-
e354a5
-  /* Number of logical processors sharing L3 cache.  */
e354a5
-  int threads_l3;
e354a5
-
e354a5
-  const struct cpu_features *cpu_features = __get_cpu_features ();
e354a5
-  int max_cpuid = cpu_features->basic.max_cpuid;
e354a5
-  unsigned int family = cpu_features->basic.family;
e354a5
-  unsigned int model = cpu_features->basic.model;
e354a5
-  long int shared = *shared_ptr;
e354a5
-  unsigned int threads = *threads_ptr;
e354a5
-  bool inclusive_cache = true;
e354a5
-  bool support_count_mask = true;
e354a5
-
e354a5
-  /* Try L3 first.  */
e354a5
-  unsigned int level = 3;
e354a5
-
e354a5
-  if (cpu_features->basic.kind == arch_kind_zhaoxin && family == 6)
e354a5
-    support_count_mask = false;
e354a5
-
e354a5
-  if (shared <= 0)
e354a5
-    {
e354a5
-      /* Try L2 otherwise.  */
e354a5
-      level  = 2;
e354a5
-      shared = core;
e354a5
-      threads_l2 = 0;
e354a5
-      threads_l3 = -1;
e354a5
-    }
e354a5
-  else
e354a5
-    {
e354a5
-      threads_l2 = 0;
e354a5
-      threads_l3 = 0;
e354a5
-    }
e354a5
-
e354a5
-  /* A value of 0 for the HTT bit indicates there is only a single
e354a5
-     logical processor.  */
e354a5
-  if (CPU_FEATURE_USABLE (HTT))
e354a5
-    {
e354a5
-      /* Figure out the number of logical threads that share the
e354a5
-         highest cache level.  */
e354a5
-      if (max_cpuid >= 4)
e354a5
-        {
e354a5
-          int i = 0;
e354a5
-
e354a5
-          /* Query until cache level 2 and 3 are enumerated.  */
e354a5
-          int check = 0x1 | (threads_l3 == 0) << 1;
e354a5
-          do
e354a5
-            {
e354a5
-              __cpuid_count (4, i++, eax, ebx, ecx, edx);
e354a5
-
e354a5
-              /* There seems to be a bug in at least some Pentium Ds
e354a5
-                 which sometimes fail to iterate all cache parameters.
e354a5
-                 Do not loop indefinitely here, stop in this case and
e354a5
-                 assume there is no such information.  */
e354a5
-              if (cpu_features->basic.kind == arch_kind_intel
e354a5
-                  && (eax & 0x1f) == 0 )
e354a5
-                goto intel_bug_no_cache_info;
e354a5
-
e354a5
-              switch ((eax >> 5) & 0x7)
e354a5
-                {
e354a5
-                  default:
e354a5
-                    break;
e354a5
-                  case 2:
e354a5
-                    if ((check & 0x1))
e354a5
-                      {
e354a5
-                        /* Get maximum number of logical processors
e354a5
-                           sharing L2 cache.  */
e354a5
-                        threads_l2 = (eax >> 14) & 0x3ff;
e354a5
-                        check &= ~0x1;
e354a5
-                      }
e354a5
-                    break;
e354a5
-                  case 3:
e354a5
-                    if ((check & (0x1 << 1)))
e354a5
-                      {
e354a5
-                        /* Get maximum number of logical processors
e354a5
-                           sharing L3 cache.  */
e354a5
-                        threads_l3 = (eax >> 14) & 0x3ff;
e354a5
-
e354a5
-                        /* Check if L2 and L3 caches are inclusive.  */
e354a5
-                        inclusive_cache = (edx & 0x2) != 0;
e354a5
-                        check &= ~(0x1 << 1);
e354a5
-                      }
e354a5
-                    break;
e354a5
-                }
e354a5
-            }
e354a5
-          while (check);
e354a5
-
e354a5
-          /* If max_cpuid >= 11, THREADS_L2/THREADS_L3 are the maximum
e354a5
-             numbers of addressable IDs for logical processors sharing
e354a5
-             the cache, instead of the maximum number of threads
e354a5
-             sharing the cache.  */
e354a5
-          if (max_cpuid >= 11 && support_count_mask)
e354a5
-            {
e354a5
-              /* Find the number of logical processors shipped in
e354a5
-                 one core and apply count mask.  */
e354a5
-              i = 0;
e354a5
-
e354a5
-              /* Count SMT only if there is L3 cache.  Always count
e354a5
-                 core if there is no L3 cache.  */
e354a5
-              int count = ((threads_l2 > 0 && level == 3)
e354a5
-                           | ((threads_l3 > 0
e354a5
-                               || (threads_l2 > 0 && level == 2)) << 1));
e354a5
-
e354a5
-              while (count)
e354a5
-                {
e354a5
-                  __cpuid_count (11, i++, eax, ebx, ecx, edx);
e354a5
-
e354a5
-                  int shipped = ebx & 0xff;
e354a5
-                  int type = ecx & 0xff00;
e354a5
-                  if (shipped == 0 || type == 0)
e354a5
-                    break;
e354a5
-                  else if (type == 0x100)
e354a5
-                    {
e354a5
-                      /* Count SMT.  */
e354a5
-                      if ((count & 0x1))
e354a5
-                        {
e354a5
-                          int count_mask;
e354a5
-
e354a5
-                          /* Compute count mask.  */
e354a5
-                          asm ("bsr %1, %0"
e354a5
-                               : "=r" (count_mask) : "g" (threads_l2));
e354a5
-                          count_mask = ~(-1 << (count_mask + 1));
e354a5
-                          threads_l2 = (shipped - 1) & count_mask;
e354a5
-                          count &= ~0x1;
e354a5
-                        }
e354a5
-                    }
e354a5
-                  else if (type == 0x200)
e354a5
-                    {
e354a5
-                      /* Count core.  */
e354a5
-                      if ((count & (0x1 << 1)))
e354a5
-                        {
e354a5
-                          int count_mask;
e354a5
-                          int threads_core
e354a5
-                            = (level == 2 ? threads_l2 : threads_l3);
e354a5
-
e354a5
-                          /* Compute count mask.  */
e354a5
-                          asm ("bsr %1, %0"
e354a5
-                               : "=r" (count_mask) : "g" (threads_core));
e354a5
-                          count_mask = ~(-1 << (count_mask + 1));
e354a5
-                          threads_core = (shipped - 1) & count_mask;
e354a5
-                          if (level == 2)
e354a5
-                            threads_l2 = threads_core;
e354a5
-                          else
e354a5
-                            threads_l3 = threads_core;
e354a5
-                          count &= ~(0x1 << 1);
e354a5
-                        }
e354a5
-                    }
e354a5
-                }
e354a5
-            }
e354a5
-          if (threads_l2 > 0)
e354a5
-            threads_l2 += 1;
e354a5
-          if (threads_l3 > 0)
e354a5
-            threads_l3 += 1;
e354a5
-          if (level == 2)
e354a5
-            {
e354a5
-              if (threads_l2)
e354a5
-                {
e354a5
-                  threads = threads_l2;
e354a5
-                  if (cpu_features->basic.kind == arch_kind_intel
e354a5
-                      && threads > 2
e354a5
-                      && family == 6)
e354a5
-                    switch (model)
e354a5
-                      {
e354a5
-                        case 0x37:
e354a5
-                        case 0x4a:
e354a5
-                        case 0x4d:
e354a5
-                        case 0x5a:
e354a5
-                        case 0x5d:
e354a5
-                          /* Silvermont has L2 cache shared by 2 cores.  */
e354a5
-                          threads = 2;
e354a5
-                          break;
e354a5
-                        default:
e354a5
-                          break;
e354a5
-                      }
e354a5
-                }
e354a5
-            }
e354a5
-          else if (threads_l3)
e354a5
-            threads = threads_l3;
e354a5
-        }
e354a5
-      else
e354a5
-        {
e354a5
-intel_bug_no_cache_info:
e354a5
-          /* Assume that all logical threads share the highest cache
e354a5
-             level.  */
e354a5
-          threads
e354a5
-            = ((cpu_features->features[COMMON_CPUID_INDEX_1].cpuid.ebx
e354a5
-                >> 16) & 0xff);
e354a5
-        }
e354a5
-
e354a5
-        /* Cap usage of highest cache level to the number of supported
e354a5
-           threads.  */
e354a5
-        if (shared > 0 && threads > 0)
e354a5
-          shared /= threads;
e354a5
-    }
e354a5
-
e354a5
-  /* Account for non-inclusive L2 and L3 caches.  */
e354a5
-  if (!inclusive_cache)
e354a5
-    {
e354a5
-      if (threads_l2 > 0)
e354a5
-        core /= threads_l2;
e354a5
-      shared += core;
e354a5
-    }
e354a5
-
e354a5
-  *shared_ptr = shared;
e354a5
-  *threads_ptr = threads;
e354a5
-}
e354a5
-
e354a5
-
e354a5
-static void
e354a5
-__attribute__((constructor))
e354a5
-init_cacheinfo (void)
e354a5
-{
e354a5
-  /* Find out what brand of processor.  */
e354a5
-  unsigned int ebx;
e354a5
-  unsigned int ecx;
e354a5
-  unsigned int edx;
e354a5
-  int max_cpuid_ex;
e354a5
-  long int data = -1;
e354a5
-  long int shared = -1;
e354a5
-  long int core;
e354a5
-  unsigned int threads = 0;
e354a5
-  const struct cpu_features *cpu_features = __get_cpu_features ();
e354a5
-
e354a5
-  if (cpu_features->basic.kind == arch_kind_intel)
e354a5
-    {
e354a5
-      data = handle_intel (_SC_LEVEL1_DCACHE_SIZE, cpu_features);
e354a5
-      core = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features);
e354a5
-      shared = handle_intel (_SC_LEVEL3_CACHE_SIZE, cpu_features);
e354a5
-
e354a5
-      get_common_cache_info (&shared, &threads, core);
e354a5
-    }
e354a5
-  else if (cpu_features->basic.kind == arch_kind_zhaoxin)
e354a5
-    {
e354a5
-      data = handle_zhaoxin (_SC_LEVEL1_DCACHE_SIZE);
e354a5
-      core = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE);
e354a5
-      shared = handle_zhaoxin (_SC_LEVEL3_CACHE_SIZE);
e354a5
-
e354a5
-      get_common_cache_info (&shared, &threads, core);
e354a5
-    }
e354a5
-  else if (cpu_features->basic.kind == arch_kind_amd)
e354a5
-    {
e354a5
-      data   = handle_amd (_SC_LEVEL1_DCACHE_SIZE);
e354a5
-      long int core = handle_amd (_SC_LEVEL2_CACHE_SIZE);
e354a5
-      shared = handle_amd (_SC_LEVEL3_CACHE_SIZE);
e354a5
+extern void __x86_cacheinfo (void) attribute_hidden;
e354a5
+const void (*__x86_cacheinfo_p) (void) attribute_hidden
e354a5
+  = __x86_cacheinfo;
e354a5
 
e354a5
-      /* Get maximum extended function. */
e354a5
-      __cpuid (0x80000000, max_cpuid_ex, ebx, ecx, edx);
e354a5
-
e354a5
-      if (shared <= 0)
e354a5
-	/* No shared L3 cache.  All we have is the L2 cache.  */
e354a5
-	shared = core;
e354a5
-      else
e354a5
-	{
e354a5
-	  /* Figure out the number of logical threads that share L3.  */
e354a5
-	  if (max_cpuid_ex >= 0x80000008)
e354a5
-	    {
e354a5
-	      /* Get width of APIC ID.  */
e354a5
-	      __cpuid (0x80000008, max_cpuid_ex, ebx, ecx, edx);
e354a5
-	      threads = 1 << ((ecx >> 12) & 0x0f);
e354a5
-	    }
e354a5
-
e354a5
-	  if (threads == 0 || cpu_features->basic.family >= 0x17)
e354a5
-	    {
e354a5
-	      /* If APIC ID width is not available, use logical
e354a5
-		 processor count.  */
e354a5
-	      __cpuid (0x00000001, max_cpuid_ex, ebx, ecx, edx);
e354a5
-
e354a5
-	      if ((edx & (1 << 28)) != 0)
e354a5
-		threads = (ebx >> 16) & 0xff;
e354a5
-	    }
e354a5
-
e354a5
-	  /* Cap usage of highest cache level to the number of
e354a5
-	     supported threads.  */
e354a5
-	  if (threads > 0)
e354a5
-	    shared /= threads;
e354a5
-
e354a5
-	  /* Get shared cache per ccx for Zen architectures.  */
e354a5
-	  if (cpu_features->basic.family >= 0x17)
e354a5
-	    {
e354a5
-	      unsigned int eax;
e354a5
-
e354a5
-	      /* Get number of threads share the L3 cache in CCX.  */
e354a5
-	      __cpuid_count (0x8000001D, 0x3, eax, ebx, ecx, edx);
e354a5
-
e354a5
-	      unsigned int threads_per_ccx = ((eax >> 14) & 0xfff) + 1;
e354a5
-	      shared *= threads_per_ccx;
e354a5
-	    }
e354a5
-	  else
e354a5
-	    {
e354a5
-	      /* Account for exclusive L2 and L3 caches.  */
e354a5
-	      shared += core;
e354a5
-            }
e354a5
-	}
e354a5
-    }
e354a5
-
e354a5
-  if (cpu_features->data_cache_size != 0)
e354a5
-    data = cpu_features->data_cache_size;
e354a5
-
e354a5
-  if (data > 0)
e354a5
-    {
e354a5
-      __x86_raw_data_cache_size_half = data / 2;
e354a5
-      __x86_raw_data_cache_size = data;
e354a5
-      /* Round data cache size to multiple of 256 bytes.  */
e354a5
-      data = data & ~255L;
e354a5
-      __x86_data_cache_size_half = data / 2;
e354a5
-      __x86_data_cache_size = data;
e354a5
-    }
e354a5
-
e354a5
-  if (cpu_features->shared_cache_size != 0)
e354a5
-    shared = cpu_features->shared_cache_size;
e354a5
-
e354a5
-  if (shared > 0)
e354a5
-    {
e354a5
-      __x86_raw_shared_cache_size_half = shared / 2;
e354a5
-      __x86_raw_shared_cache_size = shared;
e354a5
-      /* Round shared cache size to multiple of 256 bytes.  */
e354a5
-      shared = shared & ~255L;
e354a5
-      __x86_shared_cache_size_half = shared / 2;
e354a5
-      __x86_shared_cache_size = shared;
e354a5
-    }
e354a5
-
e354a5
-  /* The default setting for the non_temporal threshold is 3/4 of one
e354a5
-     thread's share of the chip's cache. For most Intel and AMD processors
e354a5
-     with an initial release date between 2017 and 2020, a thread's typical
e354a5
-     share of the cache is from 500 KBytes to 2 MBytes. Using the 3/4
e354a5
-     threshold leaves 125 KBytes to 500 KBytes of the thread's data
e354a5
-     in cache after a maximum temporal copy, which will maintain
e354a5
-     in cache a reasonable portion of the thread's stack and other
e354a5
-     active data. If the threshold is set higher than one thread's
e354a5
-     share of the cache, it has a substantial risk of negatively
e354a5
-     impacting the performance of other threads running on the chip. */
e354a5
-  __x86_shared_non_temporal_threshold
e354a5
-    = (cpu_features->non_temporal_threshold != 0
e354a5
-       ? cpu_features->non_temporal_threshold
e354a5
-       : __x86_shared_cache_size * 3 / 4);
e354a5
-
e354a5
-  /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8.  */
e354a5
-  unsigned int minimum_rep_movsb_threshold;
e354a5
-  /* NB: The default REP MOVSB threshold is 2048 * (VEC_SIZE / 16).  */
e354a5
-  unsigned int rep_movsb_threshold;
e354a5
-  if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F)
e354a5
-      && !CPU_FEATURE_PREFERRED_P (cpu_features, Prefer_No_AVX512))
e354a5
-    {
e354a5
-      rep_movsb_threshold = 2048 * (64 / 16);
e354a5
-      minimum_rep_movsb_threshold = 64 * 8;
e354a5
-    }
e354a5
-  else if (CPU_FEATURE_PREFERRED_P (cpu_features,
e354a5
-				    AVX_Fast_Unaligned_Load))
e354a5
-    {
e354a5
-      rep_movsb_threshold = 2048 * (32 / 16);
e354a5
-      minimum_rep_movsb_threshold = 32 * 8;
e354a5
-    }
e354a5
-  else
e354a5
-    {
e354a5
-      rep_movsb_threshold = 2048 * (16 / 16);
e354a5
-      minimum_rep_movsb_threshold = 16 * 8;
e354a5
-    }
e354a5
-  if (cpu_features->rep_movsb_threshold > minimum_rep_movsb_threshold)
e354a5
-    __x86_rep_movsb_threshold = cpu_features->rep_movsb_threshold;
e354a5
-  else
e354a5
-    __x86_rep_movsb_threshold = rep_movsb_threshold;
e354a5
-
e354a5
-# if HAVE_TUNABLES
e354a5
-  __x86_rep_stosb_threshold = cpu_features->rep_stosb_threshold;
e354a5
+__ifunc (__x86_cacheinfo, __x86_cacheinfo, NULL, void, init_cacheinfo);
e354a5
 # endif
e354a5
-}
e354a5
-
e354a5
 #endif
e354a5
diff --git a/sysdeps/x86/cacheinfo.h b/sysdeps/x86/cacheinfo.h
e354a5
new file mode 100644
e354a5
index 0000000000000000..0255696163b7b8ff
e354a5
--- /dev/null
e354a5
+++ b/sysdeps/x86/cacheinfo.h
e354a5
@@ -0,0 +1,427 @@
e354a5
+/* x86 cache info.
e354a5
+   Copyright (C) 2020 Free Software Foundation, Inc.
e354a5
+   This file is part of the GNU C Library.
e354a5
+
e354a5
+   The GNU C Library is free software; you can redistribute it and/or
e354a5
+   modify it under the terms of the GNU Lesser General Public
e354a5
+   License as published by the Free Software Foundation; either
e354a5
+   version 2.1 of the License, or (at your option) any later version.
e354a5
+
e354a5
+   The GNU C Library is distributed in the hope that it will be useful,
e354a5
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
e354a5
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
e354a5
+   Lesser General Public License for more details.
e354a5
+
e354a5
+   You should have received a copy of the GNU Lesser General Public
e354a5
+   License along with the GNU C Library; if not, see
e354a5
+   <https://www.gnu.org/licenses/>.  */
e354a5
+
e354a5
+#include <assert.h>
e354a5
+#include <unistd.h>
e354a5
+
e354a5
+/* Data cache size for use in memory and string routines, typically
e354a5
+   L1 size, rounded to multiple of 256 bytes.  */
e354a5
+long int __x86_data_cache_size_half attribute_hidden = 32 * 1024 / 2;
e354a5
+long int __x86_data_cache_size attribute_hidden = 32 * 1024;
e354a5
+/* Similar to __x86_data_cache_size_half, but not rounded.  */
e354a5
+long int __x86_raw_data_cache_size_half attribute_hidden = 32 * 1024 / 2;
e354a5
+/* Similar to __x86_data_cache_size, but not rounded.  */
e354a5
+long int __x86_raw_data_cache_size attribute_hidden = 32 * 1024;
e354a5
+/* Shared cache size for use in memory and string routines, typically
e354a5
+   L2 or L3 size, rounded to multiple of 256 bytes.  */
e354a5
+long int __x86_shared_cache_size_half attribute_hidden = 1024 * 1024 / 2;
e354a5
+long int __x86_shared_cache_size attribute_hidden = 1024 * 1024;
e354a5
+/* Similar to __x86_shared_cache_size_half, but not rounded.  */
e354a5
+long int __x86_raw_shared_cache_size_half attribute_hidden = 1024 * 1024 / 2;
e354a5
+/* Similar to __x86_shared_cache_size, but not rounded.  */
e354a5
+long int __x86_raw_shared_cache_size attribute_hidden = 1024 * 1024;
e354a5
+
e354a5
+/* Threshold to use non temporal store.  */
e354a5
+long int __x86_shared_non_temporal_threshold attribute_hidden;
e354a5
+
e354a5
+/* Threshold to use Enhanced REP MOVSB.  */
e354a5
+long int __x86_rep_movsb_threshold attribute_hidden = 2048;
e354a5
+
e354a5
+/* Threshold to use Enhanced REP STOSB.  */
e354a5
+long int __x86_rep_stosb_threshold attribute_hidden = 2048;
e354a5
+
e354a5
+static void
e354a5
+get_common_cache_info (long int *shared_ptr, unsigned int *threads_ptr,
e354a5
+		       long int core)
e354a5
+{
e354a5
+  unsigned int eax;
e354a5
+  unsigned int ebx;
e354a5
+  unsigned int ecx;
e354a5
+  unsigned int edx;
e354a5
+
e354a5
+  /* Number of logical processors sharing L2 cache.  */
e354a5
+  int threads_l2;
e354a5
+
e354a5
+  /* Number of logical processors sharing L3 cache.  */
e354a5
+  int threads_l3;
e354a5
+
e354a5
+  const struct cpu_features *cpu_features = __get_cpu_features ();
e354a5
+  int max_cpuid = cpu_features->basic.max_cpuid;
e354a5
+  unsigned int family = cpu_features->basic.family;
e354a5
+  unsigned int model = cpu_features->basic.model;
e354a5
+  long int shared = *shared_ptr;
e354a5
+  unsigned int threads = *threads_ptr;
e354a5
+  bool inclusive_cache = true;
e354a5
+  bool support_count_mask = true;
e354a5
+
e354a5
+  /* Try L3 first.  */
e354a5
+  unsigned int level = 3;
e354a5
+
e354a5
+  if (cpu_features->basic.kind == arch_kind_zhaoxin && family == 6)
e354a5
+    support_count_mask = false;
e354a5
+
e354a5
+  if (shared <= 0)
e354a5
+    {
e354a5
+      /* Try L2 otherwise.  */
e354a5
+      level  = 2;
e354a5
+      shared = core;
e354a5
+      threads_l2 = 0;
e354a5
+      threads_l3 = -1;
e354a5
+    }
e354a5
+  else
e354a5
+    {
e354a5
+      threads_l2 = 0;
e354a5
+      threads_l3 = 0;
e354a5
+    }
e354a5
+
e354a5
+  /* A value of 0 for the HTT bit indicates there is only a single
e354a5
+     logical processor.  */
e354a5
+  if (HAS_CPU_FEATURE (HTT))
e354a5
+    {
e354a5
+      /* Figure out the number of logical threads that share the
e354a5
+         highest cache level.  */
e354a5
+      if (max_cpuid >= 4)
e354a5
+        {
e354a5
+          int i = 0;
e354a5
+
e354a5
+          /* Query until cache level 2 and 3 are enumerated.  */
e354a5
+          int check = 0x1 | (threads_l3 == 0) << 1;
e354a5
+          do
e354a5
+            {
e354a5
+              __cpuid_count (4, i++, eax, ebx, ecx, edx);
e354a5
+
e354a5
+              /* There seems to be a bug in at least some Pentium Ds
e354a5
+                 which sometimes fail to iterate all cache parameters.
e354a5
+                 Do not loop indefinitely here, stop in this case and
e354a5
+                 assume there is no such information.  */
e354a5
+              if (cpu_features->basic.kind == arch_kind_intel
e354a5
+                  && (eax & 0x1f) == 0 )
e354a5
+                goto intel_bug_no_cache_info;
e354a5
+
e354a5
+              switch ((eax >> 5) & 0x7)
e354a5
+                {
e354a5
+                  default:
e354a5
+                    break;
e354a5
+                  case 2:
e354a5
+                    if ((check & 0x1))
e354a5
+                      {
e354a5
+                        /* Get maximum number of logical processors
e354a5
+                           sharing L2 cache.  */
e354a5
+                        threads_l2 = (eax >> 14) & 0x3ff;
e354a5
+                        check &= ~0x1;
e354a5
+                      }
e354a5
+                    break;
e354a5
+                  case 3:
e354a5
+                    if ((check & (0x1 << 1)))
e354a5
+                      {
e354a5
+                        /* Get maximum number of logical processors
e354a5
+                           sharing L3 cache.  */
e354a5
+                        threads_l3 = (eax >> 14) & 0x3ff;
e354a5
+
e354a5
+                        /* Check if L2 and L3 caches are inclusive.  */
e354a5
+                        inclusive_cache = (edx & 0x2) != 0;
e354a5
+                        check &= ~(0x1 << 1);
e354a5
+                      }
e354a5
+                    break;
e354a5
+                }
e354a5
+            }
e354a5
+          while (check);
e354a5
+
e354a5
+          /* If max_cpuid >= 11, THREADS_L2/THREADS_L3 are the maximum
e354a5
+             numbers of addressable IDs for logical processors sharing
e354a5
+             the cache, instead of the maximum number of threads
e354a5
+             sharing the cache.  */
e354a5
+          if (max_cpuid >= 11 && support_count_mask)
e354a5
+            {
e354a5
+              /* Find the number of logical processors shipped in
e354a5
+                 one core and apply count mask.  */
e354a5
+              i = 0;
e354a5
+
e354a5
+              /* Count SMT only if there is L3 cache.  Always count
e354a5
+                 core if there is no L3 cache.  */
e354a5
+              int count = ((threads_l2 > 0 && level == 3)
e354a5
+                           | ((threads_l3 > 0
e354a5
+                               || (threads_l2 > 0 && level == 2)) << 1));
e354a5
+
e354a5
+              while (count)
e354a5
+                {
e354a5
+                  __cpuid_count (11, i++, eax, ebx, ecx, edx);
e354a5
+
e354a5
+                  int shipped = ebx & 0xff;
e354a5
+                  int type = ecx & 0xff00;
e354a5
+                  if (shipped == 0 || type == 0)
e354a5
+                    break;
e354a5
+                  else if (type == 0x100)
e354a5
+                    {
e354a5
+                      /* Count SMT.  */
e354a5
+                      if ((count & 0x1))
e354a5
+                        {
e354a5
+                          int count_mask;
e354a5
+
e354a5
+                          /* Compute count mask.  */
e354a5
+                          asm ("bsr %1, %0"
e354a5
+                               : "=r" (count_mask) : "g" (threads_l2));
e354a5
+                          count_mask = ~(-1 << (count_mask + 1));
e354a5
+                          threads_l2 = (shipped - 1) & count_mask;
e354a5
+                          count &= ~0x1;
e354a5
+                        }
e354a5
+                    }
e354a5
+                  else if (type == 0x200)
e354a5
+                    {
e354a5
+                      /* Count core.  */
e354a5
+                      if ((count & (0x1 << 1)))
e354a5
+                        {
e354a5
+                          int count_mask;
e354a5
+                          int threads_core
e354a5
+                            = (level == 2 ? threads_l2 : threads_l3);
e354a5
+
e354a5
+                          /* Compute count mask.  */
e354a5
+                          asm ("bsr %1, %0"
e354a5
+                               : "=r" (count_mask) : "g" (threads_core));
e354a5
+                          count_mask = ~(-1 << (count_mask + 1));
e354a5
+                          threads_core = (shipped - 1) & count_mask;
e354a5
+                          if (level == 2)
e354a5
+                            threads_l2 = threads_core;
e354a5
+                          else
e354a5
+                            threads_l3 = threads_core;
e354a5
+                          count &= ~(0x1 << 1);
e354a5
+                        }
e354a5
+                    }
e354a5
+                }
e354a5
+            }
e354a5
+          if (threads_l2 > 0)
e354a5
+            threads_l2 += 1;
e354a5
+          if (threads_l3 > 0)
e354a5
+            threads_l3 += 1;
e354a5
+          if (level == 2)
e354a5
+            {
e354a5
+              if (threads_l2)
e354a5
+                {
e354a5
+                  threads = threads_l2;
e354a5
+                  if (cpu_features->basic.kind == arch_kind_intel
e354a5
+                      && threads > 2
e354a5
+                      && family == 6)
e354a5
+                    switch (model)
e354a5
+                      {
e354a5
+                        case 0x37:
e354a5
+                        case 0x4a:
e354a5
+                        case 0x4d:
e354a5
+                        case 0x5a:
e354a5
+                        case 0x5d:
e354a5
+                          /* Silvermont has L2 cache shared by 2 cores.  */
e354a5
+                          threads = 2;
e354a5
+                          break;
e354a5
+                        default:
e354a5
+                          break;
e354a5
+                      }
e354a5
+                }
e354a5
+            }
e354a5
+          else if (threads_l3)
e354a5
+            threads = threads_l3;
e354a5
+        }
e354a5
+      else
e354a5
+        {
e354a5
+intel_bug_no_cache_info:
e354a5
+          /* Assume that all logical threads share the highest cache
e354a5
+             level.  */
e354a5
+          threads
e354a5
+            = ((cpu_features->features[COMMON_CPUID_INDEX_1].cpuid.ebx
e354a5
+                >> 16) & 0xff);
e354a5
+        }
e354a5
+
e354a5
+        /* Cap usage of highest cache level to the number of supported
e354a5
+           threads.  */
e354a5
+        if (shared > 0 && threads > 0)
e354a5
+          shared /= threads;
e354a5
+    }
e354a5
+
e354a5
+  /* Account for non-inclusive L2 and L3 caches.  */
e354a5
+  if (!inclusive_cache)
e354a5
+    {
e354a5
+      if (threads_l2 > 0)
e354a5
+        core /= threads_l2;
e354a5
+      shared += core;
e354a5
+    }
e354a5
+
e354a5
+  *shared_ptr = shared;
e354a5
+  *threads_ptr = threads;
e354a5
+}
e354a5
+
e354a5
+static void
e354a5
+init_cacheinfo (void)
e354a5
+{
e354a5
+  /* Find out what brand of processor.  */
e354a5
+  unsigned int ebx;
e354a5
+  unsigned int ecx;
e354a5
+  unsigned int edx;
e354a5
+  int max_cpuid_ex;
e354a5
+  long int data = -1;
e354a5
+  long int shared = -1;
e354a5
+  long int core;
e354a5
+  unsigned int threads = 0;
e354a5
+  const struct cpu_features *cpu_features = __get_cpu_features ();
e354a5
+
e354a5
+  /* NB: In libc.so, cpu_features is defined in ld.so and is initialized
e354a5
+     by DL_PLATFORM_INIT or IFUNC relocation before init_cacheinfo is
e354a5
+     called by IFUNC relocation.  In libc.a, init_cacheinfo is called
e354a5
+     from init_cpu_features by ARCH_INIT_CPU_FEATURES.  */
e354a5
+  assert (cpu_features->basic.kind != arch_kind_unknown);
e354a5
+
e354a5
+  if (cpu_features->basic.kind == arch_kind_intel)
e354a5
+    {
e354a5
+      data = handle_intel (_SC_LEVEL1_DCACHE_SIZE, cpu_features);
e354a5
+      core = handle_intel (_SC_LEVEL2_CACHE_SIZE, cpu_features);
e354a5
+      shared = handle_intel (_SC_LEVEL3_CACHE_SIZE, cpu_features);
e354a5
+
e354a5
+      get_common_cache_info (&shared, &threads, core);
e354a5
+    }
e354a5
+  else if (cpu_features->basic.kind == arch_kind_zhaoxin)
e354a5
+    {
e354a5
+      data = handle_zhaoxin (_SC_LEVEL1_DCACHE_SIZE);
e354a5
+      core = handle_zhaoxin (_SC_LEVEL2_CACHE_SIZE);
e354a5
+      shared = handle_zhaoxin (_SC_LEVEL3_CACHE_SIZE);
e354a5
+
e354a5
+      get_common_cache_info (&shared, &threads, core);
e354a5
+    }
e354a5
+  else if (cpu_features->basic.kind == arch_kind_amd)
e354a5
+    {
e354a5
+      data   = handle_amd (_SC_LEVEL1_DCACHE_SIZE);
e354a5
+      long int core = handle_amd (_SC_LEVEL2_CACHE_SIZE);
e354a5
+      shared = handle_amd (_SC_LEVEL3_CACHE_SIZE);
e354a5
+
e354a5
+      /* Get maximum extended function. */
e354a5
+      __cpuid (0x80000000, max_cpuid_ex, ebx, ecx, edx);
e354a5
+
e354a5
+      if (shared <= 0)
e354a5
+	/* No shared L3 cache.  All we have is the L2 cache.  */
e354a5
+	shared = core;
e354a5
+      else
e354a5
+	{
e354a5
+	  /* Figure out the number of logical threads that share L3.  */
e354a5
+	  if (max_cpuid_ex >= 0x80000008)
e354a5
+	    {
e354a5
+	      /* Get width of APIC ID.  */
e354a5
+	      __cpuid (0x80000008, max_cpuid_ex, ebx, ecx, edx);
e354a5
+	      threads = 1 << ((ecx >> 12) & 0x0f);
e354a5
+	    }
e354a5
+
e354a5
+	  if (threads == 0 || cpu_features->basic.family >= 0x17)
e354a5
+	    {
e354a5
+	      /* If APIC ID width is not available, use logical
e354a5
+		 processor count.  */
e354a5
+	      __cpuid (0x00000001, max_cpuid_ex, ebx, ecx, edx);
e354a5
+
e354a5
+	      if ((edx & (1 << 28)) != 0)
e354a5
+		threads = (ebx >> 16) & 0xff;
e354a5
+	    }
e354a5
+
e354a5
+	  /* Cap usage of highest cache level to the number of
e354a5
+	     supported threads.  */
e354a5
+	  if (threads > 0)
e354a5
+	    shared /= threads;
e354a5
+
e354a5
+	  /* Get shared cache per ccx for Zen architectures.  */
e354a5
+	  if (cpu_features->basic.family >= 0x17)
e354a5
+	    {
e354a5
+	      unsigned int eax;
e354a5
+
e354a5
+	      /* Get number of threads share the L3 cache in CCX.  */
e354a5
+	      __cpuid_count (0x8000001D, 0x3, eax, ebx, ecx, edx);
e354a5
+
e354a5
+	      unsigned int threads_per_ccx = ((eax >> 14) & 0xfff) + 1;
e354a5
+	      shared *= threads_per_ccx;
e354a5
+	    }
e354a5
+	  else
e354a5
+	    {
e354a5
+	      /* Account for exclusive L2 and L3 caches.  */
e354a5
+	      shared += core;
e354a5
+            }
e354a5
+	}
e354a5
+    }
e354a5
+
e354a5
+  if (cpu_features->data_cache_size != 0)
e354a5
+    data = cpu_features->data_cache_size;
e354a5
+
e354a5
+  if (data > 0)
e354a5
+    {
e354a5
+      __x86_raw_data_cache_size_half = data / 2;
e354a5
+      __x86_raw_data_cache_size = data;
e354a5
+      /* Round data cache size to multiple of 256 bytes.  */
e354a5
+      data = data & ~255L;
e354a5
+      __x86_data_cache_size_half = data / 2;
e354a5
+      __x86_data_cache_size = data;
e354a5
+    }
e354a5
+
e354a5
+  if (cpu_features->shared_cache_size != 0)
e354a5
+    shared = cpu_features->shared_cache_size;
e354a5
+
e354a5
+  if (shared > 0)
e354a5
+    {
e354a5
+      __x86_raw_shared_cache_size_half = shared / 2;
e354a5
+      __x86_raw_shared_cache_size = shared;
e354a5
+      /* Round shared cache size to multiple of 256 bytes.  */
e354a5
+      shared = shared & ~255L;
e354a5
+      __x86_shared_cache_size_half = shared / 2;
e354a5
+      __x86_shared_cache_size = shared;
e354a5
+    }
e354a5
+
e354a5
+  /* The default setting for the non_temporal threshold is 3/4 of one
e354a5
+     thread's share of the chip's cache. For most Intel and AMD processors
e354a5
+     with an initial release date between 2017 and 2020, a thread's typical
e354a5
+     share of the cache is from 500 KBytes to 2 MBytes. Using the 3/4
e354a5
+     threshold leaves 125 KBytes to 500 KBytes of the thread's data
e354a5
+     in cache after a maximum temporal copy, which will maintain
e354a5
+     in cache a reasonable portion of the thread's stack and other
e354a5
+     active data. If the threshold is set higher than one thread's
e354a5
+     share of the cache, it has a substantial risk of negatively
e354a5
+     impacting the performance of other threads running on the chip. */
e354a5
+  __x86_shared_non_temporal_threshold
e354a5
+    = (cpu_features->non_temporal_threshold != 0
e354a5
+       ? cpu_features->non_temporal_threshold
e354a5
+       : __x86_shared_cache_size * 3 / 4);
e354a5
+
e354a5
+  /* NB: The REP MOVSB threshold must be greater than VEC_SIZE * 8.  */
e354a5
+  unsigned int minimum_rep_movsb_threshold;
e354a5
+  /* NB: The default REP MOVSB threshold is 2048 * (VEC_SIZE / 16).  */
e354a5
+  unsigned int rep_movsb_threshold;
e354a5
+  if (CPU_FEATURE_USABLE_P (cpu_features, AVX512F)
e354a5
+      && !CPU_FEATURE_PREFERRED_P (cpu_features, Prefer_No_AVX512))
e354a5
+    {
e354a5
+      rep_movsb_threshold = 2048 * (64 / 16);
e354a5
+      minimum_rep_movsb_threshold = 64 * 8;
e354a5
+    }
e354a5
+  else if (CPU_FEATURE_PREFERRED_P (cpu_features,
e354a5
+				    AVX_Fast_Unaligned_Load))
e354a5
+    {
e354a5
+      rep_movsb_threshold = 2048 * (32 / 16);
e354a5
+      minimum_rep_movsb_threshold = 32 * 8;
e354a5
+    }
e354a5
+  else
e354a5
+    {
e354a5
+      rep_movsb_threshold = 2048 * (16 / 16);
e354a5
+      minimum_rep_movsb_threshold = 16 * 8;
e354a5
+    }
e354a5
+  if (cpu_features->rep_movsb_threshold > minimum_rep_movsb_threshold)
e354a5
+    __x86_rep_movsb_threshold = cpu_features->rep_movsb_threshold;
e354a5
+  else
e354a5
+    __x86_rep_movsb_threshold = rep_movsb_threshold;
e354a5
+
e354a5
+# if HAVE_TUNABLES
e354a5
+  __x86_rep_stosb_threshold = cpu_features->rep_stosb_threshold;
e354a5
+# endif
e354a5
+}
e354a5
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
e354a5
index 5f0548fe08134236..4c9c15a44b618fed 100644
e354a5
--- a/sysdeps/x86/cpu-features.c
e354a5
+++ b/sysdeps/x86/cpu-features.c
e354a5
@@ -17,9 +17,14 @@
e354a5
    <http://www.gnu.org/licenses/>.  */
e354a5
 
e354a5
 #include <cpuid.h>
e354a5
-#include <cpu-features.h>
e354a5
 #include <dl-hwcap.h>
e354a5
 #include <libc-pointer-arith.h>
e354a5
+#if IS_IN (libc) && !defined SHARED
e354a5
+# include <assert.h>
e354a5
+# include <unistd.h>
e354a5
+# include <dl-cacheinfo.h>
e354a5
+# include <cacheinfo.h>
e354a5
+#endif
e354a5
 
e354a5
 #if HAVE_TUNABLES
e354a5
 # define TUNABLE_NAMESPACE cpu
e354a5
@@ -752,4 +757,9 @@ no_cpuid:
e354a5
 # endif
e354a5
     }
e354a5
 #endif
e354a5
+
e354a5
+#ifndef SHARED
e354a5
+  /* NB: In libc.a, call init_cacheinfo.  */
e354a5
+  init_cacheinfo ();
e354a5
+#endif
e354a5
 }
e354a5
diff --git a/sysdeps/x86/dl-cacheinfo.h b/sysdeps/x86/dl-cacheinfo.h
e354a5
new file mode 100644
e354a5
index 0000000000000000..b2b90074b0e98a60
e354a5
--- /dev/null
e354a5
+++ b/sysdeps/x86/dl-cacheinfo.h
e354a5
@@ -0,0 +1,478 @@
e354a5
+/* Initialize x86 cache info.
e354a5
+   Copyright (C) 2020 Free Software Foundation, Inc.
e354a5
+   This file is part of the GNU C Library.
e354a5
+
e354a5
+   The GNU C Library is free software; you can redistribute it and/or
e354a5
+   modify it under the terms of the GNU Lesser General Public
e354a5
+   License as published by the Free Software Foundation; either
e354a5
+   version 2.1 of the License, or (at your option) any later version.
e354a5
+
e354a5
+   The GNU C Library is distributed in the hope that it will be useful,
e354a5
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
e354a5
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
e354a5
+   Lesser General Public License for more details.
e354a5
+
e354a5
+   You should have received a copy of the GNU Lesser General Public
e354a5
+   License along with the GNU C Library; if not, see
e354a5
+   <https://www.gnu.org/licenses/>.  */
e354a5
+
e354a5
+static const struct intel_02_cache_info
e354a5
+{
e354a5
+  unsigned char idx;
e354a5
+  unsigned char assoc;
e354a5
+  unsigned char linesize;
e354a5
+  unsigned char rel_name;
e354a5
+  unsigned int size;
e354a5
+} intel_02_known [] =
e354a5
+  {
e354a5
+#define M(sc) ((sc) - _SC_LEVEL1_ICACHE_SIZE)
e354a5
+    { 0x06,  4, 32, M(_SC_LEVEL1_ICACHE_SIZE),    8192 },
e354a5
+    { 0x08,  4, 32, M(_SC_LEVEL1_ICACHE_SIZE),   16384 },
e354a5
+    { 0x09,  4, 32, M(_SC_LEVEL1_ICACHE_SIZE),   32768 },
e354a5
+    { 0x0a,  2, 32, M(_SC_LEVEL1_DCACHE_SIZE),    8192 },
e354a5
+    { 0x0c,  4, 32, M(_SC_LEVEL1_DCACHE_SIZE),   16384 },
e354a5
+    { 0x0d,  4, 64, M(_SC_LEVEL1_DCACHE_SIZE),   16384 },
e354a5
+    { 0x0e,  6, 64, M(_SC_LEVEL1_DCACHE_SIZE),   24576 },
e354a5
+    { 0x21,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
+    { 0x22,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),   524288 },
e354a5
+    { 0x23,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  1048576 },
e354a5
+    { 0x25,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
+    { 0x29,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
+    { 0x2c,  8, 64, M(_SC_LEVEL1_DCACHE_SIZE),   32768 },
e354a5
+    { 0x30,  8, 64, M(_SC_LEVEL1_ICACHE_SIZE),   32768 },
e354a5
+    { 0x39,  4, 64, M(_SC_LEVEL2_CACHE_SIZE),   131072 },
e354a5
+    { 0x3a,  6, 64, M(_SC_LEVEL2_CACHE_SIZE),   196608 },
e354a5
+    { 0x3b,  2, 64, M(_SC_LEVEL2_CACHE_SIZE),   131072 },
e354a5
+    { 0x3c,  4, 64, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
+    { 0x3d,  6, 64, M(_SC_LEVEL2_CACHE_SIZE),   393216 },
e354a5
+    { 0x3e,  4, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
+    { 0x3f,  2, 64, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
+    { 0x41,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),   131072 },
e354a5
+    { 0x42,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
+    { 0x43,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
+    { 0x44,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
+    { 0x45,  4, 32, M(_SC_LEVEL2_CACHE_SIZE),  2097152 },
e354a5
+    { 0x46,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
+    { 0x47,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  8388608 },
e354a5
+    { 0x48, 12, 64, M(_SC_LEVEL2_CACHE_SIZE),  3145728 },
e354a5
+    { 0x49, 16, 64, M(_SC_LEVEL2_CACHE_SIZE),  4194304 },
e354a5
+    { 0x4a, 12, 64, M(_SC_LEVEL3_CACHE_SIZE),  6291456 },
e354a5
+    { 0x4b, 16, 64, M(_SC_LEVEL3_CACHE_SIZE),  8388608 },
e354a5
+    { 0x4c, 12, 64, M(_SC_LEVEL3_CACHE_SIZE), 12582912 },
e354a5
+    { 0x4d, 16, 64, M(_SC_LEVEL3_CACHE_SIZE), 16777216 },
e354a5
+    { 0x4e, 24, 64, M(_SC_LEVEL2_CACHE_SIZE),  6291456 },
e354a5
+    { 0x60,  8, 64, M(_SC_LEVEL1_DCACHE_SIZE),   16384 },
e354a5
+    { 0x66,  4, 64, M(_SC_LEVEL1_DCACHE_SIZE),    8192 },
e354a5
+    { 0x67,  4, 64, M(_SC_LEVEL1_DCACHE_SIZE),   16384 },
e354a5
+    { 0x68,  4, 64, M(_SC_LEVEL1_DCACHE_SIZE),   32768 },
e354a5
+    { 0x78,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
+    { 0x79,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   131072 },
e354a5
+    { 0x7a,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
+    { 0x7b,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
+    { 0x7c,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
+    { 0x7d,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),  2097152 },
e354a5
+    { 0x7f,  2, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
+    { 0x80,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
+    { 0x82,  8, 32, M(_SC_LEVEL2_CACHE_SIZE),   262144 },
e354a5
+    { 0x83,  8, 32, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
+    { 0x84,  8, 32, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
+    { 0x85,  8, 32, M(_SC_LEVEL2_CACHE_SIZE),  2097152 },
e354a5
+    { 0x86,  4, 64, M(_SC_LEVEL2_CACHE_SIZE),   524288 },
e354a5
+    { 0x87,  8, 64, M(_SC_LEVEL2_CACHE_SIZE),  1048576 },
e354a5
+    { 0xd0,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),   524288 },
e354a5
+    { 0xd1,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),  1048576 },
e354a5
+    { 0xd2,  4, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
+    { 0xd6,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  1048576 },
e354a5
+    { 0xd7,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
+    { 0xd8,  8, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
+    { 0xdc, 12, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
+    { 0xdd, 12, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
+    { 0xde, 12, 64, M(_SC_LEVEL3_CACHE_SIZE),  8388608 },
e354a5
+    { 0xe2, 16, 64, M(_SC_LEVEL3_CACHE_SIZE),  2097152 },
e354a5
+    { 0xe3, 16, 64, M(_SC_LEVEL3_CACHE_SIZE),  4194304 },
e354a5
+    { 0xe4, 16, 64, M(_SC_LEVEL3_CACHE_SIZE),  8388608 },
e354a5
+    { 0xea, 24, 64, M(_SC_LEVEL3_CACHE_SIZE), 12582912 },
e354a5
+    { 0xeb, 24, 64, M(_SC_LEVEL3_CACHE_SIZE), 18874368 },
e354a5
+    { 0xec, 24, 64, M(_SC_LEVEL3_CACHE_SIZE), 25165824 },
e354a5
+  };
e354a5
+
e354a5
+#define nintel_02_known (sizeof (intel_02_known) / sizeof (intel_02_known [0]))
e354a5
+
e354a5
+static int
e354a5
+intel_02_known_compare (const void *p1, const void *p2)
e354a5
+{
e354a5
+  const struct intel_02_cache_info *i1;
e354a5
+  const struct intel_02_cache_info *i2;
e354a5
+
e354a5
+  i1 = (const struct intel_02_cache_info *) p1;
e354a5
+  i2 = (const struct intel_02_cache_info *) p2;
e354a5
+
e354a5
+  if (i1->idx == i2->idx)
e354a5
+    return 0;
e354a5
+
e354a5
+  return i1->idx < i2->idx ? -1 : 1;
e354a5
+}
e354a5
+
e354a5
+
e354a5
+static long int
e354a5
+__attribute__ ((noinline))
e354a5
+intel_check_word (int name, unsigned int value, bool *has_level_2,
e354a5
+		  bool *no_level_2_or_3,
e354a5
+		  const struct cpu_features *cpu_features)
e354a5
+{
e354a5
+  if ((value & 0x80000000) != 0)
e354a5
+    /* The register value is reserved.  */
e354a5
+    return 0;
e354a5
+
e354a5
+  /* Fold the name.  The _SC_ constants are always in the order SIZE,
e354a5
+     ASSOC, LINESIZE.  */
e354a5
+  int folded_rel_name = (M(name) / 3) * 3;
e354a5
+
e354a5
+  while (value != 0)
e354a5
+    {
e354a5
+      unsigned int byte = value & 0xff;
e354a5
+
e354a5
+      if (byte == 0x40)
e354a5
+	{
e354a5
+	  *no_level_2_or_3 = true;
e354a5
+
e354a5
+	  if (folded_rel_name == M(_SC_LEVEL3_CACHE_SIZE))
e354a5
+	    /* No need to look further.  */
e354a5
+	    break;
e354a5
+	}
e354a5
+      else if (byte == 0xff)
e354a5
+	{
e354a5
+	  /* CPUID leaf 0x4 contains all the information.  We need to
e354a5
+	     iterate over it.  */
e354a5
+	  unsigned int eax;
e354a5
+	  unsigned int ebx;
e354a5
+	  unsigned int ecx;
e354a5
+	  unsigned int edx;
e354a5
+
e354a5
+	  unsigned int round = 0;
e354a5
+	  while (1)
e354a5
+	    {
e354a5
+	      __cpuid_count (4, round, eax, ebx, ecx, edx);
e354a5
+
e354a5
+	      enum { null = 0, data = 1, inst = 2, uni = 3 } type = eax & 0x1f;
e354a5
+	      if (type == null)
e354a5
+		/* That was the end.  */
e354a5
+		break;
e354a5
+
e354a5
+	      unsigned int level = (eax >> 5) & 0x7;
e354a5
+
e354a5
+	      if ((level == 1 && type == data
e354a5
+		   && folded_rel_name == M(_SC_LEVEL1_DCACHE_SIZE))
e354a5
+		  || (level == 1 && type == inst
e354a5
+		      && folded_rel_name == M(_SC_LEVEL1_ICACHE_SIZE))
e354a5
+		  || (level == 2 && folded_rel_name == M(_SC_LEVEL2_CACHE_SIZE))
e354a5
+		  || (level == 3 && folded_rel_name == M(_SC_LEVEL3_CACHE_SIZE))
e354a5
+		  || (level == 4 && folded_rel_name == M(_SC_LEVEL4_CACHE_SIZE)))
e354a5
+		{
e354a5
+		  unsigned int offset = M(name) - folded_rel_name;
e354a5
+
e354a5
+		  if (offset == 0)
e354a5
+		    /* Cache size.  */
e354a5
+		    return (((ebx >> 22) + 1)
e354a5
+			    * (((ebx >> 12) & 0x3ff) + 1)
e354a5
+			    * ((ebx & 0xfff) + 1)
e354a5
+			    * (ecx + 1));
e354a5
+		  if (offset == 1)
e354a5
+		    return (ebx >> 22) + 1;
e354a5
+
e354a5
+		  assert (offset == 2);
e354a5
+		  return (ebx & 0xfff) + 1;
e354a5
+		}
e354a5
+
e354a5
+	      ++round;
e354a5
+	    }
e354a5
+	  /* There is no other cache information anywhere else.  */
e354a5
+	  break;
e354a5
+	}
e354a5
+      else
e354a5
+	{
e354a5
+	  if (byte == 0x49 && folded_rel_name == M(_SC_LEVEL3_CACHE_SIZE))
e354a5
+	    {
e354a5
+	      /* Intel reused this value.  For family 15, model 6 it
e354a5
+		 specifies the 3rd level cache.  Otherwise the 2nd
e354a5
+		 level cache.  */
e354a5
+	      unsigned int family = cpu_features->basic.family;
e354a5
+	      unsigned int model = cpu_features->basic.model;
e354a5
+
e354a5
+	      if (family == 15 && model == 6)
e354a5
+		{
e354a5
+		  /* The level 3 cache is encoded for this model like
e354a5
+		     the level 2 cache is for other models.  Pretend
e354a5
+		     the caller asked for the level 2 cache.  */
e354a5
+		  name = (_SC_LEVEL2_CACHE_SIZE
e354a5
+			  + (name - _SC_LEVEL3_CACHE_SIZE));
e354a5
+		  folded_rel_name = M(_SC_LEVEL2_CACHE_SIZE);
e354a5
+		}
e354a5
+	    }
e354a5
+
e354a5
+	  struct intel_02_cache_info *found;
e354a5
+	  struct intel_02_cache_info search;
e354a5
+
e354a5
+	  search.idx = byte;
e354a5
+	  found = bsearch (&search, intel_02_known, nintel_02_known,
e354a5
+			   sizeof (intel_02_known[0]), intel_02_known_compare);
e354a5
+	  if (found != NULL)
e354a5
+	    {
e354a5
+	      if (found->rel_name == folded_rel_name)
e354a5
+		{
e354a5
+		  unsigned int offset = M(name) - folded_rel_name;
e354a5
+
e354a5
+		  if (offset == 0)
e354a5
+		    /* Cache size.  */
e354a5
+		    return found->size;
e354a5
+		  if (offset == 1)
e354a5
+		    return found->assoc;
e354a5
+
e354a5
+		  assert (offset == 2);
e354a5
+		  return found->linesize;
e354a5
+		}
e354a5
+
e354a5
+	      if (found->rel_name == M(_SC_LEVEL2_CACHE_SIZE))
e354a5
+		*has_level_2 = true;
e354a5
+	    }
e354a5
+	}
e354a5
+
e354a5
+      /* Next byte for the next round.  */
e354a5
+      value >>= 8;
e354a5
+    }
e354a5
+
e354a5
+  /* Nothing found.  */
e354a5
+  return 0;
e354a5
+}
e354a5
+
e354a5
+
e354a5
+static long int __attribute__ ((noinline))
e354a5
+handle_intel (int name, const struct cpu_features *cpu_features)
e354a5
+{
e354a5
+  unsigned int maxidx = cpu_features->basic.max_cpuid;
e354a5
+
e354a5
+  /* Return -1 for older CPUs.  */
e354a5
+  if (maxidx < 2)
e354a5
+    return -1;
e354a5
+
e354a5
+  /* OK, we can use the CPUID instruction to get all info about the
e354a5
+     caches.  */
e354a5
+  unsigned int cnt = 0;
e354a5
+  unsigned int max = 1;
e354a5
+  long int result = 0;
e354a5
+  bool no_level_2_or_3 = false;
e354a5
+  bool has_level_2 = false;
e354a5
+
e354a5
+  while (cnt++ < max)
e354a5
+    {
e354a5
+      unsigned int eax;
e354a5
+      unsigned int ebx;
e354a5
+      unsigned int ecx;
e354a5
+      unsigned int edx;
e354a5
+      __cpuid (2, eax, ebx, ecx, edx);
e354a5
+
e354a5
+      /* The low byte of EAX in the first round contain the number of
e354a5
+	 rounds we have to make.  At least one, the one we are already
e354a5
+	 doing.  */
e354a5
+      if (cnt == 1)
e354a5
+	{
e354a5
+	  max = eax & 0xff;
e354a5
+	  eax &= 0xffffff00;
e354a5
+	}
e354a5
+
e354a5
+      /* Process the individual registers' value.  */
e354a5
+      result = intel_check_word (name, eax, &has_level_2,
e354a5
+				 &no_level_2_or_3, cpu_features);
e354a5
+      if (result != 0)
e354a5
+	return result;
e354a5
+
e354a5
+      result = intel_check_word (name, ebx, &has_level_2,
e354a5
+				 &no_level_2_or_3, cpu_features);
e354a5
+      if (result != 0)
e354a5
+	return result;
e354a5
+
e354a5
+      result = intel_check_word (name, ecx, &has_level_2,
e354a5
+				 &no_level_2_or_3, cpu_features);
e354a5
+      if (result != 0)
e354a5
+	return result;
e354a5
+
e354a5
+      result = intel_check_word (name, edx, &has_level_2,
e354a5
+				 &no_level_2_or_3, cpu_features);
e354a5
+      if (result != 0)
e354a5
+	return result;
e354a5
+    }
e354a5
+
e354a5
+  if (name >= _SC_LEVEL2_CACHE_SIZE && name <= _SC_LEVEL3_CACHE_LINESIZE
e354a5
+      && no_level_2_or_3)
e354a5
+    return -1;
e354a5
+
e354a5
+  return 0;
e354a5
+}
e354a5
+
e354a5
+
e354a5
+static long int __attribute__ ((noinline))
e354a5
+handle_amd (int name)
e354a5
+{
e354a5
+  unsigned int eax;
e354a5
+  unsigned int ebx;
e354a5
+  unsigned int ecx;
e354a5
+  unsigned int edx;
e354a5
+  __cpuid (0x80000000, eax, ebx, ecx, edx);
e354a5
+
e354a5
+  /* No level 4 cache (yet).  */
e354a5
+  if (name > _SC_LEVEL3_CACHE_LINESIZE)
e354a5
+    return 0;
e354a5
+
e354a5
+  unsigned int fn = 0x80000005 + (name >= _SC_LEVEL2_CACHE_SIZE);
e354a5
+  if (eax < fn)
e354a5
+    return 0;
e354a5
+
e354a5
+  __cpuid (fn, eax, ebx, ecx, edx);
e354a5
+
e354a5
+  if (name < _SC_LEVEL1_DCACHE_SIZE)
e354a5
+    {
e354a5
+      name += _SC_LEVEL1_DCACHE_SIZE - _SC_LEVEL1_ICACHE_SIZE;
e354a5
+      ecx = edx;
e354a5
+    }
e354a5
+
e354a5
+  switch (name)
e354a5
+    {
e354a5
+    case _SC_LEVEL1_DCACHE_SIZE:
e354a5
+      return (ecx >> 14) & 0x3fc00;
e354a5
+
e354a5
+    case _SC_LEVEL1_DCACHE_ASSOC:
e354a5
+      ecx >>= 16;
e354a5
+      if ((ecx & 0xff) == 0xff)
e354a5
+	/* Fully associative.  */
e354a5
+	return (ecx << 2) & 0x3fc00;
e354a5
+      return ecx & 0xff;
e354a5
+
e354a5
+    case _SC_LEVEL1_DCACHE_LINESIZE:
e354a5
+      return ecx & 0xff;
e354a5
+
e354a5
+    case _SC_LEVEL2_CACHE_SIZE:
e354a5
+      return (ecx & 0xf000) == 0 ? 0 : (ecx >> 6) & 0x3fffc00;
e354a5
+
e354a5
+    case _SC_LEVEL2_CACHE_ASSOC:
e354a5
+      switch ((ecx >> 12) & 0xf)
e354a5
+	{
e354a5
+	case 0:
e354a5
+	case 1:
e354a5
+	case 2:
e354a5
+	case 4:
e354a5
+	  return (ecx >> 12) & 0xf;
e354a5
+	case 6:
e354a5
+	  return 8;
e354a5
+	case 8:
e354a5
+	  return 16;
e354a5
+	case 10:
e354a5
+	  return 32;
e354a5
+	case 11:
e354a5
+	  return 48;
e354a5
+	case 12:
e354a5
+	  return 64;
e354a5
+	case 13:
e354a5
+	  return 96;
e354a5
+	case 14:
e354a5
+	  return 128;
e354a5
+	case 15:
e354a5
+	  return ((ecx >> 6) & 0x3fffc00) / (ecx & 0xff);
e354a5
+	default:
e354a5
+	  return 0;
e354a5
+	}
e354a5
+      /* NOTREACHED */
e354a5
+
e354a5
+    case _SC_LEVEL2_CACHE_LINESIZE:
e354a5
+      return (ecx & 0xf000) == 0 ? 0 : ecx & 0xff;
e354a5
+
e354a5
+    case _SC_LEVEL3_CACHE_SIZE:
e354a5
+      return (edx & 0xf000) == 0 ? 0 : (edx & 0x3ffc0000) << 1;
e354a5
+
e354a5
+    case _SC_LEVEL3_CACHE_ASSOC:
e354a5
+      switch ((edx >> 12) & 0xf)
e354a5
+	{
e354a5
+	case 0:
e354a5
+	case 1:
e354a5
+	case 2:
e354a5
+	case 4:
e354a5
+	  return (edx >> 12) & 0xf;
e354a5
+	case 6:
e354a5
+	  return 8;
e354a5
+	case 8:
e354a5
+	  return 16;
e354a5
+	case 10:
e354a5
+	  return 32;
e354a5
+	case 11:
e354a5
+	  return 48;
e354a5
+	case 12:
e354a5
+	  return 64;
e354a5
+	case 13:
e354a5
+	  return 96;
e354a5
+	case 14:
e354a5
+	  return 128;
e354a5
+	case 15:
e354a5
+	  return ((edx & 0x3ffc0000) << 1) / (edx & 0xff);
e354a5
+	default:
e354a5
+	  return 0;
e354a5
+	}
e354a5
+      /* NOTREACHED */
e354a5
+
e354a5
+    case _SC_LEVEL3_CACHE_LINESIZE:
e354a5
+      return (edx & 0xf000) == 0 ? 0 : edx & 0xff;
e354a5
+
e354a5
+    default:
e354a5
+      assert (! "cannot happen");
e354a5
+    }
e354a5
+  return -1;
e354a5
+}
e354a5
+
e354a5
+
e354a5
+static long int __attribute__ ((noinline))
e354a5
+handle_zhaoxin (int name)
e354a5
+{
e354a5
+  unsigned int eax;
e354a5
+  unsigned int ebx;
e354a5
+  unsigned int ecx;
e354a5
+  unsigned int edx;
e354a5
+
e354a5
+  int folded_rel_name = (M(name) / 3) * 3;
e354a5
+
e354a5
+  unsigned int round = 0;
e354a5
+  while (1)
e354a5
+    {
e354a5
+      __cpuid_count (4, round, eax, ebx, ecx, edx);
e354a5
+
e354a5
+      enum { null = 0, data = 1, inst = 2, uni = 3 } type = eax & 0x1f;
e354a5
+      if (type == null)
e354a5
+        break;
e354a5
+
e354a5
+      unsigned int level = (eax >> 5) & 0x7;
e354a5
+
e354a5
+      if ((level == 1 && type == data
e354a5
+        && folded_rel_name == M(_SC_LEVEL1_DCACHE_SIZE))
e354a5
+        || (level == 1 && type == inst
e354a5
+            && folded_rel_name == M(_SC_LEVEL1_ICACHE_SIZE))
e354a5
+        || (level == 2 && folded_rel_name == M(_SC_LEVEL2_CACHE_SIZE))
e354a5
+        || (level == 3 && folded_rel_name == M(_SC_LEVEL3_CACHE_SIZE)))
e354a5
+        {
e354a5
+          unsigned int offset = M(name) - folded_rel_name;
e354a5
+
e354a5
+          if (offset == 0)
e354a5
+            /* Cache size.  */
e354a5
+            return (((ebx >> 22) + 1)
e354a5
+                * (((ebx >> 12) & 0x3ff) + 1)
e354a5
+                * ((ebx & 0xfff) + 1)
e354a5
+                * (ecx + 1));
e354a5
+          if (offset == 1)
e354a5
+            return (ebx >> 22) + 1;
e354a5
+
e354a5
+          assert (offset == 2);
e354a5
+          return (ebx & 0xfff) + 1;
e354a5
+        }
e354a5
+
e354a5
+      ++round;
e354a5
+    }
e354a5
+
e354a5
+  /* Nothing found.  */
e354a5
+  return 0;
e354a5
+}
e354a5
diff --git a/sysdeps/x86/dl-get-cpu-features.c b/sysdeps/x86/dl-get-cpu-features.c
e354a5
index 2aba0d167129b336..82772cc12f0c7e54 100644
e354a5
--- a/sysdeps/x86/dl-get-cpu-features.c
e354a5
+++ b/sysdeps/x86/dl-get-cpu-features.c
e354a5
@@ -1,5 +1,5 @@
e354a5
-/* This file is part of the GNU C Library.
e354a5
-   Copyright (C) 2015-2018 Free Software Foundation, Inc.
e354a5
+/* Initialize CPU feature data via IFUNC relocation.
e354a5
+   Copyright (C) 2015-2020 Free Software Foundation, Inc.
e354a5
 
e354a5
    The GNU C Library is free software; you can redistribute it and/or
e354a5
    modify it under the terms of the GNU Lesser General Public
e354a5
@@ -18,6 +18,31 @@
e354a5
 
e354a5
 #include <ldsodefs.h>
e354a5
 
e354a5
+#ifdef SHARED
e354a5
+# include <cpu-features.c>
e354a5
+
e354a5
+/* NB: Normally, DL_PLATFORM_INIT calls init_cpu_features to initialize
e354a5
+   CPU features in dynamic executable.  But when loading ld.so inside of
e354a5
+   static executable, DL_PLATFORM_INIT isn't called and IFUNC relocation
e354a5
+   is used to call init_cpu_features.  In static executable, it is called
e354a5
+   once by IFUNC relocation.  In dynamic executable, it is called twice
e354a5
+   by DL_PLATFORM_INIT and by IFUNC relocation.  */
e354a5
+extern void __x86_cpu_features (void) attribute_hidden;
e354a5
+const void (*__x86_cpu_features_p) (void) attribute_hidden
e354a5
+  = __x86_cpu_features;
e354a5
+
e354a5
+void
e354a5
+_dl_x86_init_cpu_features (void)
e354a5
+{
e354a5
+  struct cpu_features *cpu_features = __get_cpu_features ();
e354a5
+  if (cpu_features->basic.kind == arch_kind_unknown)
e354a5
+    init_cpu_features (cpu_features);
e354a5
+}
e354a5
+
e354a5
+__ifunc (__x86_cpu_features, __x86_cpu_features, NULL, void,
e354a5
+	 _dl_x86_init_cpu_features);
e354a5
+#endif
e354a5
+
e354a5
 #undef __x86_get_cpu_features
e354a5
 
e354a5
 const struct cpu_features *
e354a5
diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h
e354a5
index dcf29b6fe8578078..f62be0b9b3746675 100644
e354a5
--- a/sysdeps/x86/include/cpu-features.h
e354a5
+++ b/sysdeps/x86/include/cpu-features.h
e354a5
@@ -159,6 +159,7 @@ struct cpu_features
e354a5
 /* Unused for x86.  */
e354a5
 #  define INIT_ARCH()
e354a5
 #  define __x86_get_cpu_features(max) (&GLRO(dl_x86_cpu_features))
e354a5
+extern void _dl_x86_init_cpu_features (void) attribute_hidden;
e354a5
 # endif
e354a5
 
e354a5
 # ifdef __x86_64__
e354a5
diff --git a/sysdeps/x86/libc-start.c b/sysdeps/x86/libc-start.c
e354a5
index eb5335c154096384..60f2c34ab5511350 100644
e354a5
--- a/sysdeps/x86/libc-start.c
e354a5
+++ b/sysdeps/x86/libc-start.c
e354a5
@@ -20,7 +20,6 @@
e354a5
    PIE.  */
e354a5
 # include <startup.h>
e354a5
 # include <ldsodefs.h>
e354a5
-# include <cpu-features.h>
e354a5
 # include <cpu-features.c>
e354a5
 
e354a5
 extern struct cpu_features _dl_x86_cpu_features;
e354a5
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h
e354a5
index d58298d787ef352c..e308b662d245cc63 100644
e354a5
--- a/sysdeps/x86_64/dl-machine.h
e354a5
+++ b/sysdeps/x86_64/dl-machine.h
e354a5
@@ -26,7 +26,6 @@
e354a5
 #include <sysdep.h>
e354a5
 #include <tls.h>
e354a5
 #include <dl-tlsdesc.h>
e354a5
-#include <cpu-features.c>
e354a5
 
e354a5
 /* Return nonzero iff ELF header is compatible with the running host.  */
e354a5
 static inline int __attribute__ ((unused))
e354a5
@@ -223,9 +222,9 @@ static inline void __attribute__ ((unused))
e354a5
 dl_platform_init (void)
e354a5
 {
e354a5
 #if IS_IN (rtld)
e354a5
-  /* init_cpu_features has been called early from __libc_start_main in
e354a5
-     static executable.  */
e354a5
-  init_cpu_features (&GLRO(dl_x86_cpu_features));
e354a5
+  /* _dl_x86_init_cpu_features is a wrapper for init_cpu_features which
e354a5
+     has been called early from __libc_start_main in static executable.  */
e354a5
+  _dl_x86_init_cpu_features ();
e354a5
 #else
e354a5
   if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
e354a5
     /* Avoid an empty string which would disturb us.  */