[X86] Add support for {vex2}, {vex3}, and {evex} to the assembler to match gas. Use...

These can be used to force the encoding used for instructions.

{vex2} will fail if the instruction is not VEX encoded, but otherwise won't do anything since we prefer vex2 when possible. Might need to skip use of the _REV MOV instructions for this too, but I haven't done that yet.

{vex3} will force the instruction to use the 3 byte VEX encoding or fail if there is no VEX form.

{evex} will force the instruction to use the EVEX version or fail if there is no EVEX version.

Differential Revision: https://reviews.llvm.org/D59266

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

diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp
index 50d2d195a3f8fb721ef0e592bbb2ff0a6867de56..362e57ddefddd05478c82eb589e8f0b579744356 100644 (file)
--- a/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -71,6 +71,15 @@ class X86AsmParser : public MCTargetAsmParser {
   ParseInstructionInfo *InstInfo;
   bool Code16GCC;
 
+  enum VEXEncoding {
+    VEXEncoding_Default,
+    VEXEncoding_VEX2,
+    VEXEncoding_VEX3,
+    VEXEncoding_EVEX,
+  };
+
+  VEXEncoding ForcedVEXEncoding = VEXEncoding_Default;
+
 private:
   SMLoc consumeToken() {
     MCAsmParser &Parser = getParser();
@@ -858,6 +867,8 @@ private:
   bool parseDirectiveFPOEndProc(SMLoc L);
   bool parseDirectiveFPOData(SMLoc L);
 
+  unsigned checkTargetMatchPredicate(MCInst &Inst) override;
+
   bool validateInstruction(MCInst &Inst, const OperandVector &Ops);
   bool processInstruction(MCInst &Inst, const OperandVector &Ops);
 
@@ -939,6 +950,9 @@ private:
   /// }
 
 public:
+  enum X86MatchResultTy {
+    Match_Unsupported = FIRST_TARGET_MATCH_RESULT_TY,
+  };
 
   X86AsmParser(const MCSubtargetInfo &sti, MCAsmParser &Parser,
                const MCInstrInfo &mii, const MCTargetOptions &Options)
@@ -2296,6 +2310,48 @@ bool X86AsmParser::ParseInstruction(ParseInstructionInfo &Info, StringRef Name,
                                     SMLoc NameLoc, OperandVector &Operands) {
   MCAsmParser &Parser = getParser();
   InstInfo = &Info;
+  std::string TempName; // Used when we parse a pseudo prefix.
+
+  // Reset the forced VEX encoding.
+  ForcedVEXEncoding = VEXEncoding_Default;
+
+  // Parse pseudo prefixes.
+  while (1) {
+    if (Name == "{") {
+      if (getLexer().isNot(AsmToken::Identifier))
+        return Error(Parser.getTok().getLoc(), "Unexpected token after '{'");
+      std::string Prefix = Parser.getTok().getString().lower();
+      Parser.Lex(); // Eat identifier.
+      if (getLexer().isNot(AsmToken::RCurly))
+        return Error(Parser.getTok().getLoc(), "Expected '}'");
+      Parser.Lex(); // Eat curly.
+
+      if (Prefix == "vex2")
+        ForcedVEXEncoding = VEXEncoding_VEX2;
+      else if (Prefix == "vex3")
+        ForcedVEXEncoding = VEXEncoding_VEX3;
+      else if (Prefix == "evex")
+        ForcedVEXEncoding = VEXEncoding_EVEX;
+      else
+        return Error(NameLoc, "unknown prefix");
+
+      NameLoc = Parser.getTok().getLoc();
+      if (getLexer().is(AsmToken::LCurly)) {
+        Parser.Lex();
+        Name = "{";
+      } else {
+        if (getLexer().isNot(AsmToken::Identifier))
+          return Error(Parser.getTok().getLoc(), "Expected identifier");
+        TempName = Parser.getTok().getString().lower();
+        Name = TempName;
+        Parser.Lex();
+      }
+      continue;
+    }
+
+    break;
+  }
+
   StringRef PatchedName = Name;
 
   if ((Name.equals("jmp") || Name.equals("jc") || Name.equals("jz")) &&
@@ -2943,6 +2999,22 @@ static unsigned getPrefixes(OperandVector &Operands) {
   return Result;
 }
 
+unsigned X86AsmParser::checkTargetMatchPredicate(MCInst &Inst) {
+  unsigned Opc = Inst.getOpcode();
+  const MCInstrDesc &MCID = MII.get(Opc);
+
+  if (ForcedVEXEncoding == VEXEncoding_EVEX &&
+      (MCID.TSFlags & X86II::EncodingMask) != X86II::EVEX)
+    return Match_Unsupported;
+
+  if ((ForcedVEXEncoding == VEXEncoding_VEX2 ||
+       ForcedVEXEncoding == VEXEncoding_VEX3) &&
+      (MCID.TSFlags & X86II::EncodingMask) != X86II::VEX)
+    return Match_Unsupported;
+
+  return Match_Success;
+}
+
 bool X86AsmParser::MatchAndEmitATTInstruction(SMLoc IDLoc, unsigned &Opcode,
                                               OperandVector &Operands,
                                               MCStreamer &Out,
@@ -2956,18 +3028,24 @@ bool X86AsmParser::MatchAndEmitATTInstruction(SMLoc IDLoc, unsigned &Opcode,
   MatchFPUWaitAlias(IDLoc, static_cast<X86Operand &>(*Operands[0]), Operands,
                     Out, MatchingInlineAsm);
   X86Operand &Op = static_cast<X86Operand &>(*Operands[0]);
-  bool WasOriginallyInvalidOperand = false;
   unsigned Prefixes = getPrefixes(Operands);
 
   MCInst Inst;
 
+  // If VEX3 encoding is forced, we need to pass the USE_VEX3 flag to the
+  // encoder.
+  if (ForcedVEXEncoding == VEXEncoding_VEX3)
+    Prefixes |= X86::IP_USE_VEX3;
+
   if (Prefixes)
     Inst.setFlags(Prefixes);
 
   // First, try a direct match.
   FeatureBitset MissingFeatures;
-  switch (MatchInstruction(Operands, Inst, ErrorInfo, MissingFeatures,
-                           MatchingInlineAsm, isParsingIntelSyntax())) {
+  unsigned OriginalError = MatchInstruction(Operands, Inst, ErrorInfo,
+                                            MissingFeatures, MatchingInlineAsm,
+                                            isParsingIntelSyntax());
+  switch (OriginalError) {
   default: llvm_unreachable("Unexpected match result!");
   case Match_Success:
     if (!MatchingInlineAsm && validateInstruction(Inst, Operands))
@@ -2987,9 +3065,8 @@ bool X86AsmParser::MatchAndEmitATTInstruction(SMLoc IDLoc, unsigned &Opcode,
   case Match_MissingFeature:
     return ErrorMissingFeature(IDLoc, MissingFeatures, MatchingInlineAsm);
   case Match_InvalidOperand:
-    WasOriginallyInvalidOperand = true;
-    break;
   case Match_MnemonicFail:
+  case Match_Unsupported:
     break;
   }
   if (Op.getToken().empty()) {
@@ -3080,11 +3157,15 @@ bool X86AsmParser::MatchAndEmitATTInstruction(SMLoc IDLoc, unsigned &Opcode,
   // If all of the instructions reported an invalid mnemonic, then the original
   // mnemonic was invalid.
   if (std::count(std::begin(Match), std::end(Match), Match_MnemonicFail) == 4) {
-    if (!WasOriginallyInvalidOperand) {
+    if (OriginalError == Match_MnemonicFail)
       return Error(IDLoc, "invalid instruction mnemonic '" + Base + "'",
                    Op.getLocRange(), MatchingInlineAsm);
-    }
 
+    if (OriginalError == Match_Unsupported)
+      return Error(IDLoc, "unsupported instruction", EmptyRange,
+                   MatchingInlineAsm);
+
+    assert(OriginalError == Match_InvalidOperand && "Unexpected error");
     // Recover location info for the operand if we know which was the problem.
     if (ErrorInfo != ~0ULL) {
       if (ErrorInfo >= Operands.size())
@@ -3103,6 +3184,13 @@ bool X86AsmParser::MatchAndEmitATTInstruction(SMLoc IDLoc, unsigned &Opcode,
                  MatchingInlineAsm);
   }
 
+  // If one instruction matched as unsupported, report this as unsupported.
+  if (std::count(std::begin(Match), std::end(Match),
+                 Match_Unsupported) == 1) {
+    return Error(IDLoc, "unsupported instruction", EmptyRange,
+                 MatchingInlineAsm);
+  }
+
   // If one instruction matched with a missing feature, report this as a
   // missing feature.
   if (std::count(std::begin(Match), std::end(Match),
@@ -3144,6 +3232,11 @@ bool X86AsmParser::MatchAndEmitIntelInstruction(SMLoc IDLoc, unsigned &Opcode,
 
   MCInst Inst;
 
+  // If VEX3 encoding is forced, we need to pass the USE_VEX3 flag to the
+  // encoder.
+  if (ForcedVEXEncoding == VEXEncoding_VEX3)
+    Prefixes |= X86::IP_USE_VEX3;
+
   if (Prefixes)
     Inst.setFlags(Prefixes);
 
@@ -3292,6 +3385,13 @@ bool X86AsmParser::MatchAndEmitIntelInstruction(SMLoc IDLoc, unsigned &Opcode,
                  UnsizedMemOp->getLocRange());
   }
 
+  // If one instruction matched as unsupported, report this as unsupported.
+  if (std::count(std::begin(Match), std::end(Match),
+                 Match_Unsupported) == 1) {
+    return Error(IDLoc, "unsupported instruction", EmptyRange,
+                 MatchingInlineAsm);
+  }
+
   // If one instruction matched with a missing feature, report this as a
   // missing feature.
   if (std::count(std::begin(Match), std::end(Match),

diff --git a/lib/Target/X86/MCTargetDesc/X86BaseInfo.h b/lib/Target/X86/MCTargetDesc/X86BaseInfo.h
index 1c4eff22d855dc9c6f1f44bdee0e059079ed1903..a56d64ce296cc3fbdcf8fe659449232e7cce1854 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/X86BaseInfo.h
+++ b/lib/Target/X86/MCTargetDesc/X86BaseInfo.h
@@ -60,7 +60,8 @@ namespace X86 {
     IP_HAS_REPEAT_NE = 4,
     IP_HAS_REPEAT = 8,
     IP_HAS_LOCK = 16,
-    IP_HAS_NOTRACK = 32
+    IP_HAS_NOTRACK = 32,
+    IP_USE_VEX3 = 64,
   };
 
   enum OperandType : unsigned {

diff --git a/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp b/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
index d063c4e5a86e8ce8b1546fa41f33f58dbc8c83c6..8eb48fcb0bb74d20fa1f6ba58d640bffc24e6a46 100644 (file)
--- a/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
+++ b/lib/Target/X86/MCTargetDesc/X86MCCodeEmitter.cpp
@@ -979,7 +979,8 @@ void X86MCCodeEmitter::EmitVEXOpcodePrefix(uint64_t TSFlags, unsigned &CurByte,
     uint8_t LastByte = VEX_PP | (VEX_L << 2) | (VEX_4V << 3);
 
     // Can we use the 2 byte VEX prefix?
-    if (Encoding == X86II::VEX && VEX_B && VEX_X && !VEX_W && (VEX_5M == 1)) {
+    if (!(MI.getFlags() & X86::IP_USE_VEX3) &&
+        Encoding == X86II::VEX && VEX_B && VEX_X && !VEX_W && (VEX_5M == 1)) {
       EmitByte(0xC5, CurByte, OS);
       EmitByte(LastByte | (VEX_R << 7), CurByte, OS);
       return;

diff --git a/test/MC/X86/AVX-32.s b/test/MC/X86/AVX-32.s
index 0030e2e5de0e8d974f480a4e91908a04352fad31..3e179fd421eb52676c9a7ed5f64493d2d86dfa44 100644 (file)
--- a/test/MC/X86/AVX-32.s
+++ b/test/MC/X86/AVX-32.s
@@ -4,6 +4,10 @@
 // CHECK: encoding: [0xc5,0xf1,0x58,0x8c,0x82,0x10,0xe3,0x0f,0xe3]      
 vaddpd -485498096(%edx,%eax,4), %xmm1, %xmm1 
 
+// CHECK: vaddpd -485498096(%edx,%eax,4), %xmm1, %xmm1 
+// CHECK: encoding: [0xc4,0xe1,0x71,0x58,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{vex3} vaddpd -485498096(%edx,%eax,4), %xmm1, %xmm1 
+
 // CHECK: vaddpd 485498096(%edx,%eax,4), %xmm1, %xmm1 
 // CHECK: encoding: [0xc5,0xf1,0x58,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]      
 vaddpd 485498096(%edx,%eax,4), %xmm1, %xmm1 

diff --git a/test/MC/X86/AVX512F_SCALAR-32.s b/test/MC/X86/AVX512F_SCALAR-32.s
index 2028f1d9f4d8d1e0fcf072493cbe8f1e4d3aa7bd..2aae4cfd1396c8e7a80d6f3d0781530ba8be12cd 100644 (file)
--- a/test/MC/X86/AVX512F_SCALAR-32.s
+++ b/test/MC/X86/AVX512F_SCALAR-32.s
@@ -5,12 +5,12 @@
 // we don't have that.
 
 // CHECK: vaddsd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x58,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vaddsd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x58,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vaddsd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vaddsd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x58,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vaddsd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x58,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vaddsd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vaddsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x58,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -29,8 +29,8 @@ vaddsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vaddsd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddsd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x58,0x8a,0xf0,0x1c,0xf0,0x1c]
-vaddsd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x58,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vaddsd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vaddsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x58,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -41,8 +41,8 @@ vaddsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vaddsd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddsd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x58,0x0d,0xf0,0x1c,0xf0,0x1c]
-vaddsd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x58,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vaddsd 485498096, %xmm1, %xmm1
 
 // CHECK: vaddsd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x58,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -53,8 +53,8 @@ vaddsd 485498096, %xmm1, %xmm1 {%k2}
 vaddsd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddsd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x58,0x8c,0x02,0x00,0x02,0x00,0x00]
-vaddsd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x58,0x4c,0x02,0x40
+{evex} vaddsd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vaddsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x58,0x4c,0x02,0x40]
@@ -65,8 +65,8 @@ vaddsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vaddsd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddsd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x58,0x0a]
-vaddsd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x58,0x0a]
+{evex} vaddsd (%edx), %xmm1, %xmm1
 
 // CHECK: vaddsd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x58,0x0a]
@@ -125,8 +125,8 @@ vaddsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vaddsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x58,0xc9]
-vaddsd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x58,0xc9]
+{evex} vaddsd %xmm1, %xmm1, %xmm1
 
 // CHECK: vaddsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x58,0xc9]
@@ -137,8 +137,8 @@ vaddsd %xmm1, %xmm1, %xmm1 {%k2}
 vaddsd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x58,0x8c,0x02,0x00,0x01,0x00,0x00]
-vaddss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x58,0x4c,0x02,0x40]
+{evex} vaddss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vaddss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x58,0x4c,0x02,0x40]
@@ -149,12 +149,12 @@ vaddss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vaddss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x58,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vaddss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x58,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vaddss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vaddss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x58,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vaddss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x58,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vaddss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vaddss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x58,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -173,8 +173,8 @@ vaddss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vaddss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x58,0x8a,0xf0,0x1c,0xf0,0x1c]
-vaddss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x58,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vaddss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vaddss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x58,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -185,8 +185,8 @@ vaddss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vaddss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x58,0x0d,0xf0,0x1c,0xf0,0x1c]
-vaddss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x58,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vaddss 485498096, %xmm1, %xmm1
 
 // CHECK: vaddss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x58,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -197,8 +197,8 @@ vaddss 485498096, %xmm1, %xmm1 {%k2}
 vaddss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x58,0x0a]
-vaddss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x58,0x0a]
+{evex} vaddss (%edx), %xmm1, %xmm1
 
 // CHECK: vaddss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x58,0x0a]
@@ -257,8 +257,8 @@ vaddss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vaddss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vaddss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x58,0xc9]
-vaddss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x58,0xc9]
+{evex} vaddss %xmm1, %xmm1, %xmm1
 
 // CHECK: vaddss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x58,0xc9]
@@ -397,76 +397,76 @@ vcmpeqss %xmm1, %xmm1, %k2
 vcmpeqss %xmm1, %xmm1, %k2 {%k2}
 
 // CHECK: vcomisd -485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vcomisd -485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vcomisd -485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vcomisd 485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vcomisd 485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vcomisd 485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vcomisd 485498096(%edx), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2f,0x8a,0xf0,0x1c,0xf0,0x1c]
-vcomisd 485498096(%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2f,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vcomisd 485498096(%edx), %xmm1
 
 // CHECK: vcomisd 485498096, %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2f,0x0d,0xf0,0x1c,0xf0,0x1c]
-vcomisd 485498096, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2f,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vcomisd 485498096, %xmm1
 
 // CHECK: vcomisd 512(%edx,%eax), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2f,0x8c,0x02,0x00,0x02,0x00,0x00]
-vcomisd 512(%edx,%eax), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2f,0x4c,0x02,0x40]
+{evex} vcomisd 512(%edx,%eax), %xmm1
 
 // CHECK: vcomisd (%edx), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2f,0x0a]
-vcomisd (%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2f,0x0a]
+{evex} vcomisd (%edx), %xmm1
 
 // CHECK: vcomisd {sae}, %xmm1, %xmm1
 // CHECK: encoding: [0x62,0xf1,0xfd,0x18,0x2f,0xc9]
 vcomisd {sae}, %xmm1, %xmm1
 
 // CHECK: vcomisd %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2f,0xc9]
-vcomisd %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2f,0xc9]
+{evex} vcomisd %xmm1, %xmm1
 
 // CHECK: vcomiss 256(%edx,%eax), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2f,0x8c,0x02,0x00,0x01,0x00,0x00]
-vcomiss 256(%edx,%eax), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2f,0x4c,0x02,0x40]
+{evex} vcomiss 256(%edx,%eax), %xmm1
 
 // CHECK: vcomiss -485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vcomiss -485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vcomiss -485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vcomiss 485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vcomiss 485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vcomiss 485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vcomiss 485498096(%edx), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2f,0x8a,0xf0,0x1c,0xf0,0x1c]
-vcomiss 485498096(%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2f,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vcomiss 485498096(%edx), %xmm1
 
 // CHECK: vcomiss 485498096, %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2f,0x0d,0xf0,0x1c,0xf0,0x1c]
-vcomiss 485498096, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2f,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vcomiss 485498096, %xmm1
 
 // CHECK: vcomiss (%edx), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2f,0x0a]
-vcomiss (%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2f,0x0a]
+{evex} vcomiss (%edx), %xmm1
 
 // CHECK: vcomiss {sae}, %xmm1, %xmm1
 // CHECK: encoding: [0x62,0xf1,0x7c,0x18,0x2f,0xc9]
 vcomiss {sae}, %xmm1, %xmm1
 
 // CHECK: vcomiss %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2f,0xc9]
-vcomiss %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2f,0xc9]
+{evex} vcomiss %xmm1, %xmm1
 
 // CHECK: vcvtsd2ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vcvtsd2ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5a,0x8c,0x82,0x10,0xe3,0x0f,0xe3
+{evex} vcvtsd2ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vcvtsd2ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5a,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vcvtsd2ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5a,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsd2ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vcvtsd2ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -485,8 +485,8 @@ vcvtsd2ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vcvtsd2ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtsd2ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5a,0x8a,0xf0,0x1c,0xf0,0x1c]
-vcvtsd2ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5a,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsd2ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vcvtsd2ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5a,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -497,8 +497,8 @@ vcvtsd2ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vcvtsd2ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtsd2ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5a,0x0d,0xf0,0x1c,0xf0,0x1c]
-vcvtsd2ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5a,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsd2ss 485498096, %xmm1, %xmm1
 
 // CHECK: vcvtsd2ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5a,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -509,8 +509,8 @@ vcvtsd2ss 485498096, %xmm1, %xmm1 {%k2}
 vcvtsd2ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtsd2ss 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5a,0x8c,0x02,0x00,0x02,0x00,0x00]
