Index: llvm/trunk/lib/Target/X86/X86InstrAVX512.td
===================================================================
--- llvm/trunk/lib/Target/X86/X86InstrAVX512.td
+++ llvm/trunk/lib/Target/X86/X86InstrAVX512.td
@@ -2651,7 +2651,7 @@
 //                                  fpclass(reg_vec, broadcast(eltVt), imm)
 multiclass avx512_vector_fpclass<bits<8> opc, string OpcodeStr,
                                  X86FoldableSchedWrite sched, X86VectorVTInfo _,
-                                 string mem, string broadcast>{
+                                 string mem>{
   let ExeDomain = _.ExeDomain in {
   def rr : AVX512<opc, MRMSrcReg, (outs _.KRC:$dst),
                       (ins _.RC:$src1, i32u8imm:$src2),
@@ -2685,7 +2685,7 @@
                     EVEX_K, Sched<[sched.Folded, sched.ReadAfterFold]>;
   def rmb : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
                     (ins _.ScalarMemOp:$src1, i32u8imm:$src2),
-                    OpcodeStr##_.Suffix##broadcast##"\t{$src2, ${src1}"##
+                    OpcodeStr##_.Suffix##"\t{$src2, ${src1}"##
                                       _.BroadcastStr##", $dst|$dst, ${src1}"
                                                   ##_.BroadcastStr##", $src2}",
                     [(set _.KRC:$dst,(X86Vfpclass
@@ -2695,7 +2695,7 @@
                     EVEX_B, Sched<[sched.Folded, sched.ReadAfterFold]>;
   def rmbk : AVX512<opc, MRMSrcMem, (outs _.KRC:$dst),
                     (ins _.KRCWM:$mask, _.ScalarMemOp:$src1, i32u8imm:$src2),
-                    OpcodeStr##_.Suffix##broadcast##"\t{$src2, ${src1}"##
+                    OpcodeStr##_.Suffix##"\t{$src2, ${src1}"##
                           _.BroadcastStr##", $dst {${mask}}|$dst {${mask}}, ${src1}"##
                                                    _.BroadcastStr##", $src2}",
                     [(set _.KRC:$dst,(and _.KRCWM:$mask, (X86Vfpclass_su
@@ -2708,16 +2708,16 @@
 
 multiclass avx512_vector_fpclass_all<string OpcodeStr, AVX512VLVectorVTInfo _,
                                      bits<8> opc, X86SchedWriteWidths sched,
-                                     Predicate prd, string broadcast>{
+                                     Predicate prd>{
   let Predicates = [prd] in {
     defm Z    : avx512_vector_fpclass<opc, OpcodeStr, sched.ZMM,
-                                      _.info512, "{z}", broadcast>, EVEX_V512;
+                                      _.info512, "{z}">, EVEX_V512;
   }
   let Predicates = [prd, HasVLX] in {
     defm Z128 : avx512_vector_fpclass<opc, OpcodeStr, sched.XMM,
-                                      _.info128, "{x}", broadcast>, EVEX_V128;
+                                      _.info128, "{x}">, EVEX_V128;
     defm Z256 : avx512_vector_fpclass<opc, OpcodeStr, sched.YMM,
-                                      _.info256, "{y}", broadcast>, EVEX_V256;
+                                      _.info256, "{y}">, EVEX_V256;
   }
 }
 
@@ -2725,10 +2725,10 @@
                                  bits<8> opcScalar, X86SchedWriteWidths sched,
                                  Predicate prd> {
   defm PS : avx512_vector_fpclass_all<OpcodeStr,  avx512vl_f32_info, opcVec,
-                                      sched, prd, "{l}">,
+                                      sched, prd>,
                                       EVEX_CD8<32, CD8VF>;
   defm PD : avx512_vector_fpclass_all<OpcodeStr,  avx512vl_f64_info, opcVec,
-                                      sched, prd, "{q}">,
+                                      sched, prd>,
                                       EVEX_CD8<64, CD8VF> , VEX_W;
   defm SSZ : avx512_scalar_fpclass<opcScalar, OpcodeStr,
                                    sched.Scl, f32x_info, prd>, VEX_LIG,
Index: llvm/trunk/test/MC/X86/x86-64-avx512dq.s
===================================================================
--- llvm/trunk/test/MC/X86/x86-64-avx512dq.s
+++ llvm/trunk/test/MC/X86/x86-64-avx512dq.s
@@ -3511,9 +3511,9 @@
 // CHECK:  encoding: [0x62,0xb3,0xfd,0x48,0x66,0x94,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vfpclasspdz $0x7b,291(%rax,%r14,8), %k2
 
-// CHECK: vfpclasspdq $123, (%rcx){1to8}, %k2
+// CHECK: vfpclasspd $123, (%rcx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x11,0x7b]
-          vfpclasspdq $0x7b,(%rcx){1to8}, %k2
+          vfpclasspd $0x7b,(%rcx){1to8}, %k2
 
 // CHECK: vfpclasspdz $123, 8128(%rdx), %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x48,0x66,0x52,0x7f,0x7b]
@@ -3531,21 +3531,21 @@
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x48,0x66,0x92,0xc0,0xdf,0xff,0xff,0x7b]
           vfpclasspdz $0x7b,-8256(%rdx), %k2
 
-// CHECK: vfpclasspdq $123, 1016(%rdx){1to8}, %k2
+// CHECK: vfpclasspd $123, 1016(%rdx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x52,0x7f,0x7b]
-          vfpclasspdq $0x7b,1016(%rdx){1to8}, %k2
+          vfpclasspd $0x7b,1016(%rdx){1to8}, %k2
 
-// CHECK: vfpclasspdq $123, 1024(%rdx){1to8}, %k2
+// CHECK: vfpclasspd $123, 1024(%rdx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x92,0x00,0x04,0x00,0x00,0x7b]
-          vfpclasspdq $0x7b,1024(%rdx){1to8}, %k2
+          vfpclasspd $0x7b,1024(%rdx){1to8}, %k2
 
-// CHECK: vfpclasspdq $123, -1024(%rdx){1to8}, %k2
+// CHECK: vfpclasspd $123, -1024(%rdx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x52,0x80,0x7b]
-          vfpclasspdq $0x7b,-1024(%rdx){1to8}, %k2
+          vfpclasspd $0x7b,-1024(%rdx){1to8}, %k2
 
-// CHECK: vfpclasspdq $123, -1032(%rdx){1to8}, %k2
+// CHECK: vfpclasspd $123, -1032(%rdx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x92,0xf8,0xfb,0xff,0xff,0x7b]
-          vfpclasspdq $0x7b,-1032(%rdx){1to8}, %k2
+          vfpclasspd $0x7b,-1032(%rdx){1to8}, %k2
 
 // CHECK: vfpclassps $171, %zmm21, %k2
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x48,0x66,0xd5,0xab]
@@ -3567,9 +3567,9 @@
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x48,0x66,0x94,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vfpclasspsz $0x7b,291(%rax,%r14,8), %k2
 
-// CHECK: vfpclasspsl $123, (%rcx){1to16}, %k2
+// CHECK: vfpclassps $123, (%rcx){1to16}, %k2
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0x11,0x7b]
-          vfpclasspsl $0x7b,(%rcx){1to16}, %k2
+          vfpclassps $0x7b,(%rcx){1to16}, %k2
 
 // CHECK: vfpclasspsz $123, 8128(%rdx), %k2
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x48,0x66,0x52,0x7f,0x7b]
@@ -3587,21 +3587,21 @@
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x48,0x66,0x92,0xc0,0xdf,0xff,0xff,0x7b]
           vfpclasspsz $0x7b,-8256(%rdx), %k2
 
-// CHECK: vfpclasspsl $123, 508(%rdx){1to16}, %k2
+// CHECK: vfpclassps $123, 508(%rdx){1to16}, %k2
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0x52,0x7f,0x7b]
-          vfpclasspsl $0x7b,508(%rdx){1to16}, %k2
+          vfpclassps $0x7b,508(%rdx){1to16}, %k2
 
-// CHECK: vfpclasspsl $123, 512(%rdx){1to16}, %k2
+// CHECK: vfpclassps $123, 512(%rdx){1to16}, %k2
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0x92,0x00,0x02,0x00,0x00,0x7b]
-          vfpclasspsl $0x7b,512(%rdx){1to16}, %k2
+          vfpclassps $0x7b,512(%rdx){1to16}, %k2
 
-// CHECK: vfpclasspsl $123, -512(%rdx){1to16}, %k2
+// CHECK: vfpclassps $123, -512(%rdx){1to16}, %k2
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0x52,0x80,0x7b]
-          vfpclasspsl $0x7b,-512(%rdx){1to16}, %k2
+          vfpclassps $0x7b,-512(%rdx){1to16}, %k2
 
-// CHECK: vfpclasspsl $123, -516(%rdx){1to16}, %k2
+// CHECK: vfpclassps $123, -516(%rdx){1to16}, %k2
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0x92,0xfc,0xfd,0xff,0xff,0x7b]
-          vfpclasspsl $0x7b,-516(%rdx){1to16}, %k2
+          vfpclassps $0x7b,-516(%rdx){1to16}, %k2
 
 // CHECK: vfpclasspd $171, %zmm19, %k2
 // CHECK:  encoding: [0x62,0xb3,0xfd,0x48,0x66,0xd3,0xab]
@@ -3623,9 +3623,9 @@
 // CHECK:  encoding: [0x62,0xb3,0xfd,0x48,0x66,0x94,0xf0,0x34,0x12,0x00,0x00,0x7b]
           vfpclasspdz $0x7b,4660(%rax,%r14,8), %k2
 
-// CHECK: vfpclasspdq $123, (%rcx){1to8}, %k2
+// CHECK: vfpclasspd $123, (%rcx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x11,0x7b]
-          vfpclasspdq $0x7b,(%rcx){1to8}, %k2
+          vfpclasspd $0x7b,(%rcx){1to8}, %k2
 
 // CHECK: vfpclasspdz $123, 8128(%rdx), %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x48,0x66,0x52,0x7f,0x7b]
@@ -3643,21 +3643,21 @@
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x48,0x66,0x92,0xc0,0xdf,0xff,0xff,0x7b]
           vfpclasspdz $0x7b,-8256(%rdx), %k2
 
-// CHECK: vfpclasspdq $123, 1016(%rdx){1to8}, %k2
+// CHECK: vfpclasspd $123, 1016(%rdx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x52,0x7f,0x7b]
-          vfpclasspdq $0x7b,1016(%rdx){1to8}, %k2
+          vfpclasspd $0x7b,1016(%rdx){1to8}, %k2
 
-// CHECK: vfpclasspdq $123, 1024(%rdx){1to8}, %k2
+// CHECK: vfpclasspd $123, 1024(%rdx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x92,0x00,0x04,0x00,0x00,0x7b]
-          vfpclasspdq $0x7b,1024(%rdx){1to8}, %k2
+          vfpclasspd $0x7b,1024(%rdx){1to8}, %k2
 
-// CHECK: vfpclasspdq $123, -1024(%rdx){1to8}, %k2
+// CHECK: vfpclasspd $123, -1024(%rdx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x52,0x80,0x7b]
-          vfpclasspdq $0x7b,-1024(%rdx){1to8}, %k2
+          vfpclasspd $0x7b,-1024(%rdx){1to8}, %k2
 
-// CHECK: vfpclasspdq $123, -1032(%rdx){1to8}, %k2
+// CHECK: vfpclasspd $123, -1032(%rdx){1to8}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x58,0x66,0x92,0xf8,0xfb,0xff,0xff,0x7b]
-          vfpclasspdq $0x7b,-1032(%rdx){1to8}, %k2
+          vfpclasspd $0x7b,-1032(%rdx){1to8}, %k2
 
 // CHECK: vfpclassps $171, %zmm17, %k4
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x48,0x66,0xe1,0xab]
@@ -3679,9 +3679,9 @@
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x48,0x66,0xa4,0xf0,0x34,0x12,0x00,0x00,0x7b]
           vfpclasspsz $0x7b,4660(%rax,%r14,8), %k4
 
