[llvm] [X86] Use loaded/stored element size when parsing/printing gather/scatter pointer size in Intel syntax. (PR #122530)

Craig Topper via llvm-commits llvm-commits at lists.llvm.org
Fri Jan 10 13:28:00 PST 2025


https://github.com/topperc created https://github.com/llvm/llvm-project/pull/122530

This matches binutils.

>From 82d50a9ae75902004b79453acfe6637c82ba6491 Mon Sep 17 00:00:00 2001
From: Craig Topper <craig.topper at sifive.com>
Date: Fri, 10 Jan 2025 11:33:10 -0800
Subject: [PATCH] [X86] Use loaded/stored element size when parsing/printing
 gather/scatter pointer size in Intel syntax.

This matches binutils.
---
 llvm/lib/Target/X86/AsmParser/X86Operand.h    |  46 +-
 llvm/lib/Target/X86/X86InstrAVX512.td         |  80 +-
 llvm/lib/Target/X86/X86InstrOperands.td       |  39 +-
 llvm/lib/Target/X86/X86InstrSSE.td            |  16 +-
 .../MC/Disassembler/X86/apx/evex-format.txt   |   2 +-
 .../test/MC/Disassembler/X86/intel-syntax.txt |   4 +-
 llvm/test/MC/X86/avx-64-intel.s               |  64 +-
 llvm/test/MC/X86/avx512-intel.s               | 448 ++++-----
 llvm/test/MC/X86/avx512f_vl-intel.s           | 896 +++++++++---------
 llvm/test/MC/X86/intel-syntax.s               |   2 +-
 llvm/utils/TableGen/X86RecognizableInstr.cpp  |  38 +-
 11 files changed, 808 insertions(+), 827 deletions(-)

diff --git a/llvm/lib/Target/X86/AsmParser/X86Operand.h b/llvm/lib/Target/X86/AsmParser/X86Operand.h
index 07a00af881afe0..d715fd1903802f 100644
--- a/llvm/lib/Target/X86/AsmParser/X86Operand.h
+++ b/llvm/lib/Target/X86/AsmParser/X86Operand.h
@@ -340,46 +340,38 @@ struct X86Operand final : public MCParsedAsmOperand {
     return Mem.IndexReg >= LowR && Mem.IndexReg <= HighR;
   }
 
+  bool isMem32_RC128() const {
+    return isMem32() && isMemIndexReg(X86::XMM0, X86::XMM15);
+  }
   bool isMem64_RC128() const {
     return isMem64() && isMemIndexReg(X86::XMM0, X86::XMM15);
   }
-  bool isMem128_RC128() const {
-    return isMem128() && isMemIndexReg(X86::XMM0, X86::XMM15);
-  }
-  bool isMem128_RC256() const {
-    return isMem128() && isMemIndexReg(X86::YMM0, X86::YMM15);
+  bool isMem32_RC256() const {
+    return isMem32() && isMemIndexReg(X86::YMM0, X86::YMM15);
   }
-  bool isMem256_RC128() const {
-    return isMem256() && isMemIndexReg(X86::XMM0, X86::XMM15);
-  }
-  bool isMem256_RC256() const {
-    return isMem256() && isMemIndexReg(X86::YMM0, X86::YMM15);
+  bool isMem64_RC256() const {
+    return isMem64() && isMemIndexReg(X86::YMM0, X86::YMM15);
   }
 
+  bool isMem32_RC128X() const {
+    return isMem32() && X86II::isXMMReg(Mem.IndexReg);
+  }
   bool isMem64_RC128X() const {
     return isMem64() && X86II::isXMMReg(Mem.IndexReg);
   }
-  bool isMem128_RC128X() const {
-    return isMem128() && X86II::isXMMReg(Mem.IndexReg);
+  bool isMem32_RC256X() const {
+    return isMem32() && X86II::isYMMReg(Mem.IndexReg);
   }
-  bool isMem128_RC256X() const {
-    return isMem128() && X86II::isYMMReg(Mem.IndexReg);
+  bool isMem64_RC256X() const {
+    return isMem64() && X86II::isYMMReg(Mem.IndexReg);
   }
-  bool isMem256_RC128X() const {
-    return isMem256() && X86II::isXMMReg(Mem.IndexReg);
+  bool isMem32_RC512() const {
+    return isMem32() && X86II::isZMMReg(Mem.IndexReg);
   }
-  bool isMem256_RC256X() const {
-    return isMem256() && X86II::isYMMReg(Mem.IndexReg);
-  }
-  bool isMem256_RC512() const {
-    return isMem256() && X86II::isZMMReg(Mem.IndexReg);
-  }
-  bool isMem512_RC256X() const {
-    return isMem512() && X86II::isYMMReg(Mem.IndexReg);
-  }
-  bool isMem512_RC512() const {
-    return isMem512() && X86II::isZMMReg(Mem.IndexReg);
+  bool isMem64_RC512() const {
+    return isMem64() && X86II::isZMMReg(Mem.IndexReg);
   }
+
   bool isMem512_GR16() const {
     if (!isMem512())
       return false;
diff --git a/llvm/lib/Target/X86/X86InstrAVX512.td b/llvm/lib/Target/X86/X86InstrAVX512.td
index d6ca4b142afe0a..d05c74a8ddf957 100644
--- a/llvm/lib/Target/X86/X86InstrAVX512.td
+++ b/llvm/lib/Target/X86/X86InstrAVX512.td
@@ -10279,36 +10279,36 @@ multiclass avx512_gather<bits<8> opc, string OpcodeStr, X86VectorVTInfo _,
 multiclass avx512_gather_q_pd<bits<8> dopc, bits<8> qopc,
                         AVX512VLVectorVTInfo _, string OpcodeStr, string SUFF> {
   defm NAME#D#SUFF#Z: avx512_gather<dopc, OpcodeStr#"d", _.info512,
-                                      vy512xmem>, EVEX_V512, REX_W;
+                                      vy64xmem>, EVEX_V512, REX_W;
   defm NAME#Q#SUFF#Z: avx512_gather<qopc, OpcodeStr#"q", _.info512,
-                                      vz512mem>, EVEX_V512, REX_W;
+                                      vz64mem>, EVEX_V512, REX_W;
 let Predicates = [HasVLX] in {
   defm NAME#D#SUFF#Z256: avx512_gather<dopc, OpcodeStr#"d", _.info256,
-                              vx256xmem>, EVEX_V256, REX_W;
+                              vx64xmem>, EVEX_V256, REX_W;
   defm NAME#Q#SUFF#Z256: avx512_gather<qopc, OpcodeStr#"q", _.info256,
-                              vy256xmem>, EVEX_V256, REX_W;
+                              vy64xmem>, EVEX_V256, REX_W;
   defm NAME#D#SUFF#Z128: avx512_gather<dopc, OpcodeStr#"d", _.info128,
-                              vx128xmem>, EVEX_V128, REX_W;
+                              vx64xmem>, EVEX_V128, REX_W;
   defm NAME#Q#SUFF#Z128: avx512_gather<qopc, OpcodeStr#"q", _.info128,
-                              vx128xmem>, EVEX_V128, REX_W;
+                              vx64xmem>, EVEX_V128, REX_W;
 }
 }
 
 multiclass avx512_gather_d_ps<bits<8> dopc, bits<8> qopc,
                        AVX512VLVectorVTInfo _, string OpcodeStr, string SUFF> {
-  defm NAME#D#SUFF#Z: avx512_gather<dopc, OpcodeStr#"d", _.info512, vz512mem>,
+  defm NAME#D#SUFF#Z: avx512_gather<dopc, OpcodeStr#"d", _.info512, vz32mem>,
                                        EVEX_V512;
-  defm NAME#Q#SUFF#Z: avx512_gather<qopc, OpcodeStr#"q", _.info256, vz256mem>,
+  defm NAME#Q#SUFF#Z: avx512_gather<qopc, OpcodeStr#"q", _.info256, vz32mem>,
                                        EVEX_V512;
 let Predicates = [HasVLX] in {
   defm NAME#D#SUFF#Z256: avx512_gather<dopc, OpcodeStr#"d", _.info256,
-                                          vy256xmem>, EVEX_V256;
+                                          vy32xmem>, EVEX_V256;
   defm NAME#Q#SUFF#Z256: avx512_gather<qopc, OpcodeStr#"q", _.info128,
-                                          vy128xmem>, EVEX_V256;
+                                          vy32xmem>, EVEX_V256;
   defm NAME#D#SUFF#Z128: avx512_gather<dopc, OpcodeStr#"d", _.info128,
-                                          vx128xmem>, EVEX_V128;
+                                          vx32xmem>, EVEX_V128;
   defm NAME#Q#SUFF#Z128: avx512_gather<qopc, OpcodeStr#"q", _.info128,
-                                          vx64xmem, VK2WM>, EVEX_V128;
+                                          vx32xmem, VK2WM>, EVEX_V128;
 }
 }
 
@@ -10336,36 +10336,36 @@ let mayStore = 1, Constraints = "$mask = $mask_wb", ExeDomain = _.ExeDomain,
 multiclass avx512_scatter_q_pd<bits<8> dopc, bits<8> qopc,
                         AVX512VLVectorVTInfo _, string OpcodeStr, string SUFF> {
   defm NAME#D#SUFF#Z: avx512_scatter<dopc, OpcodeStr#"d", _.info512,
-                                      vy512xmem>, EVEX_V512, REX_W;
+                                      vy64xmem>, EVEX_V512, REX_W;
   defm NAME#Q#SUFF#Z: avx512_scatter<qopc, OpcodeStr#"q", _.info512,
-                                      vz512mem>, EVEX_V512, REX_W;
+                                      vz64mem>, EVEX_V512, REX_W;
 let Predicates = [HasVLX] in {
   defm NAME#D#SUFF#Z256: avx512_scatter<dopc, OpcodeStr#"d", _.info256,
-                              vx256xmem>, EVEX_V256, REX_W;
+                              vx64xmem>, EVEX_V256, REX_W;
   defm NAME#Q#SUFF#Z256: avx512_scatter<qopc, OpcodeStr#"q", _.info256,
-                              vy256xmem>, EVEX_V256, REX_W;
+                              vy64xmem>, EVEX_V256, REX_W;
   defm NAME#D#SUFF#Z128: avx512_scatter<dopc, OpcodeStr#"d", _.info128,
-                              vx128xmem>, EVEX_V128, REX_W;
+                              vx64xmem>, EVEX_V128, REX_W;
   defm NAME#Q#SUFF#Z128: avx512_scatter<qopc, OpcodeStr#"q", _.info128,
-                              vx128xmem>, EVEX_V128, REX_W;
+                              vx64xmem>, EVEX_V128, REX_W;
 }
 }
 
 multiclass avx512_scatter_d_ps<bits<8> dopc, bits<8> qopc,
                        AVX512VLVectorVTInfo _, string OpcodeStr, string SUFF> {
-  defm NAME#D#SUFF#Z: avx512_scatter<dopc, OpcodeStr#"d", _.info512, vz512mem>,
+  defm NAME#D#SUFF#Z: avx512_scatter<dopc, OpcodeStr#"d", _.info512, vz32mem>,
                                        EVEX_V512;
-  defm NAME#Q#SUFF#Z: avx512_scatter<qopc, OpcodeStr#"q", _.info256, vz256mem>,
+  defm NAME#Q#SUFF#Z: avx512_scatter<qopc, OpcodeStr#"q", _.info256, vz32mem>,
                                        EVEX_V512;
 let Predicates = [HasVLX] in {
   defm NAME#D#SUFF#Z256: avx512_scatter<dopc, OpcodeStr#"d", _.info256,
-                                          vy256xmem>, EVEX_V256;
+                                          vy32xmem>, EVEX_V256;
   defm NAME#Q#SUFF#Z256: avx512_scatter<qopc, OpcodeStr#"q", _.info128,
-                                          vy128xmem>, EVEX_V256;
+                                          vy32xmem>, EVEX_V256;
   defm NAME#D#SUFF#Z128: avx512_scatter<dopc, OpcodeStr#"d", _.info128,
-                                          vx128xmem>, EVEX_V128;
+                                          vx32xmem>, EVEX_V128;
   defm NAME#Q#SUFF#Z128: avx512_scatter<qopc, OpcodeStr#"q", _.info128,
-                                          vx64xmem, VK2WM>, EVEX_V128;
+                                          vx32xmem, VK2WM>, EVEX_V128;
 }
 }
 
@@ -10385,52 +10385,52 @@ multiclass avx512_gather_scatter_prefetch<bits<8> opc, Format F, string OpcodeSt
 }
 
 defm VGATHERPF0DPS: avx512_gather_scatter_prefetch<0xC6, MRM1m, "vgatherpf0dps",
-                     VK16WM, vz512mem>, EVEX_V512, EVEX_CD8<32, CD8VT1>;
+                     VK16WM, vz32mem>, EVEX_V512, EVEX_CD8<32, CD8VT1>;
 
 defm VGATHERPF0QPS: avx512_gather_scatter_prefetch<0xC7, MRM1m, "vgatherpf0qps",
-                     VK8WM, vz256mem>, EVEX_V512, EVEX_CD8<64, CD8VT1>;
+                     VK8WM, vz32mem>, EVEX_V512, EVEX_CD8<64, CD8VT1>;
 
 defm VGATHERPF0DPD: avx512_gather_scatter_prefetch<0xC6, MRM1m, "vgatherpf0dpd",
-                     VK8WM, vy512xmem>, EVEX_V512, REX_W, EVEX_CD8<32, CD8VT1>;
+                     VK8WM, vy64xmem>, EVEX_V512, REX_W, EVEX_CD8<32, CD8VT1>;
 
 defm VGATHERPF0QPD: avx512_gather_scatter_prefetch<0xC7, MRM1m, "vgatherpf0qpd",
-                     VK8WM, vz512mem>, EVEX_V512, REX_W, EVEX_CD8<64, CD8VT1>;
+                     VK8WM, vz64mem>, EVEX_V512, REX_W, EVEX_CD8<64, CD8VT1>;
 
 defm VGATHERPF1DPS: avx512_gather_scatter_prefetch<0xC6, MRM2m, "vgatherpf1dps",
-                     VK16WM, vz512mem>, EVEX_V512, EVEX_CD8<32, CD8VT1>;
+                     VK16WM, vz32mem>, EVEX_V512, EVEX_CD8<32, CD8VT1>;
 
 defm VGATHERPF1QPS: avx512_gather_scatter_prefetch<0xC7, MRM2m, "vgatherpf1qps",
-                     VK8WM, vz256mem>, EVEX_V512, EVEX_CD8<64, CD8VT1>;
+                     VK8WM, vz32mem>, EVEX_V512, EVEX_CD8<64, CD8VT1>;
 
 defm VGATHERPF1DPD: avx512_gather_scatter_prefetch<0xC6, MRM2m, "vgatherpf1dpd",
-                     VK8WM, vy512xmem>, EVEX_V512, REX_W, EVEX_CD8<32, CD8VT1>;
+                     VK8WM, vy64xmem>, EVEX_V512, REX_W, EVEX_CD8<32, CD8VT1>;
 
 defm VGATHERPF1QPD: avx512_gather_scatter_prefetch<0xC7, MRM2m, "vgatherpf1qpd",
-                     VK8WM, vz512mem>, EVEX_V512, REX_W, EVEX_CD8<64, CD8VT1>;
+                     VK8WM, vz64mem>, EVEX_V512, REX_W, EVEX_CD8<64, CD8VT1>;
 
 defm VSCATTERPF0DPS: avx512_gather_scatter_prefetch<0xC6, MRM5m, "vscatterpf0dps",
-                     VK16WM, vz512mem>, EVEX_V512, EVEX_CD8<32, CD8VT1>;
+                     VK16WM, vz32mem>, EVEX_V512, EVEX_CD8<32, CD8VT1>;
 
 defm VSCATTERPF0QPS: avx512_gather_scatter_prefetch<0xC7, MRM5m, "vscatterpf0qps",
-                     VK8WM, vz256mem>, EVEX_V512, EVEX_CD8<64, CD8VT1>;
+                     VK8WM, vz32mem>, EVEX_V512, EVEX_CD8<64, CD8VT1>;
 
 defm VSCATTERPF0DPD: avx512_gather_scatter_prefetch<0xC6, MRM5m, "vscatterpf0dpd",
-                     VK8WM, vy512xmem>, EVEX_V512, REX_W, EVEX_CD8<32, CD8VT1>;
+                     VK8WM, vy64xmem>, EVEX_V512, REX_W, EVEX_CD8<32, CD8VT1>;
 
 defm VSCATTERPF0QPD: avx512_gather_scatter_prefetch<0xC7, MRM5m, "vscatterpf0qpd",
-                     VK8WM, vz512mem>, EVEX_V512, REX_W, EVEX_CD8<64, CD8VT1>;
+                     VK8WM, vz64mem>, EVEX_V512, REX_W, EVEX_CD8<64, CD8VT1>;
 
 defm VSCATTERPF1DPS: avx512_gather_scatter_prefetch<0xC6, MRM6m, "vscatterpf1dps",
-                     VK16WM, vz512mem>, EVEX_V512, EVEX_CD8<32, CD8VT1>;
+                     VK16WM, vz32mem>, EVEX_V512, EVEX_CD8<32, CD8VT1>;
 
 defm VSCATTERPF1QPS: avx512_gather_scatter_prefetch<0xC7, MRM6m, "vscatterpf1qps",
-                     VK8WM, vz256mem>, EVEX_V512, EVEX_CD8<64, CD8VT1>;
+                     VK8WM, vz32mem>, EVEX_V512, EVEX_CD8<64, CD8VT1>;
 
 defm VSCATTERPF1DPD: avx512_gather_scatter_prefetch<0xC6, MRM6m, "vscatterpf1dpd",
-                     VK8WM, vy512xmem>, EVEX_V512, REX_W, EVEX_CD8<32, CD8VT1>;
+                     VK8WM, vy64xmem>, EVEX_V512, REX_W, EVEX_CD8<32, CD8VT1>;
 
 defm VSCATTERPF1QPD: avx512_gather_scatter_prefetch<0xC7, MRM6m, "vscatterpf1qpd",
-                     VK8WM, vz512mem>, EVEX_V512, REX_W, EVEX_CD8<64, CD8VT1>;
+                     VK8WM, vz64mem>, EVEX_V512, REX_W, EVEX_CD8<64, CD8VT1>;
 
 multiclass cvt_by_vec_width<bits<8> opc, X86VectorVTInfo Vec, string OpcodeStr, SchedWrite Sched> {
 def rk : AVX512XS8I<opc, MRMSrcReg, (outs Vec.RC:$dst), (ins Vec.KRC:$src),
diff --git a/llvm/lib/Target/X86/X86InstrOperands.td b/llvm/lib/Target/X86/X86InstrOperands.td
index 2102cb4b6b5b73..4f427d6d9d72ea 100644
--- a/llvm/lib/Target/X86/X86InstrOperands.td
+++ b/llvm/lib/Target/X86/X86InstrOperands.td
@@ -25,20 +25,18 @@ let RenderMethod = "addMemOperands", SuperClasses = [X86MemAsmOperand] in {
   def X86Mem256AsmOperand : AsmOperandClass { let Name = "Mem256"; }
   def X86Mem512AsmOperand : AsmOperandClass { let Name = "Mem512"; }
   // Gather mem operands
+  def X86Mem32_RC128Operand  : AsmOperandClass { let Name = "Mem32_RC128"; }
   def X86Mem64_RC128Operand  : AsmOperandClass { let Name = "Mem64_RC128"; }
-  def X86Mem128_RC128Operand : AsmOperandClass { let Name = "Mem128_RC128"; }
-  def X86Mem256_RC128Operand : AsmOperandClass { let Name = "Mem256_RC128"; }
-  def X86Mem128_RC256Operand : AsmOperandClass { let Name = "Mem128_RC256"; }
-  def X86Mem256_RC256Operand : AsmOperandClass { let Name = "Mem256_RC256"; }
+  def X86Mem32_RC256Operand  : AsmOperandClass { let Name = "Mem32_RC256"; }
+  def X86Mem64_RC256Operand  : AsmOperandClass { let Name = "Mem64_RC256"; }
 
+  def X86Mem32_RC128XOperand  : AsmOperandClass { let Name = "Mem32_RC128X"; }
   def X86Mem64_RC128XOperand  : AsmOperandClass { let Name = "Mem64_RC128X"; }
-  def X86Mem128_RC128XOperand : AsmOperandClass { let Name = "Mem128_RC128X"; }
-  def X86Mem256_RC128XOperand : AsmOperandClass { let Name = "Mem256_RC128X"; }
-  def X86Mem128_RC256XOperand : AsmOperandClass { let Name = "Mem128_RC256X"; }
-  def X86Mem256_RC256XOperand : AsmOperandClass { let Name = "Mem256_RC256X"; }
-  def X86Mem512_RC256XOperand : AsmOperandClass { let Name = "Mem512_RC256X"; }
-  def X86Mem256_RC512Operand  : AsmOperandClass { let Name = "Mem256_RC512"; }
-  def X86Mem512_RC512Operand  : AsmOperandClass { let Name = "Mem512_RC512"; }
+  def X86Mem32_RC256XOperand  : AsmOperandClass { let Name = "Mem32_RC256X"; }
+  def X86Mem64_RC256XOperand  : AsmOperandClass { let Name = "Mem64_RC256X"; }
+  def X86Mem32_RC512Operand   : AsmOperandClass { let Name = "Mem32_RC512"; }
+  def X86Mem64_RC512Operand   : AsmOperandClass { let Name = "Mem64_RC512"; }
+
   def X86Mem512_GR16Operand : AsmOperandClass { let Name = "Mem512_GR16"; }
   def X86Mem512_GR32Operand : AsmOperandClass { let Name = "Mem512_GR32"; }
   def X86Mem512_GR64Operand : AsmOperandClass { let Name = "Mem512_GR64"; }
@@ -97,20 +95,17 @@ def i512mem_GR32 : X86MemOperand<"printzmmwordmem", X86Mem512_GR32Operand, 512>;
 def i512mem_GR64 : X86MemOperand<"printzmmwordmem", X86Mem512_GR64Operand, 512>;
 
 // Gather mem operands
+def vx32mem  : X86VMemOperand<VR128,  "printdwordmem",  X86Mem32_RC128Operand, 32>;
 def vx64mem  : X86VMemOperand<VR128,  "printqwordmem",  X86Mem64_RC128Operand, 64>;
-def vx128mem : X86VMemOperand<VR128,  "printxmmwordmem", X86Mem128_RC128Operand, 128>;
-def vx256mem : X86VMemOperand<VR128,  "printymmwordmem", X86Mem256_RC128Operand, 256>;
-def vy128mem : X86VMemOperand<VR256,  "printxmmwordmem", X86Mem128_RC256Operand, 128>;
-def vy256mem : X86VMemOperand<VR256,  "printymmwordmem", X86Mem256_RC256Operand, 256>;
+def vy32mem  : X86VMemOperand<VR256,  "printdwordmem",  X86Mem32_RC256Operand, 32>;
+def vy64mem  : X86VMemOperand<VR256,  "printqwordmem",  X86Mem64_RC256Operand, 64>;
 
+def vx32xmem  : X86VMemOperand<VR128X, "printdwordmem",  X86Mem32_RC128XOperand, 32>;
 def vx64xmem  : X86VMemOperand<VR128X, "printqwordmem",  X86Mem64_RC128XOperand, 64>;
-def vx128xmem : X86VMemOperand<VR128X, "printxmmwordmem", X86Mem128_RC128XOperand, 128>;
-def vx256xmem : X86VMemOperand<VR128X, "printymmwordmem", X86Mem256_RC128XOperand, 256>;
-def vy128xmem : X86VMemOperand<VR256X, "printxmmwordmem", X86Mem128_RC256XOperand, 128>;
-def vy256xmem : X86VMemOperand<VR256X, "printymmwordmem", X86Mem256_RC256XOperand, 256>;
-def vy512xmem : X86VMemOperand<VR256X, "printzmmwordmem", X86Mem512_RC256XOperand, 512>;
-def vz256mem  : X86VMemOperand<VR512,  "printymmwordmem", X86Mem256_RC512Operand, 256>;
-def vz512mem  : X86VMemOperand<VR512,  "printzmmwordmem", X86Mem512_RC512Operand, 512>;
+def vy32xmem  : X86VMemOperand<VR256X, "printdwordmem",  X86Mem32_RC256XOperand, 32>;
+def vy64xmem  : X86VMemOperand<VR256X, "printqwordmem",  X86Mem64_RC256XOperand, 64>;
+def vz32mem   : X86VMemOperand<VR512,  "printdwordmem",  X86Mem32_RC512Operand,  32>;
+def vz64mem   : X86VMemOperand<VR512,  "printqwordmem",  X86Mem64_RC512Operand,  64>;
 
 def shmem : X86MemOperand<"printwordmem", X86Mem16AsmOperand>;
 def ssmem : X86MemOperand<"printdwordmem", X86Mem32AsmOperand>;
diff --git a/llvm/lib/Target/X86/X86InstrSSE.td b/llvm/lib/Target/X86/X86InstrSSE.td
index 036d7d92f3f89e..6aadb788c851ed 100644
--- a/llvm/lib/Target/X86/X86InstrSSE.td
+++ b/llvm/lib/Target/X86/X86InstrSSE.td
@@ -8078,26 +8078,26 @@ let Predicates = [HasAVX2] in {
     = "@earlyclobber $dst, at earlyclobber $mask_wb, $src1 = $dst, $mask = $mask_wb"
     in {
     defm VPGATHERDQ : avx2_gather<0x90, "vpgatherdq",
-                                  VR256, vx128mem, vx256mem>, REX_W;
+                                  VR256, vx64mem, vx64mem>, REX_W;
     defm VPGATHERQQ : avx2_gather<0x91, "vpgatherqq",
-                                  VR256, vx128mem, vy256mem>, REX_W;
+                                  VR256, vx64mem, vy64mem>, REX_W;
     defm VPGATHERDD : avx2_gather<0x90, "vpgatherdd",
-                                  VR256, vx128mem, vy256mem>;
+                                  VR256, vx32mem, vy32mem>;
     defm VPGATHERQD : avx2_gather<0x91, "vpgatherqd",
-                                  VR128, vx64mem, vy128mem>;
+                                  VR128, vx32mem, vy32mem>;
 
     let ExeDomain = SSEPackedDouble in {
       defm VGATHERDPD : avx2_gather<0x92, "vgatherdpd",
-                                    VR256, vx128mem, vx256mem>, REX_W;
+                                    VR256, vx64mem, vx64mem>, REX_W;
       defm VGATHERQPD : avx2_gather<0x93, "vgatherqpd",
-                                    VR256, vx128mem, vy256mem>, REX_W;
+                                    VR256, vx64mem, vy64mem>, REX_W;
     }
 
     let ExeDomain = SSEPackedSingle in {
       defm VGATHERDPS : avx2_gather<0x92, "vgatherdps",
-                                    VR256, vx128mem, vy256mem>;
+                                    VR256, vx32mem, vy32mem>;
       defm VGATHERQPS : avx2_gather<0x93, "vgatherqps",
-                                    VR128, vx64mem, vy128mem>;
+                                    VR128, vx32mem, vy32mem>;
     }
   }
 }
diff --git a/llvm/test/MC/Disassembler/X86/apx/evex-format.txt b/llvm/test/MC/Disassembler/X86/apx/evex-format.txt
index e9a9f1327a17eb..53ae3b8b73ab47 100644
--- a/llvm/test/MC/Disassembler/X86/apx/evex-format.txt
+++ b/llvm/test/MC/Disassembler/X86/apx/evex-format.txt
@@ -90,7 +90,7 @@
 ## MRM5m
 
 # ATT:   vscatterpf0dps	(%r16,%zmm0) {%k1}
-# INTEL: vscatterpf0dps	{k1}, zmmword ptr [r16 + zmm0]
+# INTEL: vscatterpf0dps	{k1}, dword ptr [r16 + zmm0]
 0x62,0xfa,0x7d,0x49,0xc6,0x2c,0x00
 
 # ATT:   subq	$127, 123(%r16), %r17
diff --git a/llvm/test/MC/Disassembler/X86/intel-syntax.txt b/llvm/test/MC/Disassembler/X86/intel-syntax.txt
index c7c0fce268cd2d..f9284ab3884415 100644
--- a/llvm/test/MC/Disassembler/X86/intel-syntax.txt
+++ b/llvm/test/MC/Disassembler/X86/intel-syntax.txt
@@ -108,10 +108,10 @@
 # CHECK: vshufpd xmm0, xmm1, xmm2, 1
 0xc5 0xf1 0xc6 0xc2 0x01
 
-# CHECK: vpgatherqq ymm2, ymmword ptr [rdi + 2*ymm1], ymm0
+# CHECK: vpgatherqq ymm2, qword ptr [rdi + 2*ymm1], ymm0
 0xc4 0xe2 0xfd 0x91 0x14 0x4f
 
-# CHECK: vpgatherdd xmm10, xmmword ptr [r15 + 2*xmm9], xmm8
+# CHECK: vpgatherdd xmm10, dword ptr [r15 + 2*xmm9], xmm8
 0xc4 0x02 0x39 0x90 0x14 0x4f
 
 # CHECK: xsave64 [rax]
diff --git a/llvm/test/MC/X86/avx-64-intel.s b/llvm/test/MC/X86/avx-64-intel.s
index c1f20d204a8c42..392f6e99284279 100644
--- a/llvm/test/MC/X86/avx-64-intel.s
+++ b/llvm/test/MC/X86/avx-64-intel.s
@@ -1,68 +1,68 @@
 // RUN: llvm-mc -triple x86_64-unknown-unknown -x86-asm-syntax=intel -output-asm-variant=1 --show-encoding %s | FileCheck %s
 
-// CHECK: vgatherdpd    xmm2, xmmword ptr [rdi + 2*xmm1], xmm0 
+// CHECK: vgatherdpd    xmm2, qword ptr [rdi + 2*xmm1], xmm0 
 // CHECK: encoding: [0xc4,0xe2,0xf9,0x92,0x14,0x4f]
-          vgatherdpd    xmm2, xmmword ptr [rdi + 2*xmm1], xmm0 
+          vgatherdpd    xmm2, qword ptr [rdi + 2*xmm1], xmm0 
 
-// CHECK: vgatherqpd    xmm2, xmmword ptr [rdi + 2*xmm1], xmm0 
+// CHECK: vgatherqpd    xmm2, qword ptr [rdi + 2*xmm1], xmm0 
 // CHECK: encoding: [0xc4,0xe2,0xf9,0x93,0x14,0x4f]
-          vgatherqpd    xmm2, xmmword ptr [rdi + 2*xmm1], xmm0 
+          vgatherqpd    xmm2, qword ptr [rdi + 2*xmm1], xmm0 
 
-// CHECK: vgatherdpd    ymm2, ymmword ptr [rdi + 2*xmm1], ymm0 
+// CHECK: vgatherdpd    ymm2, qword ptr [rdi + 2*xmm1], ymm0 
 // CHECK: encoding: [0xc4,0xe2,0xfd,0x92,0x14,0x4f]
-          vgatherdpd    ymm2, ymmword ptr [rdi + 2*xmm1], ymm0 
+          vgatherdpd    ymm2, qword ptr [rdi + 2*xmm1], ymm0 
 
-// CHECK: vgatherqpd    ymm2, ymmword ptr [rdi + 2*ymm1], ymm0 
+// CHECK: vgatherqpd    ymm2, qword ptr [rdi + 2*ymm1], ymm0 
 // CHECK: encoding: [0xc4,0xe2,0xfd,0x93,0x14,0x4f]
-          vgatherqpd    ymm2, ymmword ptr [rdi + 2*ymm1], ymm0 
+          vgatherqpd    ymm2, qword ptr [rdi + 2*ymm1], ymm0 
 
-// CHECK: vgatherdps    xmm10, xmmword ptr [r15 + 2*xmm9], xmm8 
+// CHECK: vgatherdps    xmm10, dword ptr [r15 + 2*xmm9], xmm8 
 // CHECK: encoding: [0xc4,0x02,0x39,0x92,0x14,0x4f]
-          vgatherdps    xmm10, xmmword ptr [r15 + 2*xmm9], xmm8 
+          vgatherdps    xmm10, dword ptr [r15 + 2*xmm9], xmm8 
 
-// CHECK: vgatherqps    xmm10, qword ptr [r15 + 2*xmm9], xmm8 
+// CHECK: vgatherqps    xmm10, dword ptr [r15 + 2*xmm9], xmm8 
 // CHECK: encoding: [0xc4,0x02,0x39,0x93,0x14,0x4f]
-          vgatherqps    xmm10, qword ptr [r15 + 2*xmm9], xmm8 
+          vgatherqps    xmm10, dword ptr [r15 + 2*xmm9], xmm8 
 
-// CHECK: vgatherdps    ymm10, ymmword ptr [r15 + 2*ymm9], ymm8 
+// CHECK: vgatherdps    ymm10, dword ptr [r15 + 2*ymm9], ymm8 
 // CHECK: encoding: [0xc4,0x02,0x3d,0x92,0x14,0x4f]
-          vgatherdps    ymm10, ymmword ptr [r15 + 2*ymm9], ymm8 
+          vgatherdps    ymm10, dword ptr [r15 + 2*ymm9], ymm8 
 
-// CHECK: vgatherqps    xmm10, xmmword ptr [r15 + 2*ymm9], xmm8 
+// CHECK: vgatherqps    xmm10, dword ptr [r15 + 2*ymm9], xmm8 
 // CHECK: encoding: [0xc4,0x02,0x3d,0x93,0x14,0x4f]
-          vgatherqps    xmm10, xmmword ptr [r15 + 2*ymm9], xmm8 
+          vgatherqps    xmm10, dword ptr [r15 + 2*ymm9], xmm8 
 
-// CHECK: vpgatherdq    xmm2, xmmword ptr [rdi + 2*xmm1], xmm0 
+// CHECK: vpgatherdq    xmm2, qword ptr [rdi + 2*xmm1], xmm0 
 // CHECK: encoding: [0xc4,0xe2,0xf9,0x90,0x14,0x4f]
-          vpgatherdq    xmm2, xmmword ptr [rdi + 2*xmm1], xmm0 
+          vpgatherdq    xmm2, qword ptr [rdi + 2*xmm1], xmm0 
 
-// CHECK: vpgatherqq    xmm2, xmmword ptr [rdi + 2*xmm1], xmm0 
+// CHECK: vpgatherqq    xmm2, qword ptr [rdi + 2*xmm1], xmm0 
 // CHECK: encoding: [0xc4,0xe2,0xf9,0x91,0x14,0x4f]
-          vpgatherqq    xmm2, xmmword ptr [rdi + 2*xmm1], xmm0 
+          vpgatherqq    xmm2, qword ptr [rdi + 2*xmm1], xmm0 
 
-// CHECK: vpgatherdq    ymm2, ymmword ptr [rdi + 2*xmm1], ymm0 
+// CHECK: vpgatherdq    ymm2, qword ptr [rdi + 2*xmm1], ymm0 
 // CHECK: encoding: [0xc4,0xe2,0xfd,0x90,0x14,0x4f]
-          vpgatherdq    ymm2, ymmword ptr [rdi + 2*xmm1], ymm0 
+          vpgatherdq    ymm2, qword ptr [rdi + 2*xmm1], ymm0 
 
-// CHECK: vpgatherqq    ymm2, ymmword ptr [rdi + 2*ymm1], ymm0 
+// CHECK: vpgatherqq    ymm2, qword ptr [rdi + 2*ymm1], ymm0 
 // CHECK: encoding: [0xc4,0xe2,0xfd,0x91,0x14,0x4f]
-          vpgatherqq    ymm2, ymmword ptr [rdi + 2*ymm1], ymm0 
+          vpgatherqq    ymm2, qword ptr [rdi + 2*ymm1], ymm0 
 
-// CHECK: vpgatherdd    xmm10, xmmword ptr [r15 + 2*xmm9], xmm8 
+// CHECK: vpgatherdd    xmm10, dword ptr [r15 + 2*xmm9], xmm8 
 // CHECK: encoding: [0xc4,0x02,0x39,0x90,0x14,0x4f]
-          vpgatherdd    xmm10, xmmword ptr [r15 + 2*xmm9], xmm8 
+          vpgatherdd    xmm10, dword ptr [r15 + 2*xmm9], xmm8 
 
-// CHECK: vpgatherqd    xmm10, qword ptr [r15 + 2*xmm9], xmm8 
+// CHECK: vpgatherqd    xmm10, dword ptr [r15 + 2*xmm9], xmm8 
 // CHECK: encoding: [0xc4,0x02,0x39,0x91,0x14,0x4f]
-          vpgatherqd    xmm10, qword ptr [r15 + 2*xmm9], xmm8 
+          vpgatherqd    xmm10, dword ptr [r15 + 2*xmm9], xmm8 
 
-// CHECK: vpgatherdd    ymm10, ymmword ptr [r15 + 2*ymm9], ymm8 
+// CHECK: vpgatherdd    ymm10, dword ptr [r15 + 2*ymm9], ymm8 
 // CHECK: encoding: [0xc4,0x02,0x3d,0x90,0x14,0x4f]
-          vpgatherdd    ymm10, ymmword ptr [r15 + 2*ymm9], ymm8 
+          vpgatherdd    ymm10, dword ptr [r15 + 2*ymm9], ymm8 
 
-// CHECK: vpgatherqd    xmm10, xmmword ptr [r15 + 2*ymm9], xmm8 
+// CHECK: vpgatherqd    xmm10, dword ptr [r15 + 2*ymm9], xmm8 
 // CHECK: encoding: [0xc4,0x02,0x3d,0x91,0x14,0x4f]
-          vpgatherqd    xmm10, xmmword ptr [r15 + 2*ymm9], xmm8 
+          vpgatherqd    xmm10, dword ptr [r15 + 2*ymm9], xmm8 
 
 // CHECK: vcvtpd2ps xmm0, xmm15 
 // CHECK: encoding: [0xc4,0xc1,0x79,0x5a,0xc7]
diff --git a/llvm/test/MC/X86/avx512-intel.s b/llvm/test/MC/X86/avx512-intel.s
index d8ad3c44261762..1cbf21c7eb1b04 100644
--- a/llvm/test/MC/X86/avx512-intel.s
+++ b/llvm/test/MC/X86/avx512-intel.s
@@ -37900,450 +37900,450 @@ vaddpd zmm1, zmm1, zmm2, {rz-sae}
 // CHECK:  encoding: [0x62,0xe2,0xa5,0x50,0x77,0xaa,0xf8,0xfb,0xff,0xff]
           vpermi2pd zmm21, zmm27, qword ptr [rdx - 1032]{1to8}
 
-// CHECK: vgatherdpd zmm6 {k1}, zmmword ptr [r14 + 8*ymm16 + 123]
+// CHECK: vgatherdpd zmm6 {k1}, qword ptr [r14 + 8*ymm16 + 123]
 // CHECK:  encoding: [0x62,0xd2,0xfd,0x41,0x92,0xb4,0xc6,0x7b,0x00,0x00,0x00]
-          vgatherdpd zmm6 {k1},ZMMWORD PTR [r14+ymm16*8+0x7b]
+          vgatherdpd zmm6 {k1},QWORD PTR [r14+ymm16*8+0x7b]
 
-// CHECK: vgatherdpd zmm6 {k1}, zmmword ptr [r9 + ymm16 + 256]
+// CHECK: vgatherdpd zmm6 {k1}, qword ptr [r9 + ymm16 + 256]
 // CHECK:  encoding: [0x62,0xd2,0xfd,0x41,0x92,0x74,0x01,0x20]
-          vgatherdpd zmm6{k1},ZMMWORD PTR [r9+ymm16*1+0x100]
+          vgatherdpd zmm6{k1},QWORD PTR [r9+ymm16*1+0x100]
 
-// CHECK: vgatherdpd zmm6 {k1}, zmmword ptr [rcx + 4*ymm16 + 1024]
+// CHECK: vgatherdpd zmm6 {k1}, qword ptr [rcx + 4*ymm16 + 1024]
 // CHECK:  encoding: [0x62,0xf2,0xfd,0x41,0x92,0xb4,0x81,0x00,0x04,0x00,0x00]
-          vgatherdpd zmm6{k1},ZMMWORD PTR [rcx+ymm16*4+0x400]
+          vgatherdpd zmm6{k1},QWORD PTR [rcx+ymm16*4+0x400]
 
-// CHECK: vgatherdps zmm9 {k1}, zmmword ptr [r14 + 8*zmm19 + 123]
+// CHECK: vgatherdps zmm9 {k1}, dword ptr [r14 + 8*zmm19 + 123]
 // CHECK:  encoding: [0x62,0x52,0x7d,0x41,0x92,0x8c,0xde,0x7b,0x00,0x00,0x00]
-          vgatherdps zmm9{k1},ZMMWORD PTR [r14+zmm19*8+0x7b]
+          vgatherdps zmm9{k1},DWORD PTR [r14+zmm19*8+0x7b]
 
-// CHECK: vgatherdps zmm9 {k1}, zmmword ptr [r9 + zmm19 + 256]
+// CHECK: vgatherdps zmm9 {k1}, dword ptr [r9 + zmm19 + 256]
 // CHECK:  encoding: [0x62,0x52,0x7d,0x41,0x92,0x4c,0x19,0x40]
-          vgatherdps zmm9{k1},ZMMWORD PTR [r9+zmm19*1+0x100]
+          vgatherdps zmm9{k1},DWORD PTR [r9+zmm19*1+0x100]
 
-// CHECK: vgatherdps zmm9 {k1}, zmmword ptr [rcx + 4*zmm19 + 1024]
+// CHECK: vgatherdps zmm9 {k1}, dword ptr [rcx + 4*zmm19 + 1024]
 // CHECK:  encoding: [0x62,0x72,0x7d,0x41,0x92,0x8c,0x99,0x00,0x04,0x00,0x00]
-          vgatherdps zmm9{k1},ZMMWORD PTR [rcx+zmm19*4+0x400]
+          vgatherdps zmm9{k1},DWORD PTR [rcx+zmm19*4+0x400]
 
-// CHECK: vgatherqpd zmm29 {k1}, zmmword ptr [r14 + 8*zmm2 + 123]
+// CHECK: vgatherqpd zmm29 {k1}, qword ptr [r14 + 8*zmm2 + 123]
 // CHECK:  encoding: [0x62,0x42,0xfd,0x49,0x93,0xac,0xd6,0x7b,0x00,0x00,0x00]
-          vgatherqpd zmm29{k1},ZMMWORD PTR [r14+zmm2*8+0x7b]
+          vgatherqpd zmm29{k1},QWORD PTR [r14+zmm2*8+0x7b]
 
-// CHECK: vgatherqpd zmm29 {k1}, zmmword ptr [r9 + zmm2 + 256]
+// CHECK: vgatherqpd zmm29 {k1}, qword ptr [r9 + zmm2 + 256]
 // CHECK:  encoding: [0x62,0x42,0xfd,0x49,0x93,0x6c,0x11,0x20]
-          vgatherqpd zmm29{k1},ZMMWORD PTR [r9+zmm2*1+0x100]
+          vgatherqpd zmm29{k1},QWORD PTR [r9+zmm2*1+0x100]
 
-// CHECK: vgatherqpd zmm29 {k1}, zmmword ptr [rcx + 4*zmm2 + 1024]
+// CHECK: vgatherqpd zmm29 {k1}, qword ptr [rcx + 4*zmm2 + 1024]
 // CHECK:  encoding: [0x62,0x62,0xfd,0x49,0x93,0xac,0x91,0x00,0x04,0x00,0x00]
-          vgatherqpd zmm29{k1},ZMMWORD PTR [rcx+zmm2*4+0x400]
+          vgatherqpd zmm29{k1},QWORD PTR [rcx+zmm2*4+0x400]
 
-// CHECK: vgatherqps ymm18 {k1}, ymmword ptr [r14 + 8*zmm4 + 123]
+// CHECK: vgatherqps ymm18 {k1}, dword ptr [r14 + 8*zmm4 + 123]
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x49,0x93,0x94,0xe6,0x7b,0x00,0x00,0x00]
-          vgatherqps ymm18{k1},YMMWORD PTR [r14+zmm4*8+0x7b]
+          vgatherqps ymm18{k1},DWORD PTR [r14+zmm4*8+0x7b]
 
-// CHECK: vgatherqps ymm18 {k1}, ymmword ptr [r9 + zmm4 + 256]
+// CHECK: vgatherqps ymm18 {k1}, dword ptr [r9 + zmm4 + 256]
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x49,0x93,0x54,0x21,0x40]
-          vgatherqps ymm18{k1},YMMWORD PTR [r9+zmm4*1+0x100]
+          vgatherqps ymm18{k1},DWORD PTR [r9+zmm4*1+0x100]
 
-// CHECK: vgatherqps ymm18 {k1}, ymmword ptr [rcx + 4*zmm4 + 1024]
+// CHECK: vgatherqps ymm18 {k1}, dword ptr [rcx + 4*zmm4 + 1024]
 // CHECK:  encoding: [0x62,0xe2,0x7d,0x49,0x93,0x94,0xa1,0x00,0x04,0x00,0x00]
-          vgatherqps ymm18{k1},YMMWORD PTR [rcx+zmm4*4+0x400]
+          vgatherqps ymm18{k1},DWORD PTR [rcx+zmm4*4+0x400]
 
-// CHECK: vpgatherdd zmm17 {k1}, zmmword ptr [r14 + 8*zmm11 + 123]
+// CHECK: vpgatherdd zmm17 {k1}, dword ptr [r14 + 8*zmm11 + 123]
 // CHECK:  encoding: [0x62,0x82,0x7d,0x49,0x90,0x8c,0xde,0x7b,0x00,0x00,0x00]
-          vpgatherdd zmm17{k1},ZMMWORD PTR [r14+zmm11*8+0x7b]
+          vpgatherdd zmm17{k1},DWORD PTR [r14+zmm11*8+0x7b]
 
-// CHECK: vpgatherdd zmm17 {k1}, zmmword ptr [r9 + zmm11 + 256]
+// CHECK: vpgatherdd zmm17 {k1}, dword ptr [r9 + zmm11 + 256]
 // CHECK:  encoding: [0x62,0x82,0x7d,0x49,0x90,0x4c,0x19,0x40]
-          vpgatherdd zmm17{k1},ZMMWORD PTR [r9+zmm11*1+0x100]
+          vpgatherdd zmm17{k1},DWORD PTR [r9+zmm11*1+0x100]
 
-// CHECK: vpgatherdd zmm17 {k1}, zmmword ptr [rcx + 4*zmm11 + 1024]
+// CHECK: vpgatherdd zmm17 {k1}, dword ptr [rcx + 4*zmm11 + 1024]
 // CHECK:  encoding: [0x62,0xa2,0x7d,0x49,0x90,0x8c,0x99,0x00,0x04,0x00,0x00]
-          vpgatherdd zmm17{k1},ZMMWORD PTR [rcx+zmm11*4+0x400]
+          vpgatherdd zmm17{k1},DWORD PTR [rcx+zmm11*4+0x400]
 
-// CHECK: vpgatherdq zmm8 {k1}, zmmword ptr [r14 + 8*ymm14 + 123]
+// CHECK: vpgatherdq zmm8 {k1}, qword ptr [r14 + 8*ymm14 + 123]
 // CHECK:  encoding: [0x62,0x12,0xfd,0x49,0x90,0x84,0xf6,0x7b,0x00,0x00,0x00]
-          vpgatherdq zmm8{k1},ZMMWORD PTR [r14+ymm14*8+0x7b]
+          vpgatherdq zmm8{k1},QWORD PTR [r14+ymm14*8+0x7b]
 
-// CHECK: vpgatherdq zmm8 {k1}, zmmword ptr [r9 + ymm14 + 256]
+// CHECK: vpgatherdq zmm8 {k1}, qword ptr [r9 + ymm14 + 256]
 // CHECK:  encoding: [0x62,0x12,0xfd,0x49,0x90,0x44,0x31,0x20]
-          vpgatherdq zmm8{k1},ZMMWORD PTR [r9+ymm14*1+0x100]
+          vpgatherdq zmm8{k1},QWORD PTR [r9+ymm14*1+0x100]
 
-// CHECK: vpgatherdq zmm8 {k1}, zmmword ptr [rcx + 4*ymm14 + 1024]
+// CHECK: vpgatherdq zmm8 {k1}, qword ptr [rcx + 4*ymm14 + 1024]
 // CHECK:  encoding: [0x62,0x32,0xfd,0x49,0x90,0x84,0xb1,0x00,0x04,0x00,0x00]
-          vpgatherdq zmm8{k1},ZMMWORD PTR [rcx+ymm14*4+0x400]
+          vpgatherdq zmm8{k1},QWORD PTR [rcx+ymm14*4+0x400]
 
-// CHECK: vpgatherqd ymm3 {k1}, ymmword ptr [r14 + 8*zmm17 + 123]
+// CHECK: vpgatherqd ymm3 {k1}, dword ptr [r14 + 8*zmm17 + 123]
 // CHECK:  encoding: [0x62,0xd2,0x7d,0x41,0x91,0x9c,0xce,0x7b,0x00,0x00,0x00]
-          vpgatherqd ymm3{k1},YMMWORD PTR [r14+zmm17*8+0x7b]
+          vpgatherqd ymm3{k1},DWORD PTR [r14+zmm17*8+0x7b]
 
-// CHECK: vpgatherqd ymm3 {k1}, ymmword ptr [r9 + zmm17 + 256]
+// CHECK: vpgatherqd ymm3 {k1}, dword ptr [r9 + zmm17 + 256]
 // CHECK:  encoding: [0x62,0xd2,0x7d,0x41,0x91,0x5c,0x09,0x40]
-          vpgatherqd ymm3{k1},YMMWORD PTR [r9+zmm17*1+0x100]
+          vpgatherqd ymm3{k1},DWORD PTR [r9+zmm17*1+0x100]
 
-// CHECK: vpgatherqd ymm3 {k1}, ymmword ptr [rcx + 4*zmm17 + 1024]
+// CHECK: vpgatherqd ymm3 {k1}, dword ptr [rcx + 4*zmm17 + 1024]
 // CHECK:  encoding: [0x62,0xf2,0x7d,0x41,0x91,0x9c,0x89,0x00,0x04,0x00,0x00]
-          vpgatherqd ymm3{k1},YMMWORD PTR [rcx+zmm17*4+0x400]
+          vpgatherqd ymm3{k1},DWORD PTR [rcx+zmm17*4+0x400]
 
-// CHECK: vpgatherqq zmm17 {k1}, zmmword ptr [r14 + 8*zmm21 + 123]
+// CHECK: vpgatherqq zmm17 {k1}, qword ptr [r14 + 8*zmm21 + 123]
 // CHECK:  encoding: [0x62,0xc2,0xfd,0x41,0x91,0x8c,0xee,0x7b,0x00,0x00,0x00]
-          vpgatherqq zmm17{k1},ZMMWORD PTR [r14+zmm21*8+0x7b]
+          vpgatherqq zmm17{k1},QWORD PTR [r14+zmm21*8+0x7b]
 
-// CHECK: vpgatherqq zmm17 {k1}, zmmword ptr [r9 + zmm21 + 256]
+// CHECK: vpgatherqq zmm17 {k1}, qword ptr [r9 + zmm21 + 256]
 // CHECK:  encoding: [0x62,0xc2,0xfd,0x41,0x91,0x4c,0x29,0x20]
-          vpgatherqq zmm17{k1},ZMMWORD PTR [r9+zmm21*1+0x100]
+          vpgatherqq zmm17{k1},QWORD PTR [r9+zmm21*1+0x100]
 
-// CHECK: vpgatherqq zmm17 {k1}, zmmword ptr [rcx + 4*zmm21 + 1024]
+// CHECK: vpgatherqq zmm17 {k1}, qword ptr [rcx + 4*zmm21 + 1024]
 // CHECK:  encoding: [0x62,0xe2,0xfd,0x41,0x91,0x8c,0xa9,0x00,0x04,0x00,0x00]
-          vpgatherqq zmm17{k1},ZMMWORD PTR [rcx+zmm21*4+0x400]
+          vpgatherqq zmm17{k1},QWORD PTR [rcx+zmm21*4+0x400]
 
-// CHECK: vpscatterdd zmmword ptr [r14 + 8*zmm16 + 123] {k1}, zmm19
+// CHECK: vpscatterdd dword ptr [r14 + 8*zmm16 + 123] {k1}, zmm19
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa0,0x9c,0xc6,0x7b,0x00,0x00,0x00]
-          vpscatterdd ZMMWORD PTR [r14+zmm16*8+0x7b]{k1},zmm19
+          vpscatterdd DWORD PTR [r14+zmm16*8+0x7b]{k1},zmm19
 
-// CHECK: vpscatterdd zmmword ptr [r14 + 8*zmm16 + 123] {k1}, zmm19
+// CHECK: vpscatterdd dword ptr [r14 + 8*zmm16 + 123] {k1}, zmm19
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa0,0x9c,0xc6,0x7b,0x00,0x00,0x00]
-          vpscatterdd ZMMWORD PTR [r14+zmm16*8+0x7b]{k1},zmm19
+          vpscatterdd DWORD PTR [r14+zmm16*8+0x7b]{k1},zmm19
 
-// CHECK: vpscatterdd zmmword ptr [r9 + zmm16 + 256] {k1}, zmm19
+// CHECK: vpscatterdd dword ptr [r9 + zmm16 + 256] {k1}, zmm19
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa0,0x5c,0x01,0x40]
-          vpscatterdd ZMMWORD PTR [r9+zmm16*1+0x100]{k1},zmm19
+          vpscatterdd DWORD PTR [r9+zmm16*1+0x100]{k1},zmm19
 
-// CHECK: vpscatterdd zmmword ptr [rcx + 4*zmm16 + 1024] {k1}, zmm19
+// CHECK: vpscatterdd dword ptr [rcx + 4*zmm16 + 1024] {k1}, zmm19
 // CHECK:  encoding: [0x62,0xe2,0x7d,0x41,0xa0,0x9c,0x81,0x00,0x04,0x00,0x00]
-          vpscatterdd ZMMWORD PTR [rcx+zmm16*4+0x400]{k1},zmm19
+          vpscatterdd DWORD PTR [rcx+zmm16*4+0x400]{k1},zmm19
 
-// CHECK: vpscatterdq zmmword ptr [r14 + 8*ymm6 + 123] {k1}, zmm5
+// CHECK: vpscatterdq qword ptr [r14 + 8*ymm6 + 123] {k1}, zmm5
 // CHECK:  encoding: [0x62,0xd2,0xfd,0x49,0xa0,0xac,0xf6,0x7b,0x00,0x00,0x00]
-          vpscatterdq ZMMWORD PTR [r14+ymm6*8+0x7b]{k1},zmm5
+          vpscatterdq QWORD PTR [r14+ymm6*8+0x7b]{k1},zmm5
 
-// CHECK: vpscatterdq zmmword ptr [r14 + 8*ymm6 + 123] {k1}, zmm5
+// CHECK: vpscatterdq qword ptr [r14 + 8*ymm6 + 123] {k1}, zmm5
 // CHECK:  encoding: [0x62,0xd2,0xfd,0x49,0xa0,0xac,0xf6,0x7b,0x00,0x00,0x00]
-          vpscatterdq ZMMWORD PTR [r14+ymm6*8+0x7b]{k1},zmm5
+          vpscatterdq QWORD PTR [r14+ymm6*8+0x7b]{k1},zmm5
 
-// CHECK: vpscatterdq zmmword ptr [r9 + ymm6 + 256] {k1}, zmm5
+// CHECK: vpscatterdq qword ptr [r9 + ymm6 + 256] {k1}, zmm5
 // CHECK:  encoding: [0x62,0xd2,0xfd,0x49,0xa0,0x6c,0x31,0x20]
-          vpscatterdq ZMMWORD PTR [r9+ymm6*1+0x100]{k1},zmm5
+          vpscatterdq QWORD PTR [r9+ymm6*1+0x100]{k1},zmm5
 
-// CHECK: vpscatterdq zmmword ptr [rcx + 4*ymm6 + 1024] {k1}, zmm5
+// CHECK: vpscatterdq qword ptr [rcx + 4*ymm6 + 1024] {k1}, zmm5
 // CHECK:  encoding: [0x62,0xf2,0xfd,0x49,0xa0,0xac,0xb1,0x00,0x04,0x00,0x00]
-          vpscatterdq ZMMWORD PTR [rcx+ymm6*4+0x400]{k1},zmm5
+          vpscatterdq QWORD PTR [rcx+ymm6*4+0x400]{k1},zmm5
 
-// CHECK: vpscatterqd ymmword ptr [r14 + 8*zmm2 + 123] {k1}, ymm20
+// CHECK: vpscatterqd dword ptr [r14 + 8*zmm2 + 123] {k1}, ymm20
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x49,0xa1,0xa4,0xd6,0x7b,0x00,0x00,0x00]
-          vpscatterqd YMMWORD PTR [r14+zmm2*8+0x7b]{k1},ymm20
+          vpscatterqd DWORD PTR [r14+zmm2*8+0x7b]{k1},ymm20
 
-// CHECK: vpscatterqd ymmword ptr [r14 + 8*zmm2 + 123] {k1}, ymm20
+// CHECK: vpscatterqd dword ptr [r14 + 8*zmm2 + 123] {k1}, ymm20
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x49,0xa1,0xa4,0xd6,0x7b,0x00,0x00,0x00]
-          vpscatterqd YMMWORD PTR [r14+zmm2*8+0x7b]{k1},ymm20
+          vpscatterqd DWORD PTR [r14+zmm2*8+0x7b]{k1},ymm20
 
-// CHECK: vpscatterqd ymmword ptr [r9 + zmm2 + 256] {k1}, ymm20
+// CHECK: vpscatterqd dword ptr [r9 + zmm2 + 256] {k1}, ymm20
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x49,0xa1,0x64,0x11,0x40]
-          vpscatterqd YMMWORD PTR [r9+zmm2*1+0x100]{k1},ymm20
+          vpscatterqd DWORD PTR [r9+zmm2*1+0x100]{k1},ymm20
 
-// CHECK: vpscatterqd ymmword ptr [rcx + 4*zmm2 + 1024] {k1}, ymm20
+// CHECK: vpscatterqd dword ptr [rcx + 4*zmm2 + 1024] {k1}, ymm20
 // CHECK:  encoding: [0x62,0xe2,0x7d,0x49,0xa1,0xa4,0x91,0x00,0x04,0x00,0x00]
-          vpscatterqd YMMWORD PTR [rcx+zmm2*4+0x400]{k1},ymm20
+          vpscatterqd DWORD PTR [rcx+zmm2*4+0x400]{k1},ymm20
 
-// CHECK: vpscatterqq zmmword ptr [r14 + 8*zmm20 + 123] {k1}, zmm14
+// CHECK: vpscatterqq qword ptr [r14 + 8*zmm20 + 123] {k1}, zmm14
 // CHECK:  encoding: [0x62,0x52,0xfd,0x41,0xa1,0xb4,0xe6,0x7b,0x00,0x00,0x00]
-          vpscatterqq ZMMWORD PTR [r14+zmm20*8+0x7b]{k1},zmm14
+          vpscatterqq QWORD PTR [r14+zmm20*8+0x7b]{k1},zmm14
 
-// CHECK: vpscatterqq zmmword ptr [r14 + 8*zmm20 + 123] {k1}, zmm14
+// CHECK: vpscatterqq qword ptr [r14 + 8*zmm20 + 123] {k1}, zmm14
 // CHECK:  encoding: [0x62,0x52,0xfd,0x41,0xa1,0xb4,0xe6,0x7b,0x00,0x00,0x00]
-          vpscatterqq ZMMWORD PTR [r14+zmm20*8+0x7b]{k1},zmm14
+          vpscatterqq QWORD PTR [r14+zmm20*8+0x7b]{k1},zmm14
 
-// CHECK: vpscatterqq zmmword ptr [r9 + zmm20 + 256] {k1}, zmm14
+// CHECK: vpscatterqq qword ptr [r9 + zmm20 + 256] {k1}, zmm14
 // CHECK:  encoding: [0x62,0x52,0xfd,0x41,0xa1,0x74,0x21,0x20]
-          vpscatterqq ZMMWORD PTR [r9+zmm20*1+0x100]{k1},zmm14
+          vpscatterqq QWORD PTR [r9+zmm20*1+0x100]{k1},zmm14
 
-// CHECK: vpscatterqq zmmword ptr [rcx + 4*zmm20 + 1024] {k1}, zmm14
+// CHECK: vpscatterqq qword ptr [rcx + 4*zmm20 + 1024] {k1}, zmm14
 // CHECK:  encoding: [0x62,0x72,0xfd,0x41,0xa1,0xb4,0xa1,0x00,0x04,0x00,0x00]
-          vpscatterqq ZMMWORD PTR [rcx+zmm20*4+0x400]{k1},zmm14
+          vpscatterqq QWORD PTR [rcx+zmm20*4+0x400]{k1},zmm14
 
-// CHECK: vscatterdpd zmmword ptr [r14 + 8*ymm24 + 123] {k1}, zmm18
+// CHECK: vscatterdpd qword ptr [r14 + 8*ymm24 + 123] {k1}, zmm18
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa2,0x94,0xc6,0x7b,0x00,0x00,0x00]
-          vscatterdpd ZMMWORD PTR [r14+ymm24*8+0x7b]{k1},zmm18
+          vscatterdpd QWORD PTR [r14+ymm24*8+0x7b]{k1},zmm18
 
