[AVX-512] Remove unused Round and Itinerary from the maskable_cmp multiclasses. They...

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@257300 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/X86InstrAVX512.td b/lib/Target/X86/X86InstrAVX512.td
index 940efc2f7ac9d0ca397a2a774fa0859ffe096eb9..812c6bb4c8391d461161bdbc2f58863237897f8b 100644 (file)
--- a/lib/Target/X86/X86InstrAVX512.td
+++ b/lib/Target/X86/X86InstrAVX512.td
@@ -323,18 +323,16 @@ multiclass AVX512_maskable_custom_cmp<bits<8> O, Format F,
                                   string OpcodeStr,
                                   string AttSrcAsm, string IntelSrcAsm,
                                   list<dag> Pattern,
-                                  list<dag> MaskingPattern,
-                                  string Round = "",
-                                  InstrItinClass itin = NoItinerary> {
+                                  list<dag> MaskingPattern> {
     def NAME: AVX512<O, F, Outs, Ins,
-                       OpcodeStr#"\t{"#AttSrcAsm#", $dst "#Round#"|"#
-                                     "$dst "#Round#", "#IntelSrcAsm#"}",
-                       Pattern, itin>;
+                       OpcodeStr#"\t{"#AttSrcAsm#", $dst|"#
+                                     "$dst, "#IntelSrcAsm#"}",
+                       Pattern, NoItinerary>;
 
     def NAME#k: AVX512<O, F, Outs, MaskingIns,
-                       OpcodeStr#"\t{"#Round#AttSrcAsm#", $dst {${mask}}|"#
-                                     "$dst {${mask}}, "#IntelSrcAsm#Round#"}",
-                       MaskingPattern, itin>, EVEX_K;
+                       OpcodeStr#"\t{"#AttSrcAsm#", $dst {${mask}}|"#
+                                     "$dst {${mask}}, "#IntelSrcAsm#"}",
+                       MaskingPattern, NoItinerary>, EVEX_K;
 }
 
 multiclass AVX512_maskable_common_cmp<bits<8> O, Format F, X86VectorVTInfo _,
@@ -342,33 +340,27 @@ multiclass AVX512_maskable_common_cmp<bits<8> O, Format F, X86VectorVTInfo _,
                                   dag Ins, dag MaskingIns,
                                   string OpcodeStr,
                                   string AttSrcAsm, string IntelSrcAsm,
-                                  dag RHS, dag MaskingRHS,
-                                  string Round = "",
-                                  InstrItinClass itin = NoItinerary> :
+                                  dag RHS, dag MaskingRHS> :
   AVX512_maskable_custom_cmp<O, F, Outs, Ins, MaskingIns, OpcodeStr,
                          AttSrcAsm, IntelSrcAsm,
                          [(set _.KRC:$dst, RHS)],
-                         [(set _.KRC:$dst, MaskingRHS)],
-                         Round, NoItinerary>;
+                         [(set _.KRC:$dst, MaskingRHS)]>;
 
 multiclass AVX512_maskable_cmp<bits<8> O, Format F, X86VectorVTInfo _,
                            dag Outs, dag Ins, string OpcodeStr,
                            string AttSrcAsm, string IntelSrcAsm,
-                           dag RHS, string Round = "",
-                           InstrItinClass itin = NoItinerary> :
+                           dag RHS> :
    AVX512_maskable_common_cmp<O, F, _, Outs, Ins,
                           !con((ins _.KRCWM:$mask), Ins),
                           OpcodeStr, AttSrcAsm, IntelSrcAsm, RHS,
-                          (and _.KRCWM:$mask, RHS),
-                          Round, itin>;
+                          (and _.KRCWM:$mask, RHS)>;
 
 multiclass AVX512_maskable_cmp_alt<bits<8> O, Format F, X86VectorVTInfo _,
                            dag Outs, dag Ins, string OpcodeStr,
                            string AttSrcAsm, string IntelSrcAsm> :
    AVX512_maskable_custom_cmp<O, F, Outs,
                              Ins, !con((ins _.KRCWM:$mask),Ins), OpcodeStr,
-                             AttSrcAsm, IntelSrcAsm,
-                             [],[],"", NoItinerary>;
+                             AttSrcAsm, IntelSrcAsm, [],[]>;
 
 // Bitcasts between 512-bit vector types. Return the original type since
 // no instruction is needed for the conversion

diff --git a/test/MC/X86/intel-syntax-avx512.s b/test/MC/X86/intel-syntax-avx512.s
index 5445bdf00b7eb5b5f45f4a5fbdecbf7a91695506..48692f265d0352af4c856112daa12095e171f5f9 100644 (file)
--- a/test/MC/X86/intel-syntax-avx512.s
+++ b/test/MC/X86/intel-syntax-avx512.s
@@ -32,7 +32,7 @@ vaddpd zmm1,zmm1,zmm2,{rd-sae}
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x78,0x58,0xca]
 vaddpd zmm1,zmm1,zmm2,{rz-sae}
 
