diff --git a/gen/gen_avx512.cpp b/gen/gen_avx512.cpp
index 134b41d..60379bc 100644
--- a/gen/gen_avx512.cpp
+++ b/gen/gen_avx512.cpp
@@ -108,7 +108,7 @@ void putVcmp()
 		{ 0xC2, "vcmpsd", T_0F | T_MUST_EVEX | T_EW1 | T_SAE_Z | T_F2 | T_N8, true },
 		{ 0xC2, "vcmpss", T_0F | T_MUST_EVEX | T_EW0 | T_SAE_Z | T_F3 | T_N4, true },
 		{ 0xC2, "vcmpph", T_0F3A | T_MUST_EVEX | T_EW0 | T_SAE_Z | T_YMM | T_B16, true },
-		{ 0xC2, "vcmpsh", T_0F3A | T_MUST_EVEX | T_EW0 | T_SAE_X | T_B16, true },
+		{ 0xC2, "vcmpsh", T_F3 | T_0F3A | T_MUST_EVEX | T_EW0 | T_SAE_X | T_N2, true },
 
 		{ 0x74, "vpcmpeqb", T_66 | T_0F | T_MUST_EVEX | T_YMM, false },
 		{ 0x75, "vpcmpeqw", T_66 | T_0F | T_MUST_EVEX | T_YMM, false },
diff --git a/test/misc.cpp b/test/misc.cpp
index c8bfb8f..03de00a 100644
--- a/test/misc.cpp
+++ b/test/misc.cpp
@@ -890,8 +890,7 @@ CYBOZU_TEST_AUTO(vaddph)
 			vcmpph(k3, zm15, ptr_b[rax+64], 3);
 
 			vcmpsh(k1, xm15, ptr[rax+64], 1);
-			vcmpsh(k1, xm15, ptr_b[rax+64], 1);
-			vcmpsh(k1|k2, xm15, xm4, 1);
+			vcmpsh(k3|k5, xmm1, xmm25|T_sae, 4);
 		}
 	} c;
 	const uint8_t tbl[] = {
@@ -913,9 +912,8 @@ CYBOZU_TEST_AUTO(vaddph)
 		0x62, 0xf3, 0x04, 0x38, 0xc2, 0x50, 0x20, 0x02,
 		0x62, 0xf3, 0x04, 0x58, 0xc2, 0x58, 0x20, 0x03,
 
-		0x62, 0xf3, 0x04, 0x08, 0xc2, 0x48, 0x04, 0x01,
-		0x62, 0xf3, 0x04, 0x18, 0xc2, 0x48, 0x20, 0x01,
-		0x62, 0xf3, 0x04, 0x0a, 0xc2, 0xcc, 0x01,
+		0x62, 0xf3, 0x06, 0x08, 0xc2, 0x48, 0x20, 0x01,
+		0x62, 0x93, 0x76, 0x1d, 0xc2, 0xd9, 0x04,
 	};
 	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 4cbbc83..be8acc7 100644
--- a/xbyak/xbyak_mnemonic.h
+++ b/xbyak/xbyak_mnemonic.h
@@ -1873,7 +1873,7 @@ void vcmppd(const Opmask& k, const Xmm& x, const Operand& op, uint8_t imm) { opA
 void vcmpph(const Opmask& k, const Xmm& x, const Operand& op, uint8_t imm) { opAVX_K_X_XM(k, x, op, T_0F3A | T_EW0 | T_YMM | T_SAE_Z | T_MUST_EVEX | T_B16, 0xC2, imm); }
 void vcmpps(const Opmask& k, const Xmm& x, const Operand& op, uint8_t imm) { opAVX_K_X_XM(k, x, op, T_0F | T_EW0 | T_YMM | T_SAE_Z | T_MUST_EVEX | T_B32, 0xC2, imm); }
 void vcmpsd(const Opmask& k, const Xmm& x, const Operand& op, uint8_t imm) { opAVX_K_X_XM(k, x, op, T_N8 | T_F2 | T_0F | T_EW1 | T_SAE_Z | T_MUST_EVEX, 0xC2, imm); }
-void vcmpsh(const Opmask& k, const Xmm& x, const Operand& op, uint8_t imm) { opAVX_K_X_XM(k, x, op, T_0F3A | T_EW0 | T_SAE_X | T_MUST_EVEX | T_B16, 0xC2, imm); }
+void vcmpsh(const Opmask& k, const Xmm& x, const Operand& op, uint8_t imm) { opAVX_K_X_XM(k, x, op, T_N2 | T_F3 | T_0F3A | T_EW0 | T_SAE_X | T_MUST_EVEX, 0xC2, imm); }
 void vcmpss(const Opmask& k, const Xmm& x, const Operand& op, uint8_t imm) { opAVX_K_X_XM(k, x, op, T_N4 | T_F3 | T_0F | T_EW0 | T_SAE_Z | T_MUST_EVEX, 0xC2, imm); }
 void vcmptrue_uspd(const Opmask& k, const Xmm& x, const Operand& op) { vcmppd(k, x, op, 31); }
 void vcmptrue_usps(const Opmask& k, const Xmm& x, const Operand& op) { vcmpps(k, x, op, 31); }