-// CHECK: vfpclasspsl $123, (%rcx){1to16}, %k4
+// CHECK: vfpclassps $123, (%rcx){1to16}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0x21,0x7b]
-          vfpclasspsl $0x7b,(%rcx){1to16}, %k4
+          vfpclassps $0x7b,(%rcx){1to16}, %k4
 
 // CHECK: vfpclasspsz $123, 8128(%rdx), %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x48,0x66,0x62,0x7f,0x7b]
@@ -3699,21 +3699,21 @@
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x48,0x66,0xa2,0xc0,0xdf,0xff,0xff,0x7b]
           vfpclasspsz $0x7b,-8256(%rdx), %k4
 
-// CHECK: vfpclasspsl $123, 508(%rdx){1to16}, %k4
+// CHECK: vfpclassps $123, 508(%rdx){1to16}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0x62,0x7f,0x7b]
-          vfpclasspsl $0x7b,508(%rdx){1to16}, %k4
+          vfpclassps $0x7b,508(%rdx){1to16}, %k4
 
-// CHECK: vfpclasspsl $123, 512(%rdx){1to16}, %k4
+// CHECK: vfpclassps $123, 512(%rdx){1to16}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0xa2,0x00,0x02,0x00,0x00,0x7b]
-          vfpclasspsl $0x7b,512(%rdx){1to16}, %k4
+          vfpclassps $0x7b,512(%rdx){1to16}, %k4
 
