[llvm] [X86][MC] Support Enc/Dec for NF for promoted BMI instructions in 73899 (PR #76709)
via llvm-commits
llvm-commits at lists.llvm.org
Tue Jan 2 18:46:00 PST 2024
https://github.com/XinWang10 updated https://github.com/llvm/llvm-project/pull/76709
>From 222c5e3c86a5e8fe446c2f326b1d3793351e684f Mon Sep 17 00:00:00 2001
From: "Wang, Xin10" <xin10.wang at intel.com>
Date: Mon, 1 Jan 2024 23:47:12 -0800
Subject: [PATCH 1/3] nf support
---
llvm/lib/Target/X86/X86InstrArithmetic.td | 4 ++++
llvm/lib/Target/X86/X86InstrMisc.td | 26 ++++++++++++++++++++---
2 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/llvm/lib/Target/X86/X86InstrArithmetic.td b/llvm/lib/Target/X86/X86InstrArithmetic.td
index 6b0c1b8c28c950..abfab1c31621d6 100644
--- a/llvm/lib/Target/X86/X86InstrArithmetic.td
+++ b/llvm/lib/Target/X86/X86InstrArithmetic.td
@@ -1054,6 +1054,10 @@ defm ANDN32 : AndN<Xi32, "">, VEX, Requires<[HasBMI, NoEGPR]>;
defm ANDN64 : AndN<Xi64, "">, VEX, REX_W, Requires<[HasBMI, NoEGPR]>;
defm ANDN32 : AndN<Xi32, "_EVEX">, EVEX, Requires<[HasBMI, HasEGPR, In64BitMode]>;
defm ANDN64 : AndN<Xi64, "_EVEX">, EVEX, REX_W, Requires<[HasBMI, HasEGPR, In64BitMode]>;
+let Pattern = [(null_frag)] in {
+defm ANDN32 : AndN<Xi32, "_NF">, EVEX, EVEX_NF, Requires<[In64BitMode]>;
+defm ANDN64 : AndN<Xi64, "_NF">, EVEX, EVEX_NF, REX_W, Requires<[In64BitMode]>;
+}
}
let Predicates = [HasBMI], AddedComplexity = -6 in {
diff --git a/llvm/lib/Target/X86/X86InstrMisc.td b/llvm/lib/Target/X86/X86InstrMisc.td
index 305bd74f7bd70a..d5ff9bf8e911be 100644
--- a/llvm/lib/Target/X86/X86InstrMisc.td
+++ b/llvm/lib/Target/X86/X86InstrMisc.td
@@ -1235,7 +1235,7 @@ let Predicates = [HasBMI, NoEGPR], Defs = [EFLAGS] in {
defm BLSI64 : bmi_bls<"blsi{q}", MRM3r, MRM3m, GR64, i64mem, WriteBLS>, REX_W;
}
-let Predicates = [HasBMI, HasEGPR], Defs = [EFLAGS] in {
+let Predicates = [HasBMI, HasEGPR, In64BitMode], Defs = [EFLAGS] in {
defm BLSR32 : bmi_bls<"blsr{l}", MRM1r, MRM1m, GR32, i32mem, WriteBLS, "_EVEX">, EVEX;
defm BLSR64 : bmi_bls<"blsr{q}", MRM1r, MRM1m, GR64, i64mem, WriteBLS, "_EVEX">, REX_W, EVEX;
defm BLSMSK32 : bmi_bls<"blsmsk{l}", MRM2r, MRM2m, GR32, i32mem, WriteBLS, "_EVEX">, EVEX;
@@ -1244,6 +1244,15 @@ let Predicates = [HasBMI, HasEGPR], Defs = [EFLAGS] in {
defm BLSI64 : bmi_bls<"blsi{q}", MRM3r, MRM3m, GR64, i64mem, WriteBLS, "_EVEX">, REX_W, EVEX;
}
+let Predicates = [In64BitMode], Pattern = [(null_frag)] in {
+ defm BLSR32 : bmi_bls<"blsr{l}", MRM1r, MRM1m, GR32, i32mem, WriteBLS, "_NF">, EVEX, EVEX_NF;
+ defm BLSR64 : bmi_bls<"blsr{q}", MRM1r, MRM1m, GR64, i64mem, WriteBLS, "_NF">, REX_W, EVEX, EVEX_NF;
+ defm BLSMSK32 : bmi_bls<"blsmsk{l}", MRM2r, MRM2m, GR32, i32mem, WriteBLS, "_NF">, EVEX, EVEX_NF;
+ defm BLSMSK64 : bmi_bls<"blsmsk{q}", MRM2r, MRM2m, GR64, i64mem, WriteBLS, "_NF">, REX_W, EVEX, EVEX_NF;
+ defm BLSI32 : bmi_bls<"blsi{l}", MRM3r, MRM3m, GR32, i32mem, WriteBLS, "_NF">, EVEX, EVEX_NF;
+ defm BLSI64 : bmi_bls<"blsi{q}", MRM3r, MRM3m, GR64, i64mem, WriteBLS, "_NF">, REX_W, EVEX, EVEX_NF;
+}
+
let Predicates = [HasBMI] in {
// FIXME(1): patterns for the load versions are not implemented
// FIXME(2): By only matching `add_su` and `ineg_su` we may emit
@@ -1314,19 +1323,30 @@ let Predicates = [HasBMI2, NoEGPR], Defs = [EFLAGS] in {
defm BZHI64 : bmi4VOp3_base<0xF5, "bzhi{q}", GR64, i64mem,
X86bzhi, loadi64, WriteBZHI>, REX_W;
}
-let Predicates = [HasBMI, HasEGPR], Defs = [EFLAGS] in {
+let Predicates = [HasBMI, HasEGPR, In64BitMode], Defs = [EFLAGS] in {
defm BEXTR32 : bmi4VOp3_base<0xF7, "bextr{l}", GR32, i32mem,
X86bextr, loadi32, WriteBEXTR, "_EVEX">, EVEX;
defm BEXTR64 : bmi4VOp3_base<0xF7, "bextr{q}", GR64, i64mem,
X86bextr, loadi64, WriteBEXTR, "_EVEX">, EVEX, REX_W;
}
-let Predicates = [HasBMI2, HasEGPR], Defs = [EFLAGS] in {
+let Predicates = [HasBMI2, HasEGPR, In64BitMode], Defs = [EFLAGS] in {
defm BZHI32 : bmi4VOp3_base<0xF5, "bzhi{l}", GR32, i32mem,
X86bzhi, loadi32, WriteBZHI, "_EVEX">, EVEX;
defm BZHI64 : bmi4VOp3_base<0xF5, "bzhi{q}", GR64, i64mem,
X86bzhi, loadi64, WriteBZHI, "_EVEX">, EVEX, REX_W;
}
+let Predicates = [In64BitMode], Pattern = [(null_frag)] in {
+ defm BEXTR32 : bmi4VOp3_base<0xF7, "bextr{l}", GR32, i32mem,
+ X86bextr, loadi32, WriteBEXTR, "_NF">, EVEX, EVEX_NF;
+ defm BEXTR64 : bmi4VOp3_base<0xF7, "bextr{q}", GR64, i64mem,
+ X86bextr, loadi64, WriteBEXTR, "_NF">, EVEX, EVEX_NF, REX_W;
+ defm BZHI32 : bmi4VOp3_base<0xF5, "bzhi{l}", GR32, i32mem,
+ X86bzhi, loadi32, WriteBZHI, "_NF">, EVEX, EVEX_NF;
+ defm BZHI64 : bmi4VOp3_base<0xF5, "bzhi{q}", GR64, i64mem,
+ X86bzhi, loadi64, WriteBZHI, "_NF">, EVEX, EVEX_NF, REX_W;
+}
+
def CountTrailingOnes : SDNodeXForm<imm, [{
// Count the trailing ones in the immediate.
return getI8Imm(llvm::countr_one(N->getZExtValue()), SDLoc(N));
>From 688e7760ea4c1c3f356ca70522eb22f551b1d16d Mon Sep 17 00:00:00 2001
From: "Wang, Xin10" <xin10.wang at intel.com>
Date: Tue, 2 Jan 2024 01:39:40 -0800
Subject: [PATCH 2/3] add tests
---
.../X86/Disassembler/X86Disassembler.cpp | 17 +++++++++-
llvm/test/MC/Disassembler/X86/apx/andn.txt | 32 +++++++++++++++++
llvm/test/MC/Disassembler/X86/apx/bextr.txt | 33 ++++++++++++++++++
llvm/test/MC/Disassembler/X86/apx/blsi.txt | 32 +++++++++++++++++
llvm/test/MC/Disassembler/X86/apx/blsr.txt | 32 +++++++++++++++++
llvm/test/MC/Disassembler/X86/apx/bzhi.txt | 32 +++++++++++++++++
llvm/test/MC/X86/apx/andn-att.s | 34 ++++++++++++++++++-
llvm/test/MC/X86/apx/andn-intel.s | 32 +++++++++++++++++
llvm/test/MC/X86/apx/bextr-att.s | 34 ++++++++++++++++++-
llvm/test/MC/X86/apx/bextr-intel.s | 32 +++++++++++++++++
llvm/test/MC/X86/apx/blsi-att.s | 34 ++++++++++++++++++-
llvm/test/MC/X86/apx/blsi-intel.s | 32 +++++++++++++++++
llvm/test/MC/X86/apx/blsmsk-att.s | 34 ++++++++++++++++++-
llvm/test/MC/X86/apx/blsmsk-intel.s | 32 +++++++++++++++++
llvm/test/MC/X86/apx/blsr-att.s | 34 ++++++++++++++++++-
llvm/test/MC/X86/apx/blsr-intel.s | 32 +++++++++++++++++
llvm/test/MC/X86/apx/bzhi-att.s | 34 ++++++++++++++++++-
llvm/test/MC/X86/apx/bzhi-intel.s | 32 +++++++++++++++++
llvm/test/TableGen/x86-fold-tables.inc | 12 +++++++
19 files changed, 579 insertions(+), 7 deletions(-)
diff --git a/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp b/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
index 347dc0d4ed43a7..e6697e98faaa98 100644
--- a/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
+++ b/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
@@ -1134,6 +1134,21 @@ static int getInstructionIDWithAttrMask(uint16_t *instructionID,
return 0;
}
+static bool isNFnotMap4(InternalInstruction *insn){
+// Promoted BMI instrs below has nf version.
+if (insn->opcodeType == THREEBYTE_38 &&
+ ppFromXOP3of3(insn->vectorExtensionPrefix[2]) == VEX_PREFIX_NONE) {
+ switch (insn->opcode) {
+ case 0xf2: // ANDN
+ case 0xf3: // BLSI, BLSR, BLSMSK
+ case 0xf5: // BZHI
+ case 0xf7: // BEXTR
+ return true;
+ }
+}
+ return false;
+}
+
// Determine the ID of an instruction, consuming the ModR/M byte as appropriate
// for extended and escape opcodes. Determines the attributes and context for
// the instruction before doing so.
@@ -1171,7 +1186,7 @@ static int getInstructionID(struct InternalInstruction *insn,
attrMask |= ATTR_EVEXB;
// nf bit is the MSB of aaa
if (nfFromEVEX4of4(insn->vectorExtensionPrefix[3]) &&
- insn->opcodeType == MAP4)
+ (insn->opcodeType == MAP4 || isNFnotMap4(insn)))
attrMask |= ATTR_EVEXNF;
else if (aaaFromEVEX4of4(insn->vectorExtensionPrefix[3]))
attrMask |= ATTR_EVEXK;
diff --git a/llvm/test/MC/Disassembler/X86/apx/andn.txt b/llvm/test/MC/Disassembler/X86/apx/andn.txt
index 8b943d2a0ac44c..564b1c51920cec 100644
--- a/llvm/test/MC/Disassembler/X86/apx/andn.txt
+++ b/llvm/test/MC/Disassembler/X86/apx/andn.txt
@@ -1,6 +1,38 @@
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
+# ATT: {nf} andnl %ecx, %edx, %r10d
+# INTEL: {nf} andn r10d, edx, ecx
+0x62,0x72,0x6c,0x0c,0xf2,0xd1
+
+# ATT: andnl %ecx, %edx, %r10d
+# INTEL: andn r10d, edx, ecx
+0x62,0x72,0x6c,0x08,0xf2,0xd1
+
+# ATT: {nf} andnq %r9, %r15, %r11
+# INTEL: {nf} andn r11, r15, r9
+0x62,0x52,0x84,0x0c,0xf2,0xd9
+
+# ATT: andnq %r9, %r15, %r11
+# INTEL: andn r11, r15, r9
+0x62,0x52,0x84,0x08,0xf2,0xd9
+
+# ATT: {nf} andnl 123(%rax,%rbx,4), %ecx, %edx
+# INTEL: {nf} andn edx, ecx, dword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0x74,0x0c,0xf2,0x94,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: andnl 123(%rax,%rbx,4), %ecx, %edx
+# INTEL: andn edx, ecx, dword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0x74,0x08,0xf2,0x94,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: {nf} andnq 123(%rax,%rbx,4), %r9, %r15
+# INTEL: {nf} andn r15, r9, qword ptr [rax + 4*rbx + 123]
+0x62,0x72,0xb4,0x0c,0xf2,0xbc,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: andnq 123(%rax,%rbx,4), %r9, %r15
+# INTEL: andn r15, r9, qword ptr [rax + 4*rbx + 123]
+0x62,0x72,0xb4,0x08,0xf2,0xbc,0x98,0x7b,0x00,0x00,0x00
+
# ATT: andnl %r18d, %r22d, %r26d
# INTEL: andn r26d, r22d, r18d
0x62,0x6a,0x4c,0x00,0xf2,0xd2
diff --git a/llvm/test/MC/Disassembler/X86/apx/bextr.txt b/llvm/test/MC/Disassembler/X86/apx/bextr.txt
index abd92864b315e3..e5dfbbbdd5fa1b 100644
--- a/llvm/test/MC/Disassembler/X86/apx/bextr.txt
+++ b/llvm/test/MC/Disassembler/X86/apx/bextr.txt
@@ -1,6 +1,39 @@
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
+# CHECK: {nf} bextr r10d, edx, ecx
+# CHECK: encoding: [0x62,0x72,0x74,0x0c,0xf7,0xd2]
+ {nf} bextr r10d, edx, ecx
+
+# CHECK: bextr r10d, edx, ecx
+# CHECK: encoding: [0x62,0x72,0x74,0x08,0xf7,0xd2]
+ bextr r10d, edx, ecx
+
+# CHECK: {nf} bextr edx, dword ptr [rax + 4*rbx + 123], ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bextr edx, dword ptr [rax + 4*rbx + 123], ecx
+
+# CHECK: bextr edx, dword ptr [rax + 4*rbx + 123], ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00]
+ bextr edx, dword ptr [rax + 4*rbx + 123], ecx
+
+# CHECK: {nf} bextr r11, r15, r9
+# CHECK: encoding: [0x62,0x52,0xb4,0x0c,0xf7,0xdf]
+ {nf} bextr r11, r15, r9
+
+# CHECK: bextr r11, r15, r9
+# CHECK: encoding: [0x62,0x52,0xb4,0x08,0xf7,0xdf]
+ bextr r11, r15, r9
+
+# CHECK: {nf} bextr r15, qword ptr [rax + 4*rbx + 123], r9
+# CHECK: encoding: [0x62,0x72,0xb4,0x0c,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bextr r15, qword ptr [rax + 4*rbx + 123], r9
+
+# CHECK: bextr r15, qword ptr [rax + 4*rbx + 123], r9
+# CHECK: encoding: [0x62,0x72,0xb4,0x08,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ bextr r15, qword ptr [rax + 4*rbx + 123], r9
+
+
# ATT: bextrl %r18d, %r22d, %r26d
# INTEL: bextr r26d, r22d, r18d
0x62,0x6a,0x6c,0x00,0xf7,0xd6
diff --git a/llvm/test/MC/Disassembler/X86/apx/blsi.txt b/llvm/test/MC/Disassembler/X86/apx/blsi.txt
index 254ec90caea515..af984a8b7b6370 100644
--- a/llvm/test/MC/Disassembler/X86/apx/blsi.txt
+++ b/llvm/test/MC/Disassembler/X86/apx/blsi.txt
@@ -1,6 +1,38 @@
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
+# ATT: {nf} blsil %ecx, %edx
+# INTEL: {nf} blsi edx, ecx
+0x62,0xf2,0x6c,0x0c,0xf3,0xd9
+
+# ATT: blsil %ecx, %edx
+# INTEL: blsi edx, ecx
+0x62,0xf2,0x6c,0x08,0xf3,0xd9
+
+# ATT: {nf} blsiq %r9, %r15
+# INTEL: {nf} blsi r15, r9
+0x62,0xd2,0x84,0x0c,0xf3,0xd9
+
+# ATT: blsiq %r9, %r15
+# INTEL: blsi r15, r9
+0x62,0xd2,0x84,0x08,0xf3,0xd9
+
+# ATT: {nf} blsil 123(%rax,%rbx,4), %ecx
+# INTEL: {nf} blsi ecx, dword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0x74,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: blsil 123(%rax,%rbx,4), %ecx
+# INTEL: blsi ecx, dword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0x74,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: {nf} blsiq 123(%rax,%rbx,4), %r9
+# INTEL: {nf} blsi r9, qword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0xb4,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: blsiq 123(%rax,%rbx,4), %r9
+# INTEL: blsi r9, qword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0xb4,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00
+
# ATT: blsil %r18d, %r22d
# INTEL: blsi r22d, r18d
0x62,0xfa,0x4c,0x00,0xf3,0xda
diff --git a/llvm/test/MC/Disassembler/X86/apx/blsr.txt b/llvm/test/MC/Disassembler/X86/apx/blsr.txt
index 37df4306da26ed..6f7874595aa7a5 100644
--- a/llvm/test/MC/Disassembler/X86/apx/blsr.txt
+++ b/llvm/test/MC/Disassembler/X86/apx/blsr.txt
@@ -1,6 +1,38 @@
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
+# ATT: {nf} blsrl %ecx, %edx
+# INTEL: {nf} blsr edx, ecx
+0x62,0xf2,0x6c,0x0c,0xf3,0xc9
+
+# ATT: blsrl %ecx, %edx
+# INTEL: blsr edx, ecx
+0x62,0xf2,0x6c,0x08,0xf3,0xc9
+
+# ATT: {nf} blsrq %r9, %r15
+# INTEL: {nf} blsr r15, r9
+0x62,0xd2,0x84,0x0c,0xf3,0xc9
+
+# ATT: blsrq %r9, %r15
+# INTEL: blsr r15, r9
+0x62,0xd2,0x84,0x08,0xf3,0xc9
+
+# ATT: {nf} blsrl 123(%rax,%rbx,4), %ecx
+# INTEL: {nf} blsr ecx, dword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0x74,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: blsrl 123(%rax,%rbx,4), %ecx
+# INTEL: blsr ecx, dword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0x74,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: {nf} blsrq 123(%rax,%rbx,4), %r9
+# INTEL: {nf} blsr r9, qword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0xb4,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: blsrq 123(%rax,%rbx,4), %r9
+# INTEL: blsr r9, qword ptr [rax + 4*rbx + 123]
+0x62,0xf2,0xb4,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00
+
# ATT: blsrl %r18d, %r22d
# INTEL: blsr r22d, r18d
0x62,0xfa,0x4c,0x00,0xf3,0xca
diff --git a/llvm/test/MC/Disassembler/X86/apx/bzhi.txt b/llvm/test/MC/Disassembler/X86/apx/bzhi.txt
index 44f496e3cc0840..8eec590b048786 100644
--- a/llvm/test/MC/Disassembler/X86/apx/bzhi.txt
+++ b/llvm/test/MC/Disassembler/X86/apx/bzhi.txt
@@ -1,6 +1,38 @@
# RUN: llvm-mc --disassemble %s -triple=x86_64 | FileCheck %s --check-prefixes=ATT
# RUN: llvm-mc --disassemble %s -triple=x86_64 -x86-asm-syntax=intel --output-asm-variant=1 | FileCheck %s --check-prefixes=INTEL
+# ATT: {nf} bzhil %ecx, %edx, %r10d
+# INTEL: {nf} bzhi r10d, edx, ecx
+0x62,0x72,0x74,0x0c,0xf5,0xd2
+
+# ATT: bzhil %ecx, %edx, %r10d
+# INTEL: bzhi r10d, edx, ecx
+0x62,0x72,0x74,0x08,0xf5,0xd2
+
+# ATT: {nf} bzhil %ecx, 123(%rax,%rbx,4), %edx
+# INTEL: {nf} bzhi edx, dword ptr [rax + 4*rbx + 123], ecx
+0x62,0xf2,0x74,0x0c,0xf5,0x94,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: bzhil %ecx, 123(%rax,%rbx,4), %edx
+# INTEL: bzhi edx, dword ptr [rax + 4*rbx + 123], ecx
+0x62,0xf2,0x74,0x08,0xf5,0x94,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: {nf} bzhiq %r9, %r15, %r11
+# INTEL: {nf} bzhi r11, r15, r9
+0x62,0x52,0xb4,0x0c,0xf5,0xdf
+
+# ATT: bzhiq %r9, %r15, %r11
+# INTEL: bzhi r11, r15, r9
+0x62,0x52,0xb4,0x08,0xf5,0xdf
+
+# ATT: {nf} bzhiq %r9, 123(%rax,%rbx,4), %r15
+# INTEL: {nf} bzhi r15, qword ptr [rax + 4*rbx + 123], r9
+0x62,0x72,0xb4,0x0c,0xf5,0xbc,0x98,0x7b,0x00,0x00,0x00
+
+# ATT: bzhiq %r9, 123(%rax,%rbx,4), %r15
+# INTEL: bzhi r15, qword ptr [rax + 4*rbx + 123], r9
+0x62,0x72,0xb4,0x08,0xf5,0xbc,0x98,0x7b,0x00,0x00,0x00
+
# ATT: bzhil %r18d, %r22d, %r26d
# INTEL: bzhi r26d, r22d, r18d
0x62,0x6a,0x6c,0x00,0xf5,0xd6
diff --git a/llvm/test/MC/X86/apx/andn-att.s b/llvm/test/MC/X86/apx/andn-att.s
index d68cee8bcf1f72..f6ab0f0069ec09 100644
--- a/llvm/test/MC/X86/apx/andn-att.s
+++ b/llvm/test/MC/X86/apx/andn-att.s
@@ -1,8 +1,40 @@
# RUN: llvm-mc -triple x86_64 --show-encoding %s | FileCheck %s
# RUN: not llvm-mc -triple i386 -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
-# ERROR-COUNT-4: error:
+# ERROR-COUNT-12: error:
# ERROR-NOT: error:
+# CHECK: {nf} andnl %ecx, %edx, %r10d
+# CHECK: encoding: [0x62,0x72,0x6c,0x0c,0xf2,0xd1]
+ {nf} andnl %ecx, %edx, %r10d
+
+# CHECK: {evex} andnl %ecx, %edx, %r10d
+# CHECK: encoding: [0x62,0x72,0x6c,0x08,0xf2,0xd1]
+ {evex} andnl %ecx, %edx, %r10d
+
+# CHECK: {nf} andnq %r9, %r15, %r11
+# CHECK: encoding: [0x62,0x52,0x84,0x0c,0xf2,0xd9]
+ {nf} andnq %r9, %r15, %r11
+
+# CHECK: {evex} andnq %r9, %r15, %r11
+# CHECK: encoding: [0x62,0x52,0x84,0x08,0xf2,0xd9]
+ {evex} andnq %r9, %r15, %r11
+
+# CHECK: {nf} andnl 123(%rax,%rbx,4), %ecx, %edx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf2,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} andnl 123(%rax,%rbx,4), %ecx, %edx
+
+# CHECK: {evex} andnl 123(%rax,%rbx,4), %ecx, %edx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf2,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} andnl 123(%rax,%rbx,4), %ecx, %edx
+
+# CHECK: {nf} andnq 123(%rax,%rbx,4), %r9, %r15
+# CHECK: encoding: [0x62,0x72,0xb4,0x0c,0xf2,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {nf} andnq 123(%rax,%rbx,4), %r9, %r15
+
+# CHECK: {evex} andnq 123(%rax,%rbx,4), %r9, %r15
+# CHECK: encoding: [0x62,0x72,0xb4,0x08,0xf2,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {evex} andnq 123(%rax,%rbx,4), %r9, %r15
+
# CHECK: andnl %r18d, %r22d, %r26d
# CHECK: encoding: [0x62,0x6a,0x4c,0x00,0xf2,0xd2]
andnl %r18d, %r22d, %r26d
diff --git a/llvm/test/MC/X86/apx/andn-intel.s b/llvm/test/MC/X86/apx/andn-intel.s
index 583e6e763b1eca..4a369a0d3b6896 100644
--- a/llvm/test/MC/X86/apx/andn-intel.s
+++ b/llvm/test/MC/X86/apx/andn-intel.s
@@ -1,5 +1,37 @@
# RUN: llvm-mc -triple x86_64 -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
+# CHECK: {nf} andn r10d, edx, ecx
+# CHECK: encoding: [0x62,0x72,0x6c,0x0c,0xf2,0xd1]
+ {nf} andn r10d, edx, ecx
+
+# CHECK: {evex} andn r10d, edx, ecx
+# CHECK: encoding: [0x62,0x72,0x6c,0x08,0xf2,0xd1]
+ {evex} andn r10d, edx, ecx
+
+# CHECK: {nf} andn r11, r15, r9
+# CHECK: encoding: [0x62,0x52,0x84,0x0c,0xf2,0xd9]
+ {nf} andn r11, r15, r9
+
+# CHECK: {evex} andn r11, r15, r9
+# CHECK: encoding: [0x62,0x52,0x84,0x08,0xf2,0xd9]
+ {evex} andn r11, r15, r9
+
+# CHECK: {nf} andn edx, ecx, dword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf2,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} andn edx, ecx, dword ptr [rax + 4*rbx + 123]
+
+# CHECK: {evex} andn edx, ecx, dword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf2,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} andn edx, ecx, dword ptr [rax + 4*rbx + 123]
+
+# CHECK: {nf} andn r15, r9, qword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0x72,0xb4,0x0c,0xf2,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {nf} andn r15, r9, qword ptr [rax + 4*rbx + 123]
+
+# CHECK: {evex} andn r15, r9, qword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0x72,0xb4,0x08,0xf2,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {evex} andn r15, r9, qword ptr [rax + 4*rbx + 123]
+
# CHECK: andn r26d, r22d, r18d
# CHECK: encoding: [0x62,0x6a,0x4c,0x00,0xf2,0xd2]
andn r26d, r22d, r18d
diff --git a/llvm/test/MC/X86/apx/bextr-att.s b/llvm/test/MC/X86/apx/bextr-att.s
index 6095ffa389a34c..57f5d3e1c2b441 100644
--- a/llvm/test/MC/X86/apx/bextr-att.s
+++ b/llvm/test/MC/X86/apx/bextr-att.s
@@ -1,8 +1,40 @@
# RUN: llvm-mc -triple x86_64 --show-encoding %s | FileCheck %s
# RUN: not llvm-mc -triple i386 -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
-# ERROR-COUNT-4: error:
+# ERROR-COUNT-12: error:
# ERROR-NOT: error:
+# CHECK: {nf} bextrl %ecx, %edx, %r10d
+# CHECK: encoding: [0x62,0x72,0x74,0x0c,0xf7,0xd2]
+ {nf} bextrl %ecx, %edx, %r10d
+
+# CHECK: {evex} bextrl %ecx, %edx, %r10d
+# CHECK: encoding: [0x62,0x72,0x74,0x08,0xf7,0xd2]
+ {evex} bextrl %ecx, %edx, %r10d
+
+# CHECK: {nf} bextrl %ecx, 123(%rax,%rbx,4), %edx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bextrl %ecx, 123(%rax,%rbx,4), %edx
+
+# CHECK: {evex} bextrl %ecx, 123(%rax,%rbx,4), %edx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} bextrl %ecx, 123(%rax,%rbx,4), %edx
+
+# CHECK: {nf} bextrq %r9, %r15, %r11
+# CHECK: encoding: [0x62,0x52,0xb4,0x0c,0xf7,0xdf]
+ {nf} bextrq %r9, %r15, %r11
+
+# CHECK: {evex} bextrq %r9, %r15, %r11
+# CHECK: encoding: [0x62,0x52,0xb4,0x08,0xf7,0xdf]
+ {evex} bextrq %r9, %r15, %r11
+
+# CHECK: {nf} bextrq %r9, 123(%rax,%rbx,4), %r15
+# CHECK: encoding: [0x62,0x72,0xb4,0x0c,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bextrq %r9, 123(%rax,%rbx,4), %r15
+
+# CHECK: {evex} bextrq %r9, 123(%rax,%rbx,4), %r15
+# CHECK: encoding: [0x62,0x72,0xb4,0x08,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {evex} bextrq %r9, 123(%rax,%rbx,4), %r15
+
# CHECK: bextrl %r18d, %r22d, %r26d
# CHECK: encoding: [0x62,0x6a,0x6c,0x00,0xf7,0xd6]
bextrl %r18d, %r22d, %r26d
diff --git a/llvm/test/MC/X86/apx/bextr-intel.s b/llvm/test/MC/X86/apx/bextr-intel.s
index af70c00c1d631d..7a133d6e50f34a 100644
--- a/llvm/test/MC/X86/apx/bextr-intel.s
+++ b/llvm/test/MC/X86/apx/bextr-intel.s
@@ -1,5 +1,37 @@
# RUN: llvm-mc -triple x86_64 -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
+# CHECK: {nf} bextr r10d, edx, ecx
+# CHECK: encoding: [0x62,0x72,0x74,0x0c,0xf7,0xd2]
+ {nf} bextr r10d, edx, ecx
+
+# CHECK: {evex} bextr r10d, edx, ecx
+# CHECK: encoding: [0x62,0x72,0x74,0x08,0xf7,0xd2]
+ {evex} bextr r10d, edx, ecx
+
+# CHECK: {nf} bextr edx, dword ptr [rax + 4*rbx + 123], ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bextr edx, dword ptr [rax + 4*rbx + 123], ecx
+
+# CHECK: {evex} bextr edx, dword ptr [rax + 4*rbx + 123], ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf7,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} bextr edx, dword ptr [rax + 4*rbx + 123], ecx
+
+# CHECK: {nf} bextr r11, r15, r9
+# CHECK: encoding: [0x62,0x52,0xb4,0x0c,0xf7,0xdf]
+ {nf} bextr r11, r15, r9
+
+# CHECK: {evex} bextr r11, r15, r9
+# CHECK: encoding: [0x62,0x52,0xb4,0x08,0xf7,0xdf]
+ {evex} bextr r11, r15, r9
+
+# CHECK: {nf} bextr r15, qword ptr [rax + 4*rbx + 123], r9
+# CHECK: encoding: [0x62,0x72,0xb4,0x0c,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bextr r15, qword ptr [rax + 4*rbx + 123], r9
+
+# CHECK: {evex} bextr r15, qword ptr [rax + 4*rbx + 123], r9
+# CHECK: encoding: [0x62,0x72,0xb4,0x08,0xf7,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {evex} bextr r15, qword ptr [rax + 4*rbx + 123], r9
+
# CHECK: bextr r26d, r22d, r18d
# CHECK: encoding: [0x62,0x6a,0x6c,0x00,0xf7,0xd6]
bextr r26d, r22d, r18d
diff --git a/llvm/test/MC/X86/apx/blsi-att.s b/llvm/test/MC/X86/apx/blsi-att.s
index 65b2fd2b4d09b6..9a117e5c0d3648 100644
--- a/llvm/test/MC/X86/apx/blsi-att.s
+++ b/llvm/test/MC/X86/apx/blsi-att.s
@@ -1,8 +1,40 @@
# RUN: llvm-mc -triple x86_64 --show-encoding %s | FileCheck %s
# RUN: not llvm-mc -triple i386 -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
-# ERROR-COUNT-4: error:
+# ERROR-COUNT-12: error:
# ERROR-NOT: error:
+# CHECK: {nf} blsil %ecx, %edx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x0c,0xf3,0xd9]
+ {nf} blsil %ecx, %edx
+
+# CHECK: {evex} blsil %ecx, %edx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x08,0xf3,0xd9]
+ {evex} blsil %ecx, %edx
+
+# CHECK: {nf} blsiq %r9, %r15
+# CHECK: encoding: [0x62,0xd2,0x84,0x0c,0xf3,0xd9]
+ {nf} blsiq %r9, %r15
+
+# CHECK: {evex} blsiq %r9, %r15
+# CHECK: encoding: [0x62,0xd2,0x84,0x08,0xf3,0xd9]
+ {evex} blsiq %r9, %r15
+
+# CHECK: {nf} blsil 123(%rax,%rbx,4), %ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsil 123(%rax,%rbx,4), %ecx
+
+# CHECK: {evex} blsil 123(%rax,%rbx,4), %ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsil 123(%rax,%rbx,4), %ecx
+
+# CHECK: {nf} blsiq 123(%rax,%rbx,4), %r9
+# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsiq 123(%rax,%rbx,4), %r9
+
+# CHECK: {evex} blsiq 123(%rax,%rbx,4), %r9
+# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsiq 123(%rax,%rbx,4), %r9
+
# CHECK: blsil %r18d, %r22d
# CHECK: encoding: [0x62,0xfa,0x4c,0x00,0xf3,0xda]
blsil %r18d, %r22d
diff --git a/llvm/test/MC/X86/apx/blsi-intel.s b/llvm/test/MC/X86/apx/blsi-intel.s
index edf5711cc74b57..54a3c84caf5722 100644
--- a/llvm/test/MC/X86/apx/blsi-intel.s
+++ b/llvm/test/MC/X86/apx/blsi-intel.s
@@ -1,5 +1,37 @@
# RUN: llvm-mc -triple x86_64 -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
+# CHECK: {nf} blsi edx, ecx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x0c,0xf3,0xd9]
+ {nf} blsi edx, ecx
+
+# CHECK: {evex} blsi edx, ecx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x08,0xf3,0xd9]
+ {evex} blsi edx, ecx
+
+# CHECK: {nf} blsi r15, r9
+# CHECK: encoding: [0x62,0xd2,0x84,0x0c,0xf3,0xd9]
+ {nf} blsi r15, r9
+
+# CHECK: {evex} blsi r15, r9
+# CHECK: encoding: [0x62,0xd2,0x84,0x08,0xf3,0xd9]
+ {evex} blsi r15, r9
+
+# CHECK: {nf} blsi ecx, dword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsi ecx, dword ptr [rax + 4*rbx + 123]
+
+# CHECK: {evex} blsi ecx, dword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsi ecx, dword ptr [rax + 4*rbx + 123]
+
+# CHECK: {nf} blsi r9, qword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsi r9, qword ptr [rax + 4*rbx + 123]
+
+# CHECK: {evex} blsi r9, qword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x9c,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsi r9, qword ptr [rax + 4*rbx + 123]
+
# CHECK: blsi r22d, r18d
# CHECK: encoding: [0x62,0xfa,0x4c,0x00,0xf3,0xda]
blsi r22d, r18d
diff --git a/llvm/test/MC/X86/apx/blsmsk-att.s b/llvm/test/MC/X86/apx/blsmsk-att.s
index 710fcabddcc3ab..fcbaefcc42c8fa 100644
--- a/llvm/test/MC/X86/apx/blsmsk-att.s
+++ b/llvm/test/MC/X86/apx/blsmsk-att.s
@@ -1,8 +1,40 @@
# RUN: llvm-mc -triple x86_64 --show-encoding %s | FileCheck %s
# RUN: not llvm-mc -triple i386 -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
-# ERROR-COUNT-4: error:
+# ERROR-COUNT-12: error:
# ERROR-NOT: error:
+# CHECK: {nf} blsmskl %ecx, %edx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x0c,0xf3,0xd1]
+ {nf} blsmskl %ecx, %edx
+
+# CHECK: {evex} blsmskl %ecx, %edx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x08,0xf3,0xd1]
+ {evex} blsmskl %ecx, %edx
+
+# CHECK: {nf} blsmskq %r9, %r15
+# CHECK: encoding: [0x62,0xd2,0x84,0x0c,0xf3,0xd1]
+ {nf} blsmskq %r9, %r15
+
+# CHECK: {evex} blsmskq %r9, %r15
+# CHECK: encoding: [0x62,0xd2,0x84,0x08,0xf3,0xd1]
+ {evex} blsmskq %r9, %r15
+
+# CHECK: {nf} blsmskl 123(%rax,%rbx,4), %ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsmskl 123(%rax,%rbx,4), %ecx
+
+# CHECK: {evex} blsmskl 123(%rax,%rbx,4), %ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsmskl 123(%rax,%rbx,4), %ecx
+
+# CHECK: {nf} blsmskq 123(%rax,%rbx,4), %r9
+# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsmskq 123(%rax,%rbx,4), %r9
+
+# CHECK: {evex} blsmskq 123(%rax,%rbx,4), %r9
+# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsmskq 123(%rax,%rbx,4), %r9
+
# CHECK: blsmskl %r18d, %r22d
# CHECK: encoding: [0x62,0xfa,0x4c,0x00,0xf3,0xd2]
blsmskl %r18d, %r22d
diff --git a/llvm/test/MC/X86/apx/blsmsk-intel.s b/llvm/test/MC/X86/apx/blsmsk-intel.s
index bb8197d3d41026..168a9cfb6289e4 100644
--- a/llvm/test/MC/X86/apx/blsmsk-intel.s
+++ b/llvm/test/MC/X86/apx/blsmsk-intel.s
@@ -1,5 +1,37 @@
# RUN: llvm-mc -triple x86_64 -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
+# CHECK: {nf} blsmsk edx, ecx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x0c,0xf3,0xd1]
+ {nf} blsmsk edx, ecx
+
+# CHECK: {evex} blsmsk edx, ecx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x08,0xf3,0xd1]
+ {evex} blsmsk edx, ecx
+
+# CHECK: {nf} blsmsk r15, r9
+# CHECK: encoding: [0x62,0xd2,0x84,0x0c,0xf3,0xd1]
+ {nf} blsmsk r15, r9
+
+# CHECK: {evex} blsmsk r15, r9
+# CHECK: encoding: [0x62,0xd2,0x84,0x08,0xf3,0xd1]
+ {evex} blsmsk r15, r9
+
+# CHECK: {nf} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
+
+# CHECK: {evex} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsmsk ecx, dword ptr [rax + 4*rbx + 123]
+
+# CHECK: {nf} blsmsk r9, qword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsmsk r9, qword ptr [rax + 4*rbx + 123]
+
+# CHECK: {evex} blsmsk r9, qword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsmsk r9, qword ptr [rax + 4*rbx + 123]
+
# CHECK: blsmsk r22d, r18d
# CHECK: encoding: [0x62,0xfa,0x4c,0x00,0xf3,0xd2]
blsmsk r22d, r18d
diff --git a/llvm/test/MC/X86/apx/blsr-att.s b/llvm/test/MC/X86/apx/blsr-att.s
index c9ca56149cf1a8..40f5d4e4cf68f9 100644
--- a/llvm/test/MC/X86/apx/blsr-att.s
+++ b/llvm/test/MC/X86/apx/blsr-att.s
@@ -1,8 +1,40 @@
# RUN: llvm-mc -triple x86_64 --show-encoding %s | FileCheck %s
# RUN: not llvm-mc -triple i386 -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
-# ERROR-COUNT-4: error:
+# ERROR-COUNT-12: error:
# ERROR-NOT: error:
+# CHECK: {nf} blsrl %ecx, %edx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x0c,0xf3,0xc9]
+ {nf} blsrl %ecx, %edx
+
+# CHECK: {evex} blsrl %ecx, %edx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x08,0xf3,0xc9]
+ {evex} blsrl %ecx, %edx
+
+# CHECK: {nf} blsrq %r9, %r15
+# CHECK: encoding: [0x62,0xd2,0x84,0x0c,0xf3,0xc9]
+ {nf} blsrq %r9, %r15
+
+# CHECK: {evex} blsrq %r9, %r15
+# CHECK: encoding: [0x62,0xd2,0x84,0x08,0xf3,0xc9]
+ {evex} blsrq %r9, %r15
+
+# CHECK: {nf} blsrl 123(%rax,%rbx,4), %ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsrl 123(%rax,%rbx,4), %ecx
+
+# CHECK: {evex} blsrl 123(%rax,%rbx,4), %ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsrl 123(%rax,%rbx,4), %ecx
+
+# CHECK: {nf} blsrq 123(%rax,%rbx,4), %r9
+# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsrq 123(%rax,%rbx,4), %r9
+
+# CHECK: {evex} blsrq 123(%rax,%rbx,4), %r9
+# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsrq 123(%rax,%rbx,4), %r9
+
# CHECK: blsrl %r18d, %r22d
# CHECK: encoding: [0x62,0xfa,0x4c,0x00,0xf3,0xca]
blsrl %r18d, %r22d
diff --git a/llvm/test/MC/X86/apx/blsr-intel.s b/llvm/test/MC/X86/apx/blsr-intel.s
index acbfb81964614e..6d6d475819ee57 100644
--- a/llvm/test/MC/X86/apx/blsr-intel.s
+++ b/llvm/test/MC/X86/apx/blsr-intel.s
@@ -1,5 +1,37 @@
# RUN: llvm-mc -triple x86_64 -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
+# CHECK: {nf} blsr edx, ecx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x0c,0xf3,0xc9]
+ {nf} blsr edx, ecx
+
+# CHECK: {evex} blsr edx, ecx
+# CHECK: encoding: [0x62,0xf2,0x6c,0x08,0xf3,0xc9]
+ {evex} blsr edx, ecx
+
+# CHECK: {nf} blsr r15, r9
+# CHECK: encoding: [0x62,0xd2,0x84,0x0c,0xf3,0xc9]
+ {nf} blsr r15, r9
+
+# CHECK: {evex} blsr r15, r9
+# CHECK: encoding: [0x62,0xd2,0x84,0x08,0xf3,0xc9]
+ {evex} blsr r15, r9
+
+# CHECK: {nf} blsr ecx, dword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsr ecx, dword ptr [rax + 4*rbx + 123]
+
+# CHECK: {evex} blsr ecx, dword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsr ecx, dword ptr [rax + 4*rbx + 123]
+
+# CHECK: {nf} blsr r9, qword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0xb4,0x0c,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
+ {nf} blsr r9, qword ptr [rax + 4*rbx + 123]
+
+# CHECK: {evex} blsr r9, qword ptr [rax + 4*rbx + 123]
+# CHECK: encoding: [0x62,0xf2,0xb4,0x08,0xf3,0x8c,0x98,0x7b,0x00,0x00,0x00]
+ {evex} blsr r9, qword ptr [rax + 4*rbx + 123]
+
# CHECK: blsr r22d, r18d
# CHECK: encoding: [0x62,0xfa,0x4c,0x00,0xf3,0xca]
blsr r22d, r18d
diff --git a/llvm/test/MC/X86/apx/bzhi-att.s b/llvm/test/MC/X86/apx/bzhi-att.s
index 635cfa14e6b4f5..222c91f6dea3e1 100644
--- a/llvm/test/MC/X86/apx/bzhi-att.s
+++ b/llvm/test/MC/X86/apx/bzhi-att.s
@@ -1,8 +1,40 @@
# RUN: llvm-mc -triple x86_64 --show-encoding %s | FileCheck %s
# RUN: not llvm-mc -triple i386 -show-encoding %s 2>&1 | FileCheck %s --check-prefix=ERROR
-# ERROR-COUNT-4: error:
+# ERROR-COUNT-12: error:
# ERROR-NOT: error:
+# CHECK: {nf} bzhil %ecx, %edx, %r10d
+# CHECK: encoding: [0x62,0x72,0x74,0x0c,0xf5,0xd2]
+ {nf} bzhil %ecx, %edx, %r10d
+
+# CHECK: {evex} bzhil %ecx, %edx, %r10d
+# CHECK: encoding: [0x62,0x72,0x74,0x08,0xf5,0xd2]
+ {evex} bzhil %ecx, %edx, %r10d
+
+# CHECK: {nf} bzhil %ecx, 123(%rax,%rbx,4), %edx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf5,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bzhil %ecx, 123(%rax,%rbx,4), %edx
+
+# CHECK: {evex} bzhil %ecx, 123(%rax,%rbx,4), %edx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf5,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} bzhil %ecx, 123(%rax,%rbx,4), %edx
+
+# CHECK: {nf} bzhiq %r9, %r15, %r11
+# CHECK: encoding: [0x62,0x52,0xb4,0x0c,0xf5,0xdf]
+ {nf} bzhiq %r9, %r15, %r11
+
+# CHECK: {evex} bzhiq %r9, %r15, %r11
+# CHECK: encoding: [0x62,0x52,0xb4,0x08,0xf5,0xdf]
+ {evex} bzhiq %r9, %r15, %r11
+
+# CHECK: {nf} bzhiq %r9, 123(%rax,%rbx,4), %r15
+# CHECK: encoding: [0x62,0x72,0xb4,0x0c,0xf5,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bzhiq %r9, 123(%rax,%rbx,4), %r15
+
+# CHECK: {evex} bzhiq %r9, 123(%rax,%rbx,4), %r15
+# CHECK: encoding: [0x62,0x72,0xb4,0x08,0xf5,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {evex} bzhiq %r9, 123(%rax,%rbx,4), %r15
+
# CHECK: bzhil %r18d, %r22d, %r26d
# CHECK: encoding: [0x62,0x6a,0x6c,0x00,0xf5,0xd6]
bzhil %r18d, %r22d, %r26d
diff --git a/llvm/test/MC/X86/apx/bzhi-intel.s b/llvm/test/MC/X86/apx/bzhi-intel.s
index f7ab72dd717ee7..a45625a6fb7f00 100644
--- a/llvm/test/MC/X86/apx/bzhi-intel.s
+++ b/llvm/test/MC/X86/apx/bzhi-intel.s
@@ -1,5 +1,37 @@
# RUN: llvm-mc -triple x86_64 -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
+# CHECK: {nf} bzhi r10d, edx, ecx
+# CHECK: encoding: [0x62,0x72,0x74,0x0c,0xf5,0xd2]
+ {nf} bzhi r10d, edx, ecx
+
+# CHECK: {evex} bzhi r10d, edx, ecx
+# CHECK: encoding: [0x62,0x72,0x74,0x08,0xf5,0xd2]
+ {evex} bzhi r10d, edx, ecx
+
+# CHECK: {nf} bzhi edx, dword ptr [rax + 4*rbx + 123], ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x0c,0xf5,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bzhi edx, dword ptr [rax + 4*rbx + 123], ecx
+
+# CHECK: {evex} bzhi edx, dword ptr [rax + 4*rbx + 123], ecx
+# CHECK: encoding: [0x62,0xf2,0x74,0x08,0xf5,0x94,0x98,0x7b,0x00,0x00,0x00]
+ {evex} bzhi edx, dword ptr [rax + 4*rbx + 123], ecx
+
+# CHECK: {nf} bzhi r11, r15, r9
+# CHECK: encoding: [0x62,0x52,0xb4,0x0c,0xf5,0xdf]
+ {nf} bzhi r11, r15, r9
+
+# CHECK: {evex} bzhi r11, r15, r9
+# CHECK: encoding: [0x62,0x52,0xb4,0x08,0xf5,0xdf]
+ {evex} bzhi r11, r15, r9
+
+# CHECK: {nf} bzhi r15, qword ptr [rax + 4*rbx + 123], r9
+# CHECK: encoding: [0x62,0x72,0xb4,0x0c,0xf5,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {nf} bzhi r15, qword ptr [rax + 4*rbx + 123], r9
+
+# CHECK: {evex} bzhi r15, qword ptr [rax + 4*rbx + 123], r9
+# CHECK: encoding: [0x62,0x72,0xb4,0x08,0xf5,0xbc,0x98,0x7b,0x00,0x00,0x00]
+ {evex} bzhi r15, qword ptr [rax + 4*rbx + 123], r9
+
# CHECK: bzhi r26d, r22d, r18d
# CHECK: encoding: [0x62,0x6a,0x6c,0x00,0xf5,0xd6]
bzhi r26d, r22d, r18d
diff --git a/llvm/test/TableGen/x86-fold-tables.inc b/llvm/test/TableGen/x86-fold-tables.inc
index 8ac46a5b669249..21932ae136f261 100644
--- a/llvm/test/TableGen/x86-fold-tables.inc
+++ b/llvm/test/TableGen/x86-fold-tables.inc
@@ -526,8 +526,10 @@ static const X86FoldTableEntry Table1[] = {
{X86::AND8rr_NF_ND, X86::AND8mr_NF_ND, 0},
{X86::BEXTR32rr, X86::BEXTR32rm, 0},
{X86::BEXTR32rr_EVEX, X86::BEXTR32rm_EVEX, 0},
+ {X86::BEXTR32rr_NF, X86::BEXTR32rm_NF, 0},
{X86::BEXTR64rr, X86::BEXTR64rm, 0},
{X86::BEXTR64rr_EVEX, X86::BEXTR64rm_EVEX, 0},
+ {X86::BEXTR64rr_NF, X86::BEXTR64rm_NF, 0},
{X86::BEXTRI32ri, X86::BEXTRI32mi, 0},
{X86::BEXTRI64ri, X86::BEXTRI64mi, 0},
{X86::BLCFILL32rr, X86::BLCFILL32rm, 0},
@@ -544,18 +546,24 @@ static const X86FoldTableEntry Table1[] = {
{X86::BLSFILL64rr, X86::BLSFILL64rm, 0},
{X86::BLSI32rr, X86::BLSI32rm, 0},
{X86::BLSI32rr_EVEX, X86::BLSI32rm_EVEX, 0},
+ {X86::BLSI32rr_NF, X86::BLSI32rm_NF, 0},
{X86::BLSI64rr, X86::BLSI64rm, 0},
{X86::BLSI64rr_EVEX, X86::BLSI64rm_EVEX, 0},
+ {X86::BLSI64rr_NF, X86::BLSI64rm_NF, 0},
{X86::BLSIC32rr, X86::BLSIC32rm, 0},
{X86::BLSIC64rr, X86::BLSIC64rm, 0},
{X86::BLSMSK32rr, X86::BLSMSK32rm, 0},
{X86::BLSMSK32rr_EVEX, X86::BLSMSK32rm_EVEX, 0},
+ {X86::BLSMSK32rr_NF, X86::BLSMSK32rm_NF, 0},
{X86::BLSMSK64rr, X86::BLSMSK64rm, 0},
{X86::BLSMSK64rr_EVEX, X86::BLSMSK64rm_EVEX, 0},
+ {X86::BLSMSK64rr_NF, X86::BLSMSK64rm_NF, 0},
{X86::BLSR32rr, X86::BLSR32rm, 0},
{X86::BLSR32rr_EVEX, X86::BLSR32rm_EVEX, 0},
+ {X86::BLSR32rr_NF, X86::BLSR32rm_NF, 0},
{X86::BLSR64rr, X86::BLSR64rm, 0},
{X86::BLSR64rr_EVEX, X86::BLSR64rm_EVEX, 0},
+ {X86::BLSR64rr_NF, X86::BLSR64rm_NF, 0},
{X86::BSF16rr, X86::BSF16rm, 0},
{X86::BSF32rr, X86::BSF32rm, 0},
{X86::BSF64rr, X86::BSF64rm, 0},
@@ -564,8 +572,10 @@ static const X86FoldTableEntry Table1[] = {
{X86::BSR64rr, X86::BSR64rm, 0},
{X86::BZHI32rr, X86::BZHI32rm, 0},
{X86::BZHI32rr_EVEX, X86::BZHI32rm_EVEX, 0},
+ {X86::BZHI32rr_NF, X86::BZHI32rm_NF, 0},
{X86::BZHI64rr, X86::BZHI64rm, 0},
{X86::BZHI64rr_EVEX, X86::BZHI64rm_EVEX, 0},
+ {X86::BZHI64rr_NF, X86::BZHI64rm_NF, 0},
{X86::CMP16rr, X86::CMP16rm, 0},
{X86::CMP32rr, X86::CMP32rm, 0},
{X86::CMP64rr, X86::CMP64rm, 0},
@@ -1582,8 +1592,10 @@ static const X86FoldTableEntry Table2[] = {
{X86::AND8rr_NF_ND, X86::AND8rm_NF_ND, 0},
{X86::ANDN32rr, X86::ANDN32rm, 0},
{X86::ANDN32rr_EVEX, X86::ANDN32rm_EVEX, 0},
+ {X86::ANDN32rr_NF, X86::ANDN32rm_NF, 0},
{X86::ANDN64rr, X86::ANDN64rm, 0},
{X86::ANDN64rr_EVEX, X86::ANDN64rm_EVEX, 0},
+ {X86::ANDN64rr_NF, X86::ANDN64rm_NF, 0},
{X86::ANDNPDrr, X86::ANDNPDrm, TB_ALIGN_16},
{X86::ANDNPSrr, X86::ANDNPSrm, TB_ALIGN_16},
{X86::ANDPDrr, X86::ANDPDrm, TB_ALIGN_16},
>From cf191e8fa25aec20c3db835de88606926fbe9f8f Mon Sep 17 00:00:00 2001
From: "Wang, Xin10" <xin10.wang at intel.com>
Date: Tue, 2 Jan 2024 18:45:49 -0800
Subject: [PATCH 3/3] clang format
---
.../X86/Disassembler/X86Disassembler.cpp | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp b/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
index e6697e98faaa98..12a4cc7e97544a 100644
--- a/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
+++ b/llvm/lib/Target/X86/Disassembler/X86Disassembler.cpp
@@ -1134,18 +1134,18 @@ static int getInstructionIDWithAttrMask(uint16_t *instructionID,
return 0;
}
-static bool isNFnotMap4(InternalInstruction *insn){
-// Promoted BMI instrs below has nf version.
-if (insn->opcodeType == THREEBYTE_38 &&
- ppFromXOP3of3(insn->vectorExtensionPrefix[2]) == VEX_PREFIX_NONE) {
- switch (insn->opcode) {
- case 0xf2: // ANDN
- case 0xf3: // BLSI, BLSR, BLSMSK
- case 0xf5: // BZHI
- case 0xf7: // BEXTR
- return true;
+static bool isNFnotMap4(InternalInstruction *insn) {
+ // Promoted BMI instrs below has nf version.
+ if (insn->opcodeType == THREEBYTE_38 &&
+ ppFromXOP3of3(insn->vectorExtensionPrefix[2]) == VEX_PREFIX_NONE) {
+ switch (insn->opcode) {
+ case 0xf2: // ANDN
+ case 0xf3: // BLSI, BLSR, BLSMSK
+ case 0xf5: // BZHI
+ case 0xf7: // BEXTR
+ return true;
+ }
}
-}
return false;
}
More information about the llvm-commits
mailing list