-// CHECK: vcmppd k2 , zmm12, zmm26, 171
+// CHECK: vcmppd k2, zmm12, zmm26, 171
 // CHECK:  encoding: [0x62,0x91,0x9d,0x48,0xc2,0xd2,0xab]
           vcmppd k2,zmm12,zmm26,0xab
 
@@ -40,63 +40,63 @@ vaddpd zmm1,zmm1,zmm2,{rz-sae}
 // CHECK:  encoding: [0x62,0x91,0x9d,0x4b,0xc2,0xd2,0xab]
           vcmppd k2{k3},zmm12,zmm26,0xab
 
-// CHECK: vcmppd k2 , zmm12, zmm26, {sae}, 171
+// CHECK: vcmppd k2, zmm12, zmm26, {sae}, 171
 // CHECK:  encoding: [0x62,0x91,0x9d,0x18,0xc2,0xd2,0xab]
           vcmppd k2,zmm12,zmm26,{sae},0xab
 
-// CHECK: vcmppd k2 , zmm12, zmm26, 123
+// CHECK: vcmppd k2, zmm12, zmm26, 123
 // CHECK:  encoding: [0x62,0x91,0x9d,0x48,0xc2,0xd2,0x7b]
           vcmppd k2 ,zmm12,zmm26,0x7b
 
-// CHECK: vcmppd k2 , zmm12, zmm26, {sae}, 123
+// CHECK: vcmppd k2, zmm12, zmm26, {sae}, 123
 // CHECK:  encoding: [0x62,0x91,0x9d,0x18,0xc2,0xd2,0x7b]
           vcmppd k2,zmm12,zmm26,{sae},0x7b
 
-// CHECK: vcmppd k2 , zmm12, zmmword ptr [rcx], 123
+// CHECK: vcmppd k2, zmm12, zmmword ptr [rcx], 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x48,0xc2,0x11,0x7b]
           vcmppd k2,zmm12,zmmword PTR [rcx],0x7b
 
-// CHECK: vcmppd  k2 , zmm12, zmmword ptr [rax + 8*r14 + 291], 123
+// CHECK: vcmppd  k2, zmm12, zmmword ptr [rax + 8*r14 + 291], 123
 // CHECK:  encoding: [0x62,0xb1,0x9d,0x48,0xc2,0x94,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vcmppd k2 ,zmm12,zmmword PTR [rax+r14*8+0x123],0x7b
 
-// CHECK: vcmppd  k2 , zmm12, qword ptr [rcx]{1to8}, 123
+// CHECK: vcmppd  k2, zmm12, qword ptr [rcx]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x58,0xc2,0x11,0x7b]
           vcmppd k2,zmm12,QWORD PTR [rcx]{1to8},0x7b
 
-// CHECK: vcmppd  k2 , zmm12, zmmword ptr [rdx + 8128], 123
+// CHECK: vcmppd  k2, zmm12, zmmword ptr [rdx + 8128], 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x48,0xc2,0x52,0x7f,0x7b]
           vcmppd k2,zmm12,zmmword PTR [rdx+0x1fc0],0x7b
 
-// CHECK: vcmppd  k2 , zmm12, zmmword ptr [rdx + 8192], 123
+// CHECK: vcmppd  k2, zmm12, zmmword ptr [rdx + 8192], 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x48,0xc2,0x92,0x00,0x20,0x00,0x00,0x7b]
           vcmppd k2,zmm12,zmmword PTR [rdx+0x2000],0x7b
 
-// CHECK: vcmppd  k2 , zmm12, zmmword ptr [rdx - 8192], 123
+// CHECK: vcmppd  k2, zmm12, zmmword ptr [rdx - 8192], 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x48,0xc2,0x52,0x80,0x7b]
           vcmppd k2,zmm12,zmmword PTR [rdx-0x2000],0x7b
 
-// CHECK: vcmppd  k2 , zmm12, zmmword ptr [rdx - 8256], 123
+// CHECK: vcmppd  k2, zmm12, zmmword ptr [rdx - 8256], 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x48,0xc2,0x92,0xc0,0xdf,0xff,0xff,0x7b]
           vcmppd k2,zmm12,zmmword PTR [rdx-0x2040],0x7b
 
-// CHECK: vcmppd  k2 , zmm12, qword ptr [rdx + 1016]{1to8}, 123
+// CHECK: vcmppd  k2, zmm12, qword ptr [rdx + 1016]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x58,0xc2,0x52,0x7f,0x7b]
           vcmppd k2,zmm12,QWORD PTR [rdx+0x3f8]{1to8},0x7b
 