-// CHECK: vfpclasspsl $123, -512(%rdx){1to16}, %k4
+// CHECK: vfpclassps $123, -512(%rdx){1to16}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0x62,0x80,0x7b]
-          vfpclasspsl $0x7b,-512(%rdx){1to16}, %k4
+          vfpclassps $0x7b,-512(%rdx){1to16}, %k4
 
-// CHECK: vfpclasspsl $123, -516(%rdx){1to16}, %k4
+// CHECK: vfpclassps $123, -516(%rdx){1to16}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x58,0x66,0xa2,0xfc,0xfd,0xff,0xff,0x7b]
-          vfpclasspsl $0x7b,-516(%rdx){1to16}, %k4
+          vfpclassps $0x7b,-516(%rdx){1to16}, %k4
 
 
 // CHECK: vcvtuqq2ps {rn-sae}, %zmm21, %ymm18
Index: llvm/trunk/test/MC/X86/x86-64-avx512dq_vl.s
===================================================================
--- llvm/trunk/test/MC/X86/x86-64-avx512dq_vl.s
+++ llvm/trunk/test/MC/X86/x86-64-avx512dq_vl.s
@@ -5448,9 +5448,9 @@
 // CHECK:  encoding: [0x62,0xb3,0xfd,0x08,0x66,0x94,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vfpclasspdx $0x7b,291(%rax,%r14,8), %k2
 
