[x86] march aliases

On Sun, Dec 22, 2013 at 11:11:12PM +0100, Uros Bizjak wrote:
> On Sun, Dec 22, 2013 at 8:28 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> 
> >> > > >>> > Perhaps we should add sandybridge, ivybridge and haswell aliases for
> >> > > >>> > corei7-avx, core-avx-i, core-avx2?  I mean, it is a nightmare to remember
> >> > > >>> > which one has the i7 in and which doesn't even for me.
> >> > > >>>
> >> > > >>> Yes please, I think this is a good idea.
> >> > > >>
> >> > > >> I've added aliases for haswell, sandybridge, ivybridge, bonnell,
> >> > > >> nehalem and silvermont.
> >> > > >>
> >> > > > Old names, like corei7, core-avx-i, atom, .. don't have precise
> >> > > > description for the processor.  I think gcc driver should keep
> >> > > > accepting them.  But they should be marked as undocumented
> >> > > > or deprecated.  They should be removed from documentation.
> >> > >
> >> > > How about we leave these as -march=... to refer to the architecture,
> >> > > and reintroduce -mcpu= to refer to the exact cpu? Internally, the
> >> > > -mcpu would use some architecture specific base PTA_ attributes (as
> >> > > Jakub suggested) and would add some fine-tuning PTA_ attributes, based
> >> > > on -mcpu selection. This way, -march stays as is, and can still be
> >> > > used for some generally distributed binaries.
> >> >
> >> > -mcpu is problematic, because it means various things among different
> >> > targets, and even on i?86/x86_64 it used to mean something already in the
> >> > past.  Sometimes -mcpu= is what -march= is now on i?86/x86_64, sometimes
> >> > what -mtune= is.  I'd say we don't need to deprecate anything, just add new
> >> > aliases for the sometimes harder to remember names.  But everything just
> >> > IMHO.
> >> >
> >> >     Jakub
> >>
> >> There are many problems with the current -march=xxx/-mtune=xxx for
> >> Intel processors, which aren't faults of GCC:
> >>
> >> 1. Atom processors can be Bonnell or Silvermont processors.  -mtune=atom
> >> may not optimize for the Atom CPU being targeted.
> >> 2. Core I7 processors can be Nehalem, Westmere, Sandy Bridge, Ivy Bridge,
> >> Haswell or Broadwell. It is hard to tell which -mtune= to use for saying
> >> Core i7-3820QM.
> >> 3. There are Core i3/i5, Xeon, Celeron, Pentium processors which aren't
> >> called Core I7.  They may be Nehalem, Westmere, Sandy Bridge, Ivy Bridge,
> >> Haswell or even Silvermont.
> >>
> >> We should move away from corei7, corei7-avx, core-avx-i, core-avx2, atom.
> >> Instead, we should use the actual processor names.  We must accept those
> >> old names.  But we should remove them from GCC manual to avoid any
> >> confusions.  This patch adds -march=/mtune={nehalem,westmere,sandybridge,
> >> ivybridge,haswell,broadwell,bonnell,silvermont}.  It also adds
> >> --with-arch=/--with-cpu= support as well as adds "ivybridge", "haswell",
> >> "bonnell", "silvermont" to multi-arch function versioning.
> >>
> >> Any comments?
> >
> > This is the updated patch to add PTA_XXX as well as fix
> >
> > http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59580
> >
> > to properly check --with-arch=/--with-cpu= options. Now we only need
> > to add a new processor to x86_64_archs, which will enable its
> > --with-arch=/--with-cpu= support.
> >
> >
> > H.J.
> > ---
> > gcc/
> >
> > 2013-12-22   H.J. Lu  <hongjiu.lu@intel.com>
> >              Tocar Ilya  <ilya.tocar@intel.com>
> >
> >         * config.gcc (x86_archs): New variable.
> >         (x86_64_archs): Likewise.
> >         (x86_cpus): Likewise.
> >         Use $x86_archs, $x86_64_archs and $x86_cpus to check valid
> >         --with-arch/--with-cpu= options.
> >         Support --with-arch=/--with-cpu={nehalem,westmere,
> >         sandybridge,ivybridge,haswell,broadwell,bonnell,silvermont}.
> >
> >         * config/i386/core2.md: Replace corei7 with nehalem.
> >
> >         * config/i386/driver-i386.c (host_detect_local_cpu): Use nehalem,
> >         westmere, sandybridge, ivybridge, haswell, bonnell, silvermont
> >         for cpu names.
> >
> >         * config/i386/i386-c.c (ix86_target_macros_internal): Replace
> >         PROCESSOR_COREI7, PROCESSOR_COREI7_AVX, PROCESSOR_ATOM,
> >         PROCESSOR_SLM with PROCESSOR_NEHALEM, PROCESSOR_SANDYBRIDGE,
> >         PROCESSOR_BONNELL, PROCESSOR_SILVERMONT.  Define
> >         __nehalem/__nehalem__, __sandybridge/__sandybridge__,
> >         __haswell/__haswell__, __tune_nehalem__, __tune_sandybridge__,
> >         __tune_haswell__, __bonnell/__bonnell__,
> >         __silvermont/__silvermont__, __tune_bonnell__,
> >         __tune_silvermont__.
> >
> >         * config/i386/i386.c (m_COREI7): Renamed to ...
> >         (m_NEHALEM): This.
> >         (m_COREI7_AVX): Renamed to ...
> >         (m_SANDYBRIDGE): This.
> >         (m_ATOM): Renamed to ...
> >         (m_BONNELL): This.
> >         (m_SLM): Renamed to ...
> >         (m_SILVERMONT): This.
> >         (m_CORE_ALL): Updated.
> >         (cpu_names): Add "nehalem", "westmere", "sandybridge",
> >         "ivybridge", "haswell", "broadwell", "bonnell", "silvermont".
> >         (PTA_CORE2): New.
> >         (PTA_NEHALEM): Likewise.
> >         (PTA_WESTMERE): Likewise.
> >         (PTA_SANDYBRIDGE): Likewise.
> >         (PTA_IVYBRIDGE): Likewise.
> >         (PTA_HASWELL): Likewise.
> >         (PTA_BROADWELL): Likewise.
> >         (PTA_BONNELL): Likewise.
> >         (PTA_SILVERMONT): Likewise.
> >         (ix86_option_override_internal): Use new PTA_XXX.  Add nehalem,
> >         westmere, sandybridge, ivybridge, haswell, bonnell, silvermont.
> >         (ix86_lea_outperforms): Updated.
> >         (ix86_issue_rate): Likewise.
> >         (ix86_adjust_cost): Likewise.
> >         (ia32_multipass_dfa_lookahead): Likewise.
> >         (do_reorder_for_imul): Likewise.
> >         (swap_top_of_ready_list): Likewise.
> >         (ix86_sched_reorder): Likewise.
> >         (ix86_sched_init_global): Likewise.
> >         (get_builtin_code_for_version): Likewise.  Handle PROCESSOR_HASWELL
> >         and PROCESSOR_SILVERMONT.
> >         (processor_model): Replace M_INTEL_ATOM, M_INTEL_SLM with
> >         M_INTEL_BONNELL, M_INTEL_SILVERMONT.  Add M_INTEL_COREI7_IVYBRIDGE
> >         and M_INTEL_COREI7_HASWELL.
> >         (arch_names_table): Updated.  Add "ivybridge", "haswell",
> >         "bonnell", "silvermont".
> >
> >         * config/i386/i386.h (TARGET_COREI7): Removed.
> >         (TARGET_COREI7_AVX): Likewise.
> >         (TARGET_ATOM): Likewise.
> >         (TARGET_SLM): Likewise.
> >         (TARGET_NEHALEM): New.
> >         (TARGET_SANDYBRIDGE): Likewise.
> >         (TARGET_BONNELL): Likewise.
> >         (TARGET_SILVERMONT): Likewise.
> >         (target_cpu_default): Add TARGET_CPU_DEFAULT_nehalem,
> >         TARGET_CPU_DEFAULT_westmere, TARGET_CPU_DEFAULT_sandybridge,
> >         TARGET_CPU_DEFAULT_ivybridge, TARGET_CPU_DEFAULT_broadwell,
> >         TARGET_CPU_DEFAULT_bonnell, TARGET_CPU_DEFAULT_silvermont.
> >         (processor_type): Replace PROCESSOR_COREI7, PROCESSOR_COREI7_AVX,
> >         PROCESSOR_ATOM, PROCESSOR_SLM with PROCESSOR_NEHALEM,
> >         PROCESSOR_SANDYBRIDGE, PROCESSOR_BONNELL, PROCESSOR_SILVERMONT.
> >
> >         * config/i386/i386.md (cpu): Replace corei7 with nehalem.
> >
> >         * config/i386/x86-tune.def: Updated.
> >
> >         * doc/invoke.texi: Replace corei7, corei7-avx, core-avx-i,
> >         core-avx2, atom, slm with nehalem, sandybridge, ivybridge,
> >         haswell, bonnel, silvermont.  Add westmere.
> >
> > libgcc/
> >
> > 2013-12-22   H.J. Lu  <hongjiu.lu@intel.com>
> >
> >         * config/i386/cpuinfo.c (processor_subtypes): Replace INTEL_ATOM,
> >         INTEL_SLM with INTEL_BONNELL, INTEL_SILVERMONT.  Add
> >         INTEL_COREI7_IVYBRIDGE and INTEL_COREI7_HASWELL.
> >         (get_intel_cpu): Updated.  Check Ivy Bridge and Haswell processors.
> 
> The patch is OK for rename and addition of new aliases. Target cpu
> changes, other than renames, should be split out to a follow-up patch
> and coordinated with Allan's ongoing patch in this area.
> 
...
> > @@ -2432,9 +2432,16 @@ static const char *const cpu_names[TARGET_CPU_DEFAULT_max] =
> >    "core2",
> >    "corei7",
> >    "corei7-avx",
> > -  "core-avx2",
> 
> Please don't delete names..
> 