-// CHECK: vcmppd  k2 , zmm12, qword ptr [rdx + 1024]{1to8}, 123
+// CHECK: vcmppd  k2, zmm12, qword ptr [rdx + 1024]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x58,0xc2,0x92,0x00,0x04,0x00,0x00,0x7b]
           vcmppd k2,zmm12,QWORD PTR [rdx+0x400]{1to8},0x7b
 
-// CHECK: vcmppd  k2 , zmm12, qword ptr [rdx - 1024]{1to8}, 123
+// CHECK: vcmppd  k2, zmm12, qword ptr [rdx - 1024]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x58,0xc2,0x52,0x80,0x7b]
           vcmppd k2,zmm12,QWORD PTR [rdx-0x400]{1to8},0x7b
 
-// CHECK: vcmppd  k2 , zmm12, qword ptr [rdx - 1032]{1to8}, 123
+// CHECK: vcmppd  k2, zmm12, qword ptr [rdx - 1032]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x9d,0x58,0xc2,0x92,0xf8,0xfb,0xff,0xff,0x7b]
           vcmppd k2,zmm12,QWORD PTR [rdx-0x408]{1to8},0x7b
 
-// CHECK: vcmpps  k2 , zmm17, zmm22, 171
+// CHECK: vcmpps  k2, zmm17, zmm22, 171
 // CHECK:  encoding: [0x62,0xb1,0x74,0x40,0xc2,0xd6,0xab]
           vcmpps k2,zmm17,zmm22,0xab
 
@@ -104,59 +104,59 @@ vaddpd zmm1,zmm1,zmm2,{rz-sae}
 // CHECK:  encoding: [0x62,0xb1,0x74,0x43,0xc2,0xd6,0xab]
           vcmpps k2{k3},zmm17,zmm22,0xab
 
-// CHECK: vcmpps  k2 , zmm17, zmm22, {sae}, 171
+// CHECK: vcmpps  k2, zmm17, zmm22, {sae}, 171
 // CHECK:  encoding: [0x62,0xb1,0x74,0x10,0xc2,0xd6,0xab]
           vcmpps k2,zmm17,zmm22,{sae},0xab
 
-// CHECK: vcmpps  k2 , zmm17, zmm22, 123
+// CHECK: vcmpps  k2, zmm17, zmm22, 123
 // CHECK:  encoding: [0x62,0xb1,0x74,0x40,0xc2,0xd6,0x7b]
           vcmpps k2,zmm17,zmm22,0x7b
 
-// CHECK: vcmpps  k2 , zmm17, zmm22, {sae}, 123
+// CHECK: vcmpps  k2, zmm17, zmm22, {sae}, 123
 // CHECK:  encoding: [0x62,0xb1,0x74,0x10,0xc2,0xd6,0x7b]
           vcmpps k2,zmm17,zmm22,{sae},0x7b
 
-// CHECK: vcmpps  k2 , zmm17, zmmword ptr [rcx], 123
+// CHECK: vcmpps  k2, zmm17, zmmword ptr [rcx], 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x40,0xc2,0x11,0x7b]
           vcmpps k2,zmm17,zmmword PTR [rcx],0x7b
 
-// CHECK: vcmpps  k2 , zmm17, zmmword ptr [rax + 8*r14 + 291], 123
+// CHECK: vcmpps  k2, zmm17, zmmword ptr [rax + 8*r14 + 291], 123
 // CHECK:  encoding: [0x62,0xb1,0x74,0x40,0xc2,0x94,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vcmpps k2,zmm17,zmmword PTR [rax+r14*8+0x123],0x7b
 
-// CHECK: vcmpps  k2 , zmm17, dword ptr [rcx]{1to16}, 123
+// CHECK: vcmpps  k2, zmm17, dword ptr [rcx]{1to16}, 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x50,0xc2,0x11,0x7b]
           vcmpps k2,zmm17,DWORD PTR [rcx]{1to16},0x7b
 
-// CHECK: vcmpps  k2 , zmm17, zmmword ptr [rdx + 8128], 123
+// CHECK: vcmpps  k2, zmm17, zmmword ptr [rdx + 8128], 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x40,0xc2,0x52,0x7f,0x7b]
           vcmpps k2,zmm17,zmmword PTR [rdx+0x1fc0],0x7b
 
-// CHECK: vcmpps  k2 , zmm17, zmmword ptr [rdx + 8192], 123
+// CHECK: vcmpps  k2, zmm17, zmmword ptr [rdx + 8192], 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x40,0xc2,0x92,0x00,0x20,0x00,0x00,0x7b]
           vcmpps k2,zmm17,zmmword PTR [rdx+0x2000],0x7b
 