-// CHECK: vfpclasspdq $123, (%rcx){1to2}, %k2
+// CHECK: vfpclasspd $123, (%rcx){1to2}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x11,0x7b]
-          vfpclasspdq $0x7b,(%rcx){1to2}, %k2
+          vfpclasspd $0x7b,(%rcx){1to2}, %k2
 
 // CHECK: vfpclasspdx $123, 2032(%rdx), %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x08,0x66,0x52,0x7f,0x7b]
@@ -5468,21 +5468,21 @@
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x08,0x66,0x92,0xf0,0xf7,0xff,0xff,0x7b]
           vfpclasspdx $0x7b,-2064(%rdx), %k2
 
-// CHECK: vfpclasspdq $123, 1016(%rdx){1to2}, %k2
+// CHECK: vfpclasspd $123, 1016(%rdx){1to2}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x52,0x7f,0x7b]
-          vfpclasspdq $0x7b,1016(%rdx){1to2}, %k2
+          vfpclasspd $0x7b,1016(%rdx){1to2}, %k2
 
-// CHECK: vfpclasspdq $123, 1024(%rdx){1to2}, %k2
+// CHECK: vfpclasspd $123, 1024(%rdx){1to2}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x92,0x00,0x04,0x00,0x00,0x7b]
-          vfpclasspdq $0x7b,1024(%rdx){1to2}, %k2
+          vfpclasspd $0x7b,1024(%rdx){1to2}, %k2
 
-// CHECK: vfpclasspdq $123, -1024(%rdx){1to2}, %k2
+// CHECK: vfpclasspd $123, -1024(%rdx){1to2}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x52,0x80,0x7b]
-          vfpclasspdq $0x7b,-1024(%rdx){1to2}, %k2
+          vfpclasspd $0x7b,-1024(%rdx){1to2}, %k2
 
-// CHECK: vfpclasspdq $123, -1032(%rdx){1to2}, %k2
+// CHECK: vfpclasspd $123, -1032(%rdx){1to2}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x92,0xf8,0xfb,0xff,0xff,0x7b]
-          vfpclasspdq $0x7b,-1032(%rdx){1to2}, %k2
+          vfpclasspd $0x7b,-1032(%rdx){1to2}, %k2
 
 // CHECK: vfpclasspd $171, %ymm25, %k4
 // CHECK:  encoding: [0x62,0x93,0xfd,0x28,0x66,0xe1,0xab]
@@ -5504,9 +5504,9 @@
 // CHECK:  encoding: [0x62,0xb3,0xfd,0x28,0x66,0xa4,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vfpclasspdy $0x7b,291(%rax,%r14,8), %k4
 
