OpcodeDispatcher: Handle VPUNPCKHBW

External/FEXCore/Source/Interface/Core/OpcodeDispatcher.cpp

@@ -5915,6 +5915,7 @@ void OpDispatchBuilder::InstallHostSpecificOpcodeHandlers() {
     {OPD(1, 0b01, 0x65), 1, &OpDispatchBuilder::AVXVectorALUOp<IR::OP_VCMPGT, 2>},
     {OPD(1, 0b01, 0x66), 1, &OpDispatchBuilder::AVXVectorALUOp<IR::OP_VCMPGT, 4>},
     {OPD(1, 0b01, 0x67), 1, &OpDispatchBuilder::VPACKUSOp<2>},
+    {OPD(1, 0b01, 0x68), 1, &OpDispatchBuilder::VPUNPCKHOp<1>},
     {OPD(1, 0b01, 0x69), 1, &OpDispatchBuilder::VPUNPCKHOp<2>},
     {OPD(1, 0b01, 0x6A), 1, &OpDispatchBuilder::VPUNPCKHOp<4>},
     {OPD(1, 0b01, 0x6B), 1, &OpDispatchBuilder::VPACKSSOp<4>},

External/FEXCore/Source/Interface/Core/OpcodeDispatcher/Vector.cpp

@@ -954,6 +954,8 @@ void OpDispatchBuilder::VPUNPCKHOp(OpcodeArgs) {
   StoreResult(FPRClass, Op, Result, -1);
 }
 
+template
+void OpDispatchBuilder::VPUNPCKHOp<1>(OpcodeArgs);
 template
 void OpDispatchBuilder::VPUNPCKHOp<2>(OpcodeArgs);
 template

External/FEXCore/Source/Interface/Core/X86Tables/VEXTables.cpp

@@ -170,8 +170,7 @@ void InitializeVEXTables() {
     {OPD(1, 0b10, 0x5F), 1, X86InstInfo{"VMAXSS",   TYPE_INST, GenFlagsSizes(SIZE_128BIT, SIZE_32BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 0, nullptr}},
     {OPD(1, 0b11, 0x5F), 1, X86InstInfo{"VMAXSD",   TYPE_INST, GenFlagsSizes(SIZE_128BIT, SIZE_64BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 0, nullptr}},
 
-
-    {OPD(1, 0b01, 0x68), 1, X86InstInfo{"VPUNPCKHBW",  TYPE_UNDEC, FLAGS_NONE, 0, nullptr}},
+    {OPD(1, 0b01, 0x68), 1, X86InstInfo{"VPUNPCKHBW",  TYPE_INST, GenFlagsSameSize(SIZE_128BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 0, nullptr}},
     {OPD(1, 0b01, 0x69), 1, X86InstInfo{"VPUNPCKHWD",  TYPE_INST, GenFlagsSameSize(SIZE_128BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 0, nullptr}},
     {OPD(1, 0b01, 0x6A), 1, X86InstInfo{"VPUNPCKHDQ",  TYPE_INST, GenFlagsSameSize(SIZE_128BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 0, nullptr}},
     {OPD(1, 0b01, 0x6B), 1, X86InstInfo{"VPACKSSDW",   TYPE_INST, GenFlagsSameSize(SIZE_128BIT) | FLAGS_MODRM | FLAGS_VEX_1ST_SRC | FLAGS_XMM_FLAGS, 0, nullptr}},

unittests/ASM/VEX/vpunpckhbw.asm

@@ -0,0 +1,39 @@
+%ifdef CONFIG
+{
+  "HostFeatures": ["AVX"],
+  "RegData": {
+    "XMM2": ["0x7555765677577858", "0x7151725273537454", "0x0000000000000000", "0x0000000000000000"],
+    "XMM3": ["0x7555765677577858", "0x7151725273537454", "0x0000000000000000", "0x0000000000000000"],
+    "XMM4": ["0x7555765677577858", "0x7151725273537454", "0x1199119900880088", "0x33BB33BB22AA22AA"],
+    "XMM5": ["0x7555765677577858", "0x7151725273537454", "0x1199119900880088", "0x33BB33BB22AA22AA"]
+  },
+  "MemoryRegions": {
+    "0x100000000": "4096"
+  }
+}
+%endif
+
+lea rdx, [rel .data]
+
+vmovapd ymm0, [rdx]
+vmovapd ymm1, [rdx + 32]
+
+vpunpckhbw xmm2, xmm0, xmm1
+vpunpckhbw xmm3, xmm0, [rdx + 32]
+
+vpunpckhbw ymm4, ymm0, ymm1
+vpunpckhbw ymm5, ymm0, [rdx + 32]
+
+hlt
+
+align 32
+.data:
+dq 0x4142434445464748
+dq 0x5152535455565758
+dq 0xFFFFEEEEDDDDCCCC
+dq 0xBBBBAAAA99998888
+
+dq 0x6162636465666768
+dq 0x7172737475767778
+dq 0x7777666655554444
+dq 0x3333222211110000