Re: [Qemu-devel] [PATCH] target-i386: add Skylake-Server cpu model

[Boqun Feng]

On Fri, Jun 23, 2017 at 10:38:14AM -0300, Eduardo Habkost wrote:
> On Wed, Jun 21, 2017 at 01:29:34PM +0800, Boqun Feng (Intel) wrote:
> > Introduce Skylake-Server cpu mode which inherits the features from
> > Skylake-Client and supports some additional features that are: AVX512,
> > CWLB and PGPE1GB.
> 
> I will fix this to "CLWB" when applying the patch.
> 

Oops.. thank you for pointing this out.

> > 
> > Signed-off-by: Boqun Feng (Intel) <address@hidden>
> > ---
> >  target/i386/cpu.c | 42 ++++++++++++++++++++++++++++++++++++++++++
> >  1 file changed, 42 insertions(+)
> > 
> > diff --git a/target/i386/cpu.c b/target/i386/cpu.c
> > index b2b1d20cee51..1bed722ac2fd 100644
> > --- a/target/i386/cpu.c
> > +++ b/target/i386/cpu.c
> > @@ -1349,6 +1349,48 @@ static X86CPUDefinition builtin_x86_defs[] = {
> >          .model_id = "Intel Core Processor (Skylake)",
> >      },
> >      {
> > +        .name = "Skylake-Server",
> > +        .level = 0xd,
> > +        .vendor = CPUID_VENDOR_INTEL,
> > +        .family = 6,
> > +        .model = 85,
> > +        .stepping = 4,
> > +        .features[FEAT_1_EDX] =
> > +            CPUID_VME | CPUID_SSE2 | CPUID_SSE | CPUID_FXSR | CPUID_MMX |
> > +            CPUID_CLFLUSH | CPUID_PSE36 | CPUID_PAT | CPUID_CMOV | 
> > CPUID_MCA |
> > +            CPUID_PGE | CPUID_MTRR | CPUID_SEP | CPUID_APIC | CPUID_CX8 |
> > +            CPUID_MCE | CPUID_PAE | CPUID_MSR | CPUID_TSC | CPUID_PSE |
> > +            CPUID_DE | CPUID_FP87,
> > +        .features[FEAT_1_ECX] =
> > +            CPUID_EXT_AVX | CPUID_EXT_XSAVE | CPUID_EXT_AES |
> > +            CPUID_EXT_POPCNT | CPUID_EXT_X2APIC | CPUID_EXT_SSE42 |
> > +            CPUID_EXT_SSE41 | CPUID_EXT_CX16 | CPUID_EXT_SSSE3 |
> > +            CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3 |
> > +            CPUID_EXT_TSC_DEADLINE_TIMER | CPUID_EXT_FMA | CPUID_EXT_MOVBE 
> > |
> > +            CPUID_EXT_PCID | CPUID_EXT_F16C | CPUID_EXT_RDRAND,
> > +        .features[FEAT_8000_0001_EDX] =
> > +            CPUID_EXT2_LM | CPUID_EXT2_PDPE1GB | CPUID_EXT2_RDTSCP |
> > +            CPUID_EXT2_NX | CPUID_EXT2_SYSCALL,
> > +        .features[FEAT_8000_0001_ECX] =
> > +            CPUID_EXT3_ABM | CPUID_EXT3_LAHF_LM | CPUID_EXT3_3DNOWPREFETCH,
> > +        .features[FEAT_7_0_EBX] =
> > +            CPUID_7_0_EBX_FSGSBASE | CPUID_7_0_EBX_BMI1 |
> > +            CPUID_7_0_EBX_HLE | CPUID_7_0_EBX_AVX2 | CPUID_7_0_EBX_SMEP |
> > +            CPUID_7_0_EBX_BMI2 | CPUID_7_0_EBX_ERMS | 
> > CPUID_7_0_EBX_INVPCID |
> > +            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |
> > +            CPUID_7_0_EBX_SMAP | CPUID_7_0_EBX_MPX | CPUID_7_0_EBX_CLWB |
> > +            CPUID_7_0_EBX_AVX512F | CPUID_7_0_EBX_AVX512DQ |
> > +            CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |
> > +            CPUID_7_0_EBX_AVX512VL,
> 
> I believe we should add the same comment about XSAVES from
> Skylake-Cliente here, for consistency:
> 
>         /* Missing: XSAVES (not supported by some Linux versions,
>          * including v4.1 to v4.6).
>          * KVM doesn't yet expose any XSAVES state save component,
>          * and the only one defined in Skylake (processor tracing)
>          * probably will block migration anyway.
>          */
> 

Make sense.

> I can add it when applying the patch.
> 

Please do, thanks! Or you prefer that I send out a V2 with typo fixed
and comment added?

Regards,
Boqun

> > +        .features[FEAT_XSAVE] =
> > +            CPUID_XSAVE_XSAVEOPT | CPUID_XSAVE_XSAVEC |
> > +            CPUID_XSAVE_XGETBV1,
> > +        .features[FEAT_6_EAX] =
> > +            CPUID_6_EAX_ARAT,
> > +        .xlevel = 0x80000008,
> > +        .model_id = "Intel Xeon Processor (Skylake)",
> > +    },
> > +    {
> >          .name = "Opteron_G1",
> >          .level = 5,
> >          .vendor = CPUID_VENDOR_AMD,
> > -- 
> > 2.13.1
> > 
> 
> -- 
> Eduardo

signature.asc
Description: PGP signature