-// CHECK: vscatterdpd zmmword ptr [r14 + 8*ymm24 + 123] {k1}, zmm18
+// CHECK: vscatterdpd qword ptr [r14 + 8*ymm24 + 123] {k1}, zmm18
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa2,0x94,0xc6,0x7b,0x00,0x00,0x00]
-          vscatterdpd ZMMWORD PTR [r14+ymm24*8+0x7b]{k1},zmm18
+          vscatterdpd QWORD PTR [r14+ymm24*8+0x7b]{k1},zmm18
 
-// CHECK: vscatterdpd zmmword ptr [r9 + ymm24 + 256] {k1}, zmm18
+// CHECK: vscatterdpd qword ptr [r9 + ymm24 + 256] {k1}, zmm18
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa2,0x54,0x01,0x20]
-          vscatterdpd ZMMWORD PTR [r9+ymm24*1+0x100]{k1},zmm18
+          vscatterdpd QWORD PTR [r9+ymm24*1+0x100]{k1},zmm18
 
-// CHECK: vscatterdpd zmmword ptr [rcx + 4*ymm24 + 1024] {k1}, zmm18
+// CHECK: vscatterdpd qword ptr [rcx + 4*ymm24 + 1024] {k1}, zmm18
 // CHECK:  encoding: [0x62,0xa2,0xfd,0x41,0xa2,0x94,0x81,0x00,0x04,0x00,0x00]