-// CHECK: vfpclasspdq $123, (%rcx){1to4}, %k4
+// CHECK: vfpclasspd $123, (%rcx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0x21,0x7b]
-          vfpclasspdq $0x7b,(%rcx){1to4}, %k4
+          vfpclasspd $0x7b,(%rcx){1to4}, %k4
 
 // CHECK: vfpclasspdy $123, 4064(%rdx), %k4
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x28,0x66,0x62,0x7f,0x7b]
@@ -5524,21 +5524,21 @@
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x28,0x66,0xa2,0xe0,0xef,0xff,0xff,0x7b]
           vfpclasspdy $0x7b,-4128(%rdx), %k4
 
-// CHECK: vfpclasspdq $123, 1016(%rdx){1to4}, %k4
+// CHECK: vfpclasspd $123, 1016(%rdx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0x62,0x7f,0x7b]
-          vfpclasspdq $0x7b,1016(%rdx){1to4}, %k4
+          vfpclasspd $0x7b,1016(%rdx){1to4}, %k4
 
-// CHECK: vfpclasspdq $123, 1024(%rdx){1to4}, %k4
+// CHECK: vfpclasspd $123, 1024(%rdx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0xa2,0x00,0x04,0x00,0x00,0x7b]
-          vfpclasspdq $0x7b,1024(%rdx){1to4}, %k4
+          vfpclasspd $0x7b,1024(%rdx){1to4}, %k4
 
-// CHECK: vfpclasspdq $123, -1024(%rdx){1to4}, %k4
+// CHECK: vfpclasspd $123, -1024(%rdx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0x62,0x80,0x7b]
-          vfpclasspdq $0x7b,-1024(%rdx){1to4}, %k4
+          vfpclasspd $0x7b,-1024(%rdx){1to4}, %k4
 
-// CHECK: vfpclasspdq $123, -1032(%rdx){1to4}, %k4
+// CHECK: vfpclasspd $123, -1032(%rdx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0xa2,0xf8,0xfb,0xff,0xff,0x7b]
-          vfpclasspdq $0x7b,-1032(%rdx){1to4}, %k4
+          vfpclasspd $0x7b,-1032(%rdx){1to4}, %k4
 
 // CHECK: vfpclassps $171, %xmm20, %k4
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x08,0x66,0xe4,0xab]
@@ -5560,9 +5560,9 @@
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x08,0x66,0xa4,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vfpclasspsx $0x7b,291(%rax,%r14,8), %k4
 
-// CHECK: vfpclasspsl $123, (%rcx){1to4}, %k4
+// CHECK: vfpclassps $123, (%rcx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0x21,0x7b]
-          vfpclasspsl $0x7b,(%rcx){1to4}, %k4
+          vfpclassps $0x7b,(%rcx){1to4}, %k4
 
 // CHECK: vfpclasspsx $123, 2032(%rdx), %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x08,0x66,0x62,0x7f,0x7b]
@@ -5580,21 +5580,21 @@
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x08,0x66,0xa2,0xf0,0xf7,0xff,0xff,0x7b]
           vfpclasspsx $0x7b,-2064(%rdx), %k4
 
-// CHECK: vfpclasspsl $123, 508(%rdx){1to4}, %k4
+// CHECK: vfpclassps $123, 508(%rdx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0x62,0x7f,0x7b]
-          vfpclasspsl $0x7b,508(%rdx){1to4}, %k4
+          vfpclassps $0x7b,508(%rdx){1to4}, %k4
 
-// CHECK: vfpclasspsl $123, 512(%rdx){1to4}, %k4
+// CHECK: vfpclassps $123, 512(%rdx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0xa2,0x00,0x02,0x00,0x00,0x7b]
-          vfpclasspsl $0x7b,512(%rdx){1to4}, %k4
+          vfpclassps $0x7b,512(%rdx){1to4}, %k4
 
-// CHECK: vfpclasspsl $123, -512(%rdx){1to4}, %k4
+// CHECK: vfpclassps $123, -512(%rdx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0x62,0x80,0x7b]
-          vfpclasspsl $0x7b,-512(%rdx){1to4}, %k4
+          vfpclassps $0x7b,-512(%rdx){1to4}, %k4
 
-// CHECK: vfpclasspsl $123, -516(%rdx){1to4}, %k4
+// CHECK: vfpclassps $123, -516(%rdx){1to4}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0xa2,0xfc,0xfd,0xff,0xff,0x7b]
-          vfpclasspsl $0x7b,-516(%rdx){1to4}, %k4
+          vfpclassps $0x7b,-516(%rdx){1to4}, %k4
 
 // CHECK: vfpclassps $171, %ymm17, %k4
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x28,0x66,0xe1,0xab]
@@ -5616,9 +5616,9 @@
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x28,0x66,0xa4,0xf0,0x23,0x01,0x00,0x00,0x7b]
           vfpclasspsy $0x7b,291(%rax,%r14,8), %k4
 
