Skip to content

Commit

Permalink
x86emul: handle AVX512-FP16 floating point conversion insns
Browse files Browse the repository at this point in the history 
Signed-off-by: Jan Beulich <[email protected]>
Acked-by: Andrew Cooper <[email protected]>
  • Loading branch information
@jbeulich
jbeulich committed Jun 5, 2023
1 parent 59c2c9c commit ae11304
Show file tree
Hide file tree
Showing 4 changed files with 66 additions and 2 deletions.
8 changes: 8 additions & 0 deletions tools/tests/x86_emulator/evex-disp8.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,16 @@ static const struct test avx512_fp16_all[] = {
INSN(cmpph, , 0f3a, c2, vl, fp16, vl),
INSN(cmpsh, f3, 0f3a, c2, el, fp16, el),
INSN(comish, , map5, 2f, el, fp16, el),
INSN(cvtpd2ph, 66, map5, 5a, vl, q, vl),
INSN(cvtph2pd, , map5, 5a, vl_4, fp16, vl),
INSN(cvtph2psx, 66, map6, 13, vl_2, fp16, vl),
INSN(cvtph2uw, , map5, 7d, vl, fp16, vl),
INSN(cvtph2w, 66, map5, 7d, vl, fp16, vl),
INSN(cvtps2phx, 66, map5, 1d, vl, d, vl),
INSN(cvtsd2sh, f2, map5, 5a, el, q, el),
INSN(cvtsh2sd, f3, map5, 5a, el, fp16, el),
INSN(cvtsh2ss, , map6, 13, el, fp16, el),
INSN(cvtss2sh, , map5, 1d, el, d, el),
INSN(cvttph2uw, , map5, 7c, vl, fp16, vl),
INSN(cvttph2w, 66, map5, 7c, vl, fp16, vl),
INSN(cvtuw2ph, f2, map5, 7d, vl, fp16, vl),
Expand Down
8 changes: 8 additions & 0 deletions tools/tests/x86_emulator/predicates.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2047,6 +2047,8 @@ static const struct evex {
}, evex_map5[] = {
{ { 0x10 }, 2, T, R, pfx_f3, W0, LIG }, /* vmovsh */
{ { 0x11 }, 2, T, W, pfx_f3, W0, LIG }, /* vmovsh */
{ { 0x1d }, 2, T, R, pfx_66, W0, Ln }, /* vcvtps2phx */
{ { 0x1d }, 2, T, R, pfx_no, W0, LIG }, /* vcvtss2sh */
{ { 0x2e }, 2, T, R, pfx_no, W0, LIG }, /* vucomish */
{ { 0x2f }, 2, T, R, pfx_no, W0, LIG }, /* vcomish */
{ { 0x51 }, 2, T, R, pfx_no, W0, Ln }, /* vsqrtph */
Expand All @@ -2055,6 +2057,10 @@ static const struct evex {
{ { 0x58 }, 2, T, R, pfx_f3, W0, LIG }, /* vaddsh */
{ { 0x59 }, 2, T, R, pfx_no, W0, Ln }, /* vmulph */
{ { 0x59 }, 2, T, R, pfx_f3, W0, LIG }, /* vmulsh */
{ { 0x5a }, 2, T, R, pfx_no, W0, Ln }, /* vcvtph2pd */
{ { 0x5a }, 2, T, R, pfx_66, W1, Ln }, /* vcvtpd2ph */
{ { 0x5a }, 2, T, R, pfx_f3, W0, LIG }, /* vcvtsh2sd */
{ { 0x5a }, 2, T, R, pfx_f2, W1, LIG }, /* vcvtsd2sh */
{ { 0x5c }, 2, T, R, pfx_no, W0, Ln }, /* vsubph */
{ { 0x5c }, 2, T, R, pfx_f3, W0, LIG }, /* vsubsh */
{ { 0x5d }, 2, T, R, pfx_no, W0, Ln }, /* vminph */
Expand All @@ -2072,6 +2078,8 @@ static const struct evex {
{ { 0x7d }, 2, T, R, pfx_f2, W0, Ln }, /* vcvtuwph */
{ { 0x7e }, 2, T, W, pfx_66, WIG, L0 }, /* vmovw */
}, evex_map6[] = {
{ { 0x13 }, 2, T, R, pfx_66, W0, Ln }, /* vcvtph2psx */
{ { 0x13 }, 2, T, R, pfx_no, W0, LIG }, /* vcvtsh2ss */
{ { 0x2c }, 2, T, R, pfx_66, W0, Ln }, /* vscalefph */
{ { 0x2d }, 2, T, R, pfx_66, W0, LIG }, /* vscalefsh */
{ { 0x42 }, 2, T, R, pfx_66, W0, Ln }, /* vgetexpph */
Expand Down
37 changes: 36 additions & 1 deletion xen/arch/x86/x86_emulate/decode.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,9 @@ static const struct twobyte_table {
[0x14 ... 0x15] = { DstImplicit|SrcMem|ModRM, simd_packed_fp, d8s_vl },
[0x16] = { DstImplicit|SrcMem|ModRM|Mov, simd_other, 3 },
[0x17] = { DstMem|SrcImplicit|ModRM|Mov, simd_other, 3 },
[0x18 ... 0x1f] = { ImplicitOps|ModRM },
[0x18 ... 0x1c] = { ImplicitOps|ModRM },
[0x1d] = { ImplicitOps|ModRM, simd_none, d8s_vl },
[0x1e ... 0x1f] = { ImplicitOps|ModRM },
[0x20 ... 0x21] = { DstMem|SrcImplicit|ModRM },
[0x22 ... 0x23] = { DstImplicit|SrcMem|ModRM },
[0x28] = { DstImplicit|SrcMem|ModRM|Mov, simd_packed_fp, d8s_vl },
Expand Down Expand Up @@ -1471,6 +1473,19 @@ int x86emul_decode(struct x86_emulate_state *s,
s->fp16 = true;
break;

case 0x1d: /* vcvtps2phx / vcvtss2sh */
if ( s->evex.pfx & VEX_PREFIX_SCALAR_MASK )
break;
d = DstReg | SrcMem;
if ( s->evex.pfx & VEX_PREFIX_DOUBLE_MASK )
{
s->simd_size = simd_packed_fp;
d |= TwoOp;
}
else
s->simd_size = simd_scalar_vexw;
break;

case 0x2e: case 0x2f: /* v{,u}comish */
if ( !s->evex.pfx )
s->fp16 = true;
Expand All @@ -1495,6 +1510,15 @@ int x86emul_decode(struct x86_emulate_state *s,

/* Like above re-use twobyte_table[] here. */
disp8scale = decode_disp8scale(twobyte_table[b].d8s, s);

switch ( b )
{
case 0x5a: /* vcvtph2pd needs special casing */
if ( !s->evex.pfx && !s->evex.brs )
disp8scale -= 2;
break;
}

break;

case ext_map6:
Expand All @@ -1515,6 +1539,17 @@ int x86emul_decode(struct x86_emulate_state *s,
s->fp16 = true;
break;

case 0x13: /* vcvtph2psx / vcvtsh2ss */
if ( s->evex.pfx & VEX_PREFIX_SCALAR_MASK )
break;
s->fp16 = true;
if ( !(s->evex.pfx & VEX_PREFIX_DOUBLE_MASK) )
{
s->simd_size = simd_scalar_vexw;
d &= ~TwoOp;
}
break;

case 0x56: case 0x57: /* vf{,c}maddc{p,s}h */
case 0xd6: case 0xd7: /* vf{,c}mulc{p,s}h */
break;
Expand Down
15 changes: 14 additions & 1 deletion xen/arch/x86/x86_emulate/x86_emulate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7781,14 +7781,25 @@ x86_emulate(
generate_exception_if(evex.w, X86_EXC_UD);
goto avx512f_all_fp;

CASE_SIMD_ALL_FP(_EVEX, 5, 0x5a): /* vcvtp{h,d}2p{h,d} [xyz]mm/mem,[xyz]mm{k} */
/* vcvts{h,d}2s{h,d} xmm/mem,xmm,xmm{k} */
host_and_vcpu_must_have(avx512_fp16);
if ( vex.pfx & VEX_PREFIX_SCALAR_MASK )
d &= ~TwoOp;
op_bytes = 2 << (((evex.pfx & VEX_PREFIX_SCALAR_MASK) ? 0 : 1 + evex.lr) +
2 * evex.w);
goto avx512f_all_fp;

case X86EMUL_OPC_EVEX (5, 0x7c): /* vcvttph2uw [xyz]mm/mem,[xyz]mm{k} */
case X86EMUL_OPC_EVEX_66(5, 0x7c): /* vcvttph2w [xyz]mm/mem,[xyz]mm{k} */
case X86EMUL_OPC_EVEX (5, 0x7d): /* vcvtph2uw [xyz]mm/mem,[xyz]mm{k} */
case X86EMUL_OPC_EVEX_66(5, 0x7d): /* vcvtph2w [xyz]mm/mem,[xyz]mm{k} */
case X86EMUL_OPC_EVEX_F3(5, 0x7d): /* vcvtw2ph [xyz]mm/mem,[xyz]mm{k} */
case X86EMUL_OPC_EVEX_F2(5, 0x7d): /* vcvtuw2ph [xyz]mm/mem,[xyz]mm{k} */
op_bytes = 16 << evex.lr;
case X86EMUL_OPC_EVEX_66(6, 0x13): /* vcvtph2psx [xy]mm/mem,[xyz]mm{k} */
op_bytes = 8 << ((ext == ext_map5) + evex.lr);
/* fall through */
case X86EMUL_OPC_EVEX_66(5, 0x1d): /* vcvtps2phx [xyz]mm/mem,[xy]mm{k} */
case X86EMUL_OPC_EVEX_66(6, 0x2c): /* vscalefph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */
case X86EMUL_OPC_EVEX_66(6, 0x42): /* vgetexpph [xyz]mm/mem,[xyz]mm{k} */
case X86EMUL_OPC_EVEX_66(6, 0x96): /* vfmaddsub132ph [xyz]mm/mem,[xyz]mm,[xyz]mm{k} */
Expand All @@ -7815,6 +7826,8 @@ x86_emulate(
avx512_vlen_check(false);
goto simd_zmm;

case X86EMUL_OPC_EVEX(5, 0x1d): /* vcvtss2sh xmm/mem,xmm,xmm{k} */
case X86EMUL_OPC_EVEX(6, 0x13): /* vcvtsh2ss xmm/mem,xmm,xmm{k} */
case X86EMUL_OPC_EVEX_66(6, 0x2d): /* vscalefsh xmm/m16,xmm,xmm{k} */
case X86EMUL_OPC_EVEX_66(6, 0x43): /* vgetexpsh xmm/m16,xmm,xmm{k} */
case X86EMUL_OPC_EVEX_66(6, 0x99): /* vfmadd132sh xmm/m16,xmm,xmm{k} */
Expand Down

0 comments on commit ae11304

Please sign in to comment.