-          vscatterdpd ZMMWORD PTR [rcx+ymm24*4+0x400]{k1},zmm18
+          vscatterdpd QWORD PTR [rcx+ymm24*4+0x400]{k1},zmm18
 
-// CHECK: vscatterdps zmmword ptr [r14 + 8*zmm19 + 123] {k1}, zmm17
+// CHECK: vscatterdps dword ptr [r14 + 8*zmm19 + 123] {k1}, zmm17
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa2,0x8c,0xde,0x7b,0x00,0x00,0x00]
-          vscatterdps ZMMWORD PTR [r14+zmm19*8+0x7b]{k1},zmm17
+          vscatterdps DWORD PTR [r14+zmm19*8+0x7b]{k1},zmm17
 
-// CHECK: vscatterdps zmmword ptr [r14 + 8*zmm19 + 123] {k1}, zmm17
+// CHECK: vscatterdps dword ptr [r14 + 8*zmm19 + 123] {k1}, zmm17
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa2,0x8c,0xde,0x7b,0x00,0x00,0x00]
-          vscatterdps ZMMWORD PTR [r14+zmm19*8+0x7b]{k1},zmm17
+          vscatterdps DWORD PTR [r14+zmm19*8+0x7b]{k1},zmm17
 
-// CHECK: vscatterdps zmmword ptr [r9 + zmm19 + 256] {k1}, zmm17
+// CHECK: vscatterdps dword ptr [r9 + zmm19 + 256] {k1}, zmm17
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa2,0x4c,0x19,0x40]
-          vscatterdps ZMMWORD PTR [r9+zmm19*1+0x100]{k1},zmm17
+          vscatterdps DWORD PTR [r9+zmm19*1+0x100]{k1},zmm17
 
