Skip to content

L
linux
Commit 690ca3a3 authored by Adrian Hunter's avatar Adrian Hunter Committed by Ingo Molnar
Browse files
Options

x86/insn: Add support for APX EVEX instructions to the opcode map 

To support APX functionality, the EVEX prefix is used to:

 - promote legacy instructions
 - promote VEX instructions
 - add new instructions

Promoted VEX instructions require no extra annotation because the opcodes
do not change and the permissive nature of the instruction decoder already
allows them to have an EVEX prefix.

Promoted legacy instructions and new instructions are placed in map 4 which
has not been used before.

Create a new table for map 4 and add APX instructions.

Annotate SCALABLE instructions with "(es)" - refer to patch "x86/insn: Add
support for APX EVEX to the instruction decoder logic". SCALABLE
instructions must be represented in both no-prefix (NP) and 66 prefix
forms.
Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20240502105853.5338-9-adrian.hunter@intel.com
parent 87bbaf1a
Hide whitespace changes
Inline Side-by-side
Showing with 186 additions and 0 deletions
arch/x86/lib/x86-opcode-map.txt
View file @ 690ca3a3
......@@ -23,6 +23,7 @@
#
# AVX Superscripts
# (ev): this opcode requires EVEX prefix.
# (es): this opcode requires EVEX prefix and is SCALABALE.
# (evo): this opcode is changed by EVEX prefix (EVEX opcode)
# (v): this opcode requires VEX prefix.
# (v1): this opcode only supports 128bit VEX.
......@@ -929,6 +930,98 @@ df: VAESKEYGEN Vdq,Wdq,Ib (66),(v1)
f0: RORX Gy,Ey,Ib (F2),(v) | HRESET Gv,Ib (F3),(000),(11B)
EndTable
Table: EVEX map 4
Referrer:
AVXcode: 4
00: ADD Eb,Gb (ev)
01: ADD Ev,Gv (es) | ADD Ev,Gv (66),(es)
02: ADD Gb,Eb (ev)
03: ADD Gv,Ev (es) | ADD Gv,Ev (66),(es)
08: OR Eb,Gb (ev)
09: OR Ev,Gv (es) | OR Ev,Gv (66),(es)
0a: OR Gb,Eb (ev)
0b: OR Gv,Ev (es) | OR Gv,Ev (66),(es)
10: ADC Eb,Gb (ev)
11: ADC Ev,Gv (es) | ADC Ev,Gv (66),(es)
12: ADC Gb,Eb (ev)
13: ADC Gv,Ev (es) | ADC Gv,Ev (66),(es)
18: SBB Eb,Gb (ev)
19: SBB Ev,Gv (es) | SBB Ev,Gv (66),(es)
1a: SBB Gb,Eb (ev)
1b: SBB Gv,Ev (es) | SBB Gv,Ev (66),(es)
20: AND Eb,Gb (ev)
21: AND Ev,Gv (es) | AND Ev,Gv (66),(es)
22: AND Gb,Eb (ev)
23: AND Gv,Ev (es) | AND Gv,Ev (66),(es)
24: SHLD Ev,Gv,Ib (es) | SHLD Ev,Gv,Ib (66),(es)
28: SUB Eb,Gb (ev)
29: SUB Ev,Gv (es) | SUB Ev,Gv (66),(es)
2a: SUB Gb,Eb (ev)
2b: SUB Gv,Ev (es) | SUB Gv,Ev (66),(es)
2c: SHRD Ev,Gv,Ib (es) | SHRD Ev,Gv,Ib (66),(es)
30: XOR Eb,Gb (ev)
31: XOR Ev,Gv (es) | XOR Ev,Gv (66),(es)
32: XOR Gb,Eb (ev)
33: XOR Gv,Ev (es) | XOR Gv,Ev (66),(es)
# CCMPSCC instructions are: CCOMB, CCOMBE, CCOMF, CCOML, CCOMLE, CCOMNB, CCOMNBE, CCOMNL, CCOMNLE,
# CCOMNO, CCOMNS, CCOMNZ, CCOMO, CCOMS, CCOMT, CCOMZ
38: CCMPSCC Eb,Gb (ev)
39: CCMPSCC Ev,Gv (es) | CCMPSCC Ev,Gv (66),(es)
3a: CCMPSCC Gv,Ev (ev)
3b: CCMPSCC Gv,Ev (es) | CCMPSCC Gv,Ev (66),(es)
40: CMOVO Gv,Ev (es) | CMOVO Gv,Ev (66),(es) | CFCMOVO Ev,Ev (es) | CFCMOVO Ev,Ev (66),(es) | SETO Eb (F2),(ev)
41: CMOVNO Gv,Ev (es) | CMOVNO Gv,Ev (66),(es) | CFCMOVNO Ev,Ev (es) | CFCMOVNO Ev,Ev (66),(es) | SETNO Eb (F2),(ev)
42: CMOVB Gv,Ev (es) | CMOVB Gv,Ev (66),(es) | CFCMOVB Ev,Ev (es) | CFCMOVB Ev,Ev (66),(es) | SETB Eb (F2),(ev)
43: CMOVNB Gv,Ev (es) | CMOVNB Gv,Ev (66),(es) | CFCMOVNB Ev,Ev (es) | CFCMOVNB Ev,Ev (66),(es) | SETNB Eb (F2),(ev)
44: CMOVZ Gv,Ev (es) | CMOVZ Gv,Ev (66),(es) | CFCMOVZ Ev,Ev (es) | CFCMOVZ Ev,Ev (66),(es) | SETZ Eb (F2),(ev)
45: CMOVNZ Gv,Ev (es) | CMOVNZ Gv,Ev (66),(es) | CFCMOVNZ Ev,Ev (es) | CFCMOVNZ Ev,Ev (66),(es) | SETNZ Eb (F2),(ev)
46: CMOVBE Gv,Ev (es) | CMOVBE Gv,Ev (66),(es) | CFCMOVBE Ev,Ev (es) | CFCMOVBE Ev,Ev (66),(es) | SETBE Eb (F2),(ev)
47: CMOVNBE Gv,Ev (es) | CMOVNBE Gv,Ev (66),(es) | CFCMOVNBE Ev,Ev (es) | CFCMOVNBE Ev,Ev (66),(es) | SETNBE Eb (F2),(ev)
48: CMOVS Gv,Ev (es) | CMOVS Gv,Ev (66),(es) | CFCMOVS Ev,Ev (es) | CFCMOVS Ev,Ev (66),(es) | SETS Eb (F2),(ev)
49: CMOVNS Gv,Ev (es) | CMOVNS Gv,Ev (66),(es) | CFCMOVNS Ev,Ev (es) | CFCMOVNS Ev,Ev (66),(es) | SETNS Eb (F2),(ev)
4a: CMOVP Gv,Ev (es) | CMOVP Gv,Ev (66),(es) | CFCMOVP Ev,Ev (es) | CFCMOVP Ev,Ev (66),(es) | SETP Eb (F2),(ev)
4b: CMOVNP Gv,Ev (es) | CMOVNP Gv,Ev (66),(es) | CFCMOVNP Ev,Ev (es) | CFCMOVNP Ev,Ev (66),(es) | SETNP Eb (F2),(ev)
4c: CMOVL Gv,Ev (es) | CMOVL Gv,Ev (66),(es) | CFCMOVL Ev,Ev (es) | CFCMOVL Ev,Ev (66),(es) | SETL Eb (F2),(ev)
4d: CMOVNL Gv,Ev (es) | CMOVNL Gv,Ev (66),(es) | CFCMOVNL Ev,Ev (es) | CFCMOVNL Ev,Ev (66),(es) | SETNL Eb (F2),(ev)
4e: CMOVLE Gv,Ev (es) | CMOVLE Gv,Ev (66),(es) | CFCMOVLE Ev,Ev (es) | CFCMOVLE Ev,Ev (66),(es) | SETLE Eb (F2),(ev)
4f: CMOVNLE Gv,Ev (es) | CMOVNLE Gv,Ev (66),(es) | CFCMOVNLE Ev,Ev (es) | CFCMOVNLE Ev,Ev (66),(es) | SETNLE Eb (F2),(ev)
60: MOVBE Gv,Ev (es) | MOVBE Gv,Ev (66),(es)
61: MOVBE Ev,Gv (es) | MOVBE Ev,Gv (66),(es)
65: WRUSSD Md,Gd (66),(ev) | WRUSSQ Mq,Gq (66),(ev)
66: ADCX Gy,Ey (66),(ev) | ADOX Gy,Ey (F3),(ev) | WRSSD Md,Gd (ev) | WRSSQ Mq,Gq (66),(ev)
69: IMUL Gv,Ev,Iz (es) | IMUL Gv,Ev,Iz (66),(es)
6b: IMUL Gv,Ev,Ib (es) | IMUL Gv,Ev,Ib (66),(es)
80: Grp1 Eb,Ib (1A),(ev)
81: Grp1 Ev,Iz (1A),(es)
83: Grp1 Ev,Ib (1A),(es)
# CTESTSCC instructions are: CTESTB, CTESTBE, CTESTF, CTESTL, CTESTLE, CTESTNB, CTESTNBE, CTESTNL,
# CTESTNLE, CTESTNO, CTESTNS, CTESTNZ, CTESTO, CTESTS, CTESTT, CTESTZ
84: CTESTSCC (ev)
85: CTESTSCC (es) | CTESTSCC (66),(es)
88: POPCNT Gv,Ev (es) | POPCNT Gv,Ev (66),(es)
8f: POP2 Bq,Rq (000),(11B),(ev)
a5: SHLD Ev,Gv,CL (es) | SHLD Ev,Gv,CL (66),(es)
ad: SHRD Ev,Gv,CL (es) | SHRD Ev,Gv,CL (66),(es)
af: IMUL Gv,Ev (es) | IMUL Gv,Ev (66),(es)
c0: Grp2 Eb,Ib (1A),(ev)
c1: Grp2 Ev,Ib (1A),(es)
d0: Grp2 Eb,1 (1A),(ev)
d1: Grp2 Ev,1 (1A),(es)
d2: Grp2 Eb,CL (1A),(ev)
d3: Grp2 Ev,CL (1A),(es)
f0: CRC32 Gy,Eb (es) | INVEPT Gq,Mdq (F3),(ev)
f1: CRC32 Gy,Ey (es) | CRC32 Gy,Ey (66),(es) | INVVPID Gy,Mdq (F3),(ev)
f2: INVPCID Gy,Mdq (F3),(ev)
f4: TZCNT Gv,Ev (es) | TZCNT Gv,Ev (66),(es)
f5: LZCNT Gv,Ev (es) | LZCNT Gv,Ev (66),(es)
f6: Grp3_1 Eb (1A),(ev)
f7: Grp3_2 Ev (1A),(es)
f8: MOVDIR64B Gv,Mdqq (66),(ev) | ENQCMD Gv,Mdqq (F2),(ev) | ENQCMDS Gv,Mdqq (F3),(ev) | URDMSR Rq,Gq (F2),(11B),(ev) | UWRMSR Gq,Rq (F3),(11B),(ev)
f9: MOVDIRI My,Gy (ev)
fe: Grp4 (1A),(ev)
ff: Grp5 (1A),(es) | PUSH2 Bq,Rq (110),(11B),(ev)
EndTable
Table: EVEX map 5
Referrer:
AVXcode: 5
......
tools/arch/x86/lib/x86-opcode-map.txt
View file @ 690ca3a3
......@@ -23,6 +23,7 @@
#
# AVX Superscripts
# (ev): this opcode requires EVEX prefix.
# (es): this opcode requires EVEX prefix and is SCALABALE.
# (evo): this opcode is changed by EVEX prefix (EVEX opcode)
# (v): this opcode requires VEX prefix.
# (v1): this opcode only supports 128bit VEX.
......@@ -929,6 +930,98 @@ df: VAESKEYGEN Vdq,Wdq,Ib (66),(v1)
f0: RORX Gy,Ey,Ib (F2),(v) | HRESET Gv,Ib (F3),(000),(11B)
EndTable
Table: EVEX map 4
Referrer:
AVXcode: 4
00: ADD Eb,Gb (ev)
01: ADD Ev,Gv (es) | ADD Ev,Gv (66),(es)
02: ADD Gb,Eb (ev)
03: ADD Gv,Ev (es) | ADD Gv,Ev (66),(es)
08: OR Eb,Gb (ev)
09: OR Ev,Gv (es) | OR Ev,Gv (66),(es)
0a: OR Gb,Eb (ev)
0b: OR Gv,Ev (es) | OR Gv,Ev (66),(es)
10: ADC Eb,Gb (ev)
11: ADC Ev,Gv (es) | ADC Ev,Gv (66),(es)
12: ADC Gb,Eb (ev)
13: ADC Gv,Ev (es) | ADC Gv,Ev (66),(es)
18: SBB Eb,Gb (ev)
19: SBB Ev,Gv (es) | SBB Ev,Gv (66),(es)
1a: SBB Gb,Eb (ev)
1b: SBB Gv,Ev (es) | SBB Gv,Ev (66),(es)
20: AND Eb,Gb (ev)
21: AND Ev,Gv (es) | AND Ev,Gv (66),(es)
22: AND Gb,Eb (ev)
23: AND Gv,Ev (es) | AND Gv,Ev (66),(es)
24: SHLD Ev,Gv,Ib (es) | SHLD Ev,Gv,Ib (66),(es)
28: SUB Eb,Gb (ev)
29: SUB Ev,Gv (es) | SUB Ev,Gv (66),(es)
2a: SUB Gb,Eb (ev)
2b: SUB Gv,Ev (es) | SUB Gv,Ev (66),(es)
2c: SHRD Ev,Gv,Ib (es) | SHRD Ev,Gv,Ib (66),(es)
30: XOR Eb,Gb (ev)
31: XOR Ev,Gv (es) | XOR Ev,Gv (66),(es)
32: XOR Gb,Eb (ev)
33: XOR Gv,Ev (es) | XOR Gv,Ev (66),(es)
# CCMPSCC instructions are: CCOMB, CCOMBE, CCOMF, CCOML, CCOMLE, CCOMNB, CCOMNBE, CCOMNL, CCOMNLE,
# CCOMNO, CCOMNS, CCOMNZ, CCOMO, CCOMS, CCOMT, CCOMZ
38: CCMPSCC Eb,Gb (ev)
39: CCMPSCC Ev,Gv (es) | CCMPSCC Ev,Gv (66),(es)
3a: CCMPSCC Gv,Ev (ev)
3b: CCMPSCC Gv,Ev (es) | CCMPSCC Gv,Ev (66),(es)
40: CMOVO Gv,Ev (es) | CMOVO Gv,Ev (66),(es) | CFCMOVO Ev,Ev (es) | CFCMOVO Ev,Ev (66),(es) | SETO Eb (F2),(ev)
41: CMOVNO Gv,Ev (es) | CMOVNO Gv,Ev (66),(es) | CFCMOVNO Ev,Ev (es) | CFCMOVNO Ev,Ev (66),(es) | SETNO Eb (F2),(ev)
42: CMOVB Gv,Ev (es) | CMOVB Gv,Ev (66),(es) | CFCMOVB Ev,Ev (es) | CFCMOVB Ev,Ev (66),(es) | SETB Eb (F2),(ev)
43: CMOVNB Gv,Ev (es) | CMOVNB Gv,Ev (66),(es) | CFCMOVNB Ev,Ev (es) | CFCMOVNB Ev,Ev (66),(es) | SETNB Eb (F2),(ev)
44: CMOVZ Gv,Ev (es) | CMOVZ Gv,Ev (66),(es) | CFCMOVZ Ev,Ev (es) | CFCMOVZ Ev,Ev (66),(es) | SETZ Eb (F2),(ev)
45: CMOVNZ Gv,Ev (es) | CMOVNZ Gv,Ev (66),(es) | CFCMOVNZ Ev,Ev (es) | CFCMOVNZ Ev,Ev (66),(es) | SETNZ Eb (F2),(ev)
46: CMOVBE Gv,Ev (es) | CMOVBE Gv,Ev (66),(es) | CFCMOVBE Ev,Ev (es) | CFCMOVBE Ev,Ev (66),(es) | SETBE Eb (F2),(ev)
47: CMOVNBE Gv,Ev (es) | CMOVNBE Gv,Ev (66),(es) | CFCMOVNBE Ev,Ev (es) | CFCMOVNBE Ev,Ev (66),(es) | SETNBE Eb (F2),(ev)
48: CMOVS Gv,Ev (es) | CMOVS Gv,Ev (66),(es) | CFCMOVS Ev,Ev (es) | CFCMOVS Ev,Ev (66),(es) | SETS Eb (F2),(ev)
49: CMOVNS Gv,Ev (es) | CMOVNS Gv,Ev (66),(es) | CFCMOVNS Ev,Ev (es) | CFCMOVNS Ev,Ev (66),(es) | SETNS Eb (F2),(ev)
4a: CMOVP Gv,Ev (es) | CMOVP Gv,Ev (66),(es) | CFCMOVP Ev,Ev (es) | CFCMOVP Ev,Ev (66),(es) | SETP Eb (F2),(ev)
4b: CMOVNP Gv,Ev (es) | CMOVNP Gv,Ev (66),(es) | CFCMOVNP Ev,Ev (es) | CFCMOVNP Ev,Ev (66),(es) | SETNP Eb (F2),(ev)
4c: CMOVL Gv,Ev (es) | CMOVL Gv,Ev (66),(es) | CFCMOVL Ev,Ev (es) | CFCMOVL Ev,Ev (66),(es) | SETL Eb (F2),(ev)
4d: CMOVNL Gv,Ev (es) | CMOVNL Gv,Ev (66),(es) | CFCMOVNL Ev,Ev (es) | CFCMOVNL Ev,Ev (66),(es) | SETNL Eb (F2),(ev)
4e: CMOVLE Gv,Ev (es) | CMOVLE Gv,Ev (66),(es) | CFCMOVLE Ev,Ev (es) | CFCMOVLE Ev,Ev (66),(es) | SETLE Eb (F2),(ev)
4f: CMOVNLE Gv,Ev (es) | CMOVNLE Gv,Ev (66),(es) | CFCMOVNLE Ev,Ev (es) | CFCMOVNLE Ev,Ev (66),(es) | SETNLE Eb (F2),(ev)
60: MOVBE Gv,Ev (es) | MOVBE Gv,Ev (66),(es)
61: MOVBE Ev,Gv (es) | MOVBE Ev,Gv (66),(es)
65: WRUSSD Md,Gd (66),(ev) | WRUSSQ Mq,Gq (66),(ev)
66: ADCX Gy,Ey (66),(ev) | ADOX Gy,Ey (F3),(ev) | WRSSD Md,Gd (ev) | WRSSQ Mq,Gq (66),(ev)
69: IMUL Gv,Ev,Iz (es) | IMUL Gv,Ev,Iz (66),(es)
6b: IMUL Gv,Ev,Ib (es) | IMUL Gv,Ev,Ib (66),(es)
80: Grp1 Eb,Ib (1A),(ev)
81: Grp1 Ev,Iz (1A),(es)
83: Grp1 Ev,Ib (1A),(es)
# CTESTSCC instructions are: CTESTB, CTESTBE, CTESTF, CTESTL, CTESTLE, CTESTNB, CTESTNBE, CTESTNL,
# CTESTNLE, CTESTNO, CTESTNS, CTESTNZ, CTESTO, CTESTS, CTESTT, CTESTZ
84: CTESTSCC (ev)
85: CTESTSCC (es) | CTESTSCC (66),(es)
88: POPCNT Gv,Ev (es) | POPCNT Gv,Ev (66),(es)
8f: POP2 Bq,Rq (000),(11B),(ev)
a5: SHLD Ev,Gv,CL (es) | SHLD Ev,Gv,CL (66),(es)
ad: SHRD Ev,Gv,CL (es) | SHRD Ev,Gv,CL (66),(es)
af: IMUL Gv,Ev (es) | IMUL Gv,Ev (66),(es)
c0: Grp2 Eb,Ib (1A),(ev)
c1: Grp2 Ev,Ib (1A),(es)
d0: Grp2 Eb,1 (1A),(ev)
d1: Grp2 Ev,1 (1A),(es)
d2: Grp2 Eb,CL (1A),(ev)
d3: Grp2 Ev,CL (1A),(es)
f0: CRC32 Gy,Eb (es) | INVEPT Gq,Mdq (F3),(ev)
f1: CRC32 Gy,Ey (es) | CRC32 Gy,Ey (66),(es) | INVVPID Gy,Mdq (F3),(ev)
f2: INVPCID Gy,Mdq (F3),(ev)
f4: TZCNT Gv,Ev (es) | TZCNT Gv,Ev (66),(es)
f5: LZCNT Gv,Ev (es) | LZCNT Gv,Ev (66),(es)
f6: Grp3_1 Eb (1A),(ev)
f7: Grp3_2 Ev (1A),(es)
f8: MOVDIR64B Gv,Mdqq (66),(ev) | ENQCMD Gv,Mdqq (F2),(ev) | ENQCMDS Gv,Mdqq (F3),(ev) | URDMSR Rq,Gq (F2),(11B),(ev) | UWRMSR Gq,Rq (F3),(11B),(ev)
f9: MOVDIRI My,Gy (ev)
fe: Grp4 (1A),(ev)
ff: Grp5 (1A),(es) | PUSH2 Bq,Rq (110),(11B),(ev)
EndTable
Table: EVEX map 5
Referrer:
AVXcode: 5
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7