added underscores to AVX512_IFMA and AVX512_VBMI for uniformity

* only original AVX512 CPUID bits will omit underscores:
      AVX512{F,DQ,BW,CD,PF,ER,VL}

Change-Id: I8865617769ee94d8b74c91613c657cb595a4ce23
(cherry picked from commit d50dfb5313d9b721c924482c95e13ba542359138)
This commit is contained in:
Mark Charney
2017-01-05 18:20:21 -05:00
parent 43a71b2bda
commit 17b5552543
5 changed files with 72 additions and 72 deletions

View File

@@ -17,12 +17,12 @@
#END_LEGAL
AVX512_FUTURE: ALL_OF(SKYLAKE_SERVER) SHA \
AVX512IFMA_128 \
AVX512IFMA_256 \
AVX512IFMA_512 \
AVX512VBMI_128 \
AVX512VBMI_256 \
AVX512VBMI_512
AVX512_IFMA_128 \
AVX512_IFMA_256 \
AVX512_IFMA_512 \
AVX512_VBMI_128 \
AVX512_VBMI_256 \
AVX512_VBMI_512

View File

@@ -15,7 +15,7 @@
# limitations under the License.
#
#END_LEGAL
XED_ISA_SET_AVX512IFMA_128: avx512ifma.7.0.ebx.21 avx512vl.7.0.ebx.31
XED_ISA_SET_AVX512IFMA_256: avx512ifma.7.0.ebx.21 avx512vl.7.0.ebx.31
XED_ISA_SET_AVX512IFMA_512: avx512ifma.7.0.ebx.21
XED_ISA_SET_AVX512_IFMA_128: avx512ifma.7.0.ebx.21 avx512vl.7.0.ebx.31
XED_ISA_SET_AVX512_IFMA_256: avx512ifma.7.0.ebx.21 avx512vl.7.0.ebx.31
XED_ISA_SET_AVX512_IFMA_512: avx512ifma.7.0.ebx.21

View File

@@ -31,7 +31,7 @@ ICLASS: VPMADD52HUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_128
ISA_SET: AVX512_IFMA_128
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -45,7 +45,7 @@ ICLASS: VPMADD52HUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_128
ISA_SET: AVX512_IFMA_128
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MEMORY_FAULT_SUPPRESSION MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED
@@ -61,7 +61,7 @@ ICLASS: VPMADD52HUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_256
ISA_SET: AVX512_IFMA_256
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -75,7 +75,7 @@ ICLASS: VPMADD52HUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_256
ISA_SET: AVX512_IFMA_256
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MEMORY_FAULT_SUPPRESSION MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED
@@ -91,7 +91,7 @@ ICLASS: VPMADD52HUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_512
ISA_SET: AVX512_IFMA_512
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -105,7 +105,7 @@ ICLASS: VPMADD52HUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_512
ISA_SET: AVX512_IFMA_512
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MEMORY_FAULT_SUPPRESSION MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED
@@ -121,7 +121,7 @@ ICLASS: VPMADD52LUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_128
ISA_SET: AVX512_IFMA_128
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -135,7 +135,7 @@ ICLASS: VPMADD52LUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_128
ISA_SET: AVX512_IFMA_128
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MEMORY_FAULT_SUPPRESSION MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED
@@ -151,7 +151,7 @@ ICLASS: VPMADD52LUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_256
ISA_SET: AVX512_IFMA_256
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -165,7 +165,7 @@ ICLASS: VPMADD52LUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_256
ISA_SET: AVX512_IFMA_256
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MEMORY_FAULT_SUPPRESSION MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED
@@ -181,7 +181,7 @@ ICLASS: VPMADD52LUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_512
ISA_SET: AVX512_IFMA_512
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -195,7 +195,7 @@ ICLASS: VPMADD52LUQ
CPL: 3
CATEGORY: IFMA
EXTENSION: AVX512EVEX
ISA_SET: AVX512IFMA_512
ISA_SET: AVX512_IFMA_512
EXCEPTIONS: AVX512-E4
REAL_OPCODE: Y
ATTRIBUTES: MEMORY_FAULT_SUPPRESSION MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED

View File

@@ -15,6 +15,6 @@
# limitations under the License.
#
#END_LEGAL
XED_ISA_SET_AVX512VBMI_128: avx512vbmi.7.0.ecx.1 avx512vl.7.0.ebx.31
XED_ISA_SET_AVX512VBMI_256: avx512vbmi.7.0.ecx.1 avx512vl.7.0.ebx.31
XED_ISA_SET_AVX512VBMI_512: avx512vbmi.7.0.ecx.1
XED_ISA_SET_AVX512_VBMI_128: avx512vbmi.7.0.ecx.1 avx512vl.7.0.ebx.31
XED_ISA_SET_AVX512_VBMI_256: avx512vbmi.7.0.ecx.1 avx512vl.7.0.ebx.31
XED_ISA_SET_AVX512_VBMI_512: avx512vbmi.7.0.ecx.1

View File