-// CHECK: vscatterdps zmmword ptr [rcx + 4*zmm19 + 1024] {k1}, zmm17
+// CHECK: vscatterdps dword ptr [rcx + 4*zmm19 + 1024] {k1}, zmm17
 // CHECK:  encoding: [0x62,0xe2,0x7d,0x41,0xa2,0x8c,0x99,0x00,0x04,0x00,0x00]
-          vscatterdps ZMMWORD PTR [rcx+zmm19*4+0x400]{k1},zmm17
+          vscatterdps DWORD PTR [rcx+zmm19*4+0x400]{k1},zmm17
 
-// CHECK: vscatterqpd zmmword ptr [r14 + 8*zmm28 + 123] {k1}, zmm22
+// CHECK: vscatterqpd qword ptr [r14 + 8*zmm28 + 123] {k1}, zmm22
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa3,0xb4,0xe6,0x7b,0x00,0x00,0x00]
-          vscatterqpd ZMMWORD PTR [r14+zmm28*8+0x7b]{k1},zmm22
+          vscatterqpd QWORD PTR [r14+zmm28*8+0x7b]{k1},zmm22
 
-// CHECK: vscatterqpd zmmword ptr [r14 + 8*zmm28 + 123] {k1}, zmm22
+// CHECK: vscatterqpd qword ptr [r14 + 8*zmm28 + 123] {k1}, zmm22
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa3,0xb4,0xe6,0x7b,0x00,0x00,0x00]
-          vscatterqpd ZMMWORD PTR [r14+zmm28*8+0x7b]{k1},zmm22
+          vscatterqpd QWORD PTR [r14+zmm28*8+0x7b]{k1},zmm22
 
-// CHECK: vscatterqpd zmmword ptr [r9 + zmm28 + 256] {k1}, zmm22
+// CHECK: vscatterqpd qword ptr [r9 + zmm28 + 256] {k1}, zmm22
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa3,0x74,0x21,0x20]
-          vscatterqpd ZMMWORD PTR [r9+zmm28*1+0x100]{k1},zmm22
+          vscatterqpd QWORD PTR [r9+zmm28*1+0x100]{k1},zmm22
 
-// CHECK: vscatterqpd zmmword ptr [rcx + 4*zmm28 + 1024] {k1}, zmm22
+// CHECK: vscatterqpd qword ptr [rcx + 4*zmm28 + 1024] {k1}, zmm22
 // CHECK:  encoding: [0x62,0xa2,0xfd,0x41,0xa3,0xb4,0xa1,0x00,0x04,0x00,0x00]
-          vscatterqpd ZMMWORD PTR [rcx+zmm28*4+0x400]{k1},zmm22
+          vscatterqpd QWORD PTR [rcx+zmm28*4+0x400]{k1},zmm22
 
-// CHECK: vscatterqps ymmword ptr [r14 + 8*zmm27 + 123] {k1}, ymm6
+// CHECK: vscatterqps dword ptr [r14 + 8*zmm27 + 123] {k1}, ymm6
 // CHECK:  encoding: [0x62,0x92,0x7d,0x41,0xa3,0xb4,0xde,0x7b,0x00,0x00,0x00]
-          vscatterqps YMMWORD PTR [r14+zmm27*8+0x7b]{k1},ymm6
+          vscatterqps DWORD PTR [r14+zmm27*8+0x7b]{k1},ymm6
 
-// CHECK: vscatterqps ymmword ptr [r14 + 8*zmm27 + 123] {k1}, ymm6
+// CHECK: vscatterqps dword ptr [r14 + 8*zmm27 + 123] {k1}, ymm6
 // CHECK:  encoding: [0x62,0x92,0x7d,0x41,0xa3,0xb4,0xde,0x7b,0x00,0x00,0x00]
-          vscatterqps YMMWORD PTR [r14+zmm27*8+0x7b]{k1},ymm6
+          vscatterqps DWORD PTR [r14+zmm27*8+0x7b]{k1},ymm6
 
-// CHECK: vscatterqps ymmword ptr [r9 + zmm27 + 256] {k1}, ymm6
+// CHECK: vscatterqps dword ptr [r9 + zmm27 + 256] {k1}, ymm6
 // CHECK:  encoding: [0x62,0x92,0x7d,0x41,0xa3,0x74,0x19,0x40]
-          vscatterqps YMMWORD PTR [r9+zmm27*1+0x100]{k1},ymm6
+          vscatterqps DWORD PTR [r9+zmm27*1+0x100]{k1},ymm6
 
-// CHECK: vscatterqps ymmword ptr [rcx + 4*zmm27 + 1024] {k1}, ymm6
+// CHECK: vscatterqps dword ptr [rcx + 4*zmm27 + 1024] {k1}, ymm6
 // CHECK:  encoding: [0x62,0xb2,0x7d,0x41,0xa3,0xb4,0x99,0x00,0x04,0x00,0x00]
-          vscatterqps YMMWORD PTR [rcx+zmm27*4+0x400]{k1},ymm6
+          vscatterqps DWORD PTR [rcx+zmm27*4+0x400]{k1},ymm6
 
-// CHECK: vscatterdpd zmmword ptr [r14 + 8*ymm27 - 123] {k1}, zmm18
+// CHECK: vscatterdpd qword ptr [r14 + 8*ymm27 - 123] {k1}, zmm18
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa2,0x94,0xde,0x85,0xff,0xff,0xff]
-          vscatterdpd ZMMWORD PTR [r14+ymm27*8-0x7b]{k1},zmm18
+          vscatterdpd QWORD PTR [r14+ymm27*8-0x7b]{k1},zmm18
 
-// CHECK: vscatterdpd zmmword ptr [r14 + 8*ymm27 - 123] {k1}, zmm18
+// CHECK: vscatterdpd qword ptr [r14 + 8*ymm27 - 123] {k1}, zmm18
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa2,0x94,0xde,0x85,0xff,0xff,0xff]
-          vscatterdpd ZMMWORD PTR [r14+ymm27*8-0x7b]{k1},zmm18
+          vscatterdpd QWORD PTR [r14+ymm27*8-0x7b]{k1},zmm18
 
-// CHECK: vscatterdpd zmmword ptr [r9 + ymm27 + 256] {k1}, zmm18
+// CHECK: vscatterdpd qword ptr [r9 + ymm27 + 256] {k1}, zmm18
 // CHECK:  encoding: [0x62,0x82,0xfd,0x41,0xa2,0x54,0x19,0x20]
-          vscatterdpd ZMMWORD PTR [r9+ymm27*1+0x100]{k1},zmm18
+          vscatterdpd QWORD PTR [r9+ymm27*1+0x100]{k1},zmm18
 
-// CHECK: vscatterdpd zmmword ptr [rcx + 4*ymm27 + 1024] {k1}, zmm18
+// CHECK: vscatterdpd qword ptr [rcx + 4*ymm27 + 1024] {k1}, zmm18
 // CHECK:  encoding: [0x62,0xa2,0xfd,0x41,0xa2,0x94,0x99,0x00,0x04,0x00,0x00]
-          vscatterdpd ZMMWORD PTR [rcx+ymm27*4+0x400]{k1},zmm18
+          vscatterdpd QWORD PTR [rcx+ymm27*4+0x400]{k1},zmm18
 
-// CHECK: vscatterdps zmmword ptr [r14 + 8*zmm17 - 123] {k1}, zmm1
+// CHECK: vscatterdps dword ptr [r14 + 8*zmm17 - 123] {k1}, zmm1
 // CHECK:  encoding: [0x62,0xd2,0x7d,0x41,0xa2,0x8c,0xce,0x85,0xff,0xff,0xff]
-          vscatterdps ZMMWORD PTR [r14+zmm17*8-0x7b]{k1},zmm1
+          vscatterdps DWORD PTR [r14+zmm17*8-0x7b]{k1},zmm1
 
-// CHECK: vscatterdps zmmword ptr [r14 + 8*zmm17 - 123] {k1}, zmm1
+// CHECK: vscatterdps dword ptr [r14 + 8*zmm17 - 123] {k1}, zmm1
 // CHECK:  encoding: [0x62,0xd2,0x7d,0x41,0xa2,0x8c,0xce,0x85,0xff,0xff,0xff]
-          vscatterdps ZMMWORD PTR [r14+zmm17*8-0x7b]{k1},zmm1
+          vscatterdps DWORD PTR [r14+zmm17*8-0x7b]{k1},zmm1
 
-// CHECK: vscatterdps zmmword ptr [r9 + zmm17 + 256] {k1}, zmm1
+// CHECK: vscatterdps dword ptr [r9 + zmm17 + 256] {k1}, zmm1
 // CHECK:  encoding: [0x62,0xd2,0x7d,0x41,0xa2,0x4c,0x09,0x40]
-          vscatterdps ZMMWORD PTR [r9+zmm17*1+0x100]{k1},zmm1
+          vscatterdps DWORD PTR [r9+zmm17*1+0x100]{k1},zmm1
 
-// CHECK: vscatterdps zmmword ptr [rcx + 4*zmm17 + 1024] {k1}, zmm1
+// CHECK: vscatterdps dword ptr [rcx + 4*zmm17 + 1024] {k1}, zmm1
 // CHECK:  encoding: [0x62,0xf2,0x7d,0x41,0xa2,0x8c,0x89,0x00,0x04,0x00,0x00]
-          vscatterdps ZMMWORD PTR [rcx+zmm17*4+0x400]{k1},zmm1
+          vscatterdps DWORD PTR [rcx+zmm17*4+0x400]{k1},zmm1
 
-// CHECK: vscatterqpd zmmword ptr [r14 + 8*zmm25 - 123] {k1}, zmm8
+// CHECK: vscatterqpd qword ptr [r14 + 8*zmm25 - 123] {k1}, zmm8
 // CHECK:  encoding: [0x62,0x12,0xfd,0x41,0xa3,0x84,0xce,0x85,0xff,0xff,0xff]
-          vscatterqpd ZMMWORD PTR [r14+zmm25*8-0x7b]{k1},zmm8
+          vscatterqpd QWORD PTR [r14+zmm25*8-0x7b]{k1},zmm8
 
-// CHECK: vscatterqpd zmmword ptr [r14 + 8*zmm25 - 123] {k1}, zmm8
+// CHECK: vscatterqpd qword ptr [r14 + 8*zmm25 - 123] {k1}, zmm8
 // CHECK:  encoding: [0x62,0x12,0xfd,0x41,0xa3,0x84,0xce,0x85,0xff,0xff,0xff]
-          vscatterqpd ZMMWORD PTR [r14+zmm25*8-0x7b]{k1},zmm8
+          vscatterqpd QWORD PTR [r14+zmm25*8-0x7b]{k1},zmm8
 
-// CHECK: vscatterqpd zmmword ptr [r9 + zmm25 + 256] {k1}, zmm8
+// CHECK: vscatterqpd qword ptr [r9 + zmm25 + 256] {k1}, zmm8
 // CHECK:  encoding: [0x62,0x12,0xfd,0x41,0xa3,0x44,0x09,0x20]
-          vscatterqpd ZMMWORD PTR [r9+zmm25*1+0x100]{k1},zmm8
+          vscatterqpd QWORD PTR [r9+zmm25*1+0x100]{k1},zmm8
 
-// CHECK: vscatterqpd zmmword ptr [rcx + 4*zmm25 + 1024] {k1}, zmm8
+// CHECK: vscatterqpd qword ptr [rcx + 4*zmm25 + 1024] {k1}, zmm8
 // CHECK:  encoding: [0x62,0x32,0xfd,0x41,0xa3,0x84,0x89,0x00,0x04,0x00,0x00]
-          vscatterqpd ZMMWORD PTR [rcx+zmm25*4+0x400]{k1},zmm8
+          vscatterqpd QWORD PTR [rcx+zmm25*4+0x400]{k1},zmm8
 
-// CHECK: vscatterqps ymmword ptr [r14 + 8*zmm10 - 123] {k1}, ymm13
+// CHECK: vscatterqps dword ptr [r14 + 8*zmm10 - 123] {k1}, ymm13
 // CHECK:  encoding: [0x62,0x12,0x7d,0x49,0xa3,0xac,0xd6,0x85,0xff,0xff,0xff]
-          vscatterqps YMMWORD PTR [r14+zmm10*8-0x7b]{k1},ymm13
+          vscatterqps DWORD PTR [r14+zmm10*8-0x7b]{k1},ymm13
 
-// CHECK: vscatterqps ymmword ptr [r14 + 8*zmm10 - 123] {k1}, ymm13
+// CHECK: vscatterqps dword ptr [r14 + 8*zmm10 - 123] {k1}, ymm13
 // CHECK:  encoding: [0x62,0x12,0x7d,0x49,0xa3,0xac,0xd6,0x85,0xff,0xff,0xff]
-          vscatterqps YMMWORD PTR [r14+zmm10*8-0x7b]{k1},ymm13
+          vscatterqps DWORD PTR [r14+zmm10*8-0x7b]{k1},ymm13
 
-// CHECK: vscatterqps ymmword ptr [r9 + zmm10 + 256] {k1}, ymm13
+// CHECK: vscatterqps dword ptr [r9 + zmm10 + 256] {k1}, ymm13
 // CHECK:  encoding: [0x62,0x12,0x7d,0x49,0xa3,0x6c,0x11,0x40]
-          vscatterqps YMMWORD PTR [r9+zmm10*1+0x100]{k1},ymm13
+          vscatterqps DWORD PTR [r9+zmm10*1+0x100]{k1},ymm13
 
-// CHECK: vscatterqps ymmword ptr [rcx + 4*zmm10 + 1024] {k1}, ymm13
+// CHECK: vscatterqps dword ptr [rcx + 4*zmm10 + 1024] {k1}, ymm13
 // CHECK:  encoding: [0x62,0x32,0x7d,0x49,0xa3,0xac,0x91,0x00,0x04,0x00,0x00]
-          vscatterqps YMMWORD PTR [rcx+zmm10*4+0x400]{k1},ymm13
+          vscatterqps DWORD PTR [rcx+zmm10*4+0x400]{k1},ymm13
 
-// CHECK: vgatherdpd zmm30 {k1}, zmmword ptr [r14 + 8*ymm5 - 123]
+// CHECK: vgatherdpd zmm30 {k1}, qword ptr [r14 + 8*ymm5 - 123]
 // CHECK:  encoding: [0x62,0x42,0xfd,0x49,0x92,0xb4,0xee,0x85,0xff,0xff,0xff]
-          vgatherdpd zmm30{k1},ZMMWORD PTR [r14+ymm5*8-0x7b]
+          vgatherdpd zmm30{k1},QWORD PTR [r14+ymm5*8-0x7b]
 
-// CHECK: vgatherdpd zmm30 {k1}, zmmword ptr [r9 + ymm5 + 256]
+// CHECK: vgatherdpd zmm30 {k1}, qword ptr [r9 + ymm5 + 256]
 // CHECK:  encoding: [0x62,0x42,0xfd,0x49,0x92,0x74,0x29,0x20]
-          vgatherdpd zmm30{k1},ZMMWORD PTR [r9+ymm5*1+0x100]
+          vgatherdpd zmm30{k1},QWORD PTR [r9+ymm5*1+0x100]
 
-// CHECK: vgatherdpd zmm30 {k1}, zmmword ptr [rcx + 4*ymm5 + 1024]
+// CHECK: vgatherdpd zmm30 {k1}, qword ptr [rcx + 4*ymm5 + 1024]
 // CHECK:  encoding: [0x62,0x62,0xfd,0x49,0x92,0xb4,0xa9,0x00,0x04,0x00,0x00]
-          vgatherdpd zmm30{k1},ZMMWORD PTR [rcx+ymm5*4+0x400]
+          vgatherdpd zmm30{k1},QWORD PTR [rcx+ymm5*4+0x400]
 
-// CHECK: vgatherdps zmm8 {k1}, zmmword ptr [r14 + 8*zmm26 - 123]
+// CHECK: vgatherdps zmm8 {k1}, dword ptr [r14 + 8*zmm26 - 123]
 // CHECK:  encoding: [0x62,0x12,0x7d,0x41,0x92,0x84,0xd6,0x85,0xff,0xff,0xff]
-          vgatherdps zmm8{k1},ZMMWORD PTR [r14+zmm26*8-0x7b]
+          vgatherdps zmm8{k1},DWORD PTR [r14+zmm26*8-0x7b]
 
-// CHECK: vgatherdps zmm8 {k1}, zmmword ptr [r9 + zmm26 + 256]
+// CHECK: vgatherdps zmm8 {k1}, dword ptr [r9 + zmm26 + 256]
 // CHECK:  encoding: [0x62,0x12,0x7d,0x41,0x92,0x44,0x11,0x40]
-          vgatherdps zmm8{k1},ZMMWORD PTR [r9+zmm26*1+0x100]
+          vgatherdps zmm8{k1},DWORD PTR [r9+zmm26*1+0x100]
 
-// CHECK: vgatherdps zmm8 {k1}, zmmword ptr [rcx + 4*zmm26 + 1024]
+// CHECK: vgatherdps zmm8 {k1}, dword ptr [rcx + 4*zmm26 + 1024]
 // CHECK:  encoding: [0x62,0x32,0x7d,0x41,0x92,0x84,0x91,0x00,0x04,0x00,0x00]
-          vgatherdps zmm8{k1},ZMMWORD PTR [rcx+zmm26*4+0x400]
+          vgatherdps zmm8{k1},DWORD PTR [rcx+zmm26*4+0x400]
 
-// CHECK: vgatherqpd zmm27 {k1}, zmmword ptr [r14 + 8*zmm13 - 123]
+// CHECK: vgatherqpd zmm27 {k1}, qword ptr [r14 + 8*zmm13 - 123]
 // CHECK:  encoding: [0x62,0x02,0xfd,0x49,0x93,0x9c,0xee,0x85,0xff,0xff,0xff]
-          vgatherqpd zmm27{k1},ZMMWORD PTR [r14+zmm13*8-0x7b]
+          vgatherqpd zmm27{k1},QWORD PTR [r14+zmm13*8-0x7b]
 
-// CHECK: vgatherqpd zmm27 {k1}, zmmword ptr [r9 + zmm13 + 256]
+// CHECK: vgatherqpd zmm27 {k1}, qword ptr [r9 + zmm13 + 256]
 // CHECK:  encoding: [0x62,0x02,0xfd,0x49,0x93,0x5c,0x29,0x20]
-          vgatherqpd zmm27{k1},ZMMWORD PTR [r9+zmm13*1+0x100]
+          vgatherqpd zmm27{k1},QWORD PTR [r9+zmm13*1+0x100]
 
-// CHECK: vgatherqpd zmm27 {k1}, zmmword ptr [rcx + 4*zmm13 + 1024]
+// CHECK: vgatherqpd zmm27 {k1}, qword ptr [rcx + 4*zmm13 + 1024]
 // CHECK:  encoding: [0x62,0x22,0xfd,0x49,0x93,0x9c,0xa9,0x00,0x04,0x00,0x00]
-          vgatherqpd zmm27{k1},ZMMWORD PTR [rcx+zmm13*4+0x400]
+          vgatherqpd zmm27{k1},QWORD PTR [rcx+zmm13*4+0x400]
 
-// CHECK: vgatherqps ymm27 {k1}, ymmword ptr [r14 + 8*zmm14 - 123]
+// CHECK: vgatherqps ymm27 {k1}, dword ptr [r14 + 8*zmm14 - 123]
 // CHECK:  encoding: [0x62,0x02,0x7d,0x49,0x93,0x9c,0xf6,0x85,0xff,0xff,0xff]
-          vgatherqps ymm27{k1},YMMWORD PTR [r14+zmm14*8-0x7b]
+          vgatherqps ymm27{k1},DWORD PTR [r14+zmm14*8-0x7b]
 
-// CHECK: vgatherqps ymm27 {k1}, ymmword ptr [r9 + zmm14 + 256]
+// CHECK: vgatherqps ymm27 {k1}, dword ptr [r9 + zmm14 + 256]
 // CHECK:  encoding: [0x62,0x02,0x7d,0x49,0x93,0x5c,0x31,0x40]
-          vgatherqps ymm27{k1},YMMWORD PTR [r9+zmm14*1+0x100]
+          vgatherqps ymm27{k1},DWORD PTR [r9+zmm14*1+0x100]
 
-// CHECK: vgatherqps ymm27 {k1}, ymmword ptr [rcx + 4*zmm14 + 1024]
+// CHECK: vgatherqps ymm27 {k1}, dword ptr [rcx + 4*zmm14 + 1024]
 // CHECK:  encoding: [0x62,0x22,0x7d,0x49,0x93,0x9c,0xb1,0x00,0x04,0x00,0x00]