-vcvtsd2ss 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5a,0x4c,0x02,0x40]
+{evex} vcvtsd2ss 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vcvtsd2ss 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5a,0x4c,0x02,0x40]
@@ -521,8 +521,8 @@ vcvtsd2ss 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vcvtsd2ss 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtsd2ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5a,0x0a]
-vcvtsd2ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5a,0x0a]
+{evex} vcvtsd2ss (%edx), %xmm1, %xmm1
 
 // CHECK: vcvtsd2ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5a,0x0a]
@@ -581,8 +581,8 @@ vcvtsd2ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vcvtsd2ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtsd2ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5a,0xc9]
-vcvtsd2ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5a,0xc9]
+{evex} vcvtsd2ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vcvtsd2ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5a,0xc9]
@@ -593,56 +593,56 @@ vcvtsd2ss %xmm1, %xmm1, %xmm1 {%k2}
 vcvtsd2ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtsi2sdl 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x2a,0x8c,0x02,0x00,0x01,0x00,0x00]
-vcvtsi2sdl 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x77,0x08,0x2a,0x4c,0x02,0x40]
+{evex} vcvtsi2sdl 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vcvtsi2sdl -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x2a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vcvtsi2sdl -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x77,0x08,0x2a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vcvtsi2sdl -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vcvtsi2sdl 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x2a,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vcvtsi2sdl 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x77,0x08,0x2a,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsi2sdl 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vcvtsi2sdl 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x2a,0x8a,0xf0,0x1c,0xf0,0x1c]
-vcvtsi2sdl 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x77,0x08,0x2a,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsi2sdl 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vcvtsi2sdl 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x2a,0x0d,0xf0,0x1c,0xf0,0x1c]
-vcvtsi2sdl 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x77,0x08,0x2a,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsi2sdl 485498096, %xmm1, %xmm1
 
 // CHECK: vcvtsi2sdl (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x2a,0x0a]
-vcvtsi2sdl (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x77,0x08,0x2a,0x0a]
+{evex} vcvtsi2sdl (%edx), %xmm1, %xmm1
 
 // CHECK: vcvtsi2ssl 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x2a,0x8c,0x02,0x00,0x01,0x00,0x00]