-// CHECK: vcmpps  k2 , zmm17, zmmword ptr [rdx - 8192], 123
+// CHECK: vcmpps  k2, zmm17, zmmword ptr [rdx - 8192], 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x40,0xc2,0x52,0x80,0x7b]
           vcmpps k2,zmm17,zmmword PTR [rdx-0x2000],0x7b
 
-// CHECK: vcmpps  k2 , zmm17, zmmword ptr [rdx - 8256], 123
+// CHECK: vcmpps  k2, zmm17, zmmword ptr [rdx - 8256], 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x40,0xc2,0x92,0xc0,0xdf,0xff,0xff,0x7b]
           vcmpps k2,zmm17,zmmword PTR [rdx-0x2040],0x7b
 
-// CHECK: vcmpps  k2 , zmm17, dword ptr [rdx + 508]{1to16}, 123
+// CHECK: vcmpps  k2, zmm17, dword ptr [rdx + 508]{1to16}, 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x50,0xc2,0x52,0x7f,0x7b]
           vcmpps k2,zmm17,DWORD PTR [rdx+0x1fc]{1to16},0x7b
 
-// CHECK: vcmpps  k2 , zmm17, dword ptr [rdx + 512]{1to16}, 123
+// CHECK: vcmpps  k2, zmm17, dword ptr [rdx + 512]{1to16}, 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x50,0xc2,0x92,0x00,0x02,0x00,0x00,0x7b]
           vcmpps k2,zmm17,DWORD PTR [rdx+0x200]{1to16},0x7b
 
-// CHECK: vcmpps  k2 , zmm17, dword ptr [rdx - 512]{1to16}, 123
+// CHECK: vcmpps  k2, zmm17, dword ptr [rdx - 512]{1to16}, 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x50,0xc2,0x52,0x80,0x7b]
           vcmpps k2,zmm17,DWORD PTR [rdx-0x200]{1to16},0x7b
 
-// CHECK: vcmpps  k2 , zmm17, dword ptr [rdx - 516]{1to16}, 123
+// CHECK: vcmpps  k2, zmm17, dword ptr [rdx - 516]{1to16}, 123
 // CHECK:  encoding: [0x62,0xf1,0x74,0x50,0xc2,0x92,0xfc,0xfd,0xff,0xff,0x7b]
           vcmpps k2,zmm17,DWORD PTR [rdx-0x204]{1to16},0x7b
 

diff --git a/test/MC/X86/intel-syntax-x86-64-avx512f_vl.s b/test/MC/X86/intel-syntax-x86-64-avx512f_vl.s
index 6de59da40b306c92f054104f5b5c045641c0fd03..80e26f1ef026d5200485cc2ef781684a00f02b70 100644 (file)
--- a/test/MC/X86/intel-syntax-x86-64-avx512f_vl.s
+++ b/test/MC/X86/intel-syntax-x86-64-avx512f_vl.s
@@ -1,6 +1,6 @@
 // RUN: llvm-mc -triple x86_64-unknown-unknown -mcpu=knl -mattr=+avx512vl -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
 
-// CHECK:  vcmppd k3 , xmm27, xmm23, 171
+// CHECK:  vcmppd k3, xmm27, xmm23, 171
 // CHECK:  encoding: [0x62,0xb1,0xa5,0x00,0xc2,0xdf,0xab]
           vcmppd k3,xmm27,xmm23,0xab
 
@@ -8,55 +8,55 @@
 // CHECK:  encoding: [0x62,0xb1,0xa5,0x05,0xc2,0xdf,0xab]
           vcmppd k3{k5},xmm27,xmm23,0xab
 
-// CHECK:  vcmppd k3 , xmm27, xmm23, 123
+// CHECK:  vcmppd k3, xmm27, xmm23, 123
 // CHECK:  encoding: [0x62,0xb1,0xa5,0x00,0xc2,0xdf,0x7b]
           vcmppd k3,xmm27,xmm23,0x7b
 
-// CHECK:  vcmppd k3 , xmm27, xmmword ptr [rcx], 123
+// CHECK:  vcmppd k3, xmm27, xmmword ptr [rcx], 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x00,0xc2,0x19,0x7b]
           vcmppd k3,xmm27,XMMWORD PTR [rcx],0x7b
 
-// CHECK:  vcmppd k3 , xmm27, xmmword ptr [rax + 8*r14 + 291], 123
+// CHECK:  vcmppd k3, xmm27, xmmword ptr [rax + 8*r14 + 291], 123
 // CHECK:  encoding: [0x62,0xb1,0xa5,0x00,0xc2,0x9c,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vcmppd k3,xmm27,XMMWORD PTR [rax+r14*8+0x123],0x7b
 
