[16/19] <sys/platform/x86.h>: Add AVX-VNNI-INT8 support

Message ID 20230405162144.984598-17-hjl.tools@gmail.com
State Committed
Commit 4c120c88a631cf038520556144860d3ad5a4d0e3
Headers
Series <sys/platform/x86.h>: Update CPUID features |

Commit Message

H.J. Lu April 5, 2023, 4:21 p.m. UTC
  Add AVX-VNNI-INT8 support to <sys/platform/x86.h>.
---
 manual/platform.texi               | 3 +++
 sysdeps/x86/bits/platform/x86.h    | 6 ++++++
 sysdeps/x86/cpu-features.c         | 2 ++
 sysdeps/x86/include/cpu-features.h | 7 +++++++
 sysdeps/x86/tst-get-cpu-features.c | 2 ++
 5 files changed, 20 insertions(+)
  

Comments

Noah Goldstein April 5, 2023, 9:05 p.m. UTC | #1
On Wed, Apr 5, 2023 at 11:28 AM H.J. Lu via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> Add AVX-VNNI-INT8 support to <sys/platform/x86.h>.
> ---
>  manual/platform.texi               | 3 +++
>  sysdeps/x86/bits/platform/x86.h    | 6 ++++++
>  sysdeps/x86/cpu-features.c         | 2 ++
>  sysdeps/x86/include/cpu-features.h | 7 +++++++
>  sysdeps/x86/tst-get-cpu-features.c | 2 ++
>  5 files changed, 20 insertions(+)
>
> diff --git a/manual/platform.texi b/manual/platform.texi
> index bfccd024a5..873ea0a84a 100644
> --- a/manual/platform.texi
> +++ b/manual/platform.texi
> @@ -225,6 +225,9 @@ Leaf (EAX = 23H).
>  @item
>  @code{AVX_VNNI} -- The AVX-VNNI instruction extensions.
>
> +@item
> +@code{AVX_VNNI_INT8} -- The AVX-VNNI-INT8 instruction extensions.
> +
>  @item
>  @code{AVX512_4FMAPS} -- The AVX512_4FMAPS instruction extensions.
>
> diff --git a/sysdeps/x86/bits/platform/x86.h b/sysdeps/x86/bits/platform/x86.h
> index 57973e9a6c..7b239ef188 100644
> --- a/sysdeps/x86/bits/platform/x86.h
> +++ b/sysdeps/x86/bits/platform/x86.h
> @@ -304,6 +304,12 @@ enum
>    x86_cpu_LAM                  = x86_cpu_index_7_ecx_1_eax + 26,
>    x86_cpu_MSRLIST              = x86_cpu_index_7_ecx_1_eax + 27,
>
> +  x86_cpu_index_7_ecx_1_edx
> +    = (CPUID_INDEX_7_ECX_1 * 8 * 4 * sizeof (unsigned int)
> +       + cpuid_register_index_edx * 8 * sizeof (unsigned int)),
> +
> +  x86_cpu_AVX_VNNI_INT8                = x86_cpu_index_7_ecx_1_edx + 4,
> +
>    x86_cpu_index_19_ebx
>      = (CPUID_INDEX_19 * 8 * 4 * sizeof (unsigned int)
>         + cpuid_register_index_ebx * 8 * sizeof (unsigned int)),
> diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
> index 06fae443a8..f34f4884eb 100644
> --- a/sysdeps/x86/cpu-features.c
> +++ b/sysdeps/x86/cpu-features.c
> @@ -143,6 +143,8 @@ update_active (struct cpu_features *cpu_features)
>               CPU_FEATURE_SET_ACTIVE (cpu_features, AVX_IFMA);
>               /* Determine if AVX-VNNI is usable.  */
>               CPU_FEATURE_SET_ACTIVE (cpu_features, AVX_VNNI);
> +             /* Determine if AVX-VNNI-INT8 is usable.  */
> +             CPU_FEATURE_SET_ACTIVE (cpu_features, AVX_VNNI_INT8);
>               /* Determine if FMA is usable.  */
>               CPU_FEATURE_SET_ACTIVE (cpu_features, FMA);
>               /* Determine if VAES is usable.  */
> diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h
> index 1f4b6831f9..5e09c58d9c 100644
> --- a/sysdeps/x86/include/cpu-features.h
> +++ b/sysdeps/x86/include/cpu-features.h
> @@ -314,6 +314,9 @@ enum
>  #define bit_cpu_AVX_IFMA       (1u << 23)
>  #define bit_cpu_LAM            (1u << 26)
>
> +/* EDX.  */
> +#define bit_cpu_AVX_VNNI_INT8  (1u << 4)
> +
>  /* CPUID_INDEX_19.  */
>
>  /* EBX.  */
> @@ -552,6 +555,7 @@ enum
>  #define index_cpu_HRESET       CPUID_INDEX_7_ECX_1
>  #define index_cpu_AVX_IFMA     CPUID_INDEX_7_ECX_1
>  #define index_cpu_LAM          CPUID_INDEX_7_ECX_1
> +#define index_cpu_AVX_VNNI_INT8        CPUID_INDEX_7_ECX_1
>
>  /* CPUID_INDEX_19.  */
>
> @@ -792,6 +796,9 @@ enum
>  #define reg_AVX_IFMA           eax
>  #define reg_LAM                        eax
>
> +/* EDX.  */
> +#define reg_AVX_VNNI_INT8      edx
> +
>  /* CPUID_INDEX_19.  */
>
>  /* EBX.  */
> diff --git a/sysdeps/x86/tst-get-cpu-features.c b/sysdeps/x86/tst-get-cpu-features.c
> index 0c948c2b04..f0585cf330 100644
> --- a/sysdeps/x86/tst-get-cpu-features.c
> +++ b/sysdeps/x86/tst-get-cpu-features.c
> @@ -215,6 +215,7 @@ do_test (void)
>    CHECK_CPU_FEATURE_PRESENT (AVX_IFMA);
>    CHECK_CPU_FEATURE_PRESENT (LAM);
>    CHECK_CPU_FEATURE_PRESENT (MSRLIST);
> +  CHECK_CPU_FEATURE_PRESENT (AVX_VNNI_INT8);
>    CHECK_CPU_FEATURE_PRESENT (AESKLE);
>    CHECK_CPU_FEATURE_PRESENT (WIDE_KL);
>    CHECK_CPU_FEATURE_PRESENT (PTWRITE);
> @@ -382,6 +383,7 @@ do_test (void)
>    CHECK_CPU_FEATURE_ACTIVE (FSRCS);
>    CHECK_CPU_FEATURE_ACTIVE (AMX_FP16);
>    CHECK_CPU_FEATURE_ACTIVE (AVX_IFMA);
> +  CHECK_CPU_FEATURE_ACTIVE (AVX_VNNI_INT8);
>    CHECK_CPU_FEATURE_ACTIVE (AESKLE);
>    CHECK_CPU_FEATURE_ACTIVE (WIDE_KL);
>    CHECK_CPU_FEATURE_ACTIVE (PTWRITE);
> --
> 2.39.2
>