Done.

> > +      {"slm", PROCESSOR_SILVERMONT, CPU_SLM, PTA_SILVERMONT},
> 
> "intel" entry is missing.

Added.

> >           to save compile time.  */
> > @@ -30040,18 +30048,26 @@ get_builtin_code_for_version (tree decl, tree *predicate_list)
> 
> Please do not add new entries to get_builtin_code_for_version (and
> other target_cpu support functions) for now. These should be part of
> Allan's pending patch.

Removed.

> > diff --git a/libgcc/config/i386/cpuinfo.c b/libgcc/config/i386/cpuinfo.c
> > index 1a891e0..577881b 100644
> > --- a/libgcc/config/i386/cpuinfo.c
> > +++ b/libgcc/config/i386/cpuinfo.c
> 
> Do not reorder entries here (take care of ABI changes). The patch is
> OK for renames only. Please add new entries in a separate patch,
> preferably as part of Allan's pending patch in this area.
> 

This is the patch I checked in.  I will submit separate patches for
other parts.

H.J.
---
gcc/

2013-12-23   H.J. Lu  <hongjiu.lu@intel.com>
	     Tocar Ilya  <ilya.tocar@intel.com> 

	* config/i386/core2.md: Replace corei7 with nehalem.

	* config/i386/driver-i386.c (host_detect_local_cpu): Use nehalem,
	westmere, sandybridge, ivybridge, haswell, bonnell, silvermont
	for cpu names.

	* config/i386/i386-c.c (ix86_target_macros_internal): Replace
	PROCESSOR_COREI7, PROCESSOR_COREI7_AVX, PROCESSOR_ATOM,
	PROCESSOR_SLM with PROCESSOR_NEHALEM, PROCESSOR_SANDYBRIDGE,
	PROCESSOR_BONNELL, PROCESSOR_SILVERMONT.  Define
	__nehalem/__nehalem__, __sandybridge/__sandybridge__,
	__haswell/__haswell__, __tune_nehalem__, __tune_sandybridge__,
	__tune_haswell__, __bonnell/__bonnell__,
	__silvermont/__silvermont__, __tune_bonnell__,
	__tune_silvermont__.

	* config/i386/i386.c (m_COREI7): Renamed to ...
	(m_NEHALEM): This.
	(m_COREI7_AVX): Renamed to ...
	(m_SANDYBRIDGE): This.
	(m_ATOM): Renamed to ...
	(m_BONNELL): This.
	(m_SLM): Renamed to ...
	(m_SILVERMONT): This.
	(m_CORE_ALL): Updated.
	(cpu_names): Add "nehalem", "westmere", "sandybridge",
	"ivybridge", "haswell", "broadwell", "bonnell", "silvermont".
	(PTA_CORE2): New.
	(PTA_NEHALEM): Likewise.
	(PTA_WESTMERE): Likewise.
	(PTA_SANDYBRIDGE): Likewise.
	(PTA_IVYBRIDGE): Likewise.
	(PTA_HASWELL): Likewise.
	(PTA_BROADWELL): Likewise.
	(PTA_BONNELL): Likewise.
	(PTA_SILVERMONT): Likewise.
	(ix86_option_override_internal): Use new PTA_XXX.  Add nehalem,
	westmere, sandybridge, ivybridge, haswell, bonnell, silvermont.
	(ix86_lea_outperforms): Updated.
	(ix86_issue_rate): Likewise.
	(ix86_adjust_cost): Likewise.
	(ia32_multipass_dfa_lookahead): Likewise.
	(do_reorder_for_imul): Likewise.
	(swap_top_of_ready_list): Likewise.
	(ix86_sched_reorder): Likewise.
	(ix86_sched_init_global): Likewise.
	(get_builtin_code_for_version): Likewise.
	(processor_model): Replace M_INTEL_ATOM, M_INTEL_SLM with
	M_INTEL_BONNELL, M_INTEL_SILVERMONT.
	(arch_names_table): Updated.

	* config/i386/i386.h (TARGET_COREI7): Removed.
	(TARGET_COREI7_AVX): Likewise.
	(TARGET_ATOM): Likewise.
	(TARGET_SLM): Likewise.
	(TARGET_NEHALEM): New.
	(TARGET_SANDYBRIDGE): Likewise.
	(TARGET_BONNELL): Likewise.
	(TARGET_SILVERMONT): Likewise.
	(target_cpu_default): Add TARGET_CPU_DEFAULT_core_avx2,
	TARGET_CPU_DEFAULT_nehalem, TARGET_CPU_DEFAULT_westmere,
	TARGET_CPU_DEFAULT_sandybridge, TARGET_CPU_DEFAULT_ivybridge,
	TARGET_CPU_DEFAULT_broadwell, TARGET_CPU_DEFAULT_bonnell,
	TARGET_CPU_DEFAULT_silvermont.  Move TARGET_CPU_DEFAULT_haswell
	before TARGET_CPU_DEFAULT_broadwell.
	(processor_type): Replace PROCESSOR_COREI7, PROCESSOR_COREI7_AVX,
	PROCESSOR_ATOM, PROCESSOR_SLM with PROCESSOR_NEHALEM,
	PROCESSOR_SANDYBRIDGE, PROCESSOR_BONNELL, PROCESSOR_SILVERMONT.

	* config/i386/i386.md (cpu): Replace corei7 with nehalem.

	* config/i386/x86-tune.def: Updated.

	* doc/invoke.texi: Replace corei7, corei7-avx, core-avx-i,
	core-avx2, atom, slm with nehalem, sandybridge, ivybridge,
	haswell, bonnel, silvermont.  Add westmere.

libgcc/

2013-12-23   H.J. Lu  <hongjiu.lu@intel.com>

	* config/i386/cpuinfo.c (processor_subtypes): Replace INTEL_ATOM,
	INTEL_SLM with INTEL_BONNELL, INTEL_SILVERMONT.
	(get_intel_cpu): Updated.

[x86] march aliases

Commit Message

Comments

Patch