-// CHECK:  vcmppd k3 , xmm27, qword ptr [rcx]{1to2}, 123
+// CHECK:  vcmppd k3, xmm27, qword ptr [rcx]{1to2}, 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x10,0xc2,0x19,0x7b]
           vcmppd k3,xmm27,QWORD PTR [rcx]{1to2},0x7b
 
-// CHECK:  vcmppd k3 , xmm27, xmmword ptr [rdx + 2032], 123
+// CHECK:  vcmppd k3, xmm27, xmmword ptr [rdx + 2032], 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x00,0xc2,0x5a,0x7f,0x7b]
           vcmppd k3,xmm27,XMMWORD PTR [rdx+0x7f0],0x7b
 
-// CHECK:  vcmppd k3 , xmm27, xmmword ptr [rdx + 2048], 123
+// CHECK:  vcmppd k3, xmm27, xmmword ptr [rdx + 2048], 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x00,0xc2,0x9a,0x00,0x08,0x00,0x00,0x7b]
           vcmppd k3,xmm27,XMMWORD PTR [rdx+0x800],0x7b
 
-// CHECK:  vcmppd k3 , xmm27, xmmword ptr [rdx - 2048], 123
+// CHECK:  vcmppd k3, xmm27, xmmword ptr [rdx - 2048], 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x00,0xc2,0x5a,0x80,0x7b]
           vcmppd k3,xmm27,XMMWORD PTR [rdx-0x800],0x7b
 
-// CHECK:  vcmppd k3 , xmm27, xmmword ptr [rdx - 2064], 123
+// CHECK:  vcmppd k3, xmm27, xmmword ptr [rdx - 2064], 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x00,0xc2,0x9a,0xf0,0xf7,0xff,0xff,0x7b]
           vcmppd k3,xmm27,XMMWORD PTR [rdx-0x810],0x7b
 
-// CHECK:  vcmppd k3 , xmm27, qword ptr [rdx + 1016]{1to2}, 123
+// CHECK:  vcmppd k3, xmm27, qword ptr [rdx + 1016]{1to2}, 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x10,0xc2,0x5a,0x7f,0x7b]
           vcmppd k3,xmm27,QWORD PTR [rdx+0x3f8]{1to2},0x7b
 
-// CHECK:  vcmppd k3 , xmm27, qword ptr [rdx + 1024]{1to2}, 123
+// CHECK:  vcmppd k3, xmm27, qword ptr [rdx + 1024]{1to2}, 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x10,0xc2,0x9a,0x00,0x04,0x00,0x00,0x7b]
           vcmppd k3,xmm27,QWORD PTR [rdx+0x400]{1to2},0x7b
 
-// CHECK:  vcmppd k3 , xmm27, qword ptr [rdx - 1024]{1to2}, 123
+// CHECK:  vcmppd k3, xmm27, qword ptr [rdx - 1024]{1to2}, 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x10,0xc2,0x5a,0x80,0x7b]
           vcmppd k3,xmm27,QWORD PTR [rdx-0x400]{1to2},0x7b
 
-// CHECK:  vcmppd k3 , xmm27, qword ptr [rdx - 1032]{1to2}, 123
+// CHECK:  vcmppd k3, xmm27, qword ptr [rdx - 1032]{1to2}, 123
 // CHECK:  encoding: [0x62,0xf1,0xa5,0x10,0xc2,0x9a,0xf8,0xfb,0xff,0xff,0x7b]
           vcmppd k3,xmm27,QWORD PTR [rdx-0x408]{1to2},0x7b
 
-// CHECK:  vcmppd k4 , ymm17, ymm27, 171
+// CHECK:  vcmppd k4, ymm17, ymm27, 171
 // CHECK:  encoding: [0x62,0x91,0xf5,0x20,0xc2,0xe3,0xab]
           vcmppd k4,ymm17,ymm27,0xab
 
@@ -64,55 +64,55 @@
 // CHECK:  encoding: [0x62,0x91,0xf5,0x27,0xc2,0xe3,0xab]
           vcmppd k4{k7},ymm17,ymm27,0xab
 
-// CHECK:  vcmppd k4 , ymm17, ymm27, 123
+// CHECK:  vcmppd k4, ymm17, ymm27, 123
 // CHECK:  encoding: [0x62,0x91,0xf5,0x20,0xc2,0xe3,0x7b]
           vcmppd k4,ymm17,ymm27,0x7b
 
