Skip to content

Add Zhaoxin support for RDRAND/RDSEED/ADX/SHA/AVX2 feature #1316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlanSong-OC-ZX wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add Zhaoxin support for RDRAND/RDSEED/ADX/SHA/AVX2 feature #1316

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf39831
Fix detecting cache line size for VIA processor
AlanSong-OC-ZX Apr 23, 2025
20e6051
Add Zhaoxin support for RDRAND/RDSEED/ADX/SHA/AVX2 feature since Luji…
AlanSong-OC-ZX Apr 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions cpu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ inline bool IsVIA(const word32 output[4])
(output[3] /*EDX*/ == 0x32414956));
}

inline bool IsZhaoxin(const word32 output[4])
{
// This is the " Shanghai " string.
return ((output[1] /*EBX*/ == 0x68532020) &&
(output[2] /*ECX*/ == 0x20206961) &&
(output[3] /*EDX*/ == 0x68676E61));
}

#endif // X86, X32 and X64

#if defined(__APPLE__)
Expand Down Expand Up @@ -694,15 +702,34 @@ void DetectX86Features()
}
}
}
else if (IsVIA(cpuid0))
else if (IsVIA(cpuid0) || IsZhaoxin(cpuid0))
{
CRYPTOPP_CONSTANT(RDRAND_FLAG = (1 << 30));
CRYPTOPP_CONSTANT(RDSEED_FLAG = (1 << 18));
CRYPTOPP_CONSTANT(ADX_FLAG = (1 << 19));
CRYPTOPP_CONSTANT(SHA_FLAG = (1 << 29));
CRYPTOPP_CONSTANT(AVX2_FLAG = (1 << 5));

// Two bits: available and enabled
CRYPTOPP_CONSTANT( RNG_FLAGS = (0x3 << 2));
CRYPTOPP_CONSTANT( ACE_FLAGS = (0x3 << 6));
CRYPTOPP_CONSTANT(ACE2_FLAGS = (0x3 << 8));
CRYPTOPP_CONSTANT( PHE_FLAGS = (0x3 << 10));
CRYPTOPP_CONSTANT( PMM_FLAGS = (0x3 << 12));

g_hasRDRAND = (cpuid1[ECX_REG] & RDRAND_FLAG) != 0;

if (cpuid0[EAX_REG] >= 7)
{
if (CpuId(7, 0, cpuid2))
{
g_hasRDSEED = (cpuid2[EBX_REG] & RDSEED_FLAG) != 0;
g_hasADX = (cpuid2[EBX_REG] & ADX_FLAG) != 0;
g_hasSHA = (cpuid2[EBX_REG] & SHA_FLAG) != 0;
g_hasAVX2 = (cpuid2[EBX_REG] & AVX2_FLAG) != 0;
}
}

CpuId(0xC0000000, 0, cpuid2);
word32 extendedFeatures = cpuid2[0];

Expand All @@ -716,9 +743,10 @@ void DetectX86Features()
g_hasPadlockPMM = (cpuid2[EDX_REG] & PMM_FLAGS) != 0;
}

if (extendedFeatures >= 0xC0000005)
{
CpuId(0xC0000005, 0, cpuid2);
CpuId(0x80000000, 0, cpuid2);
extendedFeatures = cpuid2[EAX_REG];
if (extendedFeatures >= 0x80000005) {
CpuId(0x80000005, 0, cpuid2);
g_cacheLineSize = GETBYTE(cpuid2[ECX_REG], 0);
}
}
Expand Down