RE: Bootstrap fail on GCC 13 (was: Re: [PATCH] x86: Update model values for Alderlake, Rocketlake and Raptorlake.)

["Cui, Lili" <lili.cui@intel.com>]

Sorry, I should have built the patch while backporting.
I'll backport another patch to fix the problems after finishing bootstraps, probably in couple hours.

Thank you!
Lili.

> -----Original Message-----
> From: Tobias Burnus <tobias@codesourcery.com>
> Sent: Monday, August 14, 2023 5:34 PM
> To: gcc-patches@gcc.gnu.org; Cui, Lili <lili.cui@intel.com>
> Subject: Bootstrap fail on GCC 13 (was: Re: [PATCH] x86: Update model values
> for Alderlake, Rocketlake and Raptorlake.)
> 
> Hi,
> 
> your GCC 13 commit
> https://gcc.gnu.org/r13-7720-g0fa76e35a5f9e1 x86: Update model values for
> Raptorlake.
> 
> causes a build fail:
> 
> gcc/common/config/i386/cpuinfo.h: In function ‘const char*
> get_intel_cpu(__processor_model*, __processor_model2*, unsigned int*)’:
> gcc/common/config/i386/cpuinfo.h:543:5: error: duplicate case value
>    543 |     case 0xbf:
>        |     ^~~~
> gcc/common/config/i386/cpuinfo.h:539:5: note: previously used here
>    539 |     case 0xbf:
>        |     ^~~~
> 
> Your patch did:
> 
>       case 0x97:
>       case 0x9a:
>       case 0xbf:   <<<<<< Existing case value
>         /* Alder Lake.  */
>       case 0xb7:
> +    case 0xba:
> +    case 0xbf:  <<<<<< Newly added same case value
>         /* Raptor Lake.  */
> 
> 
> Tobias
> 
> On 29.06.23 05:06, Cui, Lili via Gcc-patches wrote:
> > I will directly commit this patch, it can be considered as an obvious patch.
> >
> > Thanks,
> > Lili.
> >
> >> -----Original Message-----
> >> From: Gcc-patches
> >> <gcc-patches-bounces+lili.cui=intel.com@gcc.gnu.org> On Behalf Of
> >> Cui, Lili via Gcc-patches
> >> Sent: Wednesday, June 28, 2023 6:52 PM
> >> To: gcc-patches@gcc.gnu.org
> >> Cc: Liu, Hongtao <hongtao.liu@intel.com>
> >> Subject: [PATCH] x86: Update model values for Alderlake, Rocketlake
> >> and Raptorlake.
> >>
> >> Hi Hongtao,
> >>
> >> This patch is to update model values for Alderlake, Rocketlake and
> >> Raptorlake according to SDM.
> >>
> >> Ok for trunk?
> >>
> >> Thanks.
> >> Lili.
> >>
> >> Update model values for Alderlake, Rocketlake and Raptorlake
> >> according to SDM.
> >>
> >> gcc/ChangeLog
> >>
> >>      * common/config/i386/cpuinfo.h (get_intel_cpu): Remove model
> >> value 0xa8
> >>      from Rocketlake, move model value 0xbf from Alderlake to
> >> Raptorlake.
> >> ---
> >>   gcc/common/config/i386/cpuinfo.h | 3 +--
> >>   1 file changed, 1 insertion(+), 2 deletions(-)
> >>
> >> diff --git a/gcc/common/config/i386/cpuinfo.h
> >> b/gcc/common/config/i386/cpuinfo.h
> >> index 61559ed9de2..ae48bc17771 100644
> >> --- a/gcc/common/config/i386/cpuinfo.h
> >> +++ b/gcc/common/config/i386/cpuinfo.h
> >> @@ -463,7 +463,6 @@ get_intel_cpu (struct __processor_model
> >> *cpu_model,
> >>         cpu_model->__cpu_subtype = INTEL_COREI7_SKYLAKE;
> >>         break;
> >>       case 0xa7:
> >> -    case 0xa8:
> >>         /* Rocket Lake.  */
> >>         cpu = "rocketlake";
> >>         CHECK___builtin_cpu_is ("corei7"); @@ -536,9 +535,9 @@
> >> get_intel_cpu (struct __processor_model *cpu_model,
> >>         break;
> >>       case 0x97:
> >>       case 0x9a:
> >> -    case 0xbf:
> >>         /* Alder Lake.  */
> >>       case 0xb7:
> >> +    case 0xbf:
> >>         /* Raptor Lake.  */
> >>       case 0xaa:
> >>       case 0xac:
> >> --
> >> 2.25.1
> -----------------
> Siemens Electronic Design Automation GmbH; Anschrift: Arnulfstraße 201,
> 80634 München; Gesellschaft mit beschränkter Haftung; Geschäftsführer:
> Thomas Heurung, Frank Thürauf; Sitz der Gesellschaft: München;
> Registergericht München, HRB 106955