-vcvtsi2ssl 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x2a,0x4c,0x02,0x40]
+{evex} vcvtsi2ssl 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vcvtsi2ssl -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x2a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vcvtsi2ssl -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x2a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vcvtsi2ssl -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vcvtsi2ssl 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x2a,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vcvtsi2ssl 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x2a,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsi2ssl 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vcvtsi2ssl 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x2a,0x8a,0xf0,0x1c,0xf0,0x1c]
-vcvtsi2ssl 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x2a,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsi2ssl 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vcvtsi2ssl 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x2a,0x0d,0xf0,0x1c,0xf0,0x1c]
-vcvtsi2ssl 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x2a,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtsi2ssl 485498096, %xmm1, %xmm1
 
 // CHECK: vcvtsi2ssl (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x2a,0x0a]
-vcvtsi2ssl (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x2a,0x0a]
+{evex} vcvtsi2ssl (%edx), %xmm1, %xmm1
 
 // CHECK: vcvtss2sd 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5a,0x8c,0x02,0x00,0x01,0x00,0x00]
-vcvtss2sd 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5a,0x4c,0x02,0x40]
+{evex} vcvtss2sd 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vcvtss2sd 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5a,0x4c,0x02,0x40]
@@ -653,12 +653,12 @@ vcvtss2sd 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vcvtss2sd 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtss2sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vcvtss2sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vcvtss2sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vcvtss2sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5a,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vcvtss2sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5a,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtss2sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vcvtss2sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5a,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -677,8 +677,8 @@ vcvtss2sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vcvtss2sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtss2sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5a,0x8a,0xf0,0x1c,0xf0,0x1c]
-vcvtss2sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5a,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtss2sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vcvtss2sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5a,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -689,8 +689,8 @@ vcvtss2sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vcvtss2sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtss2sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5a,0x0d,0xf0,0x1c,0xf0,0x1c]
-vcvtss2sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5a,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vcvtss2sd 485498096, %xmm1, %xmm1
 
 // CHECK: vcvtss2sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5a,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -701,8 +701,8 @@ vcvtss2sd 485498096, %xmm1, %xmm1 {%k2}
 vcvtss2sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtss2sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5a,0x0a]
-vcvtss2sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5a,0x0a]
+{evex} vcvtss2sd (%edx), %xmm1, %xmm1
 
 // CHECK: vcvtss2sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5a,0x0a]
@@ -725,8 +725,8 @@ vcvtss2sd {sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vcvtss2sd {sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vcvtss2sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5a,0xc9]
-vcvtss2sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5a,0xc9]
+{evex} vcvtss2sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vcvtss2sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5a,0xc9]
@@ -785,12 +785,12 @@ vcvtusi2ssl 485498096, %xmm1, %xmm1
 vcvtusi2ssl (%edx), %xmm1, %xmm1
 
 // CHECK: vdivsd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vdivsd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vdivsd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vdivsd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5e,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vdivsd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5e,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vdivsd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vdivsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -809,8 +809,8 @@ vdivsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vdivsd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivsd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5e,0x8a,0xf0,0x1c,0xf0,0x1c]
-vdivsd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5e,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vdivsd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vdivsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5e,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -821,8 +821,8 @@ vdivsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vdivsd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivsd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5e,0x0d,0xf0,0x1c,0xf0,0x1c]
-vdivsd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5e,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vdivsd 485498096, %xmm1, %xmm1
 
 // CHECK: vdivsd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5e,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -833,8 +833,8 @@ vdivsd 485498096, %xmm1, %xmm1 {%k2}
 vdivsd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivsd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5e,0x8c,0x02,0x00,0x02,0x00,0x00]
-vdivsd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5e,0x4c,0x02,0x40]
+{evex} vdivsd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vdivsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5e,0x4c,0x02,0x40]
@@ -845,8 +845,8 @@ vdivsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vdivsd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivsd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5e,0x0a]
-vdivsd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5e,0x0a]
+{evex} vdivsd (%edx), %xmm1, %xmm1
 
 // CHECK: vdivsd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5e,0x0a]
@@ -905,8 +905,8 @@ vdivsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vdivsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5e,0xc9]
-vdivsd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5e,0xc9]
+{evex} vdivsd %xmm1, %xmm1, %xmm1
 
 // CHECK: vdivsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5e,0xc9]
@@ -917,8 +917,8 @@ vdivsd %xmm1, %xmm1, %xmm1 {%k2}
 vdivsd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5e,0x8c,0x02,0x00,0x01,0x00,0x00]
-vdivss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5e,0x4c,0x02,0x40]
+{evex} vdivss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vdivss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5e,0x4c,0x02,0x40]
@@ -929,12 +929,12 @@ vdivss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vdivss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vdivss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vdivss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vdivss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5e,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vdivss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5e,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vdivss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vdivss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -953,8 +953,8 @@ vdivss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vdivss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5e,0x8a,0xf0,0x1c,0xf0,0x1c]
-vdivss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5e,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vdivss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vdivss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5e,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -965,8 +965,8 @@ vdivss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vdivss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5e,0x0d,0xf0,0x1c,0xf0,0x1c]
-vdivss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5e,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vdivss 485498096, %xmm1, %xmm1
 
 // CHECK: vdivss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5e,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -977,8 +977,8 @@ vdivss 485498096, %xmm1, %xmm1 {%k2}
 vdivss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5e,0x0a]
-vdivss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5e,0x0a]
+{evex} vdivss (%edx), %xmm1, %xmm1
 
 // CHECK: vdivss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5e,0x0a]
@@ -1037,8 +1037,8 @@ vdivss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vdivss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vdivss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5e,0xc9]
-vdivss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5e,0xc9]
+{evex} vdivss %xmm1, %xmm1, %xmm1
 
 // CHECK: vdivss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5e,0xc9]
@@ -1241,12 +1241,12 @@ vfixupimmss $0, %xmm1, %xmm1, %xmm1 {%k2}
 vfixupimmss $0, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x99,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x99,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x99,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmadd132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x99,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x99,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -1265,8 +1265,8 @@ vfmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmadd132sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x99,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmadd132sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x99,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd132sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd132sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x99,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -1277,8 +1277,8 @@ vfmadd132sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmadd132sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x99,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmadd132sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x99,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd132sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfmadd132sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x99,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -1289,8 +1289,8 @@ vfmadd132sd 485498096, %xmm1, %xmm1 {%k2}
 vfmadd132sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x99,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfmadd132sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x99,0x4c,0x02,0x40]
+{evex} vfmadd132sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmadd132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x99,0x4c,0x02,0x40]
@@ -1301,8 +1301,8 @@ vfmadd132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmadd132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x99,0x0a]
-vfmadd132sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x99,0x0a]
+{evex} vfmadd132sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd132sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x99,0x0a]
@@ -1361,8 +1361,8 @@ vfmadd132sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd132sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x99,0xc9]
-vfmadd132sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x99,0xc9]
+{evex} vfmadd132sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmadd132sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x99,0xc9]
@@ -1373,8 +1373,8 @@ vfmadd132sd %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd132sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x99,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfmadd132ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x99,0x4c,0x02,0x40]
+{evex} vfmadd132ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmadd132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x99,0x4c,0x02,0x40]
@@ -1385,12 +1385,12 @@ vfmadd132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmadd132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x99,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x99,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x99,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmadd132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x99,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x99,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -1409,8 +1409,8 @@ vfmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmadd132ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x99,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmadd132ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x99,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd132ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd132ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x99,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -1421,8 +1421,8 @@ vfmadd132ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmadd132ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x99,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmadd132ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x99,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd132ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfmadd132ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x99,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -1433,8 +1433,8 @@ vfmadd132ss 485498096, %xmm1, %xmm1 {%k2}
 vfmadd132ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x99,0x0a]
-vfmadd132ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x99,0x0a]
+{evex} vfmadd132ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd132ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x99,0x0a]
@@ -1493,8 +1493,8 @@ vfmadd132ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd132ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd132ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x99,0xc9]
-vfmadd132ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x99,0xc9]
+{evex} vfmadd132ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmadd132ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x99,0xc9]
@@ -1505,12 +1505,12 @@ vfmadd132ss %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd132ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xa9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xa9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xa9,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmadd213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xa9,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xa9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -1529,8 +1529,8 @@ vfmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmadd213sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xa9,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmadd213sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xa9,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd213sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd213sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xa9,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -1541,8 +1541,8 @@ vfmadd213sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmadd213sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xa9,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmadd213sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xa9,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd213sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfmadd213sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xa9,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -1553,8 +1553,8 @@ vfmadd213sd 485498096, %xmm1, %xmm1 {%k2}
 vfmadd213sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xa9,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfmadd213sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xa9,0x4c,0x02,0x40]
+{evex} vfmadd213sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmadd213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xa9,0x4c,0x02,0x40]
@@ -1565,8 +1565,8 @@ vfmadd213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmadd213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xa9,0x0a]
-vfmadd213sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xa9,0x0a]
+{evex} vfmadd213sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd213sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xa9,0x0a]
@@ -1625,8 +1625,8 @@ vfmadd213sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd213sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xa9,0xc9]
-vfmadd213sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xa9,0xc9]
+{evex} vfmadd213sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmadd213sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xa9,0xc9]
@@ -1637,8 +1637,8 @@ vfmadd213sd %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd213sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xa9,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfmadd213ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xa9,0x4c,0x02,0x40]
+{evex} vfmadd213ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmadd213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xa9,0x4c,0x02,0x40]
@@ -1649,12 +1649,12 @@ vfmadd213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmadd213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xa9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xa9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xa9,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmadd213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xa9,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xa9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -1673,8 +1673,8 @@ vfmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmadd213ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xa9,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmadd213ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xa9,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd213ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd213ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xa9,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -1685,8 +1685,8 @@ vfmadd213ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmadd213ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xa9,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmadd213ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xa9,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd213ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfmadd213ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xa9,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -1697,8 +1697,8 @@ vfmadd213ss 485498096, %xmm1, %xmm1 {%k2}
 vfmadd213ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xa9,0x0a]
-vfmadd213ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xa9,0x0a]
+{evex} vfmadd213ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd213ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xa9,0x0a]
@@ -1757,8 +1757,8 @@ vfmadd213ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd213ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd213ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xa9,0xc9]
-vfmadd213ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xa9,0xc9]
+{evex} vfmadd213ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmadd213ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xa9,0xc9]
@@ -1769,12 +1769,12 @@ vfmadd213ss %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd213ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xb9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xb9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xb9,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmadd231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xb9,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xb9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -1793,8 +1793,8 @@ vfmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmadd231sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xb9,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmadd231sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xb9,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd231sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd231sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xb9,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -1805,8 +1805,8 @@ vfmadd231sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmadd231sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xb9,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmadd231sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xb9,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd231sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfmadd231sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xb9,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -1817,8 +1817,8 @@ vfmadd231sd 485498096, %xmm1, %xmm1 {%k2}
 vfmadd231sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xb9,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfmadd231sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xb9,0x4c,0x02,0x40]
+{evex} vfmadd231sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmadd231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xb9,0x4c,0x02,0x40]
@@ -1829,8 +1829,8 @@ vfmadd231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmadd231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xb9,0x0a]
-vfmadd231sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xb9,0x0a]
+{evex} vfmadd231sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd231sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xb9,0x0a]
@@ -1889,8 +1889,8 @@ vfmadd231sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd231sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xb9,0xc9]
-vfmadd231sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xb9,0xc9]
+{evex} vfmadd231sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmadd231sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xb9,0xc9]
@@ -1901,8 +1901,8 @@ vfmadd231sd %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd231sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xb9,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfmadd231ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xb9,0x4c,0x02,0x40]
+{evex} vfmadd231ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmadd231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xb9,0x4c,0x02,0x40]
@@ -1913,12 +1913,12 @@ vfmadd231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmadd231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xb9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xb9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xb9,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmadd231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xb9,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xb9,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -1937,8 +1937,8 @@ vfmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmadd231ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xb9,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmadd231ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xb9,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd231ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd231ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xb9,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -1949,8 +1949,8 @@ vfmadd231ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmadd231ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xb9,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmadd231ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xb9,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmadd231ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfmadd231ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xb9,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -1961,8 +1961,8 @@ vfmadd231ss 485498096, %xmm1, %xmm1 {%k2}
 vfmadd231ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xb9,0x0a]