-          vgatherqps ymm27{k1},YMMWORD PTR [rcx+zmm14*4+0x400]
+          vgatherqps ymm27{k1},DWORD PTR [rcx+zmm14*4+0x400]
 
-// CHECK: vpgatherdd zmm7 {k1}, zmmword ptr [r14 + 8*zmm16 - 123]
+// CHECK: vpgatherdd zmm7 {k1}, dword ptr [r14 + 8*zmm16 - 123]
 // CHECK:  encoding: [0x62,0xd2,0x7d,0x41,0x90,0xbc,0xc6,0x85,0xff,0xff,0xff]
-          vpgatherdd zmm7{k1},ZMMWORD PTR [r14+zmm16*8-0x7b]
+          vpgatherdd zmm7{k1},DWORD PTR [r14+zmm16*8-0x7b]
 
-// CHECK: vpgatherdd zmm7 {k1}, zmmword ptr [r9 + zmm16 + 256]
+// CHECK: vpgatherdd zmm7 {k1}, dword ptr [r9 + zmm16 + 256]
 // CHECK:  encoding: [0x62,0xd2,0x7d,0x41,0x90,0x7c,0x01,0x40]
-          vpgatherdd zmm7{k1},ZMMWORD PTR [r9+zmm16*1+0x100]
+          vpgatherdd zmm7{k1},DWORD PTR [r9+zmm16*1+0x100]
 
-// CHECK: vpgatherdd zmm7 {k1}, zmmword ptr [rcx + 4*zmm16 + 1024]
+// CHECK: vpgatherdd zmm7 {k1}, dword ptr [rcx + 4*zmm16 + 1024]
 // CHECK:  encoding: [0x62,0xf2,0x7d,0x41,0x90,0xbc,0x81,0x00,0x04,0x00,0x00]
-          vpgatherdd zmm7{k1},ZMMWORD PTR [rcx+zmm16*4+0x400]
+          vpgatherdd zmm7{k1},DWORD PTR [rcx+zmm16*4+0x400]
 
-// CHECK: vpgatherdq zmm25 {k1}, zmmword ptr [r14 + 8*ymm7 - 123]
+// CHECK: vpgatherdq zmm25 {k1}, qword ptr [r14 + 8*ymm7 - 123]
 // CHECK:  encoding: [0x62,0x42,0xfd,0x49,0x90,0x8c,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherdq zmm25{k1},ZMMWORD PTR [r14+ymm7*8-0x7b]
+          vpgatherdq zmm25{k1},QWORD PTR [r14+ymm7*8-0x7b]
 
-// CHECK: vpgatherdq zmm25 {k1}, zmmword ptr [r9 + ymm7 + 256]
+// CHECK: vpgatherdq zmm25 {k1}, qword ptr [r9 + ymm7 + 256]
 // CHECK:  encoding: [0x62,0x42,0xfd,0x49,0x90,0x4c,0x39,0x20]
-          vpgatherdq zmm25{k1},ZMMWORD PTR [r9+ymm7*1+0x100]
+          vpgatherdq zmm25{k1},QWORD PTR [r9+ymm7*1+0x100]
 
-// CHECK: vpgatherdq zmm25 {k1}, zmmword ptr [rcx + 4*ymm7 + 1024]
+// CHECK: vpgatherdq zmm25 {k1}, qword ptr [rcx + 4*ymm7 + 1024]
 // CHECK:  encoding: [0x62,0x62,0xfd,0x49,0x90,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdq zmm25{k1},ZMMWORD PTR [rcx+ymm7*4+0x400]
+          vpgatherdq zmm25{k1},QWORD PTR [rcx+ymm7*4+0x400]
 
-// CHECK: vpgatherqd ymm19 {k1}, ymmword ptr [r14 + 8*zmm17 - 123]
+// CHECK: vpgatherqd ymm19 {k1}, dword ptr [r14 + 8*zmm17 - 123]
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0x91,0x9c,0xce,0x85,0xff,0xff,0xff]
-          vpgatherqd ymm19{k1},YMMWORD PTR [r14+zmm17*8-0x7b]
+          vpgatherqd ymm19{k1},DWORD PTR [r14+zmm17*8-0x7b]
 
-// CHECK: vpgatherqd ymm19 {k1}, ymmword ptr [r9 + zmm17 + 256]
+// CHECK: vpgatherqd ymm19 {k1}, dword ptr [r9 + zmm17 + 256]
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0x91,0x5c,0x09,0x40]
-          vpgatherqd ymm19{k1},YMMWORD PTR [r9+zmm17*1+0x100]
+          vpgatherqd ymm19{k1},DWORD PTR [r9+zmm17*1+0x100]
 
-// CHECK: vpgatherqd ymm19 {k1}, ymmword ptr [rcx + 4*zmm17 + 1024]
+// CHECK: vpgatherqd ymm19 {k1}, dword ptr [rcx + 4*zmm17 + 1024]
 // CHECK:  encoding: [0x62,0xe2,0x7d,0x41,0x91,0x9c,0x89,0x00,0x04,0x00,0x00]
-          vpgatherqd ymm19{k1},YMMWORD PTR [rcx+zmm17*4+0x400]
+          vpgatherqd ymm19{k1},DWORD PTR [rcx+zmm17*4+0x400]
 
-// CHECK: vpgatherqq zmm10 {k1}, zmmword ptr [r14 + 8*zmm13 - 123]
+// CHECK: vpgatherqq zmm10 {k1}, qword ptr [r14 + 8*zmm13 - 123]
 // CHECK:  encoding: [0x62,0x12,0xfd,0x49,0x91,0x94,0xee,0x85,0xff,0xff,0xff]
-          vpgatherqq zmm10{k1},ZMMWORD PTR [r14+zmm13*8-0x7b]
+          vpgatherqq zmm10{k1},QWORD PTR [r14+zmm13*8-0x7b]
 
-// CHECK: vpgatherqq zmm10 {k1}, zmmword ptr [r9 + zmm13 + 256]
+// CHECK: vpgatherqq zmm10 {k1}, qword ptr [r9 + zmm13 + 256]
 // CHECK:  encoding: [0x62,0x12,0xfd,0x49,0x91,0x54,0x29,0x20]
-          vpgatherqq zmm10{k1},ZMMWORD PTR [r9+zmm13*1+0x100]
+          vpgatherqq zmm10{k1},QWORD PTR [r9+zmm13*1+0x100]
 
-// CHECK: vpgatherqq zmm10 {k1}, zmmword ptr [rcx + 4*zmm13 + 1024]
+// CHECK: vpgatherqq zmm10 {k1}, qword ptr [rcx + 4*zmm13 + 1024]
 // CHECK:  encoding: [0x62,0x32,0xfd,0x49,0x91,0x94,0xa9,0x00,0x04,0x00,0x00]
-          vpgatherqq zmm10{k1},ZMMWORD PTR [rcx+zmm13*4+0x400]
+          vpgatherqq zmm10{k1},QWORD PTR [rcx+zmm13*4+0x400]
 
-// CHECK: vpscatterdd zmmword ptr [r14 + 8*zmm4 - 123] {k1}, zmm23
+// CHECK: vpscatterdd dword ptr [r14 + 8*zmm4 - 123] {k1}, zmm23
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x49,0xa0,0xbc,0xe6,0x85,0xff,0xff,0xff]
-          vpscatterdd ZMMWORD PTR [r14+zmm4*8-0x7b]{k1},zmm23
+          vpscatterdd DWORD PTR [r14+zmm4*8-0x7b]{k1},zmm23
 
-// CHECK: vpscatterdd zmmword ptr [r14 + 8*zmm4 - 123] {k1}, zmm23
+// CHECK: vpscatterdd dword ptr [r14 + 8*zmm4 - 123] {k1}, zmm23
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x49,0xa0,0xbc,0xe6,0x85,0xff,0xff,0xff]
-          vpscatterdd ZMMWORD PTR [r14+zmm4*8-0x7b]{k1},zmm23
+          vpscatterdd DWORD PTR [r14+zmm4*8-0x7b]{k1},zmm23
 
-// CHECK: vpscatterdd zmmword ptr [r9 + zmm4 + 256] {k1}, zmm23
+// CHECK: vpscatterdd dword ptr [r9 + zmm4 + 256] {k1}, zmm23
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x49,0xa0,0x7c,0x21,0x40]
-          vpscatterdd ZMMWORD PTR [r9+zmm4*1+0x100]{k1},zmm23
+          vpscatterdd DWORD PTR [r9+zmm4*1+0x100]{k1},zmm23
 
-// CHECK: vpscatterdd zmmword ptr [rcx + 4*zmm4 + 1024] {k1}, zmm23
+// CHECK: vpscatterdd dword ptr [rcx + 4*zmm4 + 1024] {k1}, zmm23
 // CHECK:  encoding: [0x62,0xe2,0x7d,0x49,0xa0,0xbc,0xa1,0x00,0x04,0x00,0x00]
-          vpscatterdd ZMMWORD PTR [rcx+zmm4*4+0x400]{k1},zmm23
+          vpscatterdd DWORD PTR [rcx+zmm4*4+0x400]{k1},zmm23
 
-// CHECK: vpscatterdq zmmword ptr [r14 + 8*ymm25 - 123] {k1}, zmm1
+// CHECK: vpscatterdq qword ptr [r14 + 8*ymm25 - 123] {k1}, zmm1
 // CHECK:  encoding: [0x62,0x92,0xfd,0x41,0xa0,0x8c,0xce,0x85,0xff,0xff,0xff]
-          vpscatterdq ZMMWORD PTR [r14+ymm25*8-0x7b]{k1},zmm1
+          vpscatterdq QWORD PTR [r14+ymm25*8-0x7b]{k1},zmm1
 
-// CHECK: vpscatterdq zmmword ptr [r14 + 8*ymm25 - 123] {k1}, zmm1
+// CHECK: vpscatterdq qword ptr [r14 + 8*ymm25 - 123] {k1}, zmm1
 // CHECK:  encoding: [0x62,0x92,0xfd,0x41,0xa0,0x8c,0xce,0x85,0xff,0xff,0xff]
-          vpscatterdq ZMMWORD PTR [r14+ymm25*8-0x7b]{k1},zmm1
+          vpscatterdq QWORD PTR [r14+ymm25*8-0x7b]{k1},zmm1
 
-// CHECK: vpscatterdq zmmword ptr [r9 + ymm25 + 256] {k1}, zmm1
+// CHECK: vpscatterdq qword ptr [r9 + ymm25 + 256] {k1}, zmm1
 // CHECK:  encoding: [0x62,0x92,0xfd,0x41,0xa0,0x4c,0x09,0x20]
-          vpscatterdq ZMMWORD PTR [r9+ymm25*1+0x100]{k1},zmm1
+          vpscatterdq QWORD PTR [r9+ymm25*1+0x100]{k1},zmm1
 
-// CHECK: vpscatterdq zmmword ptr [rcx + 4*ymm25 + 1024] {k1}, zmm1
+// CHECK: vpscatterdq qword ptr [rcx + 4*ymm25 + 1024] {k1}, zmm1
 // CHECK:  encoding: [0x62,0xb2,0xfd,0x41,0xa0,0x8c,0x89,0x00,0x04,0x00,0x00]
-          vpscatterdq ZMMWORD PTR [rcx+ymm25*4+0x400]{k1},zmm1
+          vpscatterdq QWORD PTR [rcx+ymm25*4+0x400]{k1},zmm1
 
-// CHECK: vpscatterqd ymmword ptr [r14 + 8*zmm22 - 123] {k1}, ymm23
+// CHECK: vpscatterqd dword ptr [r14 + 8*zmm22 - 123] {k1}, ymm23
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa1,0xbc,0xf6,0x85,0xff,0xff,0xff]
-          vpscatterqd YMMWORD PTR [r14+zmm22*8-0x7b]{k1},ymm23
+          vpscatterqd DWORD PTR [r14+zmm22*8-0x7b]{k1},ymm23
 
-// CHECK: vpscatterqd ymmword ptr [r14 + 8*zmm22 - 123] {k1}, ymm23
+// CHECK: vpscatterqd dword ptr [r14 + 8*zmm22 - 123] {k1}, ymm23
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa1,0xbc,0xf6,0x85,0xff,0xff,0xff]
-          vpscatterqd YMMWORD PTR [r14+zmm22*8-0x7b]{k1},ymm23
+          vpscatterqd DWORD PTR [r14+zmm22*8-0x7b]{k1},ymm23
 
-// CHECK: vpscatterqd ymmword ptr [r9 + zmm22 + 256] {k1}, ymm23
+// CHECK: vpscatterqd dword ptr [r9 + zmm22 + 256] {k1}, ymm23
 // CHECK:  encoding: [0x62,0xc2,0x7d,0x41,0xa1,0x7c,0x31,0x40]
-          vpscatterqd YMMWORD PTR [r9+zmm22*1+0x100]{k1},ymm23
+          vpscatterqd DWORD PTR [r9+zmm22*1+0x100]{k1},ymm23
 
-// CHECK: vpscatterqd ymmword ptr [rcx + 4*zmm22 + 1024] {k1}, ymm23
+// CHECK: vpscatterqd dword ptr [rcx + 4*zmm22 + 1024] {k1}, ymm23
 // CHECK:  encoding: [0x62,0xe2,0x7d,0x41,0xa1,0xbc,0xb1,0x00,0x04,0x00,0x00]
-          vpscatterqd YMMWORD PTR [rcx+zmm22*4+0x400]{k1},ymm23
+          vpscatterqd DWORD PTR [rcx+zmm22*4+0x400]{k1},ymm23
 
-// CHECK: vpscatterqq zmmword ptr [r14 + 8*zmm8 - 123] {k1}, zmm2
+// CHECK: vpscatterqq qword ptr [r14 + 8*zmm8 - 123] {k1}, zmm2
 // CHECK:  encoding: [0x62,0x92,0xfd,0x49,0xa1,0x94,0xc6,0x85,0xff,0xff,0xff]
-          vpscatterqq ZMMWORD PTR [r14+zmm8*8-0x7b]{k1},zmm2
+          vpscatterqq QWORD PTR [r14+zmm8*8-0x7b]{k1},zmm2
 
-// CHECK: vpscatterqq zmmword ptr [r14 + 8*zmm8 - 123] {k1}, zmm2
+// CHECK: vpscatterqq qword ptr [r14 + 8*zmm8 - 123] {k1}, zmm2
 // CHECK:  encoding: [0x62,0x92,0xfd,0x49,0xa1,0x94,0xc6,0x85,0xff,0xff,0xff]
-          vpscatterqq ZMMWORD PTR [r14+zmm8*8-0x7b]{k1},zmm2
+          vpscatterqq QWORD PTR [r14+zmm8*8-0x7b]{k1},zmm2
 
-// CHECK: vpscatterqq zmmword ptr [r9 + zmm8 + 256] {k1}, zmm2
+// CHECK: vpscatterqq qword ptr [r9 + zmm8 + 256] {k1}, zmm2
 // CHECK:  encoding: [0x62,0x92,0xfd,0x49,0xa1,0x54,0x01,0x20]
-          vpscatterqq ZMMWORD PTR [r9+zmm8*1+0x100]{k1},zmm2
+          vpscatterqq QWORD PTR [r9+zmm8*1+0x100]{k1},zmm2
 
-// CHECK: vpscatterqq zmmword ptr [rcx + 4*zmm8 + 1024] {k1}, zmm2
+// CHECK: vpscatterqq qword ptr [rcx + 4*zmm8 + 1024] {k1}, zmm2
 // CHECK:  encoding: [0x62,0xb2,0xfd,0x49,0xa1,0x94,0x81,0x00,0x04,0x00,0x00]
-          vpscatterqq ZMMWORD PTR [rcx+zmm8*4+0x400]{k1},zmm2
+          vpscatterqq QWORD PTR [rcx+zmm8*4+0x400]{k1},zmm2
diff --git a/llvm/test/MC/X86/avx512f_vl-intel.s b/llvm/test/MC/X86/avx512f_vl-intel.s
index 31c43afe501711..ed3292b83f4d79 100644
--- a/llvm/test/MC/X86/avx512f_vl-intel.s
+++ b/llvm/test/MC/X86/avx512f_vl-intel.s
@@ -224,901 +224,901 @@
 // CHECK:  encoding: [0x62,0xf1,0x64,0x30,0xc2,0xa2,0xfc,0xfd,0xff,0xff,0x7b]
           vcmpps k4,ymm19,DWORD PTR [rdx-0x204]{1to8},0x7b
 
-// CHECK: vgatherdpd	xmm17 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vgatherdpd	xmm17 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x92,0x8c,0xfe,0x7b,0x00,0x00,0x00]
-          vgatherdpd	xmm17 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+          vgatherdpd	xmm17 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vgatherdpd	xmm17 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherdpd	xmm17 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x92,0x4c,0x39,0x20]
-          vgatherdpd	xmm17 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vgatherdpd	xmm17 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherdpd	xmm17 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherdpd	xmm17 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0x92,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vgatherdpd	xmm17 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherdpd	xmm17 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherdpd	ymm23 {k1}, ymmword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vgatherdpd	ymm23 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x92,0xbc,0xfe,0x7b,0x00,0x00,0x00]
-          vgatherdpd	ymm23 {k1}, ymmword ptr [r14 + 8*xmm31 + 123] 
+          vgatherdpd	ymm23 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vgatherdpd	ymm23 {k1}, ymmword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherdpd	ymm23 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x92,0x7c,0x39,0x20]
-          vgatherdpd	ymm23 {k1}, ymmword ptr [r9 + xmm31 + 256] 
+          vgatherdpd	ymm23 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherdpd	ymm23 {k1}, ymmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherdpd	ymm23 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0x92,0xbc,0xb9,0x00,0x04,0x00,0x00]
-          vgatherdpd	ymm23 {k1}, ymmword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherdpd	ymm23 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherdpd	xmm23 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vgatherdpd	xmm23 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x92,0xbc,0xfe,0x85,0xff,0xff,0xff]
-          vgatherdpd	xmm23 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+          vgatherdpd	xmm23 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vgatherdpd	xmm23 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherdpd	xmm23 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x92,0x7c,0x39,0x20]
-          vgatherdpd	xmm23 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vgatherdpd	xmm23 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherdpd	xmm23 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherdpd	xmm23 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0x92,0xbc,0xb9,0x00,0x04,0x00,0x00]
-          vgatherdpd	xmm23 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherdpd	xmm23 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherdpd	ymm18 {k1}, ymmword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vgatherdpd	ymm18 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x92,0x94,0xfe,0x85,0xff,0xff,0xff]
-          vgatherdpd	ymm18 {k1}, ymmword ptr [r14 + 8*xmm31 - 123] 
+          vgatherdpd	ymm18 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vgatherdpd	ymm18 {k1}, ymmword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherdpd	ymm18 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x92,0x54,0x39,0x20]
-          vgatherdpd	ymm18 {k1}, ymmword ptr [r9 + xmm31 + 256] 
+          vgatherdpd	ymm18 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherdpd	ymm18 {k1}, ymmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherdpd	ymm18 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0x92,0x94,0xb9,0x00,0x04,0x00,0x00]
-          vgatherdpd	ymm18 {k1}, ymmword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherdpd	ymm18 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherdps	xmm18 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vgatherdps	xmm18 {k1}, dword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x92,0x94,0xfe,0x7b,0x00,0x00,0x00]
-          vgatherdps	xmm18 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+          vgatherdps	xmm18 {k1}, dword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vgatherdps	xmm18 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherdps	xmm18 {k1}, dword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x92,0x54,0x39,0x40]
-          vgatherdps	xmm18 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vgatherdps	xmm18 {k1}, dword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherdps	xmm18 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherdps	xmm18 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0x92,0x94,0xb9,0x00,0x04,0x00,0x00]
-          vgatherdps	xmm18 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherdps	xmm18 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherdps	ymm27 {k1}, ymmword ptr [r14 + 8*ymm31 + 123] 
+// CHECK: vgatherdps	ymm27 {k1}, dword ptr [r14 + 8*ymm31 + 123] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x92,0x9c,0xfe,0x7b,0x00,0x00,0x00]
-          vgatherdps	ymm27 {k1}, ymmword ptr [r14 + 8*ymm31 + 123] 
+          vgatherdps	ymm27 {k1}, dword ptr [r14 + 8*ymm31 + 123] 
 
-// CHECK: vgatherdps	ymm27 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+// CHECK: vgatherdps	ymm27 {k1}, dword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x92,0x5c,0x39,0x40]
-          vgatherdps	ymm27 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+          vgatherdps	ymm27 {k1}, dword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vgatherdps	ymm27 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vgatherdps	ymm27 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0x92,0x9c,0xb9,0x00,0x04,0x00,0x00]
-          vgatherdps	ymm27 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+          vgatherdps	ymm27 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vgatherdps	xmm29 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vgatherdps	xmm29 {k1}, dword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0x92,0xac,0xfe,0x85,0xff,0xff,0xff]
-          vgatherdps	xmm29 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+          vgatherdps	xmm29 {k1}, dword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vgatherdps	xmm29 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherdps	xmm29 {k1}, dword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0x92,0x6c,0x39,0x40]
-          vgatherdps	xmm29 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vgatherdps	xmm29 {k1}, dword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherdps	xmm29 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherdps	xmm29 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0x7d,0x01,0x92,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vgatherdps	xmm29 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherdps	xmm29 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherdps	ymm21 {k1}, ymmword ptr [r14 + 8*ymm31 - 123] 
+// CHECK: vgatherdps	ymm21 {k1}, dword ptr [r14 + 8*ymm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0x92,0xac,0xfe,0x85,0xff,0xff,0xff]
-          vgatherdps	ymm21 {k1}, ymmword ptr [r14 + 8*ymm31 - 123] 
+          vgatherdps	ymm21 {k1}, dword ptr [r14 + 8*ymm31 - 123] 
 