LGTM
Reviewed-by: Noah Goldstein <goldstein.w.n@gmail.com>
  

Patch

diff --git a/manual/platform.texi b/manual/platform.texi
index bfccd024a5..873ea0a84a 100644
--- a/manual/platform.texi
+++ b/manual/platform.texi
@@ -225,6 +225,9 @@  Leaf (EAX = 23H).
 @item
 @code{AVX_VNNI} -- The AVX-VNNI instruction extensions.
 
+@item
+@code{AVX_VNNI_INT8} -- The AVX-VNNI-INT8 instruction extensions.
+
 @item
 @code{AVX512_4FMAPS} -- The AVX512_4FMAPS instruction extensions.
 
diff --git a/sysdeps/x86/bits/platform/x86.h b/sysdeps/x86/bits/platform/x86.h
index 57973e9a6c..7b239ef188 100644
--- a/sysdeps/x86/bits/platform/x86.h
+++ b/sysdeps/x86/bits/platform/x86.h
@@ -304,6 +304,12 @@  enum
   x86_cpu_LAM			= x86_cpu_index_7_ecx_1_eax + 26,
   x86_cpu_MSRLIST		= x86_cpu_index_7_ecx_1_eax + 27,
 
+  x86_cpu_index_7_ecx_1_edx
+    = (CPUID_INDEX_7_ECX_1 * 8 * 4 * sizeof (unsigned int)
+       + cpuid_register_index_edx * 8 * sizeof (unsigned int)),
+
+  x86_cpu_AVX_VNNI_INT8		= x86_cpu_index_7_ecx_1_edx + 4,
+
   x86_cpu_index_19_ebx
     = (CPUID_INDEX_19 * 8 * 4 * sizeof (unsigned int)
        + cpuid_register_index_ebx * 8 * sizeof (unsigned int)),
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c
index 06fae443a8..f34f4884eb 100644
--- a/sysdeps/x86/cpu-features.c
+++ b/sysdeps/x86/cpu-features.c
@@ -143,6 +143,8 @@  update_active (struct cpu_features *cpu_features)
 	      CPU_FEATURE_SET_ACTIVE (cpu_features, AVX_IFMA);
 	      /* Determine if AVX-VNNI is usable.  */
 	      CPU_FEATURE_SET_ACTIVE (cpu_features, AVX_VNNI);