-vfmadd231ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xb9,0x0a]
+{evex} vfmadd231ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfmadd231ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xb9,0x0a]
@@ -2021,8 +2021,8 @@ vfmadd231ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd231ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmadd231ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xb9,0xc9]
-vfmadd231ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xb9,0xc9]
+{evex} vfmadd231ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmadd231ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xb9,0xc9]
@@ -2033,12 +2033,12 @@ vfmadd231ss %xmm1, %xmm1, %xmm1 {%k2}
 vfmadd231ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9b,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9b,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9b,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmsub132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9b,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9b,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -2057,8 +2057,8 @@ vfmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmsub132sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9b,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmsub132sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9b,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub132sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub132sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9b,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -2069,8 +2069,8 @@ vfmsub132sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmsub132sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9b,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmsub132sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9b,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub132sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfmsub132sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9b,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -2081,8 +2081,8 @@ vfmsub132sd 485498096, %xmm1, %xmm1 {%k2}
 vfmsub132sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9b,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfmsub132sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9b,0x4c,0x02,0x40]
+{evex} vfmsub132sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmsub132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9b,0x4c,0x02,0x40]
@@ -2093,8 +2093,8 @@ vfmsub132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmsub132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9b,0x0a]
-vfmsub132sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9b,0x0a]
+{evex} vfmsub132sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub132sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9b,0x0a]
@@ -2153,8 +2153,8 @@ vfmsub132sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub132sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9b,0xc9]
-vfmsub132sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9b,0xc9]
+{evex} vfmsub132sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmsub132sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9b,0xc9]
@@ -2165,8 +2165,8 @@ vfmsub132sd %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub132sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9b,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfmsub132ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9b,0x4c,0x02,0x40]
+{evex} vfmsub132ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmsub132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9b,0x4c,0x02,0x40]
@@ -2177,12 +2177,12 @@ vfmsub132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmsub132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9b,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9b,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9b,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmsub132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9b,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9b,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -2201,8 +2201,8 @@ vfmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmsub132ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9b,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmsub132ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9b,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub132ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub132ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9b,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -2213,8 +2213,8 @@ vfmsub132ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmsub132ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9b,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmsub132ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9b,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub132ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfmsub132ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9b,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -2225,8 +2225,8 @@ vfmsub132ss 485498096, %xmm1, %xmm1 {%k2}
 vfmsub132ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9b,0x0a]
-vfmsub132ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9b,0x0a]
+{evex} vfmsub132ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub132ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9b,0x0a]
@@ -2285,8 +2285,8 @@ vfmsub132ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub132ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub132ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9b,0xc9]
-vfmsub132ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9b,0xc9]
+{evex} vfmsub132ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmsub132ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9b,0xc9]
@@ -2297,12 +2297,12 @@ vfmsub132ss %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub132ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xab,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xab,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xab,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmsub213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xab,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xab,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -2321,8 +2321,8 @@ vfmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmsub213sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xab,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmsub213sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xab,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub213sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub213sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xab,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -2333,8 +2333,8 @@ vfmsub213sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmsub213sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xab,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmsub213sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xab,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub213sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfmsub213sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xab,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -2345,8 +2345,8 @@ vfmsub213sd 485498096, %xmm1, %xmm1 {%k2}
 vfmsub213sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xab,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfmsub213sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xab,0x4c,0x02,0x40]
+{evex} vfmsub213sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmsub213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xab,0x4c,0x02,0x40]
@@ -2357,8 +2357,8 @@ vfmsub213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmsub213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xab,0x0a]
-vfmsub213sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xab,0x0a]
+{evex} vfmsub213sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub213sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xab,0x0a]
@@ -2417,8 +2417,8 @@ vfmsub213sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub213sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xab,0xc9]
-vfmsub213sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xab,0xc9]
+{evex} vfmsub213sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmsub213sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xab,0xc9]
@@ -2429,8 +2429,8 @@ vfmsub213sd %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub213sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xab,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfmsub213ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xab,0x4c,0x02,0x40]
+{evex} vfmsub213ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmsub213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xab,0x4c,0x02,0x40]
@@ -2441,12 +2441,12 @@ vfmsub213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmsub213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xab,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xab,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xab,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmsub213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xab,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xab,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -2465,8 +2465,8 @@ vfmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmsub213ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xab,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmsub213ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xab,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub213ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub213ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xab,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -2477,8 +2477,8 @@ vfmsub213ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmsub213ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xab,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmsub213ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xab,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub213ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfmsub213ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xab,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -2489,8 +2489,8 @@ vfmsub213ss 485498096, %xmm1, %xmm1 {%k2}
 vfmsub213ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xab,0x0a]
-vfmsub213ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xab,0x0a]
+{evex} vfmsub213ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub213ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xab,0x0a]
@@ -2549,8 +2549,8 @@ vfmsub213ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub213ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub213ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xab,0xc9]
-vfmsub213ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xab,0xc9]
+{evex} vfmsub213ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmsub213ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xab,0xc9]
@@ -2561,12 +2561,12 @@ vfmsub213ss %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub213ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbb,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbb,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbb,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmsub231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbb,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbb,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -2585,8 +2585,8 @@ vfmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmsub231sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbb,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmsub231sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbb,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub231sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub231sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbb,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -2597,8 +2597,8 @@ vfmsub231sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmsub231sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbb,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmsub231sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbb,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub231sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfmsub231sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbb,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -2609,8 +2609,8 @@ vfmsub231sd 485498096, %xmm1, %xmm1 {%k2}
 vfmsub231sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbb,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfmsub231sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbb,0x4c,0x02,0x40]
+{evex} vfmsub231sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmsub231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbb,0x4c,0x02,0x40]
@@ -2621,8 +2621,8 @@ vfmsub231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmsub231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbb,0x0a]
-vfmsub231sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbb,0x0a]
+{evex} vfmsub231sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub231sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbb,0x0a]
@@ -2681,8 +2681,8 @@ vfmsub231sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub231sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbb,0xc9]
-vfmsub231sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbb,0xc9]
+{evex} vfmsub231sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmsub231sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbb,0xc9]
@@ -2693,8 +2693,8 @@ vfmsub231sd %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub231sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbb,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfmsub231ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbb,0x4c,0x02,0x40]
+{evex} vfmsub231ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfmsub231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbb,0x4c,0x02,0x40]
@@ -2705,12 +2705,12 @@ vfmsub231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfmsub231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbb,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbb,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbb,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfmsub231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbb,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbb,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -2729,8 +2729,8 @@ vfmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfmsub231ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbb,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfmsub231ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbb,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub231ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub231ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbb,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -2741,8 +2741,8 @@ vfmsub231ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfmsub231ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbb,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfmsub231ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbb,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfmsub231ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfmsub231ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbb,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -2753,8 +2753,8 @@ vfmsub231ss 485498096, %xmm1, %xmm1 {%k2}
 vfmsub231ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbb,0x0a]
-vfmsub231ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbb,0x0a]
+{evex} vfmsub231ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfmsub231ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbb,0x0a]
@@ -2813,8 +2813,8 @@ vfmsub231ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub231ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfmsub231ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbb,0xc9]
-vfmsub231ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbb,0xc9]
+{evex} vfmsub231ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfmsub231ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbb,0xc9]
@@ -2825,12 +2825,12 @@ vfmsub231ss %xmm1, %xmm1, %xmm1 {%k2}
 vfmsub231ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9d,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmadd132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9d,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -2849,8 +2849,8 @@ vfnmadd132sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmadd132sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9d,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmadd132sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9d,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd132sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd132sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9d,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -2861,8 +2861,8 @@ vfnmadd132sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmadd132sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9d,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmadd132sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9d,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd132sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmadd132sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9d,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -2873,8 +2873,8 @@ vfnmadd132sd 485498096, %xmm1, %xmm1 {%k2}
 vfnmadd132sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9d,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfnmadd132sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9d,0x4c,0x02,0x40]
+{evex} vfnmadd132sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmadd132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9d,0x4c,0x02,0x40]
@@ -2885,8 +2885,8 @@ vfnmadd132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmadd132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9d,0x0a]
-vfnmadd132sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9d,0x0a]
+{evex} vfnmadd132sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd132sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9d,0x0a]
@@ -2945,8 +2945,8 @@ vfnmadd132sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd132sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9d,0xc9]
-vfnmadd132sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9d,0xc9]
+{evex} vfnmadd132sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmadd132sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9d,0xc9]
@@ -2957,8 +2957,8 @@ vfnmadd132sd %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd132sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9d,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfnmadd132ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9d,0x4c,0x02,0x40]
+{evex} vfnmadd132ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmadd132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9d,0x4c,0x02,0x40]
@@ -2969,12 +2969,12 @@ vfnmadd132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmadd132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9d,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmadd132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9d,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -2993,8 +2993,8 @@ vfnmadd132ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmadd132ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9d,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmadd132ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9d,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd132ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd132ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9d,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -3005,8 +3005,8 @@ vfnmadd132ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmadd132ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9d,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmadd132ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9d,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd132ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmadd132ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9d,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -3017,8 +3017,8 @@ vfnmadd132ss 485498096, %xmm1, %xmm1 {%k2}
 vfnmadd132ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9d,0x0a]
-vfnmadd132ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9d,0x0a]
+{evex} vfnmadd132ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd132ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9d,0x0a]
@@ -3077,8 +3077,8 @@ vfnmadd132ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd132ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd132ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9d,0xc9]
-vfnmadd132ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9d,0xc9]
+{evex} vfnmadd132ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmadd132ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9d,0xc9]
@@ -3089,12 +3089,12 @@ vfnmadd132ss %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd132ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xad,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xad,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xad,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmadd213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xad,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xad,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -3113,8 +3113,8 @@ vfnmadd213sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmadd213sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xad,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmadd213sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xad,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd213sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd213sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xad,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -3125,8 +3125,8 @@ vfnmadd213sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmadd213sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xad,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmadd213sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xad,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd213sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmadd213sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xad,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -3137,8 +3137,8 @@ vfnmadd213sd 485498096, %xmm1, %xmm1 {%k2}
 vfnmadd213sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xad,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfnmadd213sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xad,0x4c,0x02,0x40]
+{evex} vfnmadd213sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmadd213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xad,0x4c,0x02,0x40]
@@ -3149,8 +3149,8 @@ vfnmadd213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmadd213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xad,0x0a]
-vfnmadd213sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xad,0x0a]
+{evex} vfnmadd213sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd213sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xad,0x0a]
@@ -3209,8 +3209,8 @@ vfnmadd213sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd213sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xad,0xc9]
-vfnmadd213sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xad,0xc9]
+{evex} vfnmadd213sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmadd213sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xad,0xc9]
@@ -3221,8 +3221,8 @@ vfnmadd213sd %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd213sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xad,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfnmadd213ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xad,0x4c,0x02,0x40]
+{evex} vfnmadd213ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmadd213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xad,0x4c,0x02,0x40]
@@ -3233,12 +3233,12 @@ vfnmadd213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmadd213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xad,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xad,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xad,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmadd213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xad,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xad,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -3257,8 +3257,8 @@ vfnmadd213ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmadd213ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xad,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmadd213ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xad,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd213ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd213ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xad,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -3269,8 +3269,8 @@ vfnmadd213ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmadd213ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xad,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmadd213ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xad,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd213ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmadd213ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xad,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -3281,8 +3281,8 @@ vfnmadd213ss 485498096, %xmm1, %xmm1 {%k2}
 vfnmadd213ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xad,0x0a]
