target-i386: add PCLMULQDQ and AES-NI instructions
cover target-i386: add PCLMULQDQ and AES-NI instructions
This patch series adds the PCLMULQDQ and AES-NI instructions to the x86 emulation. Along with the SSE4.1 and SSE4.2 series, this brings the instructions emulation to the level of a Westmere CPU.
It has been tested with the valgrind testsuite and with the kernel autotest.
Aurelien Jarno (3):
target-i386: add pclmulqdq instruction
target-i386: enable PCLMULQDQ on Westmere CPU
target-i386: add AES-NI instructions
target-i386/cpu.c | 19 ++-- target-i386/ops_sse.h | 212 ++++++++++++++++++++++++++++++++++++++++++ target-i386/ops_sse_header.h | 11 +++ target-i386/translate.c | 10 ++ 4 files changed, 242 insertions(+), 10 deletions(-)
Signature · 1 line
1.7.10.4
PATCH 1/3 target-i386: add pclmulqdq instruction
--- target-i386/cpu.c | 19 +++++++++---------- target-i386/ops_sse.h | 24 ++++++++++++++++++++++++ target-i386/ops_sse_header.h | 5 +++++ target-i386/translate.c | 3 +++ 4 files changed, 41 insertions(+), 10 deletions(-)
target-i386/cpu.c +9 -10
@@ -387,17 +387,16 @@ typedef struct x86_def_t {CPUID_PSE36 (needed for Solaris) */ /* missing: CPUID_VME, CPUID_DTS, CPUID_SS, CPUID_HT, CPUID_TM, CPUID_PBE */ -#define TCG_EXT_FEATURES (CPUID_EXT_SSE3 | CPUID_EXT_MONITOR | \ - CPUID_EXT_SSSE3 | CPUID_EXT_CX16 | CPUID_EXT_SSE41 | \ - CPUID_EXT_SSE42 | CPUID_EXT_POPCNT | CPUID_EXT_MOVBE | \ - CPUID_EXT_HYPERVISOR) +#define TCG_EXT_FEATURES (CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | \ + CPUID_EXT_MONITOR | CPUID_EXT_SSSE3 | CPUID_EXT_CX16 | \ + CPUID_EXT_SSE41 | CPUID_EXT_SSE42 | CPUID_EXT_POPCNT | \ + CPUID_EXT_MOVBE | CPUID_EXT_HYPERVISOR)/* missing: -CPUID_EXT_PCLMULQDQ, CPUID_EXT_DTES64, CPUID_EXT_DSCPL, -CPUID_EXT_VMX, CPUID_EXT_SMX, CPUID_EXT_EST, CPUID_EXT_TM2, -CPUID_EXT_CID, CPUID_EXT_FMA, CPUID_EXT_XTPR, CPUID_EXT_PDCM, -CPUID_EXT_PCID, CPUID_EXT_DCA, CPUID_EXT_X2APIC, -CPUID_EXT_TSC_DEADLINE_TIMER, CPUID_EXT_AES, CPUID_EXT_XSAVE, -CPUID_EXT_OSXSAVE, CPUID_EXT_AVX, CPUID_EXT_F16C, +CPUID_EXT_DTES64, CPUID_EXT_DSCPL, CPUID_EXT_VMX, CPUID_EXT_SMX, +CPUID_EXT_EST, CPUID_EXT_TM2, CPUID_EXT_CID, CPUID_EXT_FMA, +CPUID_EXT_XTPR, CPUID_EXT_PDCM, CPUID_EXT_PCID, CPUID_EXT_DCA, +CPUID_EXT_X2APIC, CPUID_EXT_TSC_DEADLINE_TIMER, CPUID_EXT_AES, +CPUID_EXT_XSAVE, CPUID_EXT_OSXSAVE, CPUID_EXT_AVX, CPUID_EXT_F16C, CPUID_EXT_RDRAND */ #define TCG_EXT2_FEATURES ((TCG_FEATURES & CPUID_EXT2_AMD_ALIASES) | \ CPUID_EXT2_NX | CPUID_EXT2_MMXEXT | CPUID_EXT2_RDTSCP | \
target-i386/ops_sse.h +24 -0
@@ -2179,6 +2179,30 @@ target_ulong helper_popcnt(CPUX86State *env, target_ulong n, uint32_t type)return POPCOUNT (n,5 );#endif } + +void glue (helper_pclmulqdq ,SUFFIX )(CPUX86State *env,Reg *d,Reg *s, +uint32_t ctrl) +{ +uint64_t ah, al, b, resh, resl; + + ah =0 ; + al = d->Q ((ctrl &1 ) !=0 ); + b = s->Q ((ctrl &16 ) !=0 ); + resh = resl =0 ; + +while (b) { +if (b &1 ) { + resl ^= al; + resh ^= ah; + } + ah = (ah <<1 ) | (al >>63 ); + al <<=1 ; + b >>=1 ; + } + + d->Q (0 ) = resl; + d->Q (1 ) = resh; +}#endif #undef SHIFT
target-i386/ops_sse_header.h +5 -0
@@ -336,6 +336,11 @@ DEF_HELPER_3(crc32, tl, i32, tl, i32) DEF_HELPER_3(popcnt, tl, env, tl, i32)#endif +/* AES-NI op helpers */ +#if SHIFT ==1 +DEF_HELPER_4(glue(pclmulqdq, SUFFIX), void, env, Reg, Reg, i32) +#endif +#undef SHIFT#undef Reg#undef SUFFIX
target-i386/translate.c +3 -0
@@ -3147,6 +3147,8 @@ struct SSEOpHelper_eppi {#define SSE41_OP (x) { { NULL, gen_helper_ ## x ## _xmm }, CPUID_EXT_SSE41 }#define SSE42_OP (x) { { NULL, gen_helper_ ## x ## _xmm }, CPUID_EXT_SSE42 }#define SSE41_SPECIAL { { NULL, SSE_SPECIAL }, CPUID_EXT_SSE41 } +#define PCLMULQDQ_OP (x) { { NULL, gen_helper_ ## x ## _xmm }, \ + CPUID_EXT_PCLMULQDQ }static const struct SSEOpHelper_epp sse_op_table6[256 ] = { [0x00 ] =SSSE3_OP (pshufb),
@@ -3216,6 +3218,7 @@ static const struct SSEOpHelper_eppi sse_op_table7[256] = { [0x40] = SSE41_OP(dpps), [0x41] = SSE41_OP(dppd), [0x42] = SSE41_OP(mpsadbw), + [0x44] = PCLMULQDQ_OP(pclmulqdq), [0x60] = SSE42_OP(pcmpestrm), [0x61] = SSE42_OP(pcmpestri), [0x62] = SSE42_OP(pcmpistrm),
Signature · 1 line
1.7.10.4
Re: [Qemu-devel] [PATCH 1/3] target-i386: add pclmulqdq instruction
Quoted 7 lines · Aurelien Jarno
Signed-off-by Aurelien Jarno <[email protected]>--- target-i386/cpu.c | 19 +++++++++---------- target-i386/ops_sse.h | 24 ++++++++++++++++++++++++ target-i386/ops_sse_header.h | 5 +++++ target-i386/translate.c | 3 +++ 4 files changed, 41 insertions(+), 10 deletions(-)
r~
PATCH 2/3 target-i386: enable PCLMULQDQ on Westmere CPU
In reply to Aurelien JarnoThe PCLMULQDQ instruction has been introduced on the Westmere CPU.
--- target-i386/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target-i386/cpu.c +1 -1
@@ -687,7 +687,7 @@ static x86_def_t builtin_x86_defs[] = { CPUID_DE | CPUID_FP87, .ext_features =CPUID_EXT_AES |CPUID_EXT_POPCNT |CPUID_EXT_SSE42 |CPUID_EXT_SSE41 |CPUID_EXT_CX16 |CPUID_EXT_SSSE3 | - CPUID_EXT_SSE3, + CPUID_EXT_PCLMULQDQ | CPUID_EXT_SSE3, .ext2_features = CPUID_EXT2_LM | CPUID_EXT2_SYSCALL | CPUID_EXT2_NX, .ext3_features = CPUID_EXT3_LAHF_LM, .xlevel = 0x8000000A,
Signature · 1 line
1.7.10.4
Re: [Qemu-devel] [PATCH 2/3] target-i386: enable PCLMULQDQ on Westmere CPU
Quoted 3 lines · Aurelien Jarno
The PCLMULQDQ instruction has been introduced on the Westmere CPU.
Signed-off-by Aurelien Jarno <[email protected]>
r~
PATCH 3/3 target-i386: add AES-NI instructions
In reply to Aurelien Jarno--- target-i386/cpu.c | 6 +- target-i386/ops_sse.h | 188 ++++++++++++++++++++++++++++++++++++++++++ target-i386/ops_sse_header.h | 6 ++ target-i386/translate.c | 7 ++ 4 files changed, 204 insertions(+), 3 deletions(-)
target-i386/cpu.c +3 -3
@@ -390,13 +390,13 @@ typedef struct x86_def_t {#define TCG_EXT_FEATURES (CPUID_EXT_SSE3 | CPUID_EXT_PCLMULQDQ | \ CPUID_EXT_MONITOR | CPUID_EXT_SSSE3 | CPUID_EXT_CX16 | \ CPUID_EXT_SSE41 | CPUID_EXT_SSE42 | CPUID_EXT_POPCNT | \ - CPUID_EXT_MOVBE | CPUID_EXT_HYPERVISOR) + CPUID_EXT_MOVBE | CPUID_EXT_AES | CPUID_EXT_HYPERVISOR)/* missing: CPUID_EXT_DTES64, CPUID_EXT_DSCPL, CPUID_EXT_VMX, CPUID_EXT_SMX, CPUID_EXT_EST, CPUID_EXT_TM2, CPUID_EXT_CID, CPUID_EXT_FMA, CPUID_EXT_XTPR, CPUID_EXT_PDCM, CPUID_EXT_PCID, CPUID_EXT_DCA, -CPUID_EXT_X2APIC, CPUID_EXT_TSC_DEADLINE_TIMER, CPUID_EXT_AES, -CPUID_EXT_XSAVE, CPUID_EXT_OSXSAVE, CPUID_EXT_AVX, CPUID_EXT_F16C, +CPUID_EXT_X2APIC, CPUID_EXT_TSC_DEADLINE_TIMER, CPUID_EXT_XSAVE, +CPUID_EXT_OSXSAVE, CPUID_EXT_AVX, CPUID_EXT_F16C, CPUID_EXT_RDRAND */ #define TCG_EXT2_FEATURES ((TCG_FEATURES & CPUID_EXT2_AMD_ALIASES) | \ CPUID_EXT2_NX | CPUID_EXT2_MMXEXT | CPUID_EXT2_RDTSCP | \
target-i386/ops_sse.h +188 -0
194 lines not on this page · raw message
target-i386/ops_sse_header.h +6 -0
@@ -338,6 +338,12 @@ DEF_HELPER_3(popcnt, tl, env, tl, i32)/* AES-NI op helpers */ #if SHIFT ==1 +DEF_HELPER_3(glue(aesdec, SUFFIX), void, env, Reg, Reg) +DEF_HELPER_3(glue(aesdeclast, SUFFIX), void, env, Reg, Reg) +DEF_HELPER_3(glue(aesenc, SUFFIX), void, env, Reg, Reg) +DEF_HELPER_3(glue(aesenclast, SUFFIX), void, env, Reg, Reg) +DEF_HELPER_3(glue(aesimc, SUFFIX), void, env, Reg, Reg) +DEF_HELPER_4(glue(aeskeygenassist, SUFFIX), void, env, Reg, Reg, i32) DEF_HELPER_4(glue(pclmulqdq, SUFFIX), void, env, Reg, Reg, i32)#endif
target-i386/translate.c +7 -0
@@ -3149,6 +3149,7 @@ struct SSEOpHelper_eppi {#define SSE41_SPECIAL { { NULL, SSE_SPECIAL }, CPUID_EXT_SSE41 }#define PCLMULQDQ_OP (x) { { NULL, gen_helper_ ## x ## _xmm }, \ CPUID_EXT_PCLMULQDQ } +#define AESNI_OP (x) { { NULL, gen_helper_ ## x ## _xmm }, CPUID_EXT_AES }static const struct SSEOpHelper_epp sse_op_table6[256 ] = { [0x00 ] =SSSE3_OP (pshufb),
@@ -3197,6 +3198,11 @@ static const struct SSEOpHelper_epp sse_op_table6[256] = { [0x3f] = SSE41_OP(pmaxud), [0x40] = SSE41_OP(pmulld), [0x41] = SSE41_OP(phminposuw), + [0xdb] = AESNI_OP(aesimc), + [0xdc] = AESNI_OP(aesenc), + [0xdd] = AESNI_OP(aesenclast), + [0xde] = AESNI_OP(aesdec), + [0xdf] = AESNI_OP(aesdeclast), };static const struct SSEOpHelper_eppi sse_op_table7[256 ] = {
@@ -3223,6 +3229,7 @@ static const struct SSEOpHelper_eppi sse_op_table7[256] = { [0x61] = SSE42_OP(pcmpestri), [0x62] = SSE42_OP(pcmpistrm), [0x63] = SSE42_OP(pcmpistri), + [0xdf] = AESNI_OP(aeskeygenassist), }; static void gen_sse(CPUX86State *env, DisasContext *s, int b,
Signature · 1 line
1.7.10.4
Re: [Qemu-devel] [PATCH 3/3] target-i386: add AES-NI instructions
target-i386/ops_sse.h void glue(helper_pclmulqdq, SUFFIX)(CPUX86State *env, Reg *d, Reg *s, · line 2309
Quoted 4 lines · Aurelien Jarno
target-i386/ops_sse.h +4
-0+const uint8_t aes_shifts[16] = { +const uint8_t aes_inv_shifts[16] = { +const uint8_t aes_mix[4] = { +const uint8_t aes_inv_mix[4] = {
static?
r~