driver-i386.c (host_detect_local_cpu): Add Kaby Lake models to skylake case.

gcc/

2017-06-22  Matt Turner  <mattst88@gmail.com>

	* config/i386/driver-i386.c (host_detect_local_cpu): Add Kaby
	Lake models to skylake case.  Assume skylake for unknown
	models with clflushopt.

gcc/testsuite/

2017-06-22  Matt Turner  <mattst88@gmail.com>

	* gcc.target/i386/builtin_target.c: Add Kaby Lake models to
	skylake check.

libgcc/

2017-06-22  Matt Turner  <mattst88@gmail.com>

	* config/i386/cpuinfo.c (get_intel_cpu): Add Kaby Lake models to
	skylake case.

From-SVN: r249574

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 03a824f6b3f3fd71055d9e97169afcad8a32dd9f..087126dcd4304296b6d25cd034c2fe1ae232e1ea 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-22  Matt Turner  <mattst88@gmail.com>
+
+       * config/i386/driver-i386.c (host_detect_local_cpu): Add Kaby
+       Lake models to skylake case.  Assume skylake for unknown
+       models with clflushopt.
+
 2017-06-22  Jeff Law  <law@redhat.com>
 
        * config/aarch64/aarch64.c (aarch64_emit_probe_stack_range): Handle

diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c
index 6c81251423950efbae7e7486a39438f8aa8e0a59..570c49031bd9072fb7c5f9be87e630b7b0987429 100644 (file)
--- a/gcc/config/i386/driver-i386.c
+++ b/gcc/config/i386/driver-i386.c
@@ -781,6 +781,9 @@ const char *host_detect_local_cpu (int argc, const char **argv)
        case 0x4e:
        case 0x5e:
          /* Skylake.  */
+       case 0x8e:
+       case 0x9e:
+         /* Kaby Lake.  */
          cpu = "skylake";
          break;
        case 0x57:
@@ -794,6 +797,9 @@ const char *host_detect_local_cpu (int argc, const char **argv)
              /* Assume Knights Landing.  */
              if (has_avx512f)
                cpu = "knl";
+             /* Assume Skylake.  */
+             else if (has_clflushopt)
+               cpu = "skylake";
              /* Assume Broadwell.  */
              else if (has_adx)
                cpu = "broadwell";

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index cc8cef2560372dc52fcd0e78b078e06a55193467..b41c8d9c4416f1a03d048a890844054a742f590d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-22  Matt Turner  <mattst88@gmail.com>
+
+       * gcc.target/i386/builtin_target.c: Add Kaby Lake models to
+       skylake check.
+
 2017-06-22 Carl Love  <cel@us.ibm.com>
 
        * gcc.target/powerpc/builtins-3.c (vmulosh, vmulouh, vmulesh,

diff --git a/gcc/testsuite/gcc.target/i386/builtin_target.c b/gcc/testsuite/gcc.target/i386/builtin_target.c
index 374f0292453bcdbbf4d8300f466f50ba29a47e52..9c190eb7ebc393b8cd802c03cba82be08e92171f 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/builtin_target.c
+++ b/gcc/testsuite/gcc.target/i386/builtin_target.c
@@ -88,6 +88,9 @@ check_intel_cpu_model (unsigned int family, unsigned int model,
            case 0x4e:
            case 0x5e:
              /* Skylake.  */
+           case 0x8e:
+           case 0x9e:
+             /* Kaby Lake.  */
              assert (__builtin_cpu_is ("corei7"));
              assert (__builtin_cpu_is ("skylake"));
              break;

diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 0fc1d60fb91dfd4ca31aa02689ad55da9a39bba9..1b5d2b5a17d4e610bebc8337f837e27f2ddc9a28 100644 (file)
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-22  Matt Turner  <mattst88@gmail.com>
+
+       * config/i386/cpuinfo.c (get_intel_cpu): Add Kaby Lake models to
+       skylake case.
+
 2017-06-21  Richard Biener  <rguenther@suse.de>
 
        PR gcov-profile/81080

diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
index a1dc011525f55ee1195c86391fc14dc5d769b69c..b008fb6e39628f2d14d3766ce840756100cb0cc7 100644 (file)
--- a/libgcc/config/i386/cpuinfo.c
+++ b/libgcc/config/i386/cpuinfo.c
@@ -183,6 +183,9 @@ get_intel_cpu (unsigned int family, unsigned int model, unsigned int brand_id)
            case 0x4e:
            case 0x5e:
              /* Skylake.  */
+           case 0x8e:
+           case 0x9e:
+             /* Kaby Lake.  */
              __cpu_model.__cpu_type = INTEL_COREI7;
              __cpu_model.__cpu_subtype = INTEL_COREI7_SKYLAKE;
              break;