johann/cpu_features
1
0
Fork 0
mirror of https://github.com/google/cpu_features.git synced 2025-04-28 07:23:37 +02:00
Code Issues Releases Wiki Activity

Add support for ZHAOXIN CPU (#218)

Browse Source
This commit is contained in:
AnvilaWang 2022-02-18 23:32:06 +08:00 committed by GitHub
parent 9edae37fc7
commit 1d02169588
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 97 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
include/cpuinfo_x86.h
View File

@ -25,6 +25,8 @@ CPU_FEATURES_START_CPP_NAMESPACE
#define CPU_FEATURES_VENDOR_GENUINE_INTEL "GenuineIntel" #define CPU_FEATURES_VENDOR_GENUINE_INTEL "GenuineIntel"
#define CPU_FEATURES_VENDOR_AUTHENTIC_AMD "AuthenticAMD" #define CPU_FEATURES_VENDOR_AUTHENTIC_AMD "AuthenticAMD"
#define CPU_FEATURES_VENDOR_HYGON_GENUINE "HygonGenuine" #define CPU_FEATURES_VENDOR_HYGON_GENUINE "HygonGenuine"
#define CPU_FEATURES_VENDOR_CENTAUR_HAULS "CentaurHauls"
#define CPU_FEATURES_VENDOR_SHANGHAI " Shanghai "
// See https://en.wikipedia.org/wiki/CPUID for a list of x86 cpu features. // See https://en.wikipedia.org/wiki/CPUID for a list of x86 cpu features.
// The field names are based on the short name provided in the wikipedia tables. // The field names are based on the short name provided in the wikipedia tables.
@ -117,50 +119,54 @@ CacheInfo GetX86CacheInfo(void);
typedef enum { typedef enum {
X86_UNKNOWN, X86_UNKNOWN,
INTEL_80486, // 80486 ZHAOXIN_ZHANGJIANG, // ZhangJiang
INTEL_P5, // P5 ZHAOXIN_WUDAOKOU, // WuDaoKou
INTEL_LAKEMONT, // LAKEMONT ZHAOXIN_LUJIAZUI, // LuJiaZui
INTEL_CORE, // CORE ZHAOXIN_YONGFENG, // YongFeng
INTEL_PNR, // PENRYN INTEL_80486, // 80486
INTEL_NHM, // NEHALEM INTEL_P5, // P5
INTEL_ATOM_BNL, // BONNELL INTEL_LAKEMONT, // LAKEMONT
INTEL_WSM, // WESTMERE INTEL_CORE, // CORE
INTEL_SNB, // SANDYBRIDGE INTEL_PNR, // PENRYN
INTEL_IVB, // IVYBRIDGE INTEL_NHM, // NEHALEM
INTEL_ATOM_SMT, // SILVERMONT INTEL_ATOM_BNL, // BONNELL
INTEL_HSW, // HASWELL INTEL_WSM, // WESTMERE
INTEL_BDW, // BROADWELL INTEL_SNB, // SANDYBRIDGE
INTEL_SKL, // SKYLAKE INTEL_IVB, // IVYBRIDGE
INTEL_ATOM_GMT, // GOLDMONT INTEL_ATOM_SMT, // SILVERMONT
INTEL_KBL, // KABY LAKE INTEL_HSW, // HASWELL
INTEL_CFL, // COFFEE LAKE INTEL_BDW, // BROADWELL
INTEL_WHL, // WHISKEY LAKE INTEL_SKL, // SKYLAKE
INTEL_CNL, // CANNON LAKE INTEL_ATOM_GMT, // GOLDMONT
INTEL_ICL, // ICE LAKE INTEL_KBL, // KABY LAKE
INTEL_TGL, // TIGER LAKE INTEL_CFL, // COFFEE LAKE
INTEL_SPR, // SAPPHIRE RAPIDS INTEL_WHL, // WHISKEY LAKE
INTEL_ADL, // ALDER LAKE INTEL_CNL, // CANNON LAKE
INTEL_RCL, // ROCKET LAKE INTEL_ICL, // ICE LAKE
INTEL_KNIGHTS_M, // KNIGHTS MILL INTEL_TGL, // TIGER LAKE
INTEL_KNIGHTS_L, // KNIGHTS LANDING INTEL_SPR, // SAPPHIRE RAPIDS
INTEL_KNIGHTS_F, // KNIGHTS FERRY INTEL_ADL, // ALDER LAKE
INTEL_KNIGHTS_C, // KNIGHTS CORNER INTEL_RCL, // ROCKET LAKE
INTEL_NETBURST, // NETBURST INTEL_KNIGHTS_M, // KNIGHTS MILL
AMD_HAMMER, // K8 HAMMER INTEL_KNIGHTS_L, // KNIGHTS LANDING
AMD_K10, // K10 INTEL_KNIGHTS_F, // KNIGHTS FERRY
AMD_K11, // K11 INTEL_KNIGHTS_C, // KNIGHTS CORNER
AMD_K12, // K12 INTEL_NETBURST, // NETBURST
AMD_BOBCAT, // K14 BOBCAT AMD_HAMMER, // K8 HAMMER
AMD_PILEDRIVER, // K15 PILEDRIVER AMD_K10, // K10
AMD_STREAMROLLER, // K15 STREAMROLLER AMD_K11, // K11
AMD_EXCAVATOR, // K15 EXCAVATOR AMD_K12, // K12
AMD_BULLDOZER, // K15 BULLDOZER AMD_BOBCAT, // K14 BOBCAT
AMD_JAGUAR, // K16 JAGUAR AMD_PILEDRIVER, // K15 PILEDRIVER
AMD_PUMA, // K16 PUMA AMD_STREAMROLLER, // K15 STREAMROLLER
AMD_ZEN, // K17 ZEN AMD_EXCAVATOR, // K15 EXCAVATOR
AMD_ZEN_PLUS, // K17 ZEN+ AMD_BULLDOZER, // K15 BULLDOZER
AMD_ZEN2, // K17 ZEN 2 AMD_JAGUAR, // K16 JAGUAR
AMD_ZEN3, // K19 ZEN 3 AMD_PUMA, // K16 PUMA
AMD_ZEN, // K17 ZEN
AMD_ZEN_PLUS, // K17 ZEN+
AMD_ZEN2, // K17 ZEN 2
AMD_ZEN3, // K19 ZEN 3
X86_MICROARCHITECTURE_LAST_, X86_MICROARCHITECTURE_LAST_,
} X86Microarchitecture; } X86Microarchitecture;

49
src/impl_x86__base_implementation.inl
View File

@ -406,8 +406,11 @@ X86Info GetX86Info(void) {
IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_AUTHENTIC_AMD); IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_AUTHENTIC_AMD);
const bool is_hygon = const bool is_hygon =
IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_HYGON_GENUINE); IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_HYGON_GENUINE);
const bool is_zhaoxin =
(IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_CENTAUR_HAULS) ||
IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_SHANGHAI));
SetVendor(leaves.leaf_0, info.vendor); SetVendor(leaves.leaf_0, info.vendor);
if (is_intel || is_amd || is_hygon) { if (is_intel || is_amd || is_hygon || is_zhaoxin) {
OsPreserves os_preserves = kEmptyOsPreserves; OsPreserves os_preserves = kEmptyOsPreserves;
ParseCpuId(&leaves, &info, &os_preserves); ParseCpuId(&leaves, &info, &os_preserves);
if (is_amd || is_hygon) { if (is_amd || is_hygon) {
@ -570,6 +573,42 @@ X86Microarchitecture GetX86Microarchitecture(const X86Info* info) {
return X86_UNKNOWN; return X86_UNKNOWN;
} }
} }
if (IsVendorByX86Info(info, CPU_FEATURES_VENDOR_CENTAUR_HAULS)) {
switch (CPUID(info->family, info->model)) {
case CPUID(0x06, 0x0F):
case CPUID(0x06, 0x19):
// https://en.wikichip.org/wiki/zhaoxin/microarchitectures/zhangjiang
return ZHAOXIN_ZHANGJIANG;
case CPUID(0x07, 0x1B):
// https://en.wikichip.org/wiki/zhaoxin/microarchitectures/wudaokou
return ZHAOXIN_WUDAOKOU;
case CPUID(0x07, 0x3B):
// https://en.wikichip.org/wiki/zhaoxin/microarchitectures/lujiazui
return ZHAOXIN_LUJIAZUI;
case CPUID(0x07, 0x5B):
return ZHAOXIN_YONGFENG;
default:
return X86_UNKNOWN;
}
}
if (IsVendorByX86Info(info, CPU_FEATURES_VENDOR_SHANGHAI)) {
switch (CPUID(info->family, info->model)) {
case CPUID(0x06, 0x0F):
case CPUID(0x06, 0x19):
// https://en.wikichip.org/wiki/zhaoxin/microarchitectures/zhangjiang
return ZHAOXIN_ZHANGJIANG;
case CPUID(0x07, 0x1B):
// https://en.wikichip.org/wiki/zhaoxin/microarchitectures/wudaokou
return ZHAOXIN_WUDAOKOU;
case CPUID(0x07, 0x3B):
// https://en.wikichip.org/wiki/zhaoxin/microarchitectures/lujiazui
return ZHAOXIN_LUJIAZUI;
case CPUID(0x07, 0x5B):
return ZHAOXIN_YONGFENG;
default:
return X86_UNKNOWN;
}
}
if (IsVendorByX86Info(info, CPU_FEATURES_VENDOR_AUTHENTIC_AMD)) { if (IsVendorByX86Info(info, CPU_FEATURES_VENDOR_AUTHENTIC_AMD)) {
switch (CPUID(info->family, info->model)) { switch (CPUID(info->family, info->model)) {
// https://en.wikichip.org/wiki/amd/cpuid // https://en.wikichip.org/wiki/amd/cpuid
@ -1623,7 +1662,9 @@ static void ParseCacheInfo(const int max_cpuid_leaf, uint32_t leaf_id,
CacheInfo GetX86CacheInfo(void) { CacheInfo GetX86CacheInfo(void) {
CacheInfo info = kEmptyCacheInfo; CacheInfo info = kEmptyCacheInfo;
const Leaves leaves = ReadLeaves(); const Leaves leaves = ReadLeaves();
if (IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_GENUINE_INTEL)) { if (IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_GENUINE_INTEL) ||
IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_CENTAUR_HAULS) ||
IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_SHANGHAI)) {
ParseLeaf2(&leaves, &info); ParseLeaf2(&leaves, &info);
ParseCacheInfo(leaves.max_cpuid_leaf, 4, &info); ParseCacheInfo(leaves.max_cpuid_leaf, 4, &info);
} else if (IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_AUTHENTIC_AMD) || } else if (IsVendor(leaves.leaf_0, CPU_FEATURES_VENDOR_AUTHENTIC_AMD) ||
@ -1709,6 +1750,10 @@ CacheInfo GetX86CacheInfo(void) {
#define X86_MICROARCHITECTURE_NAMES \ #define X86_MICROARCHITECTURE_NAMES \
LINE(X86_UNKNOWN) \ LINE(X86_UNKNOWN) \
LINE(ZHAOXIN_ZHANGJIANG) \
LINE(ZHAOXIN_WUDAOKOU) \
LINE(ZHAOXIN_LUJIAZUI) \
LINE(ZHAOXIN_YONGFENG) \
LINE(INTEL_80486) \ LINE(INTEL_80486) \
LINE(INTEL_P5) \ LINE(INTEL_P5) \
LINE(INTEL_LAKEMONT) \ LINE(INTEL_LAKEMONT) \