-// CHECK: vgatherdps	ymm21 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+// CHECK: vgatherdps	ymm21 {k1}, dword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0x92,0x6c,0x39,0x40]
-          vgatherdps	ymm21 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+          vgatherdps	ymm21 {k1}, dword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vgatherdps	ymm21 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vgatherdps	ymm21 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x21,0x92,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vgatherdps	ymm21 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+          vgatherdps	ymm21 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vgatherqpd	xmm17 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vgatherqpd	xmm17 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x93,0x8c,0xfe,0x7b,0x00,0x00,0x00]
-          vgatherqpd	xmm17 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+          vgatherqpd	xmm17 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vgatherqpd	xmm17 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherqpd	xmm17 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x93,0x4c,0x39,0x20]
-          vgatherqpd	xmm17 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vgatherqpd	xmm17 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherqpd	xmm17 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherqpd	xmm17 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0x93,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vgatherqpd	xmm17 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherqpd	xmm17 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherqpd	ymm29 {k1}, ymmword ptr [r14 + 8*ymm31 + 123] 
+// CHECK: vgatherqpd	ymm29 {k1}, qword ptr [r14 + 8*ymm31 + 123] 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0x93,0xac,0xfe,0x7b,0x00,0x00,0x00]
-          vgatherqpd	ymm29 {k1}, ymmword ptr [r14 + 8*ymm31 + 123] 
+          vgatherqpd	ymm29 {k1}, qword ptr [r14 + 8*ymm31 + 123] 
 
-// CHECK: vgatherqpd	ymm29 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+// CHECK: vgatherqpd	ymm29 {k1}, qword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0x93,0x6c,0x39,0x20]
-          vgatherqpd	ymm29 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+          vgatherqpd	ymm29 {k1}, qword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vgatherqpd	ymm29 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vgatherqpd	ymm29 {k1}, qword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0xfd,0x21,0x93,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vgatherqpd	ymm29 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+          vgatherqpd	ymm29 {k1}, qword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vgatherqpd	xmm18 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vgatherqpd	xmm18 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x93,0x94,0xfe,0x85,0xff,0xff,0xff]
-          vgatherqpd	xmm18 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+          vgatherqpd	xmm18 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vgatherqpd	xmm18 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherqpd	xmm18 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x93,0x54,0x39,0x20]
-          vgatherqpd	xmm18 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vgatherqpd	xmm18 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherqpd	xmm18 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherqpd	xmm18 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0x93,0x94,0xb9,0x00,0x04,0x00,0x00]
-          vgatherqpd	xmm18 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherqpd	xmm18 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherqpd	ymm21 {k1}, ymmword ptr [r14 + 8*ymm31 - 123] 
+// CHECK: vgatherqpd	ymm21 {k1}, qword ptr [r14 + 8*ymm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x93,0xac,0xfe,0x85,0xff,0xff,0xff]
-          vgatherqpd	ymm21 {k1}, ymmword ptr [r14 + 8*ymm31 - 123] 
+          vgatherqpd	ymm21 {k1}, qword ptr [r14 + 8*ymm31 - 123] 
 
-// CHECK: vgatherqpd	ymm21 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+// CHECK: vgatherqpd	ymm21 {k1}, qword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x93,0x6c,0x39,0x20]
-          vgatherqpd	ymm21 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+          vgatherqpd	ymm21 {k1}, qword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vgatherqpd	ymm21 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vgatherqpd	ymm21 {k1}, qword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0x93,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vgatherqpd	ymm21 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+          vgatherqpd	ymm21 {k1}, qword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vgatherqps	xmm21 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vgatherqps	xmm21 {k1}, dword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x93,0xac,0xfe,0x7b,0x00,0x00,0x00]
-          vgatherqps	xmm21 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
+          vgatherqps	xmm21 {k1}, dword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vgatherqps	xmm21 {k1}, qword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherqps	xmm21 {k1}, dword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x93,0x6c,0x39,0x40]
-          vgatherqps	xmm21 {k1}, qword ptr [r9 + xmm31 + 256] 
+          vgatherqps	xmm21 {k1}, dword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherqps	xmm21 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherqps	xmm21 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0x93,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vgatherqps	xmm21 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherqps	xmm21 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherqps	xmm19 {k1}, xmmword ptr [r14 + 8*ymm31 + 123] 
+// CHECK: vgatherqps	xmm19 {k1}, dword ptr [r14 + 8*ymm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0x93,0x9c,0xfe,0x7b,0x00,0x00,0x00]
-          vgatherqps	xmm19 {k1}, xmmword ptr [r14 + 8*ymm31 + 123] 
+          vgatherqps	xmm19 {k1}, dword ptr [r14 + 8*ymm31 + 123] 
 
-// CHECK: vgatherqps	xmm19 {k1}, xmmword ptr [r9 + ymm31 + 256] 
+// CHECK: vgatherqps	xmm19 {k1}, dword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0x93,0x5c,0x39,0x40]
-          vgatherqps	xmm19 {k1}, xmmword ptr [r9 + ymm31 + 256] 
+          vgatherqps	xmm19 {k1}, dword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vgatherqps	xmm19 {k1}, xmmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vgatherqps	xmm19 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x21,0x93,0x9c,0xb9,0x00,0x04,0x00,0x00]
-          vgatherqps	xmm19 {k1}, xmmword ptr [rcx + 4*ymm31 + 1024] 
+          vgatherqps	xmm19 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vgatherqps	xmm22 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vgatherqps	xmm22 {k1}, dword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x93,0xb4,0xfe,0x85,0xff,0xff,0xff]
-          vgatherqps	xmm22 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
+          vgatherqps	xmm22 {k1}, dword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vgatherqps	xmm22 {k1}, qword ptr [r9 + xmm31 + 256] 
+// CHECK: vgatherqps	xmm22 {k1}, dword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x93,0x74,0x39,0x40]
-          vgatherqps	xmm22 {k1}, qword ptr [r9 + xmm31 + 256] 
+          vgatherqps	xmm22 {k1}, dword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vgatherqps	xmm22 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vgatherqps	xmm22 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0x93,0xb4,0xb9,0x00,0x04,0x00,0x00]
-          vgatherqps	xmm22 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
+          vgatherqps	xmm22 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vgatherqps	xmm30 {k1}, xmmword ptr [r14 + 8*ymm31 - 123] 
+// CHECK: vgatherqps	xmm30 {k1}, dword ptr [r14 + 8*ymm31 - 123] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x93,0xb4,0xfe,0x85,0xff,0xff,0xff]
-          vgatherqps	xmm30 {k1}, xmmword ptr [r14 + 8*ymm31 - 123] 
+          vgatherqps	xmm30 {k1}, dword ptr [r14 + 8*ymm31 - 123] 
 
-// CHECK: vgatherqps	xmm30 {k1}, xmmword ptr [r9 + ymm31 + 256] 
+// CHECK: vgatherqps	xmm30 {k1}, dword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x93,0x74,0x39,0x40]
-          vgatherqps	xmm30 {k1}, xmmword ptr [r9 + ymm31 + 256] 
+          vgatherqps	xmm30 {k1}, dword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vgatherqps	xmm30 {k1}, xmmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vgatherqps	xmm30 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0x93,0xb4,0xb9,0x00,0x04,0x00,0x00]
-          vgatherqps	xmm30 {k1}, xmmword ptr [rcx + 4*ymm31 + 1024] 
+          vgatherqps	xmm30 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vpgatherdd	xmm17 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vpgatherdd	xmm17 {k1}, dword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x90,0x8c,0xfe,0x7b,0x00,0x00,0x00]
-          vpgatherdd	xmm17 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+          vpgatherdd	xmm17 {k1}, dword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vpgatherdd	xmm17 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherdd	xmm17 {k1}, dword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x90,0x4c,0x39,0x40]
-          vpgatherdd	xmm17 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vpgatherdd	xmm17 {k1}, dword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherdd	xmm17 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherdd	xmm17 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0x90,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdd	xmm17 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherdd	xmm17 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherdd	ymm19 {k1}, ymmword ptr [r14 + 8*ymm31 + 123] 
+// CHECK: vpgatherdd	ymm19 {k1}, dword ptr [r14 + 8*ymm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0x90,0x9c,0xfe,0x7b,0x00,0x00,0x00]
-          vpgatherdd	ymm19 {k1}, ymmword ptr [r14 + 8*ymm31 + 123] 
+          vpgatherdd	ymm19 {k1}, dword ptr [r14 + 8*ymm31 + 123] 
 
-// CHECK: vpgatherdd	ymm19 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+// CHECK: vpgatherdd	ymm19 {k1}, dword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0x90,0x5c,0x39,0x40]
-          vpgatherdd	ymm19 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+          vpgatherdd	ymm19 {k1}, dword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vpgatherdd	ymm19 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vpgatherdd	ymm19 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x21,0x90,0x9c,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdd	ymm19 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+          vpgatherdd	ymm19 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vpgatherdd	xmm22 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vpgatherdd	xmm22 {k1}, dword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x90,0xb4,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherdd	xmm22 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+          vpgatherdd	xmm22 {k1}, dword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vpgatherdd	xmm22 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherdd	xmm22 {k1}, dword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x90,0x74,0x39,0x40]
-          vpgatherdd	xmm22 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vpgatherdd	xmm22 {k1}, dword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherdd	xmm22 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherdd	xmm22 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0x90,0xb4,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdd	xmm22 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherdd	xmm22 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherdd	ymm29 {k1}, ymmword ptr [r14 + 8*ymm31 - 123] 
+// CHECK: vpgatherdd	ymm29 {k1}, dword ptr [r14 + 8*ymm31 - 123] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x90,0xac,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherdd	ymm29 {k1}, ymmword ptr [r14 + 8*ymm31 - 123] 
+          vpgatherdd	ymm29 {k1}, dword ptr [r14 + 8*ymm31 - 123] 
 
-// CHECK: vpgatherdd	ymm29 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+// CHECK: vpgatherdd	ymm29 {k1}, dword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x90,0x6c,0x39,0x40]
-          vpgatherdd	ymm29 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+          vpgatherdd	ymm29 {k1}, dword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vpgatherdd	ymm29 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vpgatherdd	ymm29 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0x90,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdd	ymm29 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+          vpgatherdd	ymm29 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vpgatherdq	xmm17 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vpgatherdq	xmm17 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x90,0x8c,0xfe,0x7b,0x00,0x00,0x00]
-          vpgatherdq	xmm17 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+          vpgatherdq	xmm17 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vpgatherdq	xmm17 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherdq	xmm17 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x90,0x4c,0x39,0x20]
-          vpgatherdq	xmm17 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vpgatherdq	xmm17 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherdq	xmm17 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherdq	xmm17 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0x90,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdq	xmm17 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherdq	xmm17 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherdq	ymm26 {k1}, ymmword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vpgatherdq	ymm26 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0x90,0x94,0xfe,0x7b,0x00,0x00,0x00]
-          vpgatherdq	ymm26 {k1}, ymmword ptr [r14 + 8*xmm31 + 123] 
+          vpgatherdq	ymm26 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vpgatherdq	ymm26 {k1}, ymmword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherdq	ymm26 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0x90,0x54,0x39,0x20]
-          vpgatherdq	ymm26 {k1}, ymmword ptr [r9 + xmm31 + 256] 
+          vpgatherdq	ymm26 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherdq	ymm26 {k1}, ymmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherdq	ymm26 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0xfd,0x21,0x90,0x94,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdq	ymm26 {k1}, ymmword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherdq	ymm26 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherdq	xmm25 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vpgatherdq	xmm25 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0x90,0x8c,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherdq	xmm25 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+          vpgatherdq	xmm25 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vpgatherdq	xmm25 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherdq	xmm25 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0x90,0x4c,0x39,0x20]
-          vpgatherdq	xmm25 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vpgatherdq	xmm25 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherdq	xmm25 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherdq	xmm25 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0xfd,0x01,0x90,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdq	xmm25 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherdq	xmm25 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherdq	ymm22 {k1}, ymmword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vpgatherdq	ymm22 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x90,0xb4,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherdq	ymm22 {k1}, ymmword ptr [r14 + 8*xmm31 - 123] 
+          vpgatherdq	ymm22 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vpgatherdq	ymm22 {k1}, ymmword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherdq	ymm22 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x90,0x74,0x39,0x20]
-          vpgatherdq	ymm22 {k1}, ymmword ptr [r9 + xmm31 + 256] 
+          vpgatherdq	ymm22 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherdq	ymm22 {k1}, ymmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherdq	ymm22 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0x90,0xb4,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherdq	ymm22 {k1}, ymmword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherdq	ymm22 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherqd	xmm21 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vpgatherqd	xmm21 {k1}, dword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x91,0xac,0xfe,0x7b,0x00,0x00,0x00]
-          vpgatherqd	xmm21 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
+          vpgatherqd	xmm21 {k1}, dword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vpgatherqd	xmm21 {k1}, qword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherqd	xmm21 {k1}, dword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0x91,0x6c,0x39,0x40]
-          vpgatherqd	xmm21 {k1}, qword ptr [r9 + xmm31 + 256] 
+          vpgatherqd	xmm21 {k1}, dword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherqd	xmm21 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherqd	xmm21 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0x91,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherqd	xmm21 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherqd	xmm21 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherqd	xmm25 {k1}, xmmword ptr [r14 + 8*ymm31 + 123] 
+// CHECK: vpgatherqd	xmm25 {k1}, dword ptr [r14 + 8*ymm31 + 123] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x91,0x8c,0xfe,0x7b,0x00,0x00,0x00]
-          vpgatherqd	xmm25 {k1}, xmmword ptr [r14 + 8*ymm31 + 123] 
+          vpgatherqd	xmm25 {k1}, dword ptr [r14 + 8*ymm31 + 123] 
 
-// CHECK: vpgatherqd	xmm25 {k1}, xmmword ptr [r9 + ymm31 + 256] 
+// CHECK: vpgatherqd	xmm25 {k1}, dword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x91,0x4c,0x39,0x40]
-          vpgatherqd	xmm25 {k1}, xmmword ptr [r9 + ymm31 + 256] 
+          vpgatherqd	xmm25 {k1}, dword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vpgatherqd	xmm25 {k1}, xmmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vpgatherqd	xmm25 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0x91,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherqd	xmm25 {k1}, xmmword ptr [rcx + 4*ymm31 + 1024] 
+          vpgatherqd	xmm25 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vpgatherqd	xmm30 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vpgatherqd	xmm30 {k1}, dword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0x91,0xb4,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherqd	xmm30 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
+          vpgatherqd	xmm30 {k1}, dword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vpgatherqd	xmm30 {k1}, qword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherqd	xmm30 {k1}, dword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0x91,0x74,0x39,0x40]
-          vpgatherqd	xmm30 {k1}, qword ptr [r9 + xmm31 + 256] 
+          vpgatherqd	xmm30 {k1}, dword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherqd	xmm30 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherqd	xmm30 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0x7d,0x01,0x91,0xb4,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherqd	xmm30 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherqd	xmm30 {k1}, dword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherqd	xmm28 {k1}, xmmword ptr [r14 + 8*ymm31 - 123] 
+// CHECK: vpgatherqd	xmm28 {k1}, dword ptr [r14 + 8*ymm31 - 123] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x91,0xa4,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherqd	xmm28 {k1}, xmmword ptr [r14 + 8*ymm31 - 123] 
+          vpgatherqd	xmm28 {k1}, dword ptr [r14 + 8*ymm31 - 123] 
 
-// CHECK: vpgatherqd	xmm28 {k1}, xmmword ptr [r9 + ymm31 + 256] 
+// CHECK: vpgatherqd	xmm28 {k1}, dword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0x91,0x64,0x39,0x40]
-          vpgatherqd	xmm28 {k1}, xmmword ptr [r9 + ymm31 + 256] 
+          vpgatherqd	xmm28 {k1}, dword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vpgatherqd	xmm28 {k1}, xmmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vpgatherqd	xmm28 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0x91,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherqd	xmm28 {k1}, xmmword ptr [rcx + 4*ymm31 + 1024] 
+          vpgatherqd	xmm28 {k1}, dword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vpgatherqq	xmm18 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+// CHECK: vpgatherqq	xmm18 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x91,0x94,0xfe,0x7b,0x00,0x00,0x00]
-          vpgatherqq	xmm18 {k1}, xmmword ptr [r14 + 8*xmm31 + 123] 
+          vpgatherqq	xmm18 {k1}, qword ptr [r14 + 8*xmm31 + 123] 
 
-// CHECK: vpgatherqq	xmm18 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherqq	xmm18 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x91,0x54,0x39,0x20]
-          vpgatherqq	xmm18 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vpgatherqq	xmm18 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherqq	xmm18 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherqq	xmm18 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0x91,0x94,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherqq	xmm18 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherqq	xmm18 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherqq	ymm19 {k1}, ymmword ptr [r14 + 8*ymm31 + 123] 
+// CHECK: vpgatherqq	ymm19 {k1}, qword ptr [r14 + 8*ymm31 + 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x91,0x9c,0xfe,0x7b,0x00,0x00,0x00]
-          vpgatherqq	ymm19 {k1}, ymmword ptr [r14 + 8*ymm31 + 123] 
+          vpgatherqq	ymm19 {k1}, qword ptr [r14 + 8*ymm31 + 123] 
 
-// CHECK: vpgatherqq	ymm19 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+// CHECK: vpgatherqq	ymm19 {k1}, qword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0x91,0x5c,0x39,0x20]
-          vpgatherqq	ymm19 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+          vpgatherqq	ymm19 {k1}, qword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vpgatherqq	ymm19 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vpgatherqq	ymm19 {k1}, qword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0x91,0x9c,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherqq	ymm19 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+          vpgatherqq	ymm19 {k1}, qword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vpgatherqq	xmm23 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+// CHECK: vpgatherqq	xmm23 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x91,0xbc,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherqq	xmm23 {k1}, xmmword ptr [r14 + 8*xmm31 - 123] 
+          vpgatherqq	xmm23 {k1}, qword ptr [r14 + 8*xmm31 - 123] 
 
-// CHECK: vpgatherqq	xmm23 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+// CHECK: vpgatherqq	xmm23 {k1}, qword ptr [r9 + xmm31 + 256] 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0x91,0x7c,0x39,0x20]
-          vpgatherqq	xmm23 {k1}, xmmword ptr [r9 + xmm31 + 256] 
+          vpgatherqq	xmm23 {k1}, qword ptr [r9 + xmm31 + 256] 
 
-// CHECK: vpgatherqq	xmm23 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+// CHECK: vpgatherqq	xmm23 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0x91,0xbc,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherqq	xmm23 {k1}, xmmword ptr [rcx + 4*xmm31 + 1024] 
+          vpgatherqq	xmm23 {k1}, qword ptr [rcx + 4*xmm31 + 1024] 
 
-// CHECK: vpgatherqq	ymm26 {k1}, ymmword ptr [r14 + 8*ymm31 - 123] 
+// CHECK: vpgatherqq	ymm26 {k1}, qword ptr [r14 + 8*ymm31 - 123] 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0x91,0x94,0xfe,0x85,0xff,0xff,0xff]
-          vpgatherqq	ymm26 {k1}, ymmword ptr [r14 + 8*ymm31 - 123] 
+          vpgatherqq	ymm26 {k1}, qword ptr [r14 + 8*ymm31 - 123] 
 
-// CHECK: vpgatherqq	ymm26 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+// CHECK: vpgatherqq	ymm26 {k1}, qword ptr [r9 + ymm31 + 256] 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0x91,0x54,0x39,0x20]
-          vpgatherqq	ymm26 {k1}, ymmword ptr [r9 + ymm31 + 256] 
+          vpgatherqq	ymm26 {k1}, qword ptr [r9 + ymm31 + 256] 
 
-// CHECK: vpgatherqq	ymm26 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+// CHECK: vpgatherqq	ymm26 {k1}, qword ptr [rcx + 4*ymm31 + 1024] 
 // CHECK: encoding: [0x62,0x22,0xfd,0x21,0x91,0x94,0xb9,0x00,0x04,0x00,0x00]
-          vpgatherqq	ymm26 {k1}, ymmword ptr [rcx + 4*ymm31 + 1024] 
+          vpgatherqq	ymm26 {k1}, qword ptr [rcx + 4*ymm31 + 1024] 
 
-// CHECK: vpscatterdd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm20 
+// CHECK: vpscatterdd	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm20 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa0,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterdd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm20 
+          vpscatterdd	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm20 
 
-// CHECK: vpscatterdd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm20 
+// CHECK: vpscatterdd	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm20 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa0,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterdd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm20 
+          vpscatterdd	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm20 
 
-// CHECK: vpscatterdd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm20 
+// CHECK: vpscatterdd	dword ptr [r9 + xmm31 + 256] {k1}, xmm20 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa0,0x64,0x39,0x40]
-          vpscatterdd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm20 
+          vpscatterdd	dword ptr [r9 + xmm31 + 256] {k1}, xmm20 
 