-vfnmadd213ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xad,0x0a]
+{evex} vfnmadd213ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd213ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xad,0x0a]
@@ -3341,8 +3341,8 @@ vfnmadd213ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd213ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd213ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xad,0xc9]
-vfnmadd213ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xad,0xc9]
+{evex} vfnmadd213ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmadd213ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xad,0xc9]
@@ -3353,12 +3353,12 @@ vfnmadd213ss %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd213ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbd,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbd,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbd,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmadd231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbd,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbd,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -3377,8 +3377,8 @@ vfnmadd231sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmadd231sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbd,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmadd231sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbd,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd231sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd231sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbd,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -3389,8 +3389,8 @@ vfnmadd231sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmadd231sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbd,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmadd231sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbd,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd231sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmadd231sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbd,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -3401,8 +3401,8 @@ vfnmadd231sd 485498096, %xmm1, %xmm1 {%k2}
 vfnmadd231sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbd,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfnmadd231sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbd,0x4c,0x02,0x40]
+{evex} vfnmadd231sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmadd231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbd,0x4c,0x02,0x40]
@@ -3413,8 +3413,8 @@ vfnmadd231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmadd231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbd,0x0a]
-vfnmadd231sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbd,0x0a]
+{evex} vfnmadd231sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd231sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbd,0x0a]
@@ -3473,8 +3473,8 @@ vfnmadd231sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd231sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbd,0xc9]
-vfnmadd231sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbd,0xc9]
+{evex} vfnmadd231sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmadd231sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbd,0xc9]
@@ -3485,8 +3485,8 @@ vfnmadd231sd %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd231sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbd,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfnmadd231ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbd,0x4c,0x02,0x40]
+{evex} vfnmadd231ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmadd231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbd,0x4c,0x02,0x40]
@@ -3497,12 +3497,12 @@ vfnmadd231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmadd231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbd,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbd,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbd,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmadd231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbd,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbd,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -3521,8 +3521,8 @@ vfnmadd231ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmadd231ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbd,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmadd231ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbd,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd231ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd231ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbd,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -3533,8 +3533,8 @@ vfnmadd231ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmadd231ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbd,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmadd231ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbd,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmadd231ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmadd231ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbd,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -3545,8 +3545,8 @@ vfnmadd231ss 485498096, %xmm1, %xmm1 {%k2}
 vfnmadd231ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbd,0x0a]
-vfnmadd231ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbd,0x0a]
+{evex} vfnmadd231ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmadd231ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbd,0x0a]
@@ -3605,8 +3605,8 @@ vfnmadd231ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd231ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmadd231ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbd,0xc9]
-vfnmadd231ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbd,0xc9]
+{evex} vfnmadd231ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmadd231ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbd,0xc9]
@@ -3617,12 +3617,12 @@ vfnmadd231ss %xmm1, %xmm1, %xmm1 {%k2}
 vfnmadd231ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmsub132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub132sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -3641,8 +3641,8 @@ vfnmsub132sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmsub132sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9f,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmsub132sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9f,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub132sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub132sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9f,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -3653,8 +3653,8 @@ vfnmsub132sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmsub132sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9f,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmsub132sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9f,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub132sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmsub132sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9f,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -3665,8 +3665,8 @@ vfnmsub132sd 485498096, %xmm1, %xmm1 {%k2}
 vfnmsub132sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9f,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfnmsub132sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9f,0x4c,0x02,0x40]
+{evex} vfnmsub132sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmsub132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9f,0x4c,0x02,0x40]
@@ -3677,8 +3677,8 @@ vfnmsub132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmsub132sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9f,0x0a]
-vfnmsub132sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9f,0x0a]
+{evex} vfnmsub132sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub132sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9f,0x0a]
@@ -3737,8 +3737,8 @@ vfnmsub132sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub132sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0x9f,0xc9]
-vfnmsub132sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0x9f,0xc9]
+{evex} vfnmsub132sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmsub132sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0x9f,0xc9]
@@ -3749,8 +3749,8 @@ vfnmsub132sd %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub132sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9f,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfnmsub132ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9f,0x4c,0x02,0x40]
+{evex} vfnmsub132ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmsub132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9f,0x4c,0x02,0x40]
@@ -3761,12 +3761,12 @@ vfnmsub132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmsub132ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmsub132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub132ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -3785,8 +3785,8 @@ vfnmsub132ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmsub132ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9f,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmsub132ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9f,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub132ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub132ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9f,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -3797,8 +3797,8 @@ vfnmsub132ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmsub132ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9f,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmsub132ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9f,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub132ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmsub132ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9f,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -3809,8 +3809,8 @@ vfnmsub132ss 485498096, %xmm1, %xmm1 {%k2}
 vfnmsub132ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9f,0x0a]
-vfnmsub132ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9f,0x0a]
+{evex} vfnmsub132ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub132ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9f,0x0a]
@@ -3869,8 +3869,8 @@ vfnmsub132ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub132ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub132ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0x9f,0xc9]
-vfnmsub132ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0x9f,0xc9]
+{evex} vfnmsub132ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmsub132ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0x9f,0xc9]
@@ -3881,12 +3881,12 @@ vfnmsub132ss %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub132ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xaf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xaf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xaf,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmsub213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xaf,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub213sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xaf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -3905,8 +3905,8 @@ vfnmsub213sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmsub213sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xaf,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmsub213sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xaf,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub213sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub213sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xaf,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -3917,8 +3917,8 @@ vfnmsub213sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmsub213sd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xaf,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmsub213sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xaf,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub213sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmsub213sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xaf,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -3929,8 +3929,8 @@ vfnmsub213sd 485498096, %xmm1, %xmm1 {%k2}
 vfnmsub213sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xaf,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfnmsub213sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xaf,0x4c,0x02,0x40]
+{evex} vfnmsub213sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmsub213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xaf,0x4c,0x02,0x40]
@@ -3941,8 +3941,8 @@ vfnmsub213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmsub213sd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xaf,0x0a]
-vfnmsub213sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xaf,0x0a]
+{evex} vfnmsub213sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub213sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xaf,0x0a]
@@ -4001,8 +4001,8 @@ vfnmsub213sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub213sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xaf,0xc9]
-vfnmsub213sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xaf,0xc9]
+{evex} vfnmsub213sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmsub213sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xaf,0xc9]
@@ -4013,8 +4013,8 @@ vfnmsub213sd %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub213sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xaf,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfnmsub213ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xaf,0x4c,0x02,0x40]
+{evex} vfnmsub213ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmsub213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xaf,0x4c,0x02,0x40]
@@ -4025,12 +4025,12 @@ vfnmsub213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmsub213ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xaf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xaf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xaf,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmsub213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xaf,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub213ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xaf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -4049,8 +4049,8 @@ vfnmsub213ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmsub213ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xaf,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmsub213ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xaf,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub213ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub213ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xaf,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -4061,8 +4061,8 @@ vfnmsub213ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmsub213ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xaf,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmsub213ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xaf,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub213ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmsub213ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xaf,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -4073,8 +4073,8 @@ vfnmsub213ss 485498096, %xmm1, %xmm1 {%k2}
 vfnmsub213ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xaf,0x0a]
-vfnmsub213ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xaf,0x0a]
+{evex} vfnmsub213ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub213ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xaf,0x0a]
@@ -4133,8 +4133,8 @@ vfnmsub213ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub213ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub213ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xaf,0xc9]
-vfnmsub213ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xaf,0xc9]
+{evex} vfnmsub213ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmsub213ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xaf,0xc9]
@@ -4145,12 +4145,12 @@ vfnmsub213ss %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub213ss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbf,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmsub231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbf,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub231sd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -4161,16 +4161,16 @@ vfnmsub231sd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 vfnmsub231sd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 
 // CHECK: vfnmsub231sd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbf,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmsub231sd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbf,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub231sd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub231sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbf,0x8a,0xf0,0x1c,0xf0,0x1c]
 vfnmsub231sd 485498096(%edx), %xmm1, %xmm1 {%k2}
 
 // CHECK: vfnmsub231sd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbf,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmsub231sd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbf,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub231sd 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmsub231sd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbf,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -4181,16 +4181,16 @@ vfnmsub231sd 485498096, %xmm1, %xmm1 {%k2}
 vfnmsub231sd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231sd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbf,0x8c,0x02,0x00,0x02,0x00,0x00]
-vfnmsub231sd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbf,0x4c,0x02,0x40]
+{evex} vfnmsub231sd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmsub231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbf,0x4c,0x02,0x40]
 vfnmsub231sd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 
 // CHECK: vfnmsub231sd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbf,0x0a]
-vfnmsub231sd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbf,0x0a]
+{evex} vfnmsub231sd (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub231sd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbf,0x0a]
@@ -4245,8 +4245,8 @@ vfnmsub231sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub231sd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231sd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0xf1,0xbf,0xc9]
-vfnmsub231sd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0xf5,0x08,0xbf,0xc9]
+{evex} vfnmsub231sd %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmsub231sd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0xf5,0x0a,0xbf,0xc9]
@@ -4257,8 +4257,8 @@ vfnmsub231sd %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub231sd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231ss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbf,0x8c,0x02,0x00,0x01,0x00,0x00]
-vfnmsub231ss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbf,0x4c,0x02,0x40]
+{evex} vfnmsub231ss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vfnmsub231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbf,0x4c,0x02,0x40]
@@ -4269,12 +4269,12 @@ vfnmsub231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vfnmsub231ss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vfnmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vfnmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbf,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vfnmsub231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbf,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub231ss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vfnmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbf,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -4293,8 +4293,8 @@ vfnmsub231ss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vfnmsub231ss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231ss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbf,0x8a,0xf0,0x1c,0xf0,0x1c]
-vfnmsub231ss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbf,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub231ss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub231ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbf,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -4305,8 +4305,8 @@ vfnmsub231ss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vfnmsub231ss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231ss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbf,0x0d,0xf0,0x1c,0xf0,0x1c]
-vfnmsub231ss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbf,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vfnmsub231ss 485498096, %xmm1, %xmm1
 
 // CHECK: vfnmsub231ss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbf,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -4317,8 +4317,8 @@ vfnmsub231ss 485498096, %xmm1, %xmm1 {%k2}
 vfnmsub231ss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231ss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbf,0x0a]
-vfnmsub231ss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbf,0x0a]
+{evex} vfnmsub231ss (%edx), %xmm1, %xmm1
 
 // CHECK: vfnmsub231ss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbf,0x0a]
@@ -4377,8 +4377,8 @@ vfnmsub231ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vfnmsub231ss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vfnmsub231ss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc4,0xe2,0x71,0xbf,0xc9]
-vfnmsub231ss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf2,0x75,0x08,0xbf,0xc9]
+{evex} vfnmsub231ss %xmm1, %xmm1, %xmm1
 
 // CHECK: vfnmsub231ss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf2,0x75,0x0a,0xbf,0xc9]
@@ -4773,12 +4773,12 @@ vgetmantss $0, %xmm1, %xmm1, %xmm1 {%k2}
 vgetmantss $0, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxsd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vmaxsd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vmaxsd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vmaxsd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vmaxsd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vmaxsd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vmaxsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -4797,8 +4797,8 @@ vmaxsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vmaxsd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxsd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5f,0x8a,0xf0,0x1c,0xf0,0x1c]
-vmaxsd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5f,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vmaxsd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vmaxsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5f,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -4809,8 +4809,8 @@ vmaxsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vmaxsd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxsd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5f,0x0d,0xf0,0x1c,0xf0,0x1c]
-vmaxsd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5f,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vmaxsd 485498096, %xmm1, %xmm1
 
 // CHECK: vmaxsd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5f,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -4821,8 +4821,8 @@ vmaxsd 485498096, %xmm1, %xmm1 {%k2}
 vmaxsd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxsd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5f,0x8c,0x02,0x00,0x02,0x00,0x00]