@@ -29,9 +29,9 @@ EVEX_INSTRUCTIONS()::
{
ICLASS: VPERMB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_128
ISA_SET: AVX512_VBMI_128
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -43,9 +43,9 @@ IFORM: VPERMB_XMMu8_MASKmskw_XMMu8_XMMu8_AVX512
{
ICLASS: VPERMB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_128
ISA_SET: AVX512_VBMI_128
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -59,9 +59,9 @@ IFORM: VPERMB_XMMu8_MASKmskw_XMMu8_MEMu8_AVX512
{
ICLASS: VPERMB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_256
ISA_SET: AVX512_VBMI_256
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -73,9 +73,9 @@ IFORM: VPERMB_YMMu8_MASKmskw_YMMu8_YMMu8_AVX512
{
ICLASS: VPERMB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_256
ISA_SET: AVX512_VBMI_256
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -89,9 +89,9 @@ IFORM: VPERMB_YMMu8_MASKmskw_YMMu8_MEMu8_AVX512
{
ICLASS: VPERMB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_512
ISA_SET: AVX512_VBMI_512
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -103,9 +103,9 @@ IFORM: VPERMB_ZMMu8_MASKmskw_ZMMu8_ZMMu8_AVX512
{
ICLASS: VPERMB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_512
ISA_SET: AVX512_VBMI_512
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -119,9 +119,9 @@ IFORM: VPERMB_ZMMu8_MASKmskw_ZMMu8_MEMu8_AVX512
{
ICLASS: VPERMI2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_128
ISA_SET: AVX512_VBMI_128
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -133,9 +133,9 @@ IFORM: VPERMI2B_XMMu8_MASKmskw_XMMu8_XMMu8_AVX512
{
ICLASS: VPERMI2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_128
ISA_SET: AVX512_VBMI_128
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -149,9 +149,9 @@ IFORM: VPERMI2B_XMMu8_MASKmskw_XMMu8_MEMu8_AVX512
{
ICLASS: VPERMI2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_256
ISA_SET: AVX512_VBMI_256
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -163,9 +163,9 @@ IFORM: VPERMI2B_YMMu8_MASKmskw_YMMu8_YMMu8_AVX512
{
ICLASS: VPERMI2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_256
ISA_SET: AVX512_VBMI_256
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -179,9 +179,9 @@ IFORM: VPERMI2B_YMMu8_MASKmskw_YMMu8_MEMu8_AVX512
{
ICLASS: VPERMI2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_512
ISA_SET: AVX512_VBMI_512
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -193,9 +193,9 @@ IFORM: VPERMI2B_ZMMu8_MASKmskw_ZMMu8_ZMMu8_AVX512
{
ICLASS: VPERMI2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_512
ISA_SET: AVX512_VBMI_512
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -209,9 +209,9 @@ IFORM: VPERMI2B_ZMMu8_MASKmskw_ZMMu8_MEMu8_AVX512
{
ICLASS: VPERMT2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_128
ISA_SET: AVX512_VBMI_128
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -223,9 +223,9 @@ IFORM: VPERMT2B_XMMu8_MASKmskw_XMMu8_XMMu8_AVX512
{
ICLASS: VPERMT2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_128
ISA_SET: AVX512_VBMI_128
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -239,9 +239,9 @@ IFORM: VPERMT2B_XMMu8_MASKmskw_XMMu8_MEMu8_AVX512
{
ICLASS: VPERMT2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_256
ISA_SET: AVX512_VBMI_256
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -253,9 +253,9 @@ IFORM: VPERMT2B_YMMu8_MASKmskw_YMMu8_YMMu8_AVX512
{
ICLASS: VPERMT2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_256
ISA_SET: AVX512_VBMI_256
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -269,9 +269,9 @@ IFORM: VPERMT2B_YMMu8_MASKmskw_YMMu8_MEMu8_AVX512
{
ICLASS: VPERMT2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_512
ISA_SET: AVX512_VBMI_512
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -283,9 +283,9 @@ IFORM: VPERMT2B_ZMMu8_MASKmskw_ZMMu8_ZMMu8_AVX512
{
ICLASS: VPERMT2B
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_512
ISA_SET: AVX512_VBMI_512
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULLMEM
@@ -299,9 +299,9 @@ IFORM: VPERMT2B_ZMMu8_MASKmskw_ZMMu8_MEMu8_AVX512
{
ICLASS: VPMULTISHIFTQB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_128
ISA_SET: AVX512_VBMI_128
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -313,9 +313,9 @@ IFORM: VPMULTISHIFTQB_XMMu8_MASKmskw_XMMu8_XMMu64_AVX512
{
ICLASS: VPMULTISHIFTQB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_128
ISA_SET: AVX512_VBMI_128
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED
@@ -329,9 +329,9 @@ IFORM: VPMULTISHIFTQB_XMMu8_MASKmskw_XMMu8_MEMu64_AVX512
{
ICLASS: VPMULTISHIFTQB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_256
ISA_SET: AVX512_VBMI_256
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -343,9 +343,9 @@ IFORM: VPMULTISHIFTQB_YMMu8_MASKmskw_YMMu8_YMMu64_AVX512
{
ICLASS: VPMULTISHIFTQB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_256
ISA_SET: AVX512_VBMI_256
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED
@@ -359,9 +359,9 @@ IFORM: VPMULTISHIFTQB_YMMu8_MASKmskw_YMMu8_MEMu64_AVX512
{
ICLASS: VPMULTISHIFTQB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_512
ISA_SET: AVX512_VBMI_512
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX
@@ -373,9 +373,9 @@ IFORM: VPMULTISHIFTQB_ZMMu8_MASKmskw_ZMMu8_ZMMu64_AVX512
{
ICLASS: VPMULTISHIFTQB
CPL: 3
CATEGORY: AVX512VBMI
CATEGORY: AVX512_VBMI
EXTENSION: AVX512EVEX
ISA_SET: AVX512VBMI_512
ISA_SET: AVX512_VBMI_512
EXCEPTIONS: AVX512-E4NF
REAL_OPCODE: Y
ATTRIBUTES: MASKOP_EVEX DISP8_FULL BROADCAST_ENABLED