From 02da1e9cae7c925289758d2f601f1aa5691640d0 Mon Sep 17 00:00:00 2001 From: Julia Koval Date: Fri, 2 Feb 2018 14:45:57 +0100 Subject: [PATCH] Add -march=icelake. gcc/ * config.gcc: Add -march=icelake. * config/i386/driver-i386.c (host_detect_local_cpu): Detect icelake. * config/i386/i386-c.c (ix86_target_macros_internal): Handle icelake. * config/i386/i386.c (processor_costs): Add m_ICELAKE. (PTA_ICELAKE, PTA_AVX512VNNI, PTA_GFNI, PTA_VAES, PTA_AVX512VBMI2, PTA_VPCLMULQDQ, PTA_RDPID, PTA_AVX512BITALG): New. (processor_target_table): Add icelake. (ix86_option_override_internal): Handle new PTAs. (get_builtin_code_for_version): Handle icelake. (M_INTEL_COREI7_ICELAKE): New. (fold_builtin_cpu): Handle icelake. * config/i386/i386.h (TARGET_ICELAKE, PROCESSOR_ICELAKE): New. * doc/invoke.texi: Add -march=icelake. gcc/testsuite/ * gcc.target/i386/funcspec-56.inc: Handle new march. * g++.dg/ext/mv16.C: Ditto. libgcc/ * config/i386/cpuinfo.h (processor_subtypes): Add INTEL_COREI7_ICELAKE. From-SVN: r257331 --- gcc/ChangeLog | 16 ++++++ gcc/config.gcc | 2 +- gcc/config/i386/driver-i386.c | 5 +- gcc/config/i386/i386-c.c | 7 +++ gcc/config/i386/i386.c | 49 +++++++++++++++++-- gcc/config/i386/i386.h | 2 + gcc/doc/invoke.texi | 8 +++ gcc/testsuite/ChangeLog | 5 ++ gcc/testsuite/g++.dg/ext/mv16.C | 6 +++ gcc/testsuite/gcc.target/i386/funcspec-56.inc | 1 + libgcc/ChangeLog | 4 ++ libgcc/config/i386/cpuinfo.h | 1 + 12 files changed, 100 insertions(+), 6 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 5ef0f8de4db..85ab7f6e5e8 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,19 @@ +2018-02-02 Julia Koval + + * config.gcc: Add -march=icelake. + * config/i386/driver-i386.c (host_detect_local_cpu): Detect icelake. + * config/i386/i386-c.c (ix86_target_macros_internal): Handle icelake. + * config/i386/i386.c (processor_costs): Add m_ICELAKE. + (PTA_ICELAKE, PTA_AVX512VNNI, PTA_GFNI, PTA_VAES, PTA_AVX512VBMI2, + PTA_VPCLMULQDQ, PTA_RDPID, PTA_AVX512BITALG): New. + (processor_target_table): Add icelake. + (ix86_option_override_internal): Handle new PTAs. + (get_builtin_code_for_version): Handle icelake. + (M_INTEL_COREI7_ICELAKE): New. + (fold_builtin_cpu): Handle icelake. + * config/i386/i386.h (TARGET_ICELAKE, PROCESSOR_ICELAKE): New. + * doc/invoke.texi: Add -march=icelake. + 2018-02-02 Julia Koval * config/i386/i386.c (ix86_option_override_internal): Change flags type diff --git a/gcc/config.gcc b/gcc/config.gcc index ec6822b9db1..c52fecf4221 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -635,7 +635,7 @@ x86_64_archs="amdfam10 athlon64 athlon64-sse3 barcelona bdver1 bdver2 \ bdver3 bdver4 znver1 btver1 btver2 k8 k8-sse3 opteron opteron-sse3 nocona \ core2 corei7 corei7-avx core-avx-i core-avx2 atom slm nehalem westmere \ sandybridge ivybridge haswell broadwell bonnell silvermont knl knm \ -skylake-avx512 cannonlake x86-64 native" +skylake-avx512 cannonlake icelake x86-64 native" # Additional x86 processors supported by --with-cpu=. Each processor # MUST be separated by exactly one space. diff --git a/gcc/config/i386/driver-i386.c b/gcc/config/i386/driver-i386.c index 5b20575d6a4..ca1a2e0c37e 100644 --- a/gcc/config/i386/driver-i386.c +++ b/gcc/config/i386/driver-i386.c @@ -822,8 +822,11 @@ const char *host_detect_local_cpu (int argc, const char **argv) if (arch) { /* This is unknown family 0x6 CPU. */ + /* Assume Ice Lake. */ + if (has_gfni) + cpu = "icelake"; /* Assume Cannon Lake. */ - if (has_avx512vbmi) + else if (has_avx512vbmi) cpu = "cannonlake"; /* Assume Knights Mill. */ else if (has_avx5124vnniw) diff --git a/gcc/config/i386/i386-c.c b/gcc/config/i386/i386-c.c index 78dd65785f6..c0b4ffed7ea 100644 --- a/gcc/config/i386/i386-c.c +++ b/gcc/config/i386/i386-c.c @@ -190,6 +190,10 @@ ix86_target_macros_internal (HOST_WIDE_INT isa_flag, def_or_undef (parse_in, "__cannonlake"); def_or_undef (parse_in, "__cannonlake__"); break; + case PROCESSOR_ICELAKE: + def_or_undef (parse_in, "__icelake"); + def_or_undef (parse_in, "__icelake__"); + break; /* use PROCESSOR_max to not set/unset the arch macro. */ case PROCESSOR_max: break; @@ -311,6 +315,9 @@ ix86_target_macros_internal (HOST_WIDE_INT isa_flag, case PROCESSOR_CANNONLAKE: def_or_undef (parse_in, "__tune_cannonlake__"); break; + case PROCESSOR_ICELAKE: + def_or_undef (parse_in, "__tune_icelake__"); + break; case PROCESSOR_LAKEMONT: def_or_undef (parse_in, "__tune_lakemont__"); break; diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 801f8e1aa71..5fa5d9eb171 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -146,6 +146,7 @@ const struct processor_costs *ix86_cost = NULL; #define m_KNM (1U<x_ix86_isa_flags_explicit & OPTION_MASK_ISA_AVX512IFMA)) opts->x_ix86_isa_flags |= OPTION_MASK_ISA_AVX512IFMA; + if (((processor_alias_table[i].flags & PTA_AVX512VNNI) != 0) + && !(opts->x_ix86_isa_flags_explicit & OPTION_MASK_ISA_AVX512VNNI)) + opts->x_ix86_isa_flags |= OPTION_MASK_ISA_AVX512VNNI; + if (((processor_alias_table[i].flags & PTA_GFNI) != 0) + && !(opts->x_ix86_isa_flags_explicit & OPTION_MASK_ISA_GFNI)) + opts->x_ix86_isa_flags |= OPTION_MASK_ISA_GFNI; + if (((processor_alias_table[i].flags & PTA_AVX512VBMI2) != 0) + && !(opts->x_ix86_isa_flags_explicit + & OPTION_MASK_ISA_AVX512VBMI2)) + opts->x_ix86_isa_flags |= OPTION_MASK_ISA_AVX512VBMI2; + if (((processor_alias_table[i].flags & PTA_VPCLMULQDQ) != 0) + && !(opts->x_ix86_isa_flags_explicit & OPTION_MASK_ISA_VPCLMULQDQ)) + opts->x_ix86_isa_flags |= OPTION_MASK_ISA_VPCLMULQDQ; + if (((processor_alias_table[i].flags & PTA_AVX512BITALG) != 0) + && !(opts->x_ix86_isa_flags_explicit + & OPTION_MASK_ISA_AVX512BITALG)) + opts->x_ix86_isa_flags |= OPTION_MASK_ISA_AVX512BITALG; if (((processor_alias_table[i].flags & PTA_AVX5124VNNIW) != 0) && !(opts->x_ix86_isa_flags2_explicit @@ -4123,6 +4153,12 @@ ix86_option_override_internal (bool main_args_p, if (((processor_alias_table[i].flags & PTA_SGX) != 0) && !(opts->x_ix86_isa_flags2_explicit & OPTION_MASK_ISA_SGX)) opts->x_ix86_isa_flags2 |= OPTION_MASK_ISA_SGX; + if (((processor_alias_table[i].flags & PTA_VAES) != 0) + && !(opts->x_ix86_isa_flags2_explicit & OPTION_MASK_ISA_VAES)) + opts->x_ix86_isa_flags2 |= OPTION_MASK_ISA_VAES; + if (((processor_alias_table[i].flags & PTA_RDPID) != 0) + && !(opts->x_ix86_isa_flags2_explicit & OPTION_MASK_ISA_RDPID)) + opts->x_ix86_isa_flags2 |= OPTION_MASK_ISA_RDPID; if ((processor_alias_table[i].flags & (PTA_PREFETCH_SSE | PTA_SSE)) != 0) @@ -32124,7 +32160,10 @@ get_builtin_code_for_version (tree decl, tree *predicate_list) break; case PROCESSOR_HASWELL: case PROCESSOR_SKYLAKE_AVX512: - if (new_target->x_ix86_isa_flags & OPTION_MASK_ISA_AVX512VBMI) + if (new_target->x_ix86_isa_flags & OPTION_MASK_ISA_GFNI) + arg_str = "icelake"; + else if (new_target->x_ix86_isa_flags + & OPTION_MASK_ISA_AVX512VBMI) arg_str = "cannonlake"; else if (new_target->x_ix86_isa_flags & OPTION_MASK_ISA_AVX512VL) arg_str = "skylake-avx512"; @@ -32849,7 +32888,8 @@ fold_builtin_cpu (tree fndecl, tree *args) M_INTEL_COREI7_BROADWELL, M_INTEL_COREI7_SKYLAKE, M_INTEL_COREI7_SKYLAKE_AVX512, - M_INTEL_COREI7_CANNONLAKE + M_INTEL_COREI7_CANNONLAKE, + M_INTEL_COREI7_ICELAKE }; static struct _arch_names_table @@ -32874,6 +32914,7 @@ fold_builtin_cpu (tree fndecl, tree *args) {"skylake", M_INTEL_COREI7_SKYLAKE}, {"skylake-avx512", M_INTEL_COREI7_SKYLAKE_AVX512}, {"cannonlake", M_INTEL_COREI7_CANNONLAKE}, + {"icelake", M_INTEL_COREI7_ICELAKE}, {"bonnell", M_INTEL_BONNELL}, {"silvermont", M_INTEL_SILVERMONT}, {"knl", M_INTEL_KNL}, diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 59522ccba02..9d864501d4f 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -383,6 +383,7 @@ extern const struct processor_costs ix86_size_cost; #define TARGET_KNM (ix86_tune == PROCESSOR_KNM) #define TARGET_SKYLAKE_AVX512 (ix86_tune == PROCESSOR_SKYLAKE_AVX512) #define TARGET_CANNONLAKE (ix86_tune == PROCESSOR_CANNONLAKE) +#define TARGET_ICELAKE (ix86_tune == PROCESSOR_ICELAKE) #define TARGET_INTEL (ix86_tune == PROCESSOR_INTEL) #define TARGET_GENERIC (ix86_tune == PROCESSOR_GENERIC) #define TARGET_AMDFAM10 (ix86_tune == PROCESSOR_AMDFAM10) @@ -2263,6 +2264,7 @@ enum processor_type PROCESSOR_KNM, PROCESSOR_SKYLAKE_AVX512, PROCESSOR_CANNONLAKE, + PROCESSOR_ICELAKE, PROCESSOR_INTEL, PROCESSOR_GEODE, PROCESSOR_K6, diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index dbc5c47b031..f3d93367640 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -25606,6 +25606,14 @@ RDRND, FMA, BMI, BMI2, F16C, RDSEED, ADCX, PREFETCHW, CLFLUSHOPT, XSAVEC, XSAVES, AVX512F, AVX512VL, AVX512BW, AVX512DQ, AVX512CD, AVX512VBMI, AVX512IFMA, SHA, CLWB and UMIP instruction set support. +@item Icelake +Intel Icelake Server CPU with 64-bit extensions, MOVBE, MMX, SSE, SSE2, +SSE3, SSSE3, SSE4.1, SSE4.2, POPCNT, PKU, AVX, AVX2, AES, PCLMUL, FSGSBASE, +RDRND, FMA, BMI, BMI2, F16C, RDSEED, ADCX, PREFETCHW, CLFLUSHOPT, XSAVEC, +XSAVES, AVX512F, AVX512VL, AVX512BW, AVX512DQ, AVX512CD, AVX512VBMI, +AVX512IFMA, SHA, CLWB, UMIP, RDPID, GFNI, AVX512VBMI2, AVX512VPOPCNTDQ, +AVX512BITALG, AVX512VNNI, VPCLMULQDQ, VAES instruction set support. + @item k6 AMD K6 CPU with MMX instruction set support. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 21c8134e65b..a9e5d030ea8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-02-02 Julia Koval + + * gcc.target/i386/funcspec-56.inc: Handle new march. + * g++.dg/ext/mv16.C: Ditto. + 2018-02-02 Georg-Johann Lay * lib/target-supports.exp diff --git a/gcc/testsuite/g++.dg/ext/mv16.C b/gcc/testsuite/g++.dg/ext/mv16.C index 1e1ae3d2f0d..8fbdb4791ae 100644 --- a/gcc/testsuite/g++.dg/ext/mv16.C +++ b/gcc/testsuite/g++.dg/ext/mv16.C @@ -60,6 +60,10 @@ int __attribute__ ((target("arch=cannonlake"))) foo () { return 16; } +int __attribute__ ((target("arch=icelake"))) foo () { + return 17; +} + int main () { int val = foo (); @@ -82,6 +86,8 @@ int main () assert (val == 15); else if (__builtin_cpu_is ("cannonlake")) assert (val == 16); + else if (__builtin_cpu_is ("icelake")) + assert (val == 17); else assert (val == 0); diff --git a/gcc/testsuite/gcc.target/i386/funcspec-56.inc b/gcc/testsuite/gcc.target/i386/funcspec-56.inc index ed0748bd95d..837cdc3560d 100644 --- a/gcc/testsuite/gcc.target/i386/funcspec-56.inc +++ b/gcc/testsuite/gcc.target/i386/funcspec-56.inc @@ -145,6 +145,7 @@ extern void test_arch_knl (void) __attribute__((__target__("arch=knl"))); extern void test_arch_knm (void) __attribute__((__target__("arch=knm"))); extern void test_arch_skylake_avx512 (void) __attribute__((__target__("arch=skylake-avx512"))); extern void test_arch_cannonlake (void) __attribute__((__target__("arch=cannonlake"))); +extern void test_arch_icelake (void) __attribute__((__target__("arch=icelake"))); extern void test_arch_k8 (void) __attribute__((__target__("arch=k8"))); extern void test_arch_k8_sse3 (void) __attribute__((__target__("arch=k8-sse3"))); extern void test_arch_opteron (void) __attribute__((__target__("arch=opteron"))); diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog index 79c79e8c31c..1eb16631e03 100644 --- a/libgcc/ChangeLog +++ b/libgcc/ChangeLog @@ -1,3 +1,7 @@ +2018-02-02 Julia Koval + + * config/i386/cpuinfo.h (processor_subtypes): Add INTEL_COREI7_ICELAKE. + 2018-01-26 Claudiu Zissulescu * config/arc/lib1funcs.S (__udivmodsi4): Use safe version for RF16 diff --git a/libgcc/config/i386/cpuinfo.h b/libgcc/config/i386/cpuinfo.h index c43d941011b..a2470726af1 100644 --- a/libgcc/config/i386/cpuinfo.h +++ b/libgcc/config/i386/cpuinfo.h @@ -70,6 +70,7 @@ enum processor_subtypes INTEL_COREI7_SKYLAKE, INTEL_COREI7_SKYLAKE_AVX512, INTEL_COREI7_CANNONLAKE, + INTEL_COREI7_ICELAKE, CPU_SUBTYPE_MAX };