-vmaxsd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5f,0x4c,0x02,0x40]
+{evex} vmaxsd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vmaxsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5f,0x4c,0x02,0x40]
@@ -4833,8 +4833,8 @@ vmaxsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vmaxsd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxsd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5f,0x0a]
-vmaxsd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5f,0x0a]
+{evex} vmaxsd (%edx), %xmm1, %xmm1
 
 // CHECK: vmaxsd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5f,0x0a]
@@ -4857,8 +4857,8 @@ vmaxsd {sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vmaxsd {sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5f,0xc9]
-vmaxsd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5f,0xc9]
+{evex} vmaxsd %xmm1, %xmm1, %xmm1
 
 // CHECK: vmaxsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5f,0xc9]
@@ -4869,8 +4869,8 @@ vmaxsd %xmm1, %xmm1, %xmm1 {%k2}
 vmaxsd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5f,0x8c,0x02,0x00,0x01,0x00,0x00]
-vmaxss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5f,0x4c,0x02,0x40]
+{evex} vmaxss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vmaxss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5f,0x4c,0x02,0x40]
@@ -4881,12 +4881,12 @@ vmaxss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vmaxss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vmaxss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vmaxss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vmaxss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vmaxss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5f,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vmaxss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vmaxss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5f,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -4905,8 +4905,8 @@ vmaxss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vmaxss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5f,0x8a,0xf0,0x1c,0xf0,0x1c]
-vmaxss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5f,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vmaxss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vmaxss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5f,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -4917,8 +4917,8 @@ vmaxss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vmaxss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5f,0x0d,0xf0,0x1c,0xf0,0x1c]
-vmaxss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5f,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vmaxss 485498096, %xmm1, %xmm1
 
 // CHECK: vmaxss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5f,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -4929,8 +4929,8 @@ vmaxss 485498096, %xmm1, %xmm1 {%k2}
 vmaxss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5f,0x0a]
-vmaxss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5f,0x0a]
+{evex} vmaxss (%edx), %xmm1, %xmm1
 
 // CHECK: vmaxss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5f,0x0a]
@@ -4953,8 +4953,8 @@ vmaxss {sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vmaxss {sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmaxss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5f,0xc9]
-vmaxss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5f,0xc9]
+{evex} vmaxss %xmm1, %xmm1, %xmm1
 
 // CHECK: vmaxss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5f,0xc9]
@@ -4965,12 +4965,12 @@ vmaxss %xmm1, %xmm1, %xmm1 {%k2}
 vmaxss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminsd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vminsd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vminsd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vminsd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5d,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vminsd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5d,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vminsd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vminsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -4989,8 +4989,8 @@ vminsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vminsd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminsd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5d,0x8a,0xf0,0x1c,0xf0,0x1c]
-vminsd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5d,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vminsd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vminsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5d,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -5001,8 +5001,8 @@ vminsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vminsd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminsd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5d,0x0d,0xf0,0x1c,0xf0,0x1c]
-vminsd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5d,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vminsd 485498096, %xmm1, %xmm1
 
 // CHECK: vminsd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5d,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -5013,8 +5013,8 @@ vminsd 485498096, %xmm1, %xmm1 {%k2}
 vminsd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminsd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5d,0x8c,0x02,0x00,0x02,0x00,0x00]
-vminsd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5d,0x4c,0x02,0x40]
+{evex} vminsd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vminsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5d,0x4c,0x02,0x40]
@@ -5025,8 +5025,8 @@ vminsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vminsd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminsd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5d,0x0a]
-vminsd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5d,0x0a]
+{evex} vminsd (%edx), %xmm1, %xmm1
 
 // CHECK: vminsd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5d,0x0a]
@@ -5049,8 +5049,8 @@ vminsd {sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vminsd {sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5d,0xc9]
-vminsd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5d,0xc9]
+{evex} vminsd %xmm1, %xmm1, %xmm1
 
 // CHECK: vminsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5d,0xc9]
@@ -5061,8 +5061,8 @@ vminsd %xmm1, %xmm1, %xmm1 {%k2}
 vminsd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5d,0x8c,0x02,0x00,0x01,0x00,0x00]
-vminss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5d,0x4c,0x02,0x40]
+{evex} vminss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vminss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5d,0x4c,0x02,0x40]
@@ -5073,12 +5073,12 @@ vminss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vminss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vminss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vminss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vminss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5d,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vminss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5d,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vminss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vminss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5d,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -5097,8 +5097,8 @@ vminss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vminss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5d,0x8a,0xf0,0x1c,0xf0,0x1c]
-vminss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5d,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vminss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vminss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5d,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -5109,8 +5109,8 @@ vminss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vminss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5d,0x0d,0xf0,0x1c,0xf0,0x1c]
-vminss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5d,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vminss 485498096, %xmm1, %xmm1
 
 // CHECK: vminss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5d,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -5121,8 +5121,8 @@ vminss 485498096, %xmm1, %xmm1 {%k2}
 vminss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5d,0x0a]
-vminss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5d,0x0a]
+{evex} vminss (%edx), %xmm1, %xmm1
 
 // CHECK: vminss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5d,0x0a]
@@ -5145,8 +5145,8 @@ vminss {sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vminss {sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vminss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5d,0xc9]
-vminss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5d,0xc9]
+{evex} vminss %xmm1, %xmm1, %xmm1
 
 // CHECK: vminss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5d,0xc9]
@@ -5157,12 +5157,12 @@ vminss %xmm1, %xmm1, %xmm1 {%k2}
 vminss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmovsd -485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xfb,0x10,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vmovsd -485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x10,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vmovsd -485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vmovsd 485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xfb,0x10,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vmovsd 485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x10,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovsd 485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vmovsd -485498096(%edx,%eax,4), %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x10,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -5181,8 +5181,8 @@ vmovsd -485498096(%edx,%eax,4), %xmm1 {%k2} {z}
 vmovsd 485498096(%edx,%eax,4), %xmm1 {%k2} {z}
 
 // CHECK: vmovsd 485498096(%edx), %xmm1
-// CHECK: encoding: [0xc5,0xfb,0x10,0x8a,0xf0,0x1c,0xf0,0x1c]
-vmovsd 485498096(%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x10,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovsd 485498096(%edx), %xmm1
 
 // CHECK: vmovsd 485498096(%edx), %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x10,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -5193,8 +5193,8 @@ vmovsd 485498096(%edx), %xmm1 {%k2}
 vmovsd 485498096(%edx), %xmm1 {%k2} {z}
 
 // CHECK: vmovsd 485498096, %xmm1
-// CHECK: encoding: [0xc5,0xfb,0x10,0x0d,0xf0,0x1c,0xf0,0x1c]
-vmovsd 485498096, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x10,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovsd 485498096, %xmm1
 
 // CHECK: vmovsd 485498096, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x10,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -5205,8 +5205,8 @@ vmovsd 485498096, %xmm1 {%k2}
 vmovsd 485498096, %xmm1 {%k2} {z}
 
 // CHECK: vmovsd 512(%edx,%eax), %xmm1
-// CHECK: encoding: [0xc5,0xfb,0x10,0x8c,0x02,0x00,0x02,0x00,0x00]
-vmovsd 512(%edx,%eax), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x10,0x4c,0x02,0x40]
+{evex} vmovsd 512(%edx,%eax), %xmm1
 
 // CHECK: vmovsd 512(%edx,%eax), %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x10,0x4c,0x02,0x40]
@@ -5217,8 +5217,8 @@ vmovsd 512(%edx,%eax), %xmm1 {%k2}
 vmovsd 512(%edx,%eax), %xmm1 {%k2} {z}
 
 // CHECK: vmovsd (%edx), %xmm1
-// CHECK: encoding: [0xc5,0xfb,0x10,0x0a]
-vmovsd (%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x10,0x0a]
+{evex} vmovsd (%edx), %xmm1
 
 // CHECK: vmovsd (%edx), %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x10,0x0a]
@@ -5229,8 +5229,8 @@ vmovsd (%edx), %xmm1 {%k2}
 vmovsd (%edx), %xmm1 {%k2} {z}
 
 // CHECK: vmovsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x11,0xc9]
-vmovsd.s %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x11,0xc9]
+{evex} vmovsd.s %xmm1, %xmm1, %xmm1
 
 // CHECK: vmovsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x11,0xc9]
@@ -5241,12 +5241,12 @@ vmovsd.s %xmm1, %xmm1, %xmm1 {%k2}
 vmovsd.s %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmovsd %xmm1, -485498096(%edx,%eax,4)
-// CHECK: encoding: [0xc5,0xfb,0x11,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vmovsd %xmm1, -485498096(%edx,%eax,4)
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x11,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vmovsd %xmm1, -485498096(%edx,%eax,4)
 
 // CHECK: vmovsd %xmm1, 485498096(%edx,%eax,4)
-// CHECK: encoding: [0xc5,0xfb,0x11,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vmovsd %xmm1, 485498096(%edx,%eax,4)
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x11,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovsd %xmm1, 485498096(%edx,%eax,4)
 
 // CHECK: vmovsd %xmm1, -485498096(%edx,%eax,4) {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x11,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -5257,40 +5257,40 @@ vmovsd %xmm1, -485498096(%edx,%eax,4) {%k2}
 vmovsd %xmm1, 485498096(%edx,%eax,4) {%k2}
 
 // CHECK: vmovsd %xmm1, 485498096(%edx)
-// CHECK: encoding: [0xc5,0xfb,0x11,0x8a,0xf0,0x1c,0xf0,0x1c]
-vmovsd %xmm1, 485498096(%edx)
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x11,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovsd %xmm1, 485498096(%edx)
 
 // CHECK: vmovsd %xmm1, 485498096(%edx) {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x11,0x8a,0xf0,0x1c,0xf0,0x1c]
 vmovsd %xmm1, 485498096(%edx) {%k2}
 
 // CHECK: vmovsd %xmm1, 485498096
-// CHECK: encoding: [0xc5,0xfb,0x11,0x0d,0xf0,0x1c,0xf0,0x1c]
-vmovsd %xmm1, 485498096
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x11,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovsd %xmm1, 485498096
 
 // CHECK: vmovsd %xmm1, 485498096 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x11,0x0d,0xf0,0x1c,0xf0,0x1c]
 vmovsd %xmm1, 485498096 {%k2}
 
 // CHECK: vmovsd %xmm1, 512(%edx,%eax)
-// CHECK: encoding: [0xc5,0xfb,0x11,0x8c,0x02,0x00,0x02,0x00,0x00]
-vmovsd %xmm1, 512(%edx,%eax)
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x11,0x4c,0x02,0x40]
+{evex} vmovsd %xmm1, 512(%edx,%eax)
 
 // CHECK: vmovsd %xmm1, 512(%edx,%eax) {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x11,0x4c,0x02,0x40]
 vmovsd %xmm1, 512(%edx,%eax) {%k2}
 
 // CHECK: vmovsd %xmm1, (%edx)
