x86: Add FEATURE_AVX512VP2INTERSECT and update GFNI check

Add FEATURE_AVX512VP2INTERSECT to libgcc so that enum processor_features
in libgcc matches enum processor_features in i386-builtins.c.  Update
GFNI check to support processors with SSE and AVX versions of GFNI.

	PR target/95212
	PR target/95220
	* config/i386/cpuinfo.c (get_available_features): Fix
	FEATURE_GFNI check.  Also check FEATURE_AVX512VP2INTERSECT.
	* config/i386/cpuinfo.h (processor_features): Add
	FEATURE_AVX512VP2INTERSECT.

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 7343c773ecf2301ec113fd50aba115262bc07abc..64c3bb1d3dbc5fa61928b74d8317533a933f7927 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,12 @@
+2020-05-19  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR target/95212
+       PR target/95220
+       * config/i386/cpuinfo.c (get_available_features): Fix
+       FEATURE_GFNI check.  Also check FEATURE_AVX512VP2INTERSECT.
+       * config/i386/cpuinfo.h (processor_features): Add
+       FEATURE_AVX512VP2INTERSECT.
+
 2020-05-15  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR bootstrap/95147

diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
index 00322c5862276e19cbc27e99f1a189ee9082e7d9..26c1bdca3618df9e7b7f203916ac31fab5857ed3 100644 (file)
--- a/libgcc/config/i386/cpuinfo.c
+++ b/libgcc/config/i386/cpuinfo.c
@@ -349,6 +349,8 @@ get_available_features (unsigned int ecx, unsigned int edx,
        }
       if (ebx & bit_BMI2)
        set_feature (FEATURE_BMI2);
+      if (ecx & bit_GFNI)
+       set_feature (FEATURE_GFNI);
       if (avx512_usable)
        {
          if (ebx & bit_AVX512F)
@@ -371,8 +373,6 @@ get_available_features (unsigned int ecx, unsigned int edx,
            set_feature (FEATURE_AVX512VBMI);
          if (ecx & bit_AVX512VBMI2)
            set_feature (FEATURE_AVX512VBMI2);
-         if (ecx & bit_GFNI)
-           set_feature (FEATURE_GFNI);
          if (ecx & bit_VPCLMULQDQ)
            set_feature (FEATURE_VPCLMULQDQ);
          if (ecx & bit_AVX512VNNI)
@@ -385,6 +385,8 @@ get_available_features (unsigned int ecx, unsigned int edx,
            set_feature (FEATURE_AVX5124VNNIW);
          if (edx & bit_AVX5124FMAPS)
            set_feature (FEATURE_AVX5124FMAPS);
+         if (edx & bit_AVX512VP2INTERSECT)
+           set_feature (FEATURE_AVX512VP2INTERSECT);
 
          __cpuid_count (7, 1, eax, ebx, ecx, edx);
          if (eax & bit_AVX512BF16)

diff --git a/libgcc/config/i386/cpuinfo.h b/libgcc/config/i386/cpuinfo.h
index 41c4a49a98da98e12892fc2f1809083733a82c2a..fd6d12a7d68336651a87d5927dc5c0c6bbaa63bd 100644 (file)
--- a/libgcc/config/i386/cpuinfo.h
+++ b/libgcc/config/i386/cpuinfo.h
@@ -122,6 +122,7 @@ enum processor_features
   FEATURE_VPCLMULQDQ,
   FEATURE_AVX512VNNI,
   FEATURE_AVX512BITALG,
+  FEATURE_AVX512VP2INTERSECT,
   FEATURE_AVX512BF16
 };