diff --git a/gen/gen_avx512.cpp b/gen/gen_avx512.cpp index 4f2593b..a9f76df 100644 --- a/gen/gen_avx512.cpp +++ b/gen/gen_avx512.cpp @@ -546,7 +546,7 @@ void putCvt() { 0x7A, "vcvttps2qq", T_66 | T_0F | T_YMM | T_MUST_EVEX | T_EW0 | T_B32 | T_N8 | T_N_VL | T_SAE_Y, 1 }, { 0x78, "vcvttps2uqq", T_66 | T_0F | T_YMM | T_MUST_EVEX | T_EW0 | T_B32 | T_N8 | T_N_VL | T_SAE_Y, 1 }, { 0x7A, "vcvtudq2pd", T_F3 | T_0F | T_YMM | T_MUST_EVEX | T_EW0 | T_B32 | T_N8 | T_N_VL, 1 }, - { 0x7B, "vcvtph2dq", T_66 | T_MAP5 | T_YMM | T_MUST_EVEX | T_EW0 | T_B16, 1 }, + { 0x5B, "vcvtph2dq", T_66 | T_MAP5 | T_YMM | T_MUST_EVEX | T_EW0 | T_B16 | T_ER_Y | T_N8 | T_N_VL, 1 }, { 0x79, "vcvtpd2udq", T_0F | T_YMM | T_MUST_EVEX | T_EW1 | T_B64 | T_ER_Z, 2 }, { 0x5B, "vcvtqq2ps", T_0F | T_YMM | T_MUST_EVEX | T_EW1 | T_B64 | T_ER_Z, 2 }, diff --git a/test/misc.cpp b/test/misc.cpp index 3976f54..1af638d 100644 --- a/test/misc.cpp +++ b/test/misc.cpp @@ -1079,8 +1079,15 @@ CYBOZU_TEST_AUTO(vaddph) vcvtsh2si(rdx|T_rd_sae, xmm1); vcvtsh2si(r8, ptr [rax+0x40]); - - + vcvtph2dq(xmm1, xmm5); + vcvtph2dq(xmm1, ptr [rax+0x40]); + vcvtph2dq(xmm1, ptr_b [rax+0x40]); + vcvtph2dq(ymm1|k2|T_z, xmm5); + vcvtph2dq(ymm1, ptr [rax+0x40]); + vcvtph2dq(ymm1, ptr_b [rax+0x40]); + vcvtph2dq(zmm1|k5|T_z|T_rd_sae, ymm3); + vcvtph2dq(zmm1|k5|T_z, ptr [rax+0x40]); + vcvtph2dq(zmm1|k5|T_z, ptr_b [rax+0x40]); } @@ -1339,6 +1346,17 @@ CYBOZU_TEST_AUTO(vaddph) 0x62, 0xf5, 0x7e, 0x08, 0x2d, 0x50, 0x20, 0x62, 0xf5, 0xfe, 0x38, 0x2d, 0xd1, 0x62, 0x75, 0xfe, 0x08, 0x2d, 0x40, 0x20, + + // vcvtph2dq + 0x62, 0xf5, 0x7d, 0x08, 0x5b, 0xcd, + 0x62, 0xf5, 0x7d, 0x08, 0x5b, 0x48, 0x08, + 0x62, 0xf5, 0x7d, 0x18, 0x5b, 0x48, 0x20, + 0x62, 0xf5, 0x7d, 0xaa, 0x5b, 0xcd, + 0x62, 0xf5, 0x7d, 0x28, 0x5b, 0x48, 0x04, + 0x62, 0xf5, 0x7d, 0x38, 0x5b, 0x48, 0x20, + 0x62, 0xf5, 0x7d, 0xbd, 0x5b, 0xcb, + 0x62, 0xf5, 0x7d, 0xcd, 0x5b, 0x48, 0x02, + 0x62, 0xf5, 0x7d, 0xdd, 0x5b, 0x48, 0x20, }; const size_t n = sizeof(tbl) / sizeof(tbl[0]); CYBOZU_TEST_EQUAL(c.getSize(), n); diff --git a/xbyak/xbyak_mnemonic.h b/xbyak/xbyak_mnemonic.h index a932377..8341032 100644 --- a/xbyak/xbyak_mnemonic.h +++ b/xbyak/xbyak_mnemonic.h @@ -1901,7 +1901,7 @@ void vcvtneps2bf16(const Xmm& x, const Operand& op) { opCvt2(x, op, T_F3 | T_0F3 void vcvtpd2qq(const Xmm& x, const Operand& op) { opAVX_X_XM_IMM(x, op, T_66 | T_0F | T_EW1 | T_YMM | T_ER_Z | T_MUST_EVEX | T_B64, 0x7B); } void vcvtpd2udq(const Xmm& x, const Operand& op) { opCvt2(x, op, T_0F | T_EW1 | T_YMM | T_ER_Z | T_MUST_EVEX | T_B64, 0x79); } void vcvtpd2uqq(const Xmm& x, const Operand& op) { opAVX_X_XM_IMM(x, op, T_66 | T_0F | T_EW1 | T_YMM | T_ER_Z | T_MUST_EVEX | T_B64, 0x79); } -void vcvtph2dq(const Xmm& x, const Operand& op) { checkCvt1(x, op); opVex(x, 0, op, T_66 | T_MAP5 | T_EW0 | T_YMM | T_MUST_EVEX | T_B16, 0x7B); } +void vcvtph2dq(const Xmm& x, const Operand& op) { checkCvt1(x, op); opVex(x, 0, op, T_N8 | T_N_VL | T_66 | T_MAP5 | T_EW0 | T_YMM | T_ER_Y | T_MUST_EVEX | T_B16, 0x5B); } void vcvtps2qq(const Xmm& x, const Operand& op) { checkCvt1(x, op); opVex(x, 0, op, T_N8 | T_N_VL | T_66 | T_0F | T_EW0 | T_YMM | T_ER_Y | T_MUST_EVEX | T_B32, 0x7B); } void vcvtps2udq(const Xmm& x, const Operand& op) { opAVX_X_XM_IMM(x, op, T_0F | T_EW0 | T_YMM | T_ER_Z | T_MUST_EVEX | T_B32, 0x79); } void vcvtps2uqq(const Xmm& x, const Operand& op) { checkCvt1(x, op); opVex(x, 0, op, T_N8 | T_N_VL | T_66 | T_0F | T_EW0 | T_YMM | T_ER_Y | T_MUST_EVEX | T_B32, 0x79); }