-// CHECK: encoding: [0xc5,0xfb,0x11,0x0a]
-vmovsd %xmm1, (%edx)
+// CHECK: encoding: [0x62,0xf1,0xff,0x08,0x11,0x0a]
+{evex} vmovsd %xmm1, (%edx)
 
 // CHECK: vmovsd %xmm1, (%edx) {%k2}
 // CHECK: encoding: [0x62,0xf1,0xff,0x0a,0x11,0x0a]
 vmovsd %xmm1, (%edx) {%k2}
 
 // CHECK: vmovsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x10,0xc9]
-vmovsd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x10,0xc9]
+{evex} vmovsd %xmm1, %xmm1, %xmm1
 
 // CHECK: vmovsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x10,0xc9]
@@ -5301,8 +5301,8 @@ vmovsd %xmm1, %xmm1, %xmm1 {%k2}
 vmovsd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmovss 256(%edx,%eax), %xmm1
-// CHECK: encoding: [0xc5,0xfa,0x10,0x8c,0x02,0x00,0x01,0x00,0x00]
-vmovss 256(%edx,%eax), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x10,0x4c,0x02,0x40]
+{evex} vmovss 256(%edx,%eax), %xmm1
 
 // CHECK: vmovss 256(%edx,%eax), %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x10,0x4c,0x02,0x40]
@@ -5313,12 +5313,12 @@ vmovss 256(%edx,%eax), %xmm1 {%k2}
 vmovss 256(%edx,%eax), %xmm1 {%k2} {z}
 
 // CHECK: vmovss -485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xfa,0x10,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vmovss -485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x10,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vmovss -485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vmovss 485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xfa,0x10,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vmovss 485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x10,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovss 485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vmovss -485498096(%edx,%eax,4), %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x10,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -5337,8 +5337,8 @@ vmovss -485498096(%edx,%eax,4), %xmm1 {%k2} {z}
 vmovss 485498096(%edx,%eax,4), %xmm1 {%k2} {z}
 
 // CHECK: vmovss 485498096(%edx), %xmm1
-// CHECK: encoding: [0xc5,0xfa,0x10,0x8a,0xf0,0x1c,0xf0,0x1c]
-vmovss 485498096(%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x10,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovss 485498096(%edx), %xmm1
 
 // CHECK: vmovss 485498096(%edx), %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x10,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -5349,8 +5349,8 @@ vmovss 485498096(%edx), %xmm1 {%k2}
 vmovss 485498096(%edx), %xmm1 {%k2} {z}
 
 // CHECK: vmovss 485498096, %xmm1
-// CHECK: encoding: [0xc5,0xfa,0x10,0x0d,0xf0,0x1c,0xf0,0x1c]
-vmovss 485498096, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x10,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovss 485498096, %xmm1
 
 // CHECK: vmovss 485498096, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x10,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -5361,8 +5361,8 @@ vmovss 485498096, %xmm1 {%k2}
 vmovss 485498096, %xmm1 {%k2} {z}
 
 // CHECK: vmovss (%edx), %xmm1
-// CHECK: encoding: [0xc5,0xfa,0x10,0x0a]
-vmovss (%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x10,0x0a]
+{evex} vmovss (%edx), %xmm1
 
 // CHECK: vmovss (%edx), %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x10,0x0a]
@@ -5373,8 +5373,8 @@ vmovss (%edx), %xmm1 {%k2}
 vmovss (%edx), %xmm1 {%k2} {z}
 
 // CHECK: vmovss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x11,0xc9]
-vmovss.s %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x11,0xc9]
+{evex} vmovss.s %xmm1, %xmm1, %xmm1
 
 // CHECK: vmovss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x11,0xc9]
@@ -5385,20 +5385,20 @@ vmovss.s %xmm1, %xmm1, %xmm1 {%k2}
 vmovss.s %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmovss %xmm1, 256(%edx,%eax)
-// CHECK: encoding: [0xc5,0xfa,0x11,0x8c,0x02,0x00,0x01,0x00,0x00]
-vmovss %xmm1, 256(%edx,%eax)
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x11,0x4c,0x02,0x40]
+{evex} vmovss %xmm1, 256(%edx,%eax)
 
 // CHECK: vmovss %xmm1, 256(%edx,%eax) {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x11,0x4c,0x02,0x40]
 vmovss %xmm1, 256(%edx,%eax) {%k2}
 
 // CHECK: vmovss %xmm1, -485498096(%edx,%eax,4)
-// CHECK: encoding: [0xc5,0xfa,0x11,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vmovss %xmm1, -485498096(%edx,%eax,4)
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x11,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vmovss %xmm1, -485498096(%edx,%eax,4)
 
 // CHECK: vmovss %xmm1, 485498096(%edx,%eax,4)
-// CHECK: encoding: [0xc5,0xfa,0x11,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vmovss %xmm1, 485498096(%edx,%eax,4)
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x11,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovss %xmm1, 485498096(%edx,%eax,4)
 
 // CHECK: vmovss %xmm1, -485498096(%edx,%eax,4) {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x11,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -5409,32 +5409,32 @@ vmovss %xmm1, -485498096(%edx,%eax,4) {%k2}
 vmovss %xmm1, 485498096(%edx,%eax,4) {%k2}
 
 // CHECK: vmovss %xmm1, 485498096(%edx)
-// CHECK: encoding: [0xc5,0xfa,0x11,0x8a,0xf0,0x1c,0xf0,0x1c]
-vmovss %xmm1, 485498096(%edx)
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x11,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vmovss %xmm1, 485498096(%edx)
 
 // CHECK: vmovss %xmm1, 485498096(%edx) {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x11,0x8a,0xf0,0x1c,0xf0,0x1c]
 vmovss %xmm1, 485498096(%edx) {%k2}
 
 // CHECK: vmovss %xmm1, 485498096
-// CHECK: encoding: [0xc5,0xfa,0x11,0x0d,0xf0,0x1c,0xf0,0x1c]
-vmovss %xmm1, 485498096
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x11,0x0d,0xf0,0x1c,0xf0,0x1c
+{evex} vmovss %xmm1, 485498096
 
 // CHECK: vmovss %xmm1, 485498096 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x11,0x0d,0xf0,0x1c,0xf0,0x1c]
 vmovss %xmm1, 485498096 {%k2}
 
 // CHECK: vmovss %xmm1, (%edx)
-// CHECK: encoding: [0xc5,0xfa,0x11,0x0a]
-vmovss %xmm1, (%edx)
+// CHECK: encoding: [0x62,0xf1,0x7e,0x08,0x11,0x0a]
+{evex} vmovss %xmm1, (%edx)
 
 // CHECK: vmovss %xmm1, (%edx) {%k2}
 // CHECK: encoding: [0x62,0xf1,0x7e,0x0a,0x11,0x0a]
 vmovss %xmm1, (%edx) {%k2}
 
 // CHECK: vmovss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x10,0xc9]
-vmovss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x10,0xc9]
+{evex} vmovss %xmm1, %xmm1, %xmm1
 
 // CHECK: vmovss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x10,0xc9]
@@ -5445,12 +5445,12 @@ vmovss %xmm1, %xmm1, %xmm1 {%k2}
 vmovss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulsd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x59,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vmulsd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x59,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vmulsd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vmulsd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x59,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vmulsd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x59,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vmulsd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vmulsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x59,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -5469,8 +5469,8 @@ vmulsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vmulsd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulsd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x59,0x8a,0xf0,0x1c,0xf0,0x1c]
-vmulsd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x59,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vmulsd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vmulsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x59,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -5481,8 +5481,8 @@ vmulsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vmulsd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulsd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x59,0x0d,0xf0,0x1c,0xf0,0x1c]
-vmulsd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x59,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vmulsd 485498096, %xmm1, %xmm1
 
 // CHECK: vmulsd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x59,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -5493,8 +5493,8 @@ vmulsd 485498096, %xmm1, %xmm1 {%k2}
 vmulsd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulsd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x59,0x8c,0x02,0x00,0x02,0x00,0x00]
-vmulsd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x59,0x4c,0x02,0x40]
+{evex} vmulsd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vmulsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x59,0x4c,0x02,0x40]
@@ -5505,8 +5505,8 @@ vmulsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vmulsd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulsd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x59,0x0a]
-vmulsd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x59,0x0a]
+{evex} vmulsd (%edx), %xmm1, %xmm1
 
 // CHECK: vmulsd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x59,0x0a]
@@ -5565,8 +5565,8 @@ vmulsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vmulsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x59,0xc9]
-vmulsd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x59,0xc9]
+{evex} vmulsd %xmm1, %xmm1, %xmm1
 
 // CHECK: vmulsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x59,0xc9]
@@ -5577,8 +5577,8 @@ vmulsd %xmm1, %xmm1, %xmm1 {%k2}
 vmulsd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x59,0x8c,0x02,0x00,0x01,0x00,0x00]
-vmulss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x59,0x4c,0x02,0x40]
+{evex} vmulss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vmulss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x59,0x4c,0x02,0x40]
@@ -5589,12 +5589,12 @@ vmulss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vmulss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x59,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vmulss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x59,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vmulss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vmulss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x59,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vmulss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x59,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vmulss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vmulss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x59,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -5613,8 +5613,8 @@ vmulss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vmulss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x59,0x8a,0xf0,0x1c,0xf0,0x1c]
-vmulss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x59,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vmulss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vmulss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x59,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -5625,8 +5625,8 @@ vmulss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vmulss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x59,0x0d,0xf0,0x1c,0xf0,0x1c]
-vmulss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x59,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vmulss 485498096, %xmm1, %xmm1
 
 // CHECK: vmulss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x59,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -5637,8 +5637,8 @@ vmulss 485498096, %xmm1, %xmm1 {%k2}
 vmulss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x59,0x0a]
-vmulss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x59,0x0a]
+{evex} vmulss (%edx), %xmm1, %xmm1
 
 // CHECK: vmulss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x59,0x0a]
@@ -5697,8 +5697,8 @@ vmulss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vmulss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vmulss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x59,0xc9]
-vmulss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x59,0xc9]
+{evex} vmulss %xmm1, %xmm1, %xmm1
 
 // CHECK: vmulss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x59,0xc9]
@@ -6501,12 +6501,12 @@ vscalefss %xmm1, %xmm1, %xmm1 {%k2}
 vscalefss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtsd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x51,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vsqrtsd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x51,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vsqrtsd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vsqrtsd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x51,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vsqrtsd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x51,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vsqrtsd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vsqrtsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x51,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -6525,8 +6525,8 @@ vsqrtsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vsqrtsd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtsd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x51,0x8a,0xf0,0x1c,0xf0,0x1c]
-vsqrtsd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x51,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vsqrtsd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vsqrtsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x51,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -6537,8 +6537,8 @@ vsqrtsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vsqrtsd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtsd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x51,0x0d,0xf0,0x1c,0xf0,0x1c]
-vsqrtsd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x51,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vsqrtsd 485498096, %xmm1, %xmm1
 
 // CHECK: vsqrtsd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x51,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -6549,8 +6549,8 @@ vsqrtsd 485498096, %xmm1, %xmm1 {%k2}
 vsqrtsd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtsd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x51,0x8c,0x02,0x00,0x02,0x00,0x00]
-vsqrtsd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x51,0x4c,0x02,0x40]
+{evex} vsqrtsd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vsqrtsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x51,0x4c,0x02,0x40]
@@ -6561,8 +6561,8 @@ vsqrtsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vsqrtsd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtsd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x51,0x0a]
-vsqrtsd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x51,0x0a]
+{evex} vsqrtsd (%edx), %xmm1, %xmm1
 
 // CHECK: vsqrtsd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x51,0x0a]
