[X86] Accept 64-bit GPRs for vextractps when using a register that requires EVEX.

This is consistent with the VEX version. It also fixes a sorting
issue in the matching table that caused the EVEX version to be
prioritized over VEX in intel syntax.

Fixes issue [2] from PR48991.
This commit is contained in:
Craig Topper 2021-02-01 10:56:09 -08:00
parent 771b359654
commit c691fe14da
3 changed files with 9 additions and 2 deletions

View File

@ -1123,10 +1123,10 @@ defm : vextract_for_mask_cast<"VEXTRACTI64x4Z", v64i8_info, v32i8x_info,
EXTRACT_get_vextract256_imm, [HasAVX512]>;
// vextractps - extract 32 bits from XMM
def VEXTRACTPSZrr : AVX512AIi8<0x17, MRMDestReg, (outs GR32:$dst),
def VEXTRACTPSZrr : AVX512AIi8<0x17, MRMDestReg, (outs GR32orGR64:$dst),
(ins VR128X:$src1, u8imm:$src2),
"vextractps\t{$src2, $src1, $dst|$dst, $src1, $src2}",
[(set GR32:$dst, (extractelt (bc_v4i32 (v4f32 VR128X:$src1)), imm:$src2))]>,
[(set GR32orGR64:$dst, (extractelt (bc_v4i32 (v4f32 VR128X:$src1)), imm:$src2))]>,
EVEX, VEX_WIG, Sched<[WriteVecExtract]>;
def VEXTRACTPSZmr : AVX512AIi8<0x17, MRMDestMem, (outs),

View File

@ -167,3 +167,7 @@
// CHECK: vpmaddwd ymm1, ymm2, ymmword ptr [rcx + 8*r14 - 536870910]
// CHECK: encoding: [0xc4,0xa1,0x6d,0xf5,0x8c,0xf1,0x02,0x00,0x00,0xe0]
vpmaddwd ymm1, ymm2, ymmword ptr [rcx + 8*r14 - 536870910]
// CHECK: vextractps ecx, xmm2, 1
// CHECK: encoding: [0xc4,0xe3,0x79,0x17,0xd1,0x01]
vextractps ecx, xmm2, 1

View File

@ -1260,3 +1260,6 @@
// CHECK: encoding: [0x62,0xf1,0x7e,0x89,0xe6,0x11]
vcvtdq2pd xmm2 {k1} {z}, qword ptr [rcx]
// CHECK: vextractps ecx, xmm17, 1
// CHECK: encoding: [0x62,0xe3,0x7d,0x08,0x17,0xc9,0x01]
vextractps rcx, xmm17, 1