Skip to content

[X86][MC] Not emit {evex} for VEX-promoted instructions with GPR operands #74039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 1, 2023
Merged

[X86][MC] Not emit {evex} for VEX-promoted instructions with GPR operands #74039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
593fc52
[X86][MC] Not emit {evex} for VEX-promoted instructions with GPR oper…
KanRobert Dec 1, 2023
44d0adb
Refine check
KanRobert Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions llvm/lib/Target/X86/X86InstrAVX512.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2855,8 +2855,8 @@ defm VFPCLASS : avx512_fp_fpclass_all<"vfpclass", 0x66, 0x67, SchedWriteFCmp>, E
multiclass avx512_mask_mov<bits<8> opc_kk, bits<8> opc_km, bits<8> opc_mk,
string OpcodeStr, RegisterClass KRC, ValueType vvt,
X86MemOperand x86memop, string Suffix = ""> {
let explicitOpPrefix = !if(!eq(Suffix, ""), NoExplicitOpPrefix, ExplicitEVEX) in {
let isMoveReg = 1, hasSideEffects = 0, SchedRW = [WriteMove] in
let isMoveReg = 1, hasSideEffects = 0, SchedRW = [WriteMove],
explicitOpPrefix = !if(!eq(Suffix, ""), NoExplicitOpPrefix, ExplicitEVEX) in
def kk#Suffix : I<opc_kk, MRMSrcReg, (outs KRC:$dst), (ins KRC:$src),
!strconcat(OpcodeStr, "\t{$src, $dst|$dst, $src}"), []>,
Sched<[WriteMove]>;
Expand All @@ -2868,13 +2868,12 @@ multiclass avx512_mask_mov<bits<8> opc_kk, bits<8> opc_km, bits<8> opc_mk,
!strconcat(OpcodeStr, "\t{$src, $dst|$dst, $src}"),
[(store KRC:$src, addr:$dst)]>,
Sched<[WriteStore]>;
}
}