@@ -6621,8 +6621,8 @@ vsqrtsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vsqrtsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x51,0xc9]
-vsqrtsd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x51,0xc9]
+{evex} vsqrtsd %xmm1, %xmm1, %xmm1
 
 // CHECK: vsqrtsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x51,0xc9]
@@ -6633,8 +6633,8 @@ vsqrtsd %xmm1, %xmm1, %xmm1 {%k2}
 vsqrtsd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x51,0x8c,0x02,0x00,0x01,0x00,0x00]
-vsqrtss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x51,0x4c,0x02,0x40
+{evex} vsqrtss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vsqrtss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x51,0x4c,0x02,0x40]
@@ -6645,12 +6645,12 @@ vsqrtss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vsqrtss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x51,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vsqrtss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x51,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vsqrtss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vsqrtss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x51,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vsqrtss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x51,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vsqrtss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vsqrtss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x51,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -6669,8 +6669,8 @@ vsqrtss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vsqrtss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x51,0x8a,0xf0,0x1c,0xf0,0x1c]
-vsqrtss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x51,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vsqrtss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vsqrtss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x51,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -6681,8 +6681,8 @@ vsqrtss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vsqrtss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x51,0x0d,0xf0,0x1c,0xf0,0x1c]
-vsqrtss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x51,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vsqrtss 485498096, %xmm1, %xmm1
 
 // CHECK: vsqrtss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x51,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -6693,8 +6693,8 @@ vsqrtss 485498096, %xmm1, %xmm1 {%k2}
 vsqrtss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x51,0x0a]
-vsqrtss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x51,0x0a]
+{evex} vsqrtss (%edx), %xmm1, %xmm1
 
 // CHECK: vsqrtss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x51,0x0a]
@@ -6753,8 +6753,8 @@ vsqrtss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vsqrtss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsqrtss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x51,0xc9]
-vsqrtss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x51,0xc9]
+{evex} vsqrtss %xmm1, %xmm1, %xmm1
 
 // CHECK: vsqrtss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x51,0xc9]
@@ -6765,12 +6765,12 @@ vsqrtss %xmm1, %xmm1, %xmm1 {%k2}
 vsqrtss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubsd -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5c,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vsubsd -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5c,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vsubsd -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vsubsd 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5c,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vsubsd 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5c,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vsubsd 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vsubsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5c,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -6789,8 +6789,8 @@ vsubsd -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vsubsd 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubsd 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5c,0x8a,0xf0,0x1c,0xf0,0x1c]
-vsubsd 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5c,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vsubsd 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vsubsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5c,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -6801,8 +6801,8 @@ vsubsd 485498096(%edx), %xmm1, %xmm1 {%k2}
 vsubsd 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubsd 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5c,0x0d,0xf0,0x1c,0xf0,0x1c]
-vsubsd 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5c,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vsubsd 485498096, %xmm1, %xmm1
 
 // CHECK: vsubsd 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5c,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -6813,8 +6813,8 @@ vsubsd 485498096, %xmm1, %xmm1 {%k2}
 vsubsd 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubsd 512(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5c,0x8c,0x02,0x00,0x02,0x00,0x00]
-vsubsd 512(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5c,0x4c,0x02,0x40]
+{evex} vsubsd 512(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vsubsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5c,0x4c,0x02,0x40]
@@ -6825,8 +6825,8 @@ vsubsd 512(%edx,%eax), %xmm1, %xmm1 {%k2}
 vsubsd 512(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubsd (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5c,0x0a]
-vsubsd (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5c,0x0a]
+{evex} vsubsd (%edx), %xmm1, %xmm1
 
 // CHECK: vsubsd (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5c,0x0a]
@@ -6885,8 +6885,8 @@ vsubsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vsubsd {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubsd %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf3,0x5c,0xc9]
-vsubsd %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xf7,0x08,0x5c,0xc9]
+{evex} vsubsd %xmm1, %xmm1, %xmm1
 
 // CHECK: vsubsd %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0xf7,0x0a,0x5c,0xc9]
@@ -6897,8 +6897,8 @@ vsubsd %xmm1, %xmm1, %xmm1 {%k2}
 vsubsd %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubss 256(%edx,%eax), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5c,0x8c,0x02,0x00,0x01,0x00,0x00]
-vsubss 256(%edx,%eax), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5c,0x4c,0x02,0x40]
+{evex} vsubss 256(%edx,%eax), %xmm1, %xmm1
 
 // CHECK: vsubss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5c,0x4c,0x02,0x40]
@@ -6909,12 +6909,12 @@ vsubss 256(%edx,%eax), %xmm1, %xmm1 {%k2}
 vsubss 256(%edx,%eax), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubss -485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5c,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vsubss -485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5c,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vsubss -485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vsubss 485498096(%edx,%eax,4), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5c,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vsubss 485498096(%edx,%eax,4), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5c,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vsubss 485498096(%edx,%eax,4), %xmm1, %xmm1
 
 // CHECK: vsubss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5c,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
@@ -6933,8 +6933,8 @@ vsubss -485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 vsubss 485498096(%edx,%eax,4), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubss 485498096(%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5c,0x8a,0xf0,0x1c,0xf0,0x1c]
-vsubss 485498096(%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5c,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vsubss 485498096(%edx), %xmm1, %xmm1
 
 // CHECK: vsubss 485498096(%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5c,0x8a,0xf0,0x1c,0xf0,0x1c]
@@ -6945,8 +6945,8 @@ vsubss 485498096(%edx), %xmm1, %xmm1 {%k2}
 vsubss 485498096(%edx), %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubss 485498096, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5c,0x0d,0xf0,0x1c,0xf0,0x1c]
-vsubss 485498096, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5c,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vsubss 485498096, %xmm1, %xmm1
 
 // CHECK: vsubss 485498096, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5c,0x0d,0xf0,0x1c,0xf0,0x1c]
@@ -6957,8 +6957,8 @@ vsubss 485498096, %xmm1, %xmm1 {%k2}
 vsubss 485498096, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubss (%edx), %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5c,0x0a]
-vsubss (%edx), %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5c,0x0a]
+{evex} vsubss (%edx), %xmm1, %xmm1
 
 // CHECK: vsubss (%edx), %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5c,0x0a]
@@ -7017,8 +7017,8 @@ vsubss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2}
 vsubss {rz-sae}, %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vsubss %xmm1, %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf2,0x5c,0xc9]
-vsubss %xmm1, %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x76,0x08,0x5c,0xc9]
+{evex} vsubss %xmm1, %xmm1, %xmm1
 
 // CHECK: vsubss %xmm1, %xmm1, %xmm1 {%k2}
 // CHECK: encoding: [0x62,0xf1,0x76,0x0a,0x5c,0xc9]
@@ -7029,66 +7029,66 @@ vsubss %xmm1, %xmm1, %xmm1 {%k2}
 vsubss %xmm1, %xmm1, %xmm1 {%k2} {z}
 
 // CHECK: vucomisd -485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vucomisd -485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vucomisd -485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vucomisd 485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2e,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vucomisd 485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2e,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vucomisd 485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vucomisd 485498096(%edx), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2e,0x8a,0xf0,0x1c,0xf0,0x1c]
-vucomisd 485498096(%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2e,0x8a,0xf0,0x1c,0xf0,0x1c
+{evex} vucomisd 485498096(%edx), %xmm1
 
 // CHECK: vucomisd 485498096, %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2e,0x0d,0xf0,0x1c,0xf0,0x1c]
-vucomisd 485498096, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2e,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vucomisd 485498096, %xmm1
 
 // CHECK: vucomisd 512(%edx,%eax), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2e,0x8c,0x02,0x00,0x02,0x00,0x00]
-vucomisd 512(%edx,%eax), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2e,0x4c,0x02,0x40]
+{evex} vucomisd 512(%edx,%eax), %xmm1
 
 // CHECK: vucomisd (%edx), %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2e,0x0a]
-vucomisd (%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2e,0x0a]
+{evex} vucomisd (%edx), %xmm1
 
 // CHECK: vucomisd {sae}, %xmm1, %xmm1
 // CHECK: encoding: [0x62,0xf1,0xfd,0x18,0x2e,0xc9]
 vucomisd {sae}, %xmm1, %xmm1
 
 // CHECK: vucomisd %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf9,0x2e,0xc9]
-vucomisd %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0xfd,0x08,0x2e,0xc9]
+{evex} vucomisd %xmm1, %xmm1
 
 // CHECK: vucomiss 256(%edx,%eax), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2e,0x8c,0x02,0x00,0x01,0x00,0x00]
-vucomiss 256(%edx,%eax), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2e,0x4c,0x02,0x40]
+{evex} vucomiss 256(%edx,%eax), %xmm1
 
 // CHECK: vucomiss -485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
-vucomiss -485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2e,0x8c,0x82,0x10,0xe3,0x0f,0xe3]
+{evex} vucomiss -485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vucomiss 485498096(%edx,%eax,4), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2e,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
-vucomiss 485498096(%edx,%eax,4), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2e,0x8c,0x82,0xf0,0x1c,0xf0,0x1c]
+{evex} vucomiss 485498096(%edx,%eax,4), %xmm1
 
 // CHECK: vucomiss 485498096(%edx), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2e,0x8a,0xf0,0x1c,0xf0,0x1c]
-vucomiss 485498096(%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2e,0x8a,0xf0,0x1c,0xf0,0x1c]
+{evex} vucomiss 485498096(%edx), %xmm1
 
 // CHECK: vucomiss 485498096, %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2e,0x0d,0xf0,0x1c,0xf0,0x1c]
-vucomiss 485498096, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2e,0x0d,0xf0,0x1c,0xf0,0x1c]
+{evex} vucomiss 485498096, %xmm1
 
 // CHECK: vucomiss (%edx), %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2e,0x0a]
-vucomiss (%edx), %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2e,0x0a]
+{evex} vucomiss (%edx), %xmm1
 
 // CHECK: vucomiss {sae}, %xmm1, %xmm1
 // CHECK: encoding: [0x62,0xf1,0x7c,0x18,0x2e,0xc9]
 vucomiss {sae}, %xmm1, %xmm1
 
 // CHECK: vucomiss %xmm1, %xmm1
-// CHECK: encoding: [0xc5,0xf8,0x2e,0xc9]
-vucomiss %xmm1, %xmm1
+// CHECK: encoding: [0x62,0xf1,0x7c,0x08,0x2e,0xc9]
+{evex} vucomiss %xmm1, %xmm1
 

diff --git a/test/MC/X86/x86_errors.s b/test/MC/X86/x86_errors.s
index 74893a57d952d05e9d71526b3d80a1688974f3e4..c7d563bfda755e6f4aaa0c89da3f9df90cf2784b 100644 (file)
--- a/test/MC/X86/x86_errors.s
+++ b/test/MC/X86/x86_errors.s
@@ -167,3 +167,15 @@ cltq
 
 // 32: error: instruction requires: 64-bit mode
 cmpxchg16b (%eax)
+
+// 32: error: unsupported instruction
+// 64: error: unsupported instruction
+{vex2} vmovdqu32 %xmm0, %xmm0
+
+// 32: error: unsupported instruction
+// 64: error: unsupported instruction
+{vex3} vmovdqu32 %xmm0, %xmm0
+
+// 32: error: unsupported instruction
+// 64: error: unsupported instruction
+{evex} vmovdqu %xmm0, %xmm0