From: H.J. Lu <hjl.tools@gmail.com>
Date: Wed, 5 Apr 2023 16:21:44 +0000 (-0700)
Subject: <sys/platform/x86.h>: Add PREFETCHI support
X-Git-Tag: glibc-2.38~395
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81a3cc956ef4e324c83419fa6d7a559d6e762cd7;p=thirdparty%2Fglibc.git

<sys/platform/x86.h>: Add PREFETCHI support

Add PREFETCHI support to <sys/platform/x86.h>.
Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com>
---

diff --git a/manual/platform.texi b/manual/platform.texi
index e7448ffc1aa..c6ed73cb97b 100644
--- a/manual/platform.texi
+++ b/manual/platform.texi
@@ -533,6 +533,9 @@ extended state management using XSAVE/XRSTOR.
 @item
 @code{PREFETCHWT1} -- PREFETCHWT1 instruction.
 
+@item
+@code{PREFETCHI} -- PREFETCHIT0/1 instructions.
+
 @item
 @code{PSE} -- Page Size Extension.
 
diff --git a/sysdeps/x86/bits/platform/x86.h b/sysdeps/x86/bits/platform/x86.h
index 96eb4c070de..6555f9b91d6 100644
--- a/sysdeps/x86/bits/platform/x86.h
+++ b/sysdeps/x86/bits/platform/x86.h
@@ -311,6 +311,7 @@ enum
   x86_cpu_AVX_VNNI_INT8		= x86_cpu_index_7_ecx_1_edx + 4,
   x86_cpu_AVX_NE_CONVERT	= x86_cpu_index_7_ecx_1_edx + 5,
   x86_cpu_AMX_COMPLEX		= x86_cpu_index_7_ecx_1_edx + 8,
+  x86_cpu_PREFETCHI		= x86_cpu_index_7_ecx_1_edx + 14,
 
   x86_cpu_index_19_ebx
     = (CPUID_INDEX_19 * 8 * 4 * sizeof (unsigned int)
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index c2bea6a32d8..5bff8ec0b4c 100644
--- a/sysdeps/x86/cpu-features.c
+++ b/sysdeps/x86/cpu-features.c
@@ -104,6 +104,7 @@ update_active (struct cpu_features *cpu_features)
   CPU_FEATURE_SET_ACTIVE (cpu_features, FZLRM);
   CPU_FEATURE_SET_ACTIVE (cpu_features, FSRS);
   CPU_FEATURE_SET_ACTIVE (cpu_features, FSRCS);
+  CPU_FEATURE_SET_ACTIVE (cpu_features, PREFETCHI);
   CPU_FEATURE_SET_ACTIVE (cpu_features, PTWRITE);
 
   if (!CPU_FEATURES_CPU_P (cpu_features, RTM_ALWAYS_ABORT))
diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h
index f14c1078d5a..40b8129d6a4 100644
--- a/sysdeps/x86/include/cpu-features.h
+++ b/sysdeps/x86/include/cpu-features.h
@@ -318,6 +318,7 @@ enum
 #define bit_cpu_AVX_VNNI_INT8	(1u << 4)
 #define bit_cpu_AVX_NE_CONVERT	(1u << 5)
 #define bit_cpu_AMX_COMPLEX	(1u << 8)
+#define bit_cpu_PREFETCHI	(1u << 14)
 
 /* CPUID_INDEX_19.  */
 
@@ -560,6 +561,7 @@ enum
 #define index_cpu_AVX_VNNI_INT8	CPUID_INDEX_7_ECX_1
 #define index_cpu_AVX_NE_CONVERT CPUID_INDEX_7_ECX_1
 #define index_cpu_AMX_COMPLEX	CPUID_INDEX_7_ECX_1
+#define index_cpu_PREFETCHI	CPUID_INDEX_7_ECX_1
 
 /* CPUID_INDEX_19.  */
 
@@ -804,6 +806,7 @@ enum
 #define reg_AVX_VNNI_INT8	edx
 #define reg_AVX_NE_CONVERT	edx
 #define reg_AMX_COMPLEX		edx
+#define reg_PREFETCHI		edx
 
 /* CPUID_INDEX_19.  */
 
diff --git a/sysdeps/x86/tst-get-cpu-features.c b/sysdeps/x86/tst-get-cpu-features.c
index 87fe27340f3..1bd7e0be538 100644
--- a/sysdeps/x86/tst-get-cpu-features.c
+++ b/sysdeps/x86/tst-get-cpu-features.c
@@ -218,6 +218,7 @@ do_test (void)
   CHECK_CPU_FEATURE_PRESENT (AVX_VNNI_INT8);
   CHECK_CPU_FEATURE_PRESENT (AVX_NE_CONVERT);
   CHECK_CPU_FEATURE_PRESENT (AMX_COMPLEX);
+  CHECK_CPU_FEATURE_PRESENT (PREFETCHI);
   CHECK_CPU_FEATURE_PRESENT (AESKLE);
   CHECK_CPU_FEATURE_PRESENT (WIDE_KL);
   CHECK_CPU_FEATURE_PRESENT (PTWRITE);
@@ -388,6 +389,7 @@ do_test (void)
   CHECK_CPU_FEATURE_ACTIVE (AVX_VNNI_INT8);
   CHECK_CPU_FEATURE_ACTIVE (AVX_NE_CONVERT);
   CHECK_CPU_FEATURE_ACTIVE (AMX_COMPLEX);
+  CHECK_CPU_FEATURE_ACTIVE (PREFETCHI);
   CHECK_CPU_FEATURE_ACTIVE (AESKLE);
   CHECK_CPU_FEATURE_ACTIVE (WIDE_KL);
   CHECK_CPU_FEATURE_ACTIVE (PTWRITE);