-// CHECK: vfpclasspsl $123, (%rcx){1to8}, %k4
+// CHECK: vfpclassps $123, (%rcx){1to8}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0x21,0x7b]
-          vfpclasspsl $0x7b,(%rcx){1to8}, %k4
+          vfpclassps $0x7b,(%rcx){1to8}, %k4
 
 // CHECK: vfpclasspsy $123, 4064(%rdx), %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x28,0x66,0x62,0x7f,0x7b]
@@ -5636,21 +5636,21 @@
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x28,0x66,0xa2,0xe0,0xef,0xff,0xff,0x7b]
           vfpclasspsy $0x7b,-4128(%rdx), %k4
 
-// CHECK: vfpclasspsl $123, 508(%rdx){1to8}, %k4
+// CHECK: vfpclassps $123, 508(%rdx){1to8}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0x62,0x7f,0x7b]
-          vfpclasspsl $0x7b,508(%rdx){1to8}, %k4
+          vfpclassps $0x7b,508(%rdx){1to8}, %k4
 
-// CHECK: vfpclasspsl $123, 512(%rdx){1to8}, %k4
+// CHECK: vfpclassps $123, 512(%rdx){1to8}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0xa2,0x00,0x02,0x00,0x00,0x7b]
-          vfpclasspsl $0x7b,512(%rdx){1to8}, %k4
+          vfpclassps $0x7b,512(%rdx){1to8}, %k4
 
-// CHECK: vfpclasspsl $123, -512(%rdx){1to8}, %k4
+// CHECK: vfpclassps $123, -512(%rdx){1to8}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0x62,0x80,0x7b]
-          vfpclasspsl $0x7b,-512(%rdx){1to8}, %k4
+          vfpclassps $0x7b,-512(%rdx){1to8}, %k4
 
-// CHECK: vfpclasspsl $123, -516(%rdx){1to8}, %k4
+// CHECK: vfpclassps $123, -516(%rdx){1to8}, %k4
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0xa2,0xfc,0xfd,0xff,0xff,0x7b]
-          vfpclasspsl $0x7b,-516(%rdx){1to8}, %k4
+          vfpclassps $0x7b,-516(%rdx){1to8}, %k4
 
 // CHECK: vfpclasspd $171, %xmm26, %k3
 // CHECK:  encoding: [0x62,0x93,0xfd,0x08,0x66,0xda,0xab]
@@ -5672,9 +5672,9 @@
 // CHECK:  encoding: [0x62,0xb3,0xfd,0x08,0x66,0x9c,0xf0,0x34,0x12,0x00,0x00,0x7b]
           vfpclasspdx $0x7b,4660(%rax,%r14,8), %k3
 
-// CHECK: vfpclasspdq $123, (%rcx){1to2}, %k3
+// CHECK: vfpclasspd $123, (%rcx){1to2}, %k3
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x19,0x7b]
-          vfpclasspdq $0x7b,(%rcx){1to2}, %k3
+          vfpclasspd $0x7b,(%rcx){1to2}, %k3
 
 // CHECK: vfpclasspdx $123, 2032(%rdx), %k3
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x08,0x66,0x5a,0x7f,0x7b]
@@ -5692,21 +5692,21 @@
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x08,0x66,0x9a,0xf0,0xf7,0xff,0xff,0x7b]
           vfpclasspdx $0x7b,-2064(%rdx), %k3
 
-// CHECK: vfpclasspdq $123, 1016(%rdx){1to2}, %k3
+// CHECK: vfpclasspd $123, 1016(%rdx){1to2}, %k3
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x5a,0x7f,0x7b]
-          vfpclasspdq $0x7b,1016(%rdx){1to2}, %k3
+          vfpclasspd $0x7b,1016(%rdx){1to2}, %k3
 
-// CHECK: vfpclasspdq $123, 1024(%rdx){1to2}, %k3
+// CHECK: vfpclasspd $123, 1024(%rdx){1to2}, %k3
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x9a,0x00,0x04,0x00,0x00,0x7b]
-          vfpclasspdq $0x7b,1024(%rdx){1to2}, %k3
+          vfpclasspd $0x7b,1024(%rdx){1to2}, %k3
 