-// CHECK: vpscatterdd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm20 
+// CHECK: vpscatterdd	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm20 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0xa0,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterdd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm20 
+          vpscatterdd	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm20 
 
-// CHECK: vpscatterdd	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm28 
+// CHECK: vpscatterdd	dword ptr [r14 + 8*ymm31 + 123] {k1}, ymm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa0,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterdd	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm28 
+          vpscatterdd	dword ptr [r14 + 8*ymm31 + 123] {k1}, ymm28 
 
-// CHECK: vpscatterdd	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm28 
+// CHECK: vpscatterdd	dword ptr [r14 + 8*ymm31 + 123] {k1}, ymm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa0,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterdd	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm28 
+          vpscatterdd	dword ptr [r14 + 8*ymm31 + 123] {k1}, ymm28 
 
-// CHECK: vpscatterdd	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm28 
+// CHECK: vpscatterdd	dword ptr [r9 + ymm31 + 256] {k1}, ymm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa0,0x64,0x39,0x40]
-          vpscatterdd	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm28 
+          vpscatterdd	dword ptr [r9 + ymm31 + 256] {k1}, ymm28 
 
-// CHECK: vpscatterdd	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm28 
+// CHECK: vpscatterdd	dword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm28 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0xa0,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterdd	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm28 
+          vpscatterdd	dword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm28 
 
-// CHECK: vpscatterdd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm17 
+// CHECK: vpscatterdd	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm17 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa0,0x8c,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterdd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm17 
+          vpscatterdd	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm17 
 
-// CHECK: vpscatterdd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm17 
+// CHECK: vpscatterdd	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm17 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa0,0x8c,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterdd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm17 
+          vpscatterdd	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm17 
 
-// CHECK: vpscatterdd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm17 
+// CHECK: vpscatterdd	dword ptr [r9 + xmm31 + 256] {k1}, xmm17 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa0,0x4c,0x39,0x40]
-          vpscatterdd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm17 
+          vpscatterdd	dword ptr [r9 + xmm31 + 256] {k1}, xmm17 
 
-// CHECK: vpscatterdd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm17 
+// CHECK: vpscatterdd	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm17 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0xa0,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterdd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm17 
+          vpscatterdd	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm17 
 
-// CHECK: vpscatterdd	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm24 
+// CHECK: vpscatterdd	dword ptr [r14 + 8*ymm31 - 123] {k1}, ymm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa0,0x84,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterdd	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm24 
+          vpscatterdd	dword ptr [r14 + 8*ymm31 - 123] {k1}, ymm24 
 
-// CHECK: vpscatterdd	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm24 
+// CHECK: vpscatterdd	dword ptr [r14 + 8*ymm31 - 123] {k1}, ymm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa0,0x84,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterdd	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm24 
+          vpscatterdd	dword ptr [r14 + 8*ymm31 - 123] {k1}, ymm24 
 
-// CHECK: vpscatterdd	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm24 
+// CHECK: vpscatterdd	dword ptr [r9 + ymm31 + 256] {k1}, ymm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa0,0x44,0x39,0x40]
-          vpscatterdd	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm24 
+          vpscatterdd	dword ptr [r9 + ymm31 + 256] {k1}, ymm24 
 
-// CHECK: vpscatterdd	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm24 
+// CHECK: vpscatterdd	dword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm24 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0xa0,0x84,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterdd	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm24 
+          vpscatterdd	dword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm24 
 
-// CHECK: vpscatterdq	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
+// CHECK: vpscatterdq	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa0,0xac,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterdq	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
+          vpscatterdq	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
 
-// CHECK: vpscatterdq	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
+// CHECK: vpscatterdq	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa0,0xac,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterdq	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
+          vpscatterdq	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
 
-// CHECK: vpscatterdq	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm21 
+// CHECK: vpscatterdq	qword ptr [r9 + xmm31 + 256] {k1}, xmm21 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa0,0x6c,0x39,0x20]
-          vpscatterdq	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm21 
+          vpscatterdq	qword ptr [r9 + xmm31 + 256] {k1}, xmm21 
 
-// CHECK: vpscatterdq	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm21 
+// CHECK: vpscatterdq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm21 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0xa0,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterdq	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm21 
+          vpscatterdq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm21 
 
-// CHECK: vpscatterdq	ymmword ptr [r14 + 8*xmm31 + 123] {k1}, ymm28 
+// CHECK: vpscatterdq	qword ptr [r14 + 8*xmm31 + 123] {k1}, ymm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa0,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterdq	ymmword ptr [r14 + 8*xmm31 + 123] {k1}, ymm28 
+          vpscatterdq	qword ptr [r14 + 8*xmm31 + 123] {k1}, ymm28 
 
-// CHECK: vpscatterdq	ymmword ptr [r14 + 8*xmm31 + 123] {k1}, ymm28 
+// CHECK: vpscatterdq	qword ptr [r14 + 8*xmm31 + 123] {k1}, ymm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa0,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterdq	ymmword ptr [r14 + 8*xmm31 + 123] {k1}, ymm28 
+          vpscatterdq	qword ptr [r14 + 8*xmm31 + 123] {k1}, ymm28 
 
-// CHECK: vpscatterdq	ymmword ptr [r9 + xmm31 + 256] {k1}, ymm28 
+// CHECK: vpscatterdq	qword ptr [r9 + xmm31 + 256] {k1}, ymm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa0,0x64,0x39,0x20]
-          vpscatterdq	ymmword ptr [r9 + xmm31 + 256] {k1}, ymm28 
+          vpscatterdq	qword ptr [r9 + xmm31 + 256] {k1}, ymm28 
 
-// CHECK: vpscatterdq	ymmword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm28 
+// CHECK: vpscatterdq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm28 
 // CHECK: encoding: [0x62,0x22,0xfd,0x21,0xa0,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterdq	ymmword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm28 
+          vpscatterdq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm28 
 
-// CHECK: vpscatterdq	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
+// CHECK: vpscatterdq	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa0,0xa4,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterdq	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
+          vpscatterdq	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
 
-// CHECK: vpscatterdq	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
+// CHECK: vpscatterdq	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa0,0xa4,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterdq	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
+          vpscatterdq	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
 
-// CHECK: vpscatterdq	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm28 
+// CHECK: vpscatterdq	qword ptr [r9 + xmm31 + 256] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa0,0x64,0x39,0x20]
-          vpscatterdq	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm28 
+          vpscatterdq	qword ptr [r9 + xmm31 + 256] {k1}, xmm28 
 
-// CHECK: vpscatterdq	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
+// CHECK: vpscatterdq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x22,0xfd,0x01,0xa0,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterdq	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
+          vpscatterdq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
 
-// CHECK: vpscatterdq	ymmword ptr [r14 + 8*xmm31 - 123] {k1}, ymm20 
+// CHECK: vpscatterdq	qword ptr [r14 + 8*xmm31 - 123] {k1}, ymm20 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa0,0xa4,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterdq	ymmword ptr [r14 + 8*xmm31 - 123] {k1}, ymm20 
+          vpscatterdq	qword ptr [r14 + 8*xmm31 - 123] {k1}, ymm20 
 
-// CHECK: vpscatterdq	ymmword ptr [r14 + 8*xmm31 - 123] {k1}, ymm20 
+// CHECK: vpscatterdq	qword ptr [r14 + 8*xmm31 - 123] {k1}, ymm20 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa0,0xa4,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterdq	ymmword ptr [r14 + 8*xmm31 - 123] {k1}, ymm20 
+          vpscatterdq	qword ptr [r14 + 8*xmm31 - 123] {k1}, ymm20 
 
-// CHECK: vpscatterdq	ymmword ptr [r9 + xmm31 + 256] {k1}, ymm20 
+// CHECK: vpscatterdq	qword ptr [r9 + xmm31 + 256] {k1}, ymm20 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa0,0x64,0x39,0x20]
-          vpscatterdq	ymmword ptr [r9 + xmm31 + 256] {k1}, ymm20 
+          vpscatterdq	qword ptr [r9 + xmm31 + 256] {k1}, ymm20 
 
-// CHECK: vpscatterdq	ymmword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm20 
+// CHECK: vpscatterdq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm20 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0xa0,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterdq	ymmword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm20 
+          vpscatterdq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm20 
 
-// CHECK: vpscatterqd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm22 
+// CHECK: vpscatterqd	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm22 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa1,0xb4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterqd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm22 
+          vpscatterqd	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm22 
 
-// CHECK: vpscatterqd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm22 
+// CHECK: vpscatterqd	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm22 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa1,0xb4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterqd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm22 
+          vpscatterqd	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm22 
 
-// CHECK: vpscatterqd	qword ptr [r9 + xmm31 + 256] {k1}, xmm22 
+// CHECK: vpscatterqd	dword ptr [r9 + xmm31 + 256] {k1}, xmm22 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa1,0x74,0x39,0x40]
-          vpscatterqd	qword ptr [r9 + xmm31 + 256] {k1}, xmm22 
+          vpscatterqd	dword ptr [r9 + xmm31 + 256] {k1}, xmm22 
 
-// CHECK: vpscatterqd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm22 
+// CHECK: vpscatterqd	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm22 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0xa1,0xb4,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterqd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm22 
+          vpscatterqd	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm22 
 
-// CHECK: vpscatterqd	xmmword ptr [r14 + 8*ymm31 + 123] {k1}, xmm24 
+// CHECK: vpscatterqd	dword ptr [r14 + 8*ymm31 + 123] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa1,0x84,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterqd	xmmword ptr [r14 + 8*ymm31 + 123] {k1}, xmm24 
+          vpscatterqd	dword ptr [r14 + 8*ymm31 + 123] {k1}, xmm24 
 
-// CHECK: vpscatterqd	xmmword ptr [r14 + 8*ymm31 + 123] {k1}, xmm24 
+// CHECK: vpscatterqd	dword ptr [r14 + 8*ymm31 + 123] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa1,0x84,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterqd	xmmword ptr [r14 + 8*ymm31 + 123] {k1}, xmm24 
+          vpscatterqd	dword ptr [r14 + 8*ymm31 + 123] {k1}, xmm24 
 
-// CHECK: vpscatterqd	xmmword ptr [r9 + ymm31 + 256] {k1}, xmm24 
+// CHECK: vpscatterqd	dword ptr [r9 + ymm31 + 256] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa1,0x44,0x39,0x40]
-          vpscatterqd	xmmword ptr [r9 + ymm31 + 256] {k1}, xmm24 
+          vpscatterqd	dword ptr [r9 + ymm31 + 256] {k1}, xmm24 
 
-// CHECK: vpscatterqd	xmmword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm24 
+// CHECK: vpscatterqd	dword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0xa1,0x84,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterqd	xmmword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm24 
+          vpscatterqd	dword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm24 
 
-// CHECK: vpscatterqd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm22 
+// CHECK: vpscatterqd	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm22 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa1,0xb4,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterqd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm22 
+          vpscatterqd	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm22 
 
-// CHECK: vpscatterqd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm22 
+// CHECK: vpscatterqd	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm22 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa1,0xb4,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterqd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm22 
+          vpscatterqd	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm22 
 
-// CHECK: vpscatterqd	qword ptr [r9 + xmm31 + 256] {k1}, xmm22 
+// CHECK: vpscatterqd	dword ptr [r9 + xmm31 + 256] {k1}, xmm22 
 // CHECK: encoding: [0x62,0x82,0x7d,0x01,0xa1,0x74,0x39,0x40]
-          vpscatterqd	qword ptr [r9 + xmm31 + 256] {k1}, xmm22 
+          vpscatterqd	dword ptr [r9 + xmm31 + 256] {k1}, xmm22 
 
-// CHECK: vpscatterqd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm22 
+// CHECK: vpscatterqd	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm22 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x01,0xa1,0xb4,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterqd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm22 
+          vpscatterqd	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm22 
 
-// CHECK: vpscatterqd	xmmword ptr [r14 + 8*ymm31 - 123] {k1}, xmm29 
+// CHECK: vpscatterqd	dword ptr [r14 + 8*ymm31 - 123] {k1}, xmm29 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa1,0xac,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterqd	xmmword ptr [r14 + 8*ymm31 - 123] {k1}, xmm29 
+          vpscatterqd	dword ptr [r14 + 8*ymm31 - 123] {k1}, xmm29 
 
-// CHECK: vpscatterqd	xmmword ptr [r14 + 8*ymm31 - 123] {k1}, xmm29 
+// CHECK: vpscatterqd	dword ptr [r14 + 8*ymm31 - 123] {k1}, xmm29 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa1,0xac,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterqd	xmmword ptr [r14 + 8*ymm31 - 123] {k1}, xmm29 
+          vpscatterqd	dword ptr [r14 + 8*ymm31 - 123] {k1}, xmm29 
 
-// CHECK: vpscatterqd	xmmword ptr [r9 + ymm31 + 256] {k1}, xmm29 
+// CHECK: vpscatterqd	dword ptr [r9 + ymm31 + 256] {k1}, xmm29 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa1,0x6c,0x39,0x40]
-          vpscatterqd	xmmword ptr [r9 + ymm31 + 256] {k1}, xmm29 
+          vpscatterqd	dword ptr [r9 + ymm31 + 256] {k1}, xmm29 
 
-// CHECK: vpscatterqd	xmmword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm29 
+// CHECK: vpscatterqd	dword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm29 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0xa1,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterqd	xmmword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm29 
+          vpscatterqd	dword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm29 
 
-// CHECK: vpscatterqq	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
+// CHECK: vpscatterqq	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa1,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterqq	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
+          vpscatterqq	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
 
-// CHECK: vpscatterqq	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
+// CHECK: vpscatterqq	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa1,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterqq	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
+          vpscatterqq	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
 
-// CHECK: vpscatterqq	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm28 
+// CHECK: vpscatterqq	qword ptr [r9 + xmm31 + 256] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa1,0x64,0x39,0x20]
-          vpscatterqq	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm28 
+          vpscatterqq	qword ptr [r9 + xmm31 + 256] {k1}, xmm28 
 
-// CHECK: vpscatterqq	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
+// CHECK: vpscatterqq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x22,0xfd,0x01,0xa1,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterqq	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
+          vpscatterqq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
 
-// CHECK: vpscatterqq	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm19 
+// CHECK: vpscatterqq	qword ptr [r14 + 8*ymm31 + 123] {k1}, ymm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa1,0x9c,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterqq	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm19 
+          vpscatterqq	qword ptr [r14 + 8*ymm31 + 123] {k1}, ymm19 
 
-// CHECK: vpscatterqq	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm19 
+// CHECK: vpscatterqq	qword ptr [r14 + 8*ymm31 + 123] {k1}, ymm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa1,0x9c,0xfe,0x7b,0x00,0x00,0x00]
-          vpscatterqq	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm19 
+          vpscatterqq	qword ptr [r14 + 8*ymm31 + 123] {k1}, ymm19 
 
-// CHECK: vpscatterqq	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm19 
+// CHECK: vpscatterqq	qword ptr [r9 + ymm31 + 256] {k1}, ymm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa1,0x5c,0x39,0x20]
-          vpscatterqq	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm19 
+          vpscatterqq	qword ptr [r9 + ymm31 + 256] {k1}, ymm19 
 
-// CHECK: vpscatterqq	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm19 
+// CHECK: vpscatterqq	qword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm19 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0xa1,0x9c,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterqq	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm19 
+          vpscatterqq	qword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm19 
 
-// CHECK: vpscatterqq	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm24 
+// CHECK: vpscatterqq	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa1,0x84,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterqq	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm24 
+          vpscatterqq	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm24 
 
-// CHECK: vpscatterqq	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm24 
+// CHECK: vpscatterqq	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa1,0x84,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterqq	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm24 
+          vpscatterqq	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm24 
 
-// CHECK: vpscatterqq	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm24 
+// CHECK: vpscatterqq	qword ptr [r9 + xmm31 + 256] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0xfd,0x01,0xa1,0x44,0x39,0x20]
-          vpscatterqq	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm24 
+          vpscatterqq	qword ptr [r9 + xmm31 + 256] {k1}, xmm24 
 
-// CHECK: vpscatterqq	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm24 
+// CHECK: vpscatterqq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x22,0xfd,0x01,0xa1,0x84,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterqq	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm24 
+          vpscatterqq	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm24 
 
-// CHECK: vpscatterqq	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm17 
+// CHECK: vpscatterqq	qword ptr [r14 + 8*ymm31 - 123] {k1}, ymm17 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa1,0x8c,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterqq	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm17 
+          vpscatterqq	qword ptr [r14 + 8*ymm31 - 123] {k1}, ymm17 
 
-// CHECK: vpscatterqq	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm17 
+// CHECK: vpscatterqq	qword ptr [r14 + 8*ymm31 - 123] {k1}, ymm17 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa1,0x8c,0xfe,0x85,0xff,0xff,0xff]
-          vpscatterqq	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm17 
+          vpscatterqq	qword ptr [r14 + 8*ymm31 - 123] {k1}, ymm17 
 
-// CHECK: vpscatterqq	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm17 
+// CHECK: vpscatterqq	qword ptr [r9 + ymm31 + 256] {k1}, ymm17 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa1,0x4c,0x39,0x20]
-          vpscatterqq	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm17 
+          vpscatterqq	qword ptr [r9 + ymm31 + 256] {k1}, ymm17 
 
-// CHECK: vpscatterqq	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm17 
+// CHECK: vpscatterqq	qword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm17 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0xa1,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vpscatterqq	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm17 
+          vpscatterqq	qword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm17 
 
-// CHECK: vscatterdpd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm18 
+// CHECK: vscatterdpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm18 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa2,0x94,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterdpd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm18 
+          vscatterdpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm18 
 
-// CHECK: vscatterdpd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm18 
+// CHECK: vscatterdpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm18 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa2,0x94,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterdpd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm18 
+          vscatterdpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm18 
 
-// CHECK: vscatterdpd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm18 
+// CHECK: vscatterdpd	qword ptr [r9 + xmm31 + 256] {k1}, xmm18 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa2,0x54,0x39,0x20]
-          vscatterdpd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm18 
+          vscatterdpd	qword ptr [r9 + xmm31 + 256] {k1}, xmm18 
 
-// CHECK: vscatterdpd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm18 
+// CHECK: vscatterdpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm18 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0xa2,0x94,0xb9,0x00,0x04,0x00,0x00]
-          vscatterdpd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm18 
+          vscatterdpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm18 
 
-// CHECK: vscatterdpd	ymmword ptr [r14 + 8*xmm31 + 123] {k1}, ymm30 
+// CHECK: vscatterdpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, ymm30 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa2,0xb4,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterdpd	ymmword ptr [r14 + 8*xmm31 + 123] {k1}, ymm30 
+          vscatterdpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, ymm30 
 
-// CHECK: vscatterdpd	ymmword ptr [r14 + 8*xmm31 + 123] {k1}, ymm30 
+// CHECK: vscatterdpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, ymm30 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa2,0xb4,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterdpd	ymmword ptr [r14 + 8*xmm31 + 123] {k1}, ymm30 
+          vscatterdpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, ymm30 
 
-// CHECK: vscatterdpd	ymmword ptr [r9 + xmm31 + 256] {k1}, ymm30 
+// CHECK: vscatterdpd	qword ptr [r9 + xmm31 + 256] {k1}, ymm30 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa2,0x74,0x39,0x20]
-          vscatterdpd	ymmword ptr [r9 + xmm31 + 256] {k1}, ymm30 
+          vscatterdpd	qword ptr [r9 + xmm31 + 256] {k1}, ymm30 
 
-// CHECK: vscatterdpd	ymmword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm30 
+// CHECK: vscatterdpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm30 
 // CHECK: encoding: [0x62,0x22,0xfd,0x21,0xa2,0xb4,0xb9,0x00,0x04,0x00,0x00]
-          vscatterdpd	ymmword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm30 
+          vscatterdpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm30 
 
-// CHECK: vscatterdpd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
+// CHECK: vscatterdpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa2,0x9c,0xfe,0x85,0xff,0xff,0xff]
-          vscatterdpd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
+          vscatterdpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
 
-// CHECK: vscatterdpd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
+// CHECK: vscatterdpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa2,0x9c,0xfe,0x85,0xff,0xff,0xff]
-          vscatterdpd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
+          vscatterdpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
 
-// CHECK: vscatterdpd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm19 
+// CHECK: vscatterdpd	qword ptr [r9 + xmm31 + 256] {k1}, xmm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa2,0x5c,0x39,0x20]
-          vscatterdpd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm19 
+          vscatterdpd	qword ptr [r9 + xmm31 + 256] {k1}, xmm19 
 
-// CHECK: vscatterdpd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm19 
+// CHECK: vscatterdpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm19 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0xa2,0x9c,0xb9,0x00,0x04,0x00,0x00]
-          vscatterdpd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm19 
+          vscatterdpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm19 
 
-// CHECK: vscatterdpd	ymmword ptr [r14 + 8*xmm31 - 123] {k1}, ymm26 
+// CHECK: vscatterdpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, ymm26 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa2,0x94,0xfe,0x85,0xff,0xff,0xff]
-          vscatterdpd	ymmword ptr [r14 + 8*xmm31 - 123] {k1}, ymm26 
+          vscatterdpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, ymm26 
 
-// CHECK: vscatterdpd	ymmword ptr [r14 + 8*xmm31 - 123] {k1}, ymm26 
+// CHECK: vscatterdpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, ymm26 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa2,0x94,0xfe,0x85,0xff,0xff,0xff]
-          vscatterdpd	ymmword ptr [r14 + 8*xmm31 - 123] {k1}, ymm26 
+          vscatterdpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, ymm26 
 