-// CHECK:  vcmppd k4 , ymm17, ymmword ptr [rcx], 123
+// CHECK:  vcmppd k4, ymm17, ymmword ptr [rcx], 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x20,0xc2,0x21,0x7b]
           vcmppd k4,ymm17,YMMWORD PTR [rcx],0x7b
 
-// CHECK:  vcmppd k4 , ymm17, ymmword ptr [rax + 8*r14 + 291], 123
+// CHECK:  vcmppd k4, ymm17, ymmword ptr [rax + 8*r14 + 291], 123
 // CHECK:  encoding: [0x62,0xb1,0xf5,0x20,0xc2,0xa4,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vcmppd k4,ymm17,YMMWORD PTR [rax+r14*8+0x123],0x7b
 
-// CHECK:  vcmppd k4 , ymm17, qword ptr [rcx]{1to4}, 123
+// CHECK:  vcmppd k4, ymm17, qword ptr [rcx]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x30,0xc2,0x21,0x7b]
           vcmppd k4,ymm17,QWORD PTR [rcx]{1to4},0x7b
 
-// CHECK:  vcmppd k4 , ymm17, ymmword ptr [rdx + 4064], 123
+// CHECK:  vcmppd k4, ymm17, ymmword ptr [rdx + 4064], 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x20,0xc2,0x62,0x7f,0x7b]
           vcmppd k4,ymm17,YMMWORD PTR [rdx+0xfe0],0x7b
 
-// CHECK:  vcmppd k4 , ymm17, ymmword ptr [rdx + 4096], 123
+// CHECK:  vcmppd k4, ymm17, ymmword ptr [rdx + 4096], 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x20,0xc2,0xa2,0x00,0x10,0x00,0x00,0x7b]
           vcmppd k4,ymm17,YMMWORD PTR [rdx+0x1000],0x7b
 
-// CHECK:  vcmppd k4 , ymm17, ymmword ptr [rdx - 4096], 123
+// CHECK:  vcmppd k4, ymm17, ymmword ptr [rdx - 4096], 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x20,0xc2,0x62,0x80,0x7b]
           vcmppd k4,ymm17,YMMWORD PTR [rdx-0x1000],0x7b
 
-// CHECK:  vcmppd k4 , ymm17, ymmword ptr [rdx - 4128], 123
+// CHECK:  vcmppd k4, ymm17, ymmword ptr [rdx - 4128], 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x20,0xc2,0xa2,0xe0,0xef,0xff,0xff,0x7b]
           vcmppd k4,ymm17,YMMWORD PTR [rdx-0x1020],0x7b
 
-// CHECK:  vcmppd k4 , ymm17, qword ptr [rdx + 1016]{1to4}, 123
+// CHECK:  vcmppd k4, ymm17, qword ptr [rdx + 1016]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x30,0xc2,0x62,0x7f,0x7b]
           vcmppd k4,ymm17,QWORD PTR [rdx+0x3f8]{1to4},0x7b
 
-// CHECK:  vcmppd k4 , ymm17, qword ptr [rdx + 1024]{1to4}, 123
+// CHECK:  vcmppd k4, ymm17, qword ptr [rdx + 1024]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x30,0xc2,0xa2,0x00,0x04,0x00,0x00,0x7b]
           vcmppd k4,ymm17,QWORD PTR [rdx+0x400]{1to4},0x7b
 
-// CHECK:  vcmppd k4 , ymm17, qword ptr [rdx - 1024]{1to4}, 123
+// CHECK:  vcmppd k4, ymm17, qword ptr [rdx - 1024]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x30,0xc2,0x62,0x80,0x7b]
           vcmppd k4,ymm17,QWORD PTR [rdx-0x400]{1to4},0x7b
 
-// CHECK:  vcmppd k4 , ymm17, qword ptr [rdx - 1032]{1to4}, 123
+// CHECK:  vcmppd k4, ymm17, qword ptr [rdx - 1032]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0xf5,0x30,0xc2,0xa2,0xf8,0xfb,0xff,0xff,0x7b]
           vcmppd k4,ymm17,QWORD PTR [rdx-0x408]{1to4},0x7b
 
-// CHECK:  vcmpps k4 , xmm29, xmm28, 171
+// CHECK:  vcmpps k4, xmm29, xmm28, 171
 // CHECK:  encoding: [0x62,0x91,0x14,0x00,0xc2,0xe4,0xab]
           vcmpps k4,xmm29,xmm28,0xab
 
@@ -120,55 +120,55 @@
 // CHECK:  encoding: [0x62,0x91,0x14,0x02,0xc2,0xe4,0xab]
           vcmpps k4{k2},xmm29,xmm28,0xab
 