+	      /* Determine if AVX-VNNI-INT8 is usable.  */
+	      CPU_FEATURE_SET_ACTIVE (cpu_features, AVX_VNNI_INT8);
 	      /* Determine if FMA is usable.  */
 	      CPU_FEATURE_SET_ACTIVE (cpu_features, FMA);
 	      /* Determine if VAES is usable.  */
diff --git a/sysdeps/x86/include/cpu-features.h b/sysdeps/x86/include/cpu-features.h
index 1f4b6831f9..5e09c58d9c 100644
--- a/sysdeps/x86/include/cpu-features.h
+++ b/sysdeps/x86/include/cpu-features.h
@@ -314,6 +314,9 @@  enum
 #define bit_cpu_AVX_IFMA	(1u << 23)
 #define bit_cpu_LAM		(1u << 26)
 
+/* EDX.  */
+#define bit_cpu_AVX_VNNI_INT8	(1u << 4)
+
 /* CPUID_INDEX_19.  */
 
 /* EBX.  */
@@ -552,6 +555,7 @@  enum
 #define index_cpu_HRESET	CPUID_INDEX_7_ECX_1
 #define index_cpu_AVX_IFMA	CPUID_INDEX_7_ECX_1
 #define index_cpu_LAM		CPUID_INDEX_7_ECX_1
+#define index_cpu_AVX_VNNI_INT8	CPUID_INDEX_7_ECX_1
 
 /* CPUID_INDEX_19.  */
 
@@ -792,6 +796,9 @@  enum
 #define reg_AVX_IFMA		eax
 #define reg_LAM			eax
 
+/* EDX.  */
+#define reg_AVX_VNNI_INT8	edx
+
 /* CPUID_INDEX_19.  */
 
 /* EBX.  */
diff --git a/sysdeps/x86/tst-get-cpu-features.c b/sysdeps/x86/tst-get-cpu-features.c
index 0c948c2b04..f0585cf330 100644
--- a/sysdeps/x86/tst-get-cpu-features.c
+++ b/sysdeps/x86/tst-get-cpu-features.c
@@ -215,6 +215,7 @@  do_test (void)
   CHECK_CPU_FEATURE_PRESENT (AVX_IFMA);
   CHECK_CPU_FEATURE_PRESENT (LAM);
   CHECK_CPU_FEATURE_PRESENT (MSRLIST);
+  CHECK_CPU_FEATURE_PRESENT (AVX_VNNI_INT8);
   CHECK_CPU_FEATURE_PRESENT (AESKLE);
   CHECK_CPU_FEATURE_PRESENT (WIDE_KL);
   CHECK_CPU_FEATURE_PRESENT (PTWRITE);
@@ -382,6 +383,7 @@  do_test (void)
   CHECK_CPU_FEATURE_ACTIVE (FSRCS);
   CHECK_CPU_FEATURE_ACTIVE (AMX_FP16);
   CHECK_CPU_FEATURE_ACTIVE (AVX_IFMA);
+  CHECK_CPU_FEATURE_ACTIVE (AVX_VNNI_INT8);
   CHECK_CPU_FEATURE_ACTIVE (AESKLE);
   CHECK_CPU_FEATURE_ACTIVE (WIDE_KL);
   CHECK_CPU_FEATURE_ACTIVE (PTWRITE);