-// CHECK: vfpclasspdq $123, -1024(%rdx){1to2}, %k3
+// CHECK: vfpclasspd $123, -1024(%rdx){1to2}, %k3
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x5a,0x80,0x7b]
-          vfpclasspdq $0x7b,-1024(%rdx){1to2}, %k3
+          vfpclasspd $0x7b,-1024(%rdx){1to2}, %k3
 
-// CHECK: vfpclasspdq $123, -1032(%rdx){1to2}, %k3
+// CHECK: vfpclasspd $123, -1032(%rdx){1to2}, %k3
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x18,0x66,0x9a,0xf8,0xfb,0xff,0xff,0x7b]
-          vfpclasspdq $0x7b,-1032(%rdx){1to2}, %k3
+          vfpclasspd $0x7b,-1032(%rdx){1to2}, %k3
 
 // CHECK: vfpclasspd $171, %ymm26, %k2
 // CHECK:  encoding: [0x62,0x93,0xfd,0x28,0x66,0xd2,0xab]
@@ -5728,9 +5728,9 @@
 // CHECK:  encoding: [0x62,0xb3,0xfd,0x28,0x66,0x94,0xf0,0x34,0x12,0x00,0x00,0x7b]
           vfpclasspdy $0x7b,4660(%rax,%r14,8), %k2
 
-// CHECK: vfpclasspdq $123, (%rcx){1to4}, %k2
+// CHECK: vfpclasspd $123, (%rcx){1to4}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0x11,0x7b]
-          vfpclasspdq $0x7b,(%rcx){1to4}, %k2
+          vfpclasspd $0x7b,(%rcx){1to4}, %k2
 
 // CHECK: vfpclasspdy $123, 4064(%rdx), %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x28,0x66,0x52,0x7f,0x7b]
@@ -5748,21 +5748,21 @@
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x28,0x66,0x92,0xe0,0xef,0xff,0xff,0x7b]
           vfpclasspdy $0x7b,-4128(%rdx), %k2
 
-// CHECK: vfpclasspdq $123, 1016(%rdx){1to4}, %k2
+// CHECK: vfpclasspd $123, 1016(%rdx){1to4}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0x52,0x7f,0x7b]
-          vfpclasspdq $0x7b,1016(%rdx){1to4}, %k2
+          vfpclasspd $0x7b,1016(%rdx){1to4}, %k2
 
-// CHECK: vfpclasspdq $123, 1024(%rdx){1to4}, %k2
+// CHECK: vfpclasspd $123, 1024(%rdx){1to4}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0x92,0x00,0x04,0x00,0x00,0x7b]
-          vfpclasspdq $0x7b,1024(%rdx){1to4}, %k2
+          vfpclasspd $0x7b,1024(%rdx){1to4}, %k2
 
-// CHECK: vfpclasspdq $123, -1024(%rdx){1to4}, %k2
+// CHECK: vfpclasspd $123, -1024(%rdx){1to4}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0x52,0x80,0x7b]
-          vfpclasspdq $0x7b,-1024(%rdx){1to4}, %k2
+          vfpclasspd $0x7b,-1024(%rdx){1to4}, %k2
 
-// CHECK: vfpclasspdq $123, -1032(%rdx){1to4}, %k2
+// CHECK: vfpclasspd $123, -1032(%rdx){1to4}, %k2
 // CHECK:  encoding: [0x62,0xf3,0xfd,0x38,0x66,0x92,0xf8,0xfb,0xff,0xff,0x7b]
-          vfpclasspdq $0x7b,-1032(%rdx){1to4}, %k2
+          vfpclasspd $0x7b,-1032(%rdx){1to4}, %k2
 
 // CHECK: vfpclassps $171, %xmm29, %k3
 // CHECK:  encoding: [0x62,0x93,0x7d,0x08,0x66,0xdd,0xab]
@@ -5784,9 +5784,9 @@
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x08,0x66,0x9c,0xf0,0x34,0x12,0x00,0x00,0x7b]
           vfpclasspsx $0x7b,4660(%rax,%r14,8), %k3
 
-// CHECK: vfpclasspsl $123, (%rcx){1to4}, %k3
+// CHECK: vfpclassps $123, (%rcx){1to4}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0x19,0x7b]
-          vfpclasspsl $0x7b,(%rcx){1to4}, %k3
+          vfpclassps $0x7b,(%rcx){1to4}, %k3
 
 // CHECK: vfpclasspsx $123, 2032(%rdx), %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x08,0x66,0x5a,0x7f,0x7b]
@@ -5804,21 +5804,21 @@
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x08,0x66,0x9a,0xf0,0xf7,0xff,0xff,0x7b]
           vfpclasspsx $0x7b,-2064(%rdx), %k3
 