-// CHECK:  vcmpps k4 , xmm29, xmm28, 123
+// CHECK:  vcmpps k4, xmm29, xmm28, 123
 // CHECK:  encoding: [0x62,0x91,0x14,0x00,0xc2,0xe4,0x7b]
           vcmpps k4,xmm29,xmm28,0x7b
 
-// CHECK:  vcmpps k4 , xmm29, xmmword ptr [rcx], 123
+// CHECK:  vcmpps k4, xmm29, xmmword ptr [rcx], 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x00,0xc2,0x21,0x7b]
           vcmpps k4,xmm29,XMMWORD PTR [rcx],0x7b
 
-// CHECK:  vcmpps k4 , xmm29, xmmword ptr [rax + 8*r14 + 291], 123
+// CHECK:  vcmpps k4, xmm29, xmmword ptr [rax + 8*r14 + 291], 123
 // CHECK:  encoding: [0x62,0xb1,0x14,0x00,0xc2,0xa4,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vcmpps k4,xmm29,XMMWORD PTR [rax+r14*8+0x123],0x7b
 
-// CHECK:  vcmpps k4 , xmm29, dword ptr [rcx]{1to4}, 123
+// CHECK:  vcmpps k4, xmm29, dword ptr [rcx]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x10,0xc2,0x21,0x7b]
           vcmpps k4,xmm29,DWORD PTR [rcx]{1to4},0x7b
 
-// CHECK:  vcmpps k4 , xmm29, xmmword ptr [rdx + 2032], 123
+// CHECK:  vcmpps k4, xmm29, xmmword ptr [rdx + 2032], 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x00,0xc2,0x62,0x7f,0x7b]
           vcmpps k4,xmm29,XMMWORD PTR [rdx+0x7f0],0x7b
 
-// CHECK:  vcmpps k4 , xmm29, xmmword ptr [rdx + 2048], 123
+// CHECK:  vcmpps k4, xmm29, xmmword ptr [rdx + 2048], 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x00,0xc2,0xa2,0x00,0x08,0x00,0x00,0x7b]
           vcmpps k4,xmm29,XMMWORD PTR [rdx+0x800],0x7b
 
-// CHECK:  vcmpps k4 , xmm29, xmmword ptr [rdx - 2048], 123
+// CHECK:  vcmpps k4, xmm29, xmmword ptr [rdx - 2048], 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x00,0xc2,0x62,0x80,0x7b]
           vcmpps k4,xmm29,XMMWORD PTR [rdx-0x800],0x7b
 
-// CHECK:  vcmpps k4 , xmm29, xmmword ptr [rdx - 2064], 123
+// CHECK:  vcmpps k4, xmm29, xmmword ptr [rdx - 2064], 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x00,0xc2,0xa2,0xf0,0xf7,0xff,0xff,0x7b]
           vcmpps k4,xmm29,XMMWORD PTR [rdx-0x810],0x7b
 
-// CHECK:  vcmpps k4 , xmm29, dword ptr [rdx + 508]{1to4}, 123
+// CHECK:  vcmpps k4, xmm29, dword ptr [rdx + 508]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x10,0xc2,0x62,0x7f,0x7b]
           vcmpps k4,xmm29,DWORD PTR [rdx+0x1fc]{1to4},0x7b
 
-// CHECK:  vcmpps k4 , xmm29, dword ptr [rdx + 512]{1to4}, 123
+// CHECK:  vcmpps k4, xmm29, dword ptr [rdx + 512]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x10,0xc2,0xa2,0x00,0x02,0x00,0x00,0x7b]
           vcmpps k4,xmm29,DWORD PTR [rdx+0x200]{1to4},0x7b
 
-// CHECK:  vcmpps k4 , xmm29, dword ptr [rdx - 512]{1to4}, 123
+// CHECK:  vcmpps k4, xmm29, dword ptr [rdx - 512]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x10,0xc2,0x62,0x80,0x7b]
           vcmpps k4,xmm29,DWORD PTR [rdx-0x200]{1to4},0x7b
 
-// CHECK:  vcmpps k4 , xmm29, dword ptr [rdx - 516]{1to4}, 123
+// CHECK:  vcmpps k4, xmm29, dword ptr [rdx - 516]{1to4}, 123
 // CHECK:  encoding: [0x62,0xf1,0x14,0x10,0xc2,0xa2,0xfc,0xfd,0xff,0xff,0x7b]
           vcmpps k4,xmm29,DWORD PTR [rdx-0x204]{1to4},0x7b
 
-// CHECK:  vcmpps k4 , ymm19, ymm18, 171
+// CHECK:  vcmpps k4, ymm19, ymm18, 171
 // CHECK:  encoding: [0x62,0xb1,0x64,0x20,0xc2,0xe2,0xab]
           vcmpps k4,ymm19,ymm18,0xab
 