multiclass avx512_mask_mov_gpr<bits<8> opc_kr, bits<8> opc_rk,
string OpcodeStr, RegisterClass KRC,
RegisterClass GRC, string Suffix = ""> {
let hasSideEffects = 0, explicitOpPrefix = !if(!eq(Suffix, ""), NoExplicitOpPrefix, ExplicitEVEX) in {
let hasSideEffects = 0 in {
def kr#Suffix : I<opc_kr, MRMSrcReg, (outs KRC:$dst), (ins GRC:$src),
!strconcat(OpcodeStr, "\t{$src, $dst|$dst, $src}"), []>,
Sched<[WriteMove]>;
Expand Down
35 changes: 19 additions & 16 deletions llvm/test/MC/Disassembler/X86/apx/kmov.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,25 @@
# RUN: llvm-mc -triple x86_64 -disassemble %s | FileCheck %s --check-prefix=ATT
# RUN: llvm-mc -triple x86_64 -disassemble -output-asm-variant=1 %s | FileCheck %s --check-prefix=INTEL

# ATT: {evex} kmovb %k1, %k2
# INTEL: {evex} kmovb k2, k1
0x62,0xf1,0x7d,0x08,0x90,0xd1

# ATT: {evex} kmovw %k1, %k2
# INTEL: {evex} kmovw k2, k1
0x62,0xf1,0x7c,0x08,0x90,0xd1

# ATT: {evex} kmovd %k1, %k2
# INTEL: {evex} kmovd k2, k1
0x62,0xf1,0xfd,0x08,0x90,0xd1

# ATT: {evex} kmovq %k1, %k2
# INTEL: {evex} kmovq k2, k1
0x62,0xf1,0xfc,0x08,0x90,0xd1

# ATT-NOT: {evex}
# INTEL-NOT: {evex}

# ATT: kmovb %r16d, %k1
# INTEL: kmovb k1, r16d
0x62,0xf9,0x7d,0x08,0x92,0xc8
Expand Down Expand Up @@ -64,19 +83,3 @@
# ATT: kmovq %k1, (%r16,%r17)
# INTEL: kmovq qword ptr [r16 + r17], k1
0x62,0xf9,0xf8,0x08,0x91,0x0c,0x08

# ATT: {evex} kmovb %k1, %k2
# INTEL: {evex} kmovb k2, k1
0x62,0xf1,0x7d,0x08,0x90,0xd1

# ATT: {evex} kmovw %k1, %k2
# INTEL: {evex} kmovw k2, k1
0x62,0xf1,0x7c,0x08,0x90,0xd1

# ATT: {evex} kmovd %k1, %k2
# INTEL: {evex} kmovd k2, k1
0x62,0xf1,0xfd,0x08,0x90,0xd1

# ATT: {evex} kmovq %k1, %k2
# INTEL: {evex} kmovq k2, k1
0x62,0xf1,0xfc,0x08,0x90,0xd1
28 changes: 15 additions & 13 deletions llvm/test/MC/X86/apx/kmov-att.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@

# ERROR-COUNT-20: error:
# ERROR-NOT: error:
# CHECK: {evex} kmovb %k1, %k2
# CHECK: encoding: [0x62,0xf1,0x7d,0x08,0x90,0xd1]
{evex} kmovb %k1, %k2
# CHECK: {evex} kmovw %k1, %k2
# CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x90,0xd1]
{evex} kmovw %k1, %k2
# CHECK: {evex} kmovd %k1, %k2
# CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x90,0xd1]
{evex} kmovd %k1, %k2
# CHECK: {evex} kmovq %k1, %k2
# CHECK: encoding: [0x62,0xf1,0xfc,0x08,0x90,0xd1]
{evex} kmovq %k1, %k2

# CHECK-NOT: {evex}

# CHECK: kmovb %r16d, %k1
# CHECK: encoding: [0x62,0xf9,0x7d,0x08,0x92,0xc8]
kmovb %r16d, %k1
Expand Down Expand Up @@ -54,16 +69,3 @@
# CHECK: kmovq %k1, (%r16,%r17)
# CHECK: encoding: [0x62,0xf9,0xf8,0x08,0x91,0x0c,0x08]
kmovq %k1, (%r16,%r17)

# CHECK: {evex} kmovb %k1, %k2
# CHECK: encoding: [0x62,0xf1,0x7d,0x08,0x90,0xd1]
{evex} kmovb %k1, %k2
# CHECK: {evex} kmovw %k1, %k2
# CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x90,0xd1]
{evex} kmovw %k1, %k2
# CHECK: {evex} kmovd %k1, %k2
# CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x90,0xd1]
{evex} kmovd %k1, %k2
# CHECK: {evex} kmovq %k1, %k2
# CHECK: encoding: [0x62,0xf1,0xfc,0x08,0x90,0xd1]
{evex} kmovq %k1, %k2
28 changes: 15 additions & 13 deletions llvm/test/MC/X86/apx/kmov-intel.s
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# RUN: llvm-mc -triple x86_64 -show-encoding -x86-asm-syntax=intel -output-asm-variant=1 %s | FileCheck %s

# CHECK: {evex} kmovb k2, k1
# CHECK: encoding: [0x62,0xf1,0x7d,0x08,0x90,0xd1]
{evex} kmovb k2, k1
# CHECK: {evex} kmovw k2, k1
# CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x90,0xd1]
{evex} kmovw k2, k1
# CHECK: {evex} kmovd k2, k1
# CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x90,0xd1]
{evex} kmovd k2, k1
# CHECK: {evex} kmovq k2, k1
# CHECK: encoding: [0x62,0xf1,0xfc,0x08,0x90,0xd1]
{evex} kmovq k2, k1

# CHECK-NOT: {evex}

# CHECK: kmovb k1, r16d
# CHECK: encoding: [0x62,0xf9,0x7d,0x08,0x92,0xc8]
kmovb k1, r16d
Expand Down Expand Up @@ -51,16 +66,3 @@
# CHECK: kmovq qword ptr [r16 + r17], k1
# CHECK: encoding: [0x62,0xf9,0xf8,0x08,0x91,0x0c,0x08]
kmovq qword ptr [r16 + r17], k1

# CHECK: {evex} kmovb k2, k1
# CHECK: encoding: [0x62,0xf1,0x7d,0x08,0x90,0xd1]
{evex} kmovb k2, k1
# CHECK: {evex} kmovw k2, k1
# CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x90,0xd1]
{evex} kmovw k2, k1
# CHECK: {evex} kmovd k2, k1
# CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x90,0xd1]
{evex} kmovd k2, k1
# CHECK: {evex} kmovq k2, k1
# CHECK: encoding: [0x62,0xf1,0xfc,0x08,0x90,0xd1]
{evex} kmovq k2, k1