-// CHECK: vfpclasspsl $123, 508(%rdx){1to4}, %k3
+// CHECK: vfpclassps $123, 508(%rdx){1to4}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0x5a,0x7f,0x7b]
-          vfpclasspsl $0x7b,508(%rdx){1to4}, %k3
+          vfpclassps $0x7b,508(%rdx){1to4}, %k3
 
-// CHECK: vfpclasspsl $123, 512(%rdx){1to4}, %k3
+// CHECK: vfpclassps $123, 512(%rdx){1to4}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0x9a,0x00,0x02,0x00,0x00,0x7b]
-          vfpclasspsl $0x7b,512(%rdx){1to4}, %k3
+          vfpclassps $0x7b,512(%rdx){1to4}, %k3
 
-// CHECK: vfpclasspsl $123, -512(%rdx){1to4}, %k3
+// CHECK: vfpclassps $123, -512(%rdx){1to4}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0x5a,0x80,0x7b]
-          vfpclasspsl $0x7b,-512(%rdx){1to4}, %k3
+          vfpclassps $0x7b,-512(%rdx){1to4}, %k3
 
-// CHECK: vfpclasspsl $123, -516(%rdx){1to4}, %k3
+// CHECK: vfpclassps $123, -516(%rdx){1to4}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x18,0x66,0x9a,0xfc,0xfd,0xff,0xff,0x7b]
-          vfpclasspsl $0x7b,-516(%rdx){1to4}, %k3
+          vfpclassps $0x7b,-516(%rdx){1to4}, %k3
 
 // CHECK: vfpclassps $171, %ymm19, %k3
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x28,0x66,0xdb,0xab]
@@ -5840,9 +5840,9 @@
 // CHECK:  encoding: [0x62,0xb3,0x7d,0x28,0x66,0x9c,0xf0,0x34,0x12,0x00,0x00,0x7b]
           vfpclasspsy $0x7b,4660(%rax,%r14,8), %k3
 
-// CHECK: vfpclasspsl $123, (%rcx){1to8}, %k3
+// CHECK: vfpclassps $123, (%rcx){1to8}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0x19,0x7b]
-          vfpclasspsl $0x7b,(%rcx){1to8}, %k3
+          vfpclassps $0x7b,(%rcx){1to8}, %k3
 
 // CHECK: vfpclasspsy $123, 4064(%rdx), %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x28,0x66,0x5a,0x7f,0x7b]
@@ -5860,21 +5860,21 @@
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x28,0x66,0x9a,0xe0,0xef,0xff,0xff,0x7b]
           vfpclasspsy $0x7b,-4128(%rdx), %k3
 
-// CHECK: vfpclasspsl $123, 508(%rdx){1to8}, %k3
+// CHECK: vfpclassps $123, 508(%rdx){1to8}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0x5a,0x7f,0x7b]
-          vfpclasspsl $0x7b,508(%rdx){1to8}, %k3
+          vfpclassps $0x7b,508(%rdx){1to8}, %k3
 
-// CHECK: vfpclasspsl $123, 512(%rdx){1to8}, %k3
+// CHECK: vfpclassps $123, 512(%rdx){1to8}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0x9a,0x00,0x02,0x00,0x00,0x7b]
-          vfpclasspsl $0x7b,512(%rdx){1to8}, %k3
+          vfpclassps $0x7b,512(%rdx){1to8}, %k3
 
-// CHECK: vfpclasspsl $123, -512(%rdx){1to8}, %k3
+// CHECK: vfpclassps $123, -512(%rdx){1to8}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0x5a,0x80,0x7b]
-          vfpclasspsl $0x7b,-512(%rdx){1to8}, %k3
+          vfpclassps $0x7b,-512(%rdx){1to8}, %k3
 
-// CHECK: vfpclasspsl $123, -516(%rdx){1to8}, %k3
+// CHECK: vfpclassps $123, -516(%rdx){1to8}, %k3
 // CHECK:  encoding: [0x62,0xf3,0x7d,0x38,0x66,0x9a,0xfc,0xfd,0xff,0xff,0x7b]
-          vfpclasspsl $0x7b,-516(%rdx){1to8}, %k3
+          vfpclassps $0x7b,-516(%rdx){1to8}, %k3
 
 // CHECK: vbroadcasti32x2 %xmm30, %xmm30
 // CHECK:  encoding: [0x62,0x02,0x7d,0x08,0x59,0xf6]