@@ -176,50 +176,50 @@
 // CHECK:  encoding: [0x62,0xb1,0x64,0x21,0xc2,0xe2,0xab]
           vcmpps k4{k1},ymm19,ymm18,0xab
 
-// CHECK:  vcmpps k4 , ymm19, ymm18, 123
+// CHECK:  vcmpps k4, ymm19, ymm18, 123
 // CHECK:  encoding: [0x62,0xb1,0x64,0x20,0xc2,0xe2,0x7b]
           vcmpps k4,ymm19,ymm18,0x7b
 
-// CHECK:  vcmpps k4 , ymm19, ymmword ptr [rcx], 123
+// CHECK:  vcmpps k4, ymm19, ymmword ptr [rcx], 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x20,0xc2,0x21,0x7b]
           vcmpps k4,ymm19,YMMWORD PTR [rcx],0x7b
 
-// CHECK:  vcmpps k4 , ymm19, ymmword ptr [rax + 8*r14 + 291], 123
+// CHECK:  vcmpps k4, ymm19, ymmword ptr [rax + 8*r14 + 291], 123
 // CHECK:  encoding: [0x62,0xb1,0x64,0x20,0xc2,0xa4,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vcmpps k4,ymm19,YMMWORD PTR [rax+r14*8+0x123],0x7b
 
-// CHECK: vcmpps k4 , ymm19, dword ptr [rcx]{1to8}, 123
+// CHECK: vcmpps k4, ymm19, dword ptr [rcx]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x30,0xc2,0x21,0x7b]
           vcmpps k4,ymm19,DWORD PTR [rcx]{1to8},0x7b
 
-// CHECK:  vcmpps k4 , ymm19, ymmword ptr [rdx + 4064], 123
+// CHECK:  vcmpps k4, ymm19, ymmword ptr [rdx + 4064], 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x20,0xc2,0x62,0x7f,0x7b]
           vcmpps k4,ymm19,YMMWORD PTR [rdx+0xfe0],0x7b
 
-// CHECK:  vcmpps k4 , ymm19, ymmword ptr [rdx + 4096], 123
+// CHECK:  vcmpps k4, ymm19, ymmword ptr [rdx + 4096], 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x20,0xc2,0xa2,0x00,0x10,0x00,0x00,0x7b]
           vcmpps k4,ymm19,YMMWORD PTR [rdx+0x1000],0x7b
 
-// CHECK:  vcmpps k4 , ymm19, ymmword ptr [rdx - 4096], 123
+// CHECK:  vcmpps k4, ymm19, ymmword ptr [rdx - 4096], 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x20,0xc2,0x62,0x80,0x7b]
           vcmpps k4,ymm19,YMMWORD PTR [rdx-0x1000],0x7b
 
-// CHECK:  vcmpps k4 , ymm19, ymmword ptr [rdx - 4128], 123
+// CHECK:  vcmpps k4, ymm19, ymmword ptr [rdx - 4128], 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x20,0xc2,0xa2,0xe0,0xef,0xff,0xff,0x7b]
           vcmpps k4,ymm19,YMMWORD PTR [rdx-0x1020],0x7b
 
-// CHECK:  vcmpps k4 , ymm19, dword ptr [rdx + 508]{1to8}, 123
+// CHECK:  vcmpps k4, ymm19, dword ptr [rdx + 508]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x30,0xc2,0x62,0x7f,0x7b]
           vcmpps k4,ymm19,DWORD PTR [rdx+0x1fc]{1to8},0x7b
 
-// CHECK:  vcmpps k4 , ymm19, dword ptr [rdx + 512]{1to8}, 123
+// CHECK:  vcmpps k4, ymm19, dword ptr [rdx + 512]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x30,0xc2,0xa2,0x00,0x02,0x00,0x00,0x7b]
           vcmpps k4,ymm19,DWORD PTR [rdx+0x200]{1to8},0x7b
 
-// CHECK:  vcmpps k4 , ymm19, dword ptr [rdx - 512]{1to8}, 123
+// CHECK:  vcmpps k4, ymm19, dword ptr [rdx - 512]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x30,0xc2,0x62,0x80,0x7b]
           vcmpps k4,ymm19,DWORD PTR [rdx-0x200]{1to8},0x7b
 
-// CHECK:  vcmpps k4 , ymm19, dword ptr [rdx - 516]{1to8}, 123
+// CHECK:  vcmpps k4, ymm19, dword ptr [rdx - 516]{1to8}, 123
 // CHECK:  encoding: [0x62,0xf1,0x64,0x30,0xc2,0xa2,0xfc,0xfd,0xff,0xff,0x7b]
           vcmpps k4,ymm19,DWORD PTR [rdx-0x204]{1to8},0x7b