Commit e7694a5e authored by Tao Xu's avatar Tao Xu Committed by Eduardo Habkost
Browse files

target/i386: drop the duplicated definition of cpuid AVX512_VBMI macro 



Drop the duplicated definition of cpuid AVX512_VBMI macro and rename
it as CPUID_7_0_ECX_AVX512_VBMI. Rename CPUID_7_0_ECX_VBMI2 as
CPUID_7_0_ECX_AVX512_VBMI2.

Acked-by: default avatarStefano Garzarella <sgarzare@redhat.com>
Signed-off-by: default avatarTao Xu <tao3.xu@intel.com>
Message-Id: <20190926021055.6970-3-tao3.xu@intel.com>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent f2be0beb

target/i386/cpu.c

+4 −4
Original line number Diff line number Diff line
@@ -2645,8 +2645,8 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_RDSEED | CPUID_7_0_EBX_ADX |

            CPUID_7_0_EBX_SMAP,

        .features[FEAT_7_0_ECX] =

            CPUID_7_0_ECX_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU |

            CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI |

            CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU |

            CPUID_7_0_ECX_AVX512_VBMI2 | CPUID_7_0_ECX_GFNI |

            CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ |

            CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG |

            CPUID_7_0_ECX_AVX512_VPOPCNTDQ,
@@ -2703,8 +2703,8 @@ static X86CPUDefinition builtin_x86_defs[] = { 
            CPUID_7_0_EBX_AVX512BW | CPUID_7_0_EBX_AVX512CD |

            CPUID_7_0_EBX_AVX512VL | CPUID_7_0_EBX_CLFLUSHOPT,

        .features[FEAT_7_0_ECX] =

            CPUID_7_0_ECX_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU |

            CPUID_7_0_ECX_VBMI2 | CPUID_7_0_ECX_GFNI |

            CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_UMIP | CPUID_7_0_ECX_PKU |

            CPUID_7_0_ECX_AVX512_VBMI2 | CPUID_7_0_ECX_GFNI |

            CPUID_7_0_ECX_VAES | CPUID_7_0_ECX_VPCLMULQDQ |

            CPUID_7_0_ECX_AVX512VNNI | CPUID_7_0_ECX_AVX512BITALG |

            CPUID_7_0_ECX_AVX512_VPOPCNTDQ | CPUID_7_0_ECX_LA57,

target/i386/cpu.h

+2 −3
Original line number Diff line number Diff line
@@ -723,8 +723,7 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS]; 
#define CPUID_7_0_EBX_AVX512VL          (1U << 31)



/* AVX-512 Vector Byte Manipulation Instruction */

#define CPUID_7_0_ECX_AVX512BMI         (1U << 1)

#define CPUID_7_0_ECX_VBMI              (1U << 1)

#define CPUID_7_0_ECX_AVX512_VBMI       (1U << 1)

/* User-Mode Instruction Prevention */

#define CPUID_7_0_ECX_UMIP              (1U << 2)

/* Protection Keys for User-mode Pages */
@@ -732,7 +731,7 @@ typedef uint64_t FeatureWordArray[FEATURE_WORDS]; 
/* OS Enable Protection Keys */

#define CPUID_7_0_ECX_OSPKE             (1U << 4)

/* Additional AVX-512 Vector Byte Manipulation Instruction */

#define CPUID_7_0_ECX_VBMI2             (1U << 6)

#define CPUID_7_0_ECX_AVX512_VBMI2      (1U << 6)

/* Galois Field New Instructions */

#define CPUID_7_0_ECX_GFNI              (1U << 8)

/* Vector AES Instructions */

target/i386/hvf/x86_cpuid.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ uint32_t hvf_get_supported_cpuid(uint32_t func, uint32_t idx, 
                ebx &= ~CPUID_7_0_EBX_INVPCID;

            }



            ecx &= CPUID_7_0_ECX_AVX512BMI | CPUID_7_0_ECX_AVX512_VPOPCNTDQ;

            ecx &= CPUID_7_0_ECX_AVX512_VBMI | CPUID_7_0_ECX_AVX512_VPOPCNTDQ;

            edx &= CPUID_7_0_EDX_AVX512_4VNNIW | CPUID_7_0_EDX_AVX512_4FMAPS;

        } else {

            ebx = 0;