-// CHECK: vscatterdpd	ymmword ptr [r9 + xmm31 + 256] {k1}, ymm26 
+// CHECK: vscatterdpd	qword ptr [r9 + xmm31 + 256] {k1}, ymm26 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa2,0x54,0x39,0x20]
-          vscatterdpd	ymmword ptr [r9 + xmm31 + 256] {k1}, ymm26 
+          vscatterdpd	qword ptr [r9 + xmm31 + 256] {k1}, ymm26 
 
-// CHECK: vscatterdpd	ymmword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm26 
+// CHECK: vscatterdpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm26 
 // CHECK: encoding: [0x62,0x22,0xfd,0x21,0xa2,0x94,0xb9,0x00,0x04,0x00,0x00]
-          vscatterdpd	ymmword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm26 
+          vscatterdpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, ymm26 
 
-// CHECK: vscatterdps	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm24 
+// CHECK: vscatterdps	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa2,0x84,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterdps	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm24 
+          vscatterdps	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm24 
 
-// CHECK: vscatterdps	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm24 
+// CHECK: vscatterdps	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa2,0x84,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterdps	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm24 
+          vscatterdps	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm24 
 
-// CHECK: vscatterdps	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm24 
+// CHECK: vscatterdps	dword ptr [r9 + xmm31 + 256] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa2,0x44,0x39,0x40]
-          vscatterdps	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm24 
+          vscatterdps	dword ptr [r9 + xmm31 + 256] {k1}, xmm24 
 
-// CHECK: vscatterdps	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm24 
+// CHECK: vscatterdps	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm24 
 // CHECK: encoding: [0x62,0x22,0x7d,0x01,0xa2,0x84,0xb9,0x00,0x04,0x00,0x00]
-          vscatterdps	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm24 
+          vscatterdps	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm24 
 
-// CHECK: vscatterdps	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
+// CHECK: vscatterdps	dword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0xa2,0xbc,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterdps	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
+          vscatterdps	dword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
 
-// CHECK: vscatterdps	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
+// CHECK: vscatterdps	dword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0xa2,0xbc,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterdps	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
+          vscatterdps	dword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
 
-// CHECK: vscatterdps	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm23 
+// CHECK: vscatterdps	dword ptr [r9 + ymm31 + 256] {k1}, ymm23 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0xa2,0x7c,0x39,0x40]
-          vscatterdps	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm23 
+          vscatterdps	dword ptr [r9 + ymm31 + 256] {k1}, ymm23 
 
-// CHECK: vscatterdps	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm23 
+// CHECK: vscatterdps	dword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm23 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x21,0xa2,0xbc,0xb9,0x00,0x04,0x00,0x00]
-          vscatterdps	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm23 
+          vscatterdps	dword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm23 
 
-// CHECK: vscatterdps	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
+// CHECK: vscatterdps	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa2,0xa4,0xfe,0x85,0xff,0xff,0xff]
-          vscatterdps	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
+          vscatterdps	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
 
-// CHECK: vscatterdps	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
+// CHECK: vscatterdps	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa2,0xa4,0xfe,0x85,0xff,0xff,0xff]
-          vscatterdps	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
+          vscatterdps	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm28 
 
-// CHECK: vscatterdps	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm28 
+// CHECK: vscatterdps	dword ptr [r9 + xmm31 + 256] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa2,0x64,0x39,0x40]
-          vscatterdps	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm28 
+          vscatterdps	dword ptr [r9 + xmm31 + 256] {k1}, xmm28 
 
-// CHECK: vscatterdps	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
+// CHECK: vscatterdps	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x22,0x7d,0x01,0xa2,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vscatterdps	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
+          vscatterdps	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
 
-// CHECK: vscatterdps	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm25 
+// CHECK: vscatterdps	dword ptr [r14 + 8*ymm31 - 123] {k1}, ymm25 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa2,0x8c,0xfe,0x85,0xff,0xff,0xff]
-          vscatterdps	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm25 
+          vscatterdps	dword ptr [r14 + 8*ymm31 - 123] {k1}, ymm25 
 
-// CHECK: vscatterdps	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm25 
+// CHECK: vscatterdps	dword ptr [r14 + 8*ymm31 - 123] {k1}, ymm25 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa2,0x8c,0xfe,0x85,0xff,0xff,0xff]
-          vscatterdps	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm25 
+          vscatterdps	dword ptr [r14 + 8*ymm31 - 123] {k1}, ymm25 
 
-// CHECK: vscatterdps	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm25 
+// CHECK: vscatterdps	dword ptr [r9 + ymm31 + 256] {k1}, ymm25 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa2,0x4c,0x39,0x40]
-          vscatterdps	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm25 
+          vscatterdps	dword ptr [r9 + ymm31 + 256] {k1}, ymm25 
 
-// CHECK: vscatterdps	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm25 
+// CHECK: vscatterdps	dword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm25 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0xa2,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vscatterdps	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm25 
+          vscatterdps	dword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm25 
 
-// CHECK: vscatterqpd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
+// CHECK: vscatterqpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa3,0xac,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterqpd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
+          vscatterqpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
 
-// CHECK: vscatterqpd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
+// CHECK: vscatterqpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa3,0xac,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterqpd	xmmword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
+          vscatterqpd	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm21 
 
-// CHECK: vscatterqpd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm21 
+// CHECK: vscatterqpd	qword ptr [r9 + xmm31 + 256] {k1}, xmm21 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa3,0x6c,0x39,0x20]
-          vscatterqpd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm21 
+          vscatterqpd	qword ptr [r9 + xmm31 + 256] {k1}, xmm21 
 
-// CHECK: vscatterqpd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm21 
+// CHECK: vscatterqpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm21 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0xa3,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vscatterqpd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm21 
+          vscatterqpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm21 
 
-// CHECK: vscatterqpd	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
+// CHECK: vscatterqpd	qword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa3,0xbc,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterqpd	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
+          vscatterqpd	qword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
 
-// CHECK: vscatterqpd	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
+// CHECK: vscatterqpd	qword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa3,0xbc,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterqpd	ymmword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
+          vscatterqpd	qword ptr [r14 + 8*ymm31 + 123] {k1}, ymm23 
 
-// CHECK: vscatterqpd	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm23 
+// CHECK: vscatterqpd	qword ptr [r9 + ymm31 + 256] {k1}, ymm23 
 // CHECK: encoding: [0x62,0x82,0xfd,0x21,0xa3,0x7c,0x39,0x20]
-          vscatterqpd	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm23 
+          vscatterqpd	qword ptr [r9 + ymm31 + 256] {k1}, ymm23 
 
-// CHECK: vscatterqpd	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm23 
+// CHECK: vscatterqpd	qword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm23 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x21,0xa3,0xbc,0xb9,0x00,0x04,0x00,0x00]
-          vscatterqpd	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm23 
+          vscatterqpd	qword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm23 
 
-// CHECK: vscatterqpd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
+// CHECK: vscatterqpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa3,0x9c,0xfe,0x85,0xff,0xff,0xff]
-          vscatterqpd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
+          vscatterqpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
 
-// CHECK: vscatterqpd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
+// CHECK: vscatterqpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa3,0x9c,0xfe,0x85,0xff,0xff,0xff]
-          vscatterqpd	xmmword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
+          vscatterqpd	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm19 
 
-// CHECK: vscatterqpd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm19 
+// CHECK: vscatterqpd	qword ptr [r9 + xmm31 + 256] {k1}, xmm19 
 // CHECK: encoding: [0x62,0x82,0xfd,0x01,0xa3,0x5c,0x39,0x20]
-          vscatterqpd	xmmword ptr [r9 + xmm31 + 256] {k1}, xmm19 
+          vscatterqpd	qword ptr [r9 + xmm31 + 256] {k1}, xmm19 
 
-// CHECK: vscatterqpd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm19 
+// CHECK: vscatterqpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm19 
 // CHECK: encoding: [0x62,0xa2,0xfd,0x01,0xa3,0x9c,0xb9,0x00,0x04,0x00,0x00]
-          vscatterqpd	xmmword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm19 
+          vscatterqpd	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm19 
 
-// CHECK: vscatterqpd	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm29 
+// CHECK: vscatterqpd	qword ptr [r14 + 8*ymm31 - 123] {k1}, ymm29 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa3,0xac,0xfe,0x85,0xff,0xff,0xff]
-          vscatterqpd	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm29 
+          vscatterqpd	qword ptr [r14 + 8*ymm31 - 123] {k1}, ymm29 
 
-// CHECK: vscatterqpd	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm29 
+// CHECK: vscatterqpd	qword ptr [r14 + 8*ymm31 - 123] {k1}, ymm29 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa3,0xac,0xfe,0x85,0xff,0xff,0xff]
-          vscatterqpd	ymmword ptr [r14 + 8*ymm31 - 123] {k1}, ymm29 
+          vscatterqpd	qword ptr [r14 + 8*ymm31 - 123] {k1}, ymm29 
 
-// CHECK: vscatterqpd	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm29 
+// CHECK: vscatterqpd	qword ptr [r9 + ymm31 + 256] {k1}, ymm29 
 // CHECK: encoding: [0x62,0x02,0xfd,0x21,0xa3,0x6c,0x39,0x20]
-          vscatterqpd	ymmword ptr [r9 + ymm31 + 256] {k1}, ymm29 
+          vscatterqpd	qword ptr [r9 + ymm31 + 256] {k1}, ymm29 
 
-// CHECK: vscatterqpd	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm29 
+// CHECK: vscatterqpd	qword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm29 
 // CHECK: encoding: [0x62,0x22,0xfd,0x21,0xa3,0xac,0xb9,0x00,0x04,0x00,0x00]
-          vscatterqpd	ymmword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm29 
+          vscatterqpd	qword ptr [rcx + 4*ymm31 + 1024] {k1}, ymm29 
 
-// CHECK: vscatterqps	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
+// CHECK: vscatterqps	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa3,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterqps	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
+          vscatterqps	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
 
-// CHECK: vscatterqps	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
+// CHECK: vscatterqps	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa3,0xa4,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterqps	qword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
+          vscatterqps	dword ptr [r14 + 8*xmm31 + 123] {k1}, xmm28 
 
-// CHECK: vscatterqps	qword ptr [r9 + xmm31 + 256] {k1}, xmm28 
+// CHECK: vscatterqps	dword ptr [r9 + xmm31 + 256] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa3,0x64,0x39,0x40]
-          vscatterqps	qword ptr [r9 + xmm31 + 256] {k1}, xmm28 
+          vscatterqps	dword ptr [r9 + xmm31 + 256] {k1}, xmm28 
 
-// CHECK: vscatterqps	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
+// CHECK: vscatterqps	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
 // CHECK: encoding: [0x62,0x22,0x7d,0x01,0xa3,0xa4,0xb9,0x00,0x04,0x00,0x00]
-          vscatterqps	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
+          vscatterqps	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm28 
 
-// CHECK: vscatterqps	xmmword ptr [r14 + 8*ymm31 + 123] {k1}, xmm25 
+// CHECK: vscatterqps	dword ptr [r14 + 8*ymm31 + 123] {k1}, xmm25 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa3,0x8c,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterqps	xmmword ptr [r14 + 8*ymm31 + 123] {k1}, xmm25 
+          vscatterqps	dword ptr [r14 + 8*ymm31 + 123] {k1}, xmm25 
 
-// CHECK: vscatterqps	xmmword ptr [r14 + 8*ymm31 + 123] {k1}, xmm25 
+// CHECK: vscatterqps	dword ptr [r14 + 8*ymm31 + 123] {k1}, xmm25 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa3,0x8c,0xfe,0x7b,0x00,0x00,0x00]
-          vscatterqps	xmmword ptr [r14 + 8*ymm31 + 123] {k1}, xmm25 
+          vscatterqps	dword ptr [r14 + 8*ymm31 + 123] {k1}, xmm25 
 
-// CHECK: vscatterqps	xmmword ptr [r9 + ymm31 + 256] {k1}, xmm25 
+// CHECK: vscatterqps	dword ptr [r9 + ymm31 + 256] {k1}, xmm25 
 // CHECK: encoding: [0x62,0x02,0x7d,0x21,0xa3,0x4c,0x39,0x40]
-          vscatterqps	xmmword ptr [r9 + ymm31 + 256] {k1}, xmm25 
+          vscatterqps	dword ptr [r9 + ymm31 + 256] {k1}, xmm25 
 
-// CHECK: vscatterqps	xmmword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm25 
+// CHECK: vscatterqps	dword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm25 
 // CHECK: encoding: [0x62,0x22,0x7d,0x21,0xa3,0x8c,0xb9,0x00,0x04,0x00,0x00]
-          vscatterqps	xmmword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm25 
+          vscatterqps	dword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm25 
 
-// CHECK: vscatterqps	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm27 
+// CHECK: vscatterqps	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm27 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa3,0x9c,0xfe,0x85,0xff,0xff,0xff]
-          vscatterqps	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm27 
+          vscatterqps	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm27 
 
-// CHECK: vscatterqps	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm27 
+// CHECK: vscatterqps	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm27 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa3,0x9c,0xfe,0x85,0xff,0xff,0xff]
-          vscatterqps	qword ptr [r14 + 8*xmm31 - 123] {k1}, xmm27 
+          vscatterqps	dword ptr [r14 + 8*xmm31 - 123] {k1}, xmm27 
 
-// CHECK: vscatterqps	qword ptr [r9 + xmm31 + 256] {k1}, xmm27 
+// CHECK: vscatterqps	dword ptr [r9 + xmm31 + 256] {k1}, xmm27 
 // CHECK: encoding: [0x62,0x02,0x7d,0x01,0xa3,0x5c,0x39,0x40]
-          vscatterqps	qword ptr [r9 + xmm31 + 256] {k1}, xmm27 
+          vscatterqps	dword ptr [r9 + xmm31 + 256] {k1}, xmm27 
 
-// CHECK: vscatterqps	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm27 
+// CHECK: vscatterqps	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm27 
 // CHECK: encoding: [0x62,0x22,0x7d,0x01,0xa3,0x9c,0xb9,0x00,0x04,0x00,0x00]
-          vscatterqps	qword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm27 
+          vscatterqps	dword ptr [rcx + 4*xmm31 + 1024] {k1}, xmm27 
 
-// CHECK: vscatterqps	xmmword ptr [r14 + 8*ymm31 - 123] {k1}, xmm23 
+// CHECK: vscatterqps	dword ptr [r14 + 8*ymm31 - 123] {k1}, xmm23 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0xa3,0xbc,0xfe,0x85,0xff,0xff,0xff]
-          vscatterqps	xmmword ptr [r14 + 8*ymm31 - 123] {k1}, xmm23 
+          vscatterqps	dword ptr [r14 + 8*ymm31 - 123] {k1}, xmm23 
 
-// CHECK: vscatterqps	xmmword ptr [r14 + 8*ymm31 - 123] {k1}, xmm23 
+// CHECK: vscatterqps	dword ptr [r14 + 8*ymm31 - 123] {k1}, xmm23 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0xa3,0xbc,0xfe,0x85,0xff,0xff,0xff]
-          vscatterqps	xmmword ptr [r14 + 8*ymm31 - 123] {k1}, xmm23 
+          vscatterqps	dword ptr [r14 + 8*ymm31 - 123] {k1}, xmm23 
 
-// CHECK: vscatterqps	xmmword ptr [r9 + ymm31 + 256] {k1}, xmm23 
+// CHECK: vscatterqps	dword ptr [r9 + ymm31 + 256] {k1}, xmm23 
 // CHECK: encoding: [0x62,0x82,0x7d,0x21,0xa3,0x7c,0x39,0x40]
-          vscatterqps	xmmword ptr [r9 + ymm31 + 256] {k1}, xmm23 
+          vscatterqps	dword ptr [r9 + ymm31 + 256] {k1}, xmm23 
 
-// CHECK: vscatterqps	xmmword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm23 
+// CHECK: vscatterqps	dword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm23 
 // CHECK: encoding: [0x62,0xa2,0x7d,0x21,0xa3,0xbc,0xb9,0x00,0x04,0x00,0x00]
-          vscatterqps	xmmword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm23 
+          vscatterqps	dword ptr [rcx + 4*ymm31 + 1024] {k1}, xmm23 
 
 // CHECK: vcvtpd2ps xmm0, xmm23 
 // CHECK: encoding: [0x62,0xb1,0xfd,0x08,0x5a,0xc7]
diff --git a/llvm/test/MC/X86/intel-syntax.s b/llvm/test/MC/X86/intel-syntax.s
index 2b365699eec7bd..c622832d24bea2 100644
--- a/llvm/test/MC/X86/intel-syntax.s
+++ b/llvm/test/MC/X86/intel-syntax.s
@@ -144,7 +144,7 @@ main:
 // CHECK: vshufpd $1, %xmm2, %xmm1, %xmm0
     vshufpd XMM0, XMM1, XMM2, 1
 // CHECK: vpgatherdd %xmm8, (%r15,%xmm9,2), %xmm1
-    vpgatherdd XMM10, XMMWORD PTR [R15 + 2*XMM9], XMM8
+    vpgatherdd XMM10, DWORD PTR [R15 + 2*XMM9], XMM8
 // CHECK: movsd -8, %xmm5
     movsd   XMM5, QWORD PTR [-8]
 // CHECK: movsl (%rsi), %es:(%rdi)
diff --git a/llvm/utils/TableGen/X86RecognizableInstr.cpp b/llvm/utils/TableGen/X86RecognizableInstr.cpp
index c6cd3da13646a6..607a6bd27c21f7 100644
--- a/llvm/utils/TableGen/X86RecognizableInstr.cpp
+++ b/llvm/utils/TableGen/X86RecognizableInstr.cpp
@@ -1147,19 +1147,16 @@ OperandType RecognizableInstr::typeFromString(const std::string &s,
   TYPE("VK4Pair", TYPE_VK_PAIR)
   TYPE("VK8Pair", TYPE_VK_PAIR)
   TYPE("VK16Pair", TYPE_VK_PAIR)
+  TYPE("vx32mem", TYPE_MVSIBX)
   TYPE("vx64mem", TYPE_MVSIBX)
-  TYPE("vx128mem", TYPE_MVSIBX)
-  TYPE("vx256mem", TYPE_MVSIBX)
-  TYPE("vy128mem", TYPE_MVSIBY)
-  TYPE("vy256mem", TYPE_MVSIBY)
+  TYPE("vy32mem", TYPE_MVSIBY)
+  TYPE("vy64mem", TYPE_MVSIBY)
+  TYPE("vx32xmem", TYPE_MVSIBX)
   TYPE("vx64xmem", TYPE_MVSIBX)
-  TYPE("vx128xmem", TYPE_MVSIBX)
-  TYPE("vx256xmem", TYPE_MVSIBX)
-  TYPE("vy128xmem", TYPE_MVSIBY)
-  TYPE("vy256xmem", TYPE_MVSIBY)
-  TYPE("vy512xmem", TYPE_MVSIBY)
-  TYPE("vz256mem", TYPE_MVSIBZ)
-  TYPE("vz512mem", TYPE_MVSIBZ)
+  TYPE("vy32xmem", TYPE_MVSIBY)
+  TYPE("vy64xmem", TYPE_MVSIBY)
+  TYPE("vz32mem", TYPE_MVSIBZ)
+  TYPE("vz64mem", TYPE_MVSIBZ)
   TYPE("BNDR", TYPE_BNDR)
   TYPE("TILE", TYPE_TMM)
   TYPE("TILEPair", TYPE_TMM_PAIR)
@@ -1372,19 +1369,16 @@ RecognizableInstr::memoryEncodingFromString(const std::string &s,
   ENCODING("anymem", ENCODING_RM)
   ENCODING("opaquemem", ENCODING_RM)
   ENCODING("sibmem", ENCODING_SIB)
+  ENCODING("vx32mem", ENCODING_VSIB)
   ENCODING("vx64mem", ENCODING_VSIB)
-  ENCODING("vx128mem", ENCODING_VSIB)
-  ENCODING("vx256mem", ENCODING_VSIB)
-  ENCODING("vy128mem", ENCODING_VSIB)
-  ENCODING("vy256mem", ENCODING_VSIB)
+  ENCODING("vy32mem", ENCODING_VSIB)
+  ENCODING("vy64mem", ENCODING_VSIB)
+  ENCODING("vx32xmem", ENCODING_VSIB)
   ENCODING("vx64xmem", ENCODING_VSIB)
-  ENCODING("vx128xmem", ENCODING_VSIB)
-  ENCODING("vx256xmem", ENCODING_VSIB)
-  ENCODING("vy128xmem", ENCODING_VSIB)
-  ENCODING("vy256xmem", ENCODING_VSIB)
-  ENCODING("vy512xmem", ENCODING_VSIB)
-  ENCODING("vz256mem", ENCODING_VSIB)
-  ENCODING("vz512mem", ENCODING_VSIB)
+  ENCODING("vy32xmem", ENCODING_VSIB)
+  ENCODING("vy64xmem", ENCODING_VSIB)
+  ENCODING("vz32mem", ENCODING_VSIB)
+  ENCODING("vz64mem", ENCODING_VSIB)
   errs() << "Unhandled memory encoding " << s << "\n";
   llvm_unreachable("Unhandled memory encoding");
 }



More information about the llvm-commits mailing list