diff --git a/llvm/include/llvm/CodeGen/ValueTypes.td b/llvm/include/llvm/CodeGen/ValueTypes.td
index c797039b78fa..72055400fd16 100644
--- a/llvm/include/llvm/CodeGen/ValueTypes.td
+++ b/llvm/include/llvm/CodeGen/ValueTypes.td
@@ -75,141 +75,145 @@ def v2i32    : ValueType<64,    49>;  //    2 x i32 vector value
 def v3i32    : ValueType<96,    50>;  //    3 x i32 vector value
 def v4i32    : ValueType<128,   51>;  //    4 x i32 vector value
 def v5i32    : ValueType<160,   52>;  //    5 x i32 vector value
-def v8i32    : ValueType<256,   53>;  //    8 x i32 vector value
-def v16i32   : ValueType<512,   54>;  //   16 x i32 vector value
-def v32i32   : ValueType<1024,  55>;  //   32 x i32 vector value
-def v64i32   : ValueType<2048,  56>;  //   64 x i32 vector value
-def v128i32  : ValueType<4096,  57>;  //  128 x i32 vector value
-def v256i32  : ValueType<8192,  58>;  //  256 x i32 vector value
-def v512i32  : ValueType<16384, 59>;  //  512 x i32 vector value
-def v1024i32 : ValueType<32768, 60>;  // 1024 x i32 vector value
-def v2048i32 : ValueType<65536, 61>;  // 2048 x i32 vector value
+def v6i32    : ValueType<192,   53>;  //    6 x f32 vector value
+def v7i32    : ValueType<224,   54>;  //    7 x f32 vector value
+def v8i32    : ValueType<256,   55>;  //    8 x i32 vector value
+def v16i32   : ValueType<512,   56>;  //   16 x i32 vector value
+def v32i32   : ValueType<1024,  57>;  //   32 x i32 vector value
+def v64i32   : ValueType<2048,  58>;  //   64 x i32 vector value
+def v128i32  : ValueType<4096,  59>;  //  128 x i32 vector value
+def v256i32  : ValueType<8192,  60>;  //  256 x i32 vector value
+def v512i32  : ValueType<16384, 61>;  //  512 x i32 vector value
+def v1024i32 : ValueType<32768, 62>;  // 1024 x i32 vector value
+def v2048i32 : ValueType<65536, 63>;  // 2048 x i32 vector value
 
-def v1i64   : ValueType<64,    62>;  //   1 x i64 vector value
-def v2i64   : ValueType<128,   63>;  //   2 x i64 vector value
-def v4i64   : ValueType<256,   64>;  //   4 x i64 vector value
-def v8i64   : ValueType<512,   65>;  //   8 x i64 vector value
-def v16i64  : ValueType<1024,  66>;  //  16 x i64 vector value
-def v32i64  : ValueType<2048,  67>;  //  32 x i64 vector value
-def v64i64  : ValueType<4096,  68>;  //  64 x i64 vector value
-def v128i64 : ValueType<8192,  69>;  // 128 x i64 vector value
-def v256i64 : ValueType<16384, 70>;  // 256 x i64 vector value
+def v1i64   : ValueType<64,    64>;  //   1 x i64 vector value
+def v2i64   : ValueType<128,   65>;  //   2 x i64 vector value
+def v4i64   : ValueType<256,   66>;  //   4 x i64 vector value
+def v8i64   : ValueType<512,   67>;  //   8 x i64 vector value
+def v16i64  : ValueType<1024,  68>;  //  16 x i64 vector value
+def v32i64  : ValueType<2048,  69>;  //  32 x i64 vector value
+def v64i64  : ValueType<4096,  70>;  //  64 x i64 vector value
+def v128i64 : ValueType<8192,  71>;  // 128 x i64 vector value
+def v256i64 : ValueType<16384, 72>;  // 256 x i64 vector value
 
-def v1i128 : ValueType<128, 71>;  //  1 x i128 vector value
+def v1i128 : ValueType<128, 73>;  //  1 x i128 vector value
 
-def v1f16    : ValueType<16,     72>;  //    1 x f16 vector value
-def v2f16    : ValueType<32,     73>;  //    2 x f16 vector value
-def v3f16    : ValueType<48,     74>;  //    3 x f16 vector value
-def v4f16    : ValueType<64,     75>;  //    4 x f16 vector value
-def v8f16    : ValueType<128,    76>;  //    8 x f16 vector value
-def v16f16   : ValueType<256,    77>;  //   16 x f16 vector value
-def v32f16   : ValueType<512,    78>;  //   32 x f16 vector value
-def v64f16   : ValueType<1024,   79>;  //   64 x f16 vector value
-def v128f16  : ValueType<2048,   80>;  //  128 x f16 vector value
-def v256f16  : ValueType<4096,   81>;  //  256 x f16 vector value
-def v512f16  : ValueType<8192,   82>;  //  512 x f16 vector value
+def v1f16    : ValueType<16,     74>;  //    1 x f16 vector value
+def v2f16    : ValueType<32,     75>;  //    2 x f16 vector value
+def v3f16    : ValueType<48,     76>;  //    3 x f16 vector value
+def v4f16    : ValueType<64,     77>;  //    4 x f16 vector value
+def v8f16    : ValueType<128,    78>;  //    8 x f16 vector value
+def v16f16   : ValueType<256,    79>;  //   16 x f16 vector value
+def v32f16   : ValueType<512,    80>;  //   32 x f16 vector value
+def v64f16   : ValueType<1024,   81>;  //   64 x f16 vector value
+def v128f16  : ValueType<2048,   82>;  //  128 x f16 vector value
+def v256f16  : ValueType<4096,   83>;  //  256 x f16 vector value
+def v512f16  : ValueType<8192,   84>;  //  512 x f16 vector value
 
-def v2bf16   : ValueType<32,     83>;  //    2 x bf16 vector value
-def v3bf16   : ValueType<48,     84>;  //    3 x bf16 vector value
-def v4bf16   : ValueType<64,     85>;  //    4 x bf16 vector value
-def v8bf16   : ValueType<128,    86>;  //    8 x bf16 vector value
-def v16bf16  : ValueType<256,    87>;  //   16 x bf16 vector value
-def v32bf16  : ValueType<512,    88>;  //   32 x bf16 vector value
-def v64bf16  : ValueType<1024,   89>;  //   64 x bf16 vector value
-def v128bf16 : ValueType<2048,   90>;  //  128 x bf16 vector value
+def v2bf16   : ValueType<32,     85>;  //    2 x bf16 vector value
+def v3bf16   : ValueType<48,     86>;  //    3 x bf16 vector value
+def v4bf16   : ValueType<64,     87>;  //    4 x bf16 vector value
+def v8bf16   : ValueType<128,    88>;  //    8 x bf16 vector value
+def v16bf16  : ValueType<256,    89>;  //   16 x bf16 vector value
+def v32bf16  : ValueType<512,    90>;  //   32 x bf16 vector value
+def v64bf16  : ValueType<1024,   91>;  //   64 x bf16 vector value
+def v128bf16 : ValueType<2048,   92>;  //  128 x bf16 vector value
 
-def v1f32    : ValueType<32,     91>;  //    1 x f32 vector value
-def v2f32    : ValueType<64,     92>;  //    2 x f32 vector value
-def v3f32    : ValueType<96,     93>;  //    3 x f32 vector value
-def v4f32    : ValueType<128,    94>;  //    4 x f32 vector value
-def v5f32    : ValueType<160,    95>;  //    5 x f32 vector value
-def v8f32    : ValueType<256,    96>;  //    8 x f32 vector value
-def v16f32   : ValueType<512,    97>;  //   16 x f32 vector value
-def v32f32   : ValueType<1024,   98>;  //   32 x f32 vector value
-def v64f32   : ValueType<2048,   99>;  //   64 x f32 vector value
-def v128f32  : ValueType<4096,  100>;  //  128 x f32 vector value
-def v256f32  : ValueType<8192,  101>;  //  256 x f32 vector value
-def v512f32  : ValueType<16384, 102>;  //  512 x f32 vector value
-def v1024f32 : ValueType<32768, 103>;  // 1024 x f32 vector value
-def v2048f32 : ValueType<65536, 104>;  // 2048 x f32 vector value
+def v1f32    : ValueType<32,     93>;  //    1 x f32 vector value
+def v2f32    : ValueType<64,     94>;  //    2 x f32 vector value
+def v3f32    : ValueType<96,     95>;  //    3 x f32 vector value
+def v4f32    : ValueType<128,    96>;  //    4 x f32 vector value
+def v5f32    : ValueType<160,    97>;  //    5 x f32 vector value
+def v6f32    : ValueType<192,    98>;  //    6 x f32 vector value
+def v7f32    : ValueType<224,    99>;  //    7 x f32 vector value
+def v8f32    : ValueType<256,   100>;  //    8 x f32 vector value
+def v16f32   : ValueType<512,   101>;  //   16 x f32 vector value
+def v32f32   : ValueType<1024,  102>;  //   32 x f32 vector value
+def v64f32   : ValueType<2048,  103>;  //   64 x f32 vector value
+def v128f32  : ValueType<4096,  104>;  //  128 x f32 vector value
+def v256f32  : ValueType<8192,  105>;  //  256 x f32 vector value
+def v512f32  : ValueType<16384, 106>;  //  512 x f32 vector value
+def v1024f32 : ValueType<32768, 107>;  // 1024 x f32 vector value
+def v2048f32 : ValueType<65536, 108>;  // 2048 x f32 vector value
 
-def v1f64    : ValueType<64,    105>;  //    1 x f64 vector value
-def v2f64    : ValueType<128,   106>;  //    2 x f64 vector value
-def v4f64    : ValueType<256,   107>;  //    4 x f64 vector value
-def v8f64    : ValueType<512,   108>;  //    8 x f64 vector value
-def v16f64   : ValueType<1024,  109>;  //   16 x f64 vector value
-def v32f64   : ValueType<2048,  110>;  //   32 x f64 vector value
-def v64f64   : ValueType<4096,  111>;  //   64 x f64 vector value
-def v128f64  : ValueType<8192,  112>;  //  128 x f64 vector value
-def v256f64  : ValueType<16384, 113>;  //  256 x f64 vector value
+def v1f64    : ValueType<64,    109>;  //    1 x f64 vector value
+def v2f64    : ValueType<128,   110>;  //    2 x f64 vector value
+def v4f64    : ValueType<256,   111>;  //    4 x f64 vector value
+def v8f64    : ValueType<512,   112>;  //    8 x f64 vector value
+def v16f64   : ValueType<1024,  113>;  //   16 x f64 vector value
+def v32f64   : ValueType<2048,  114>;  //   32 x f64 vector value
+def v64f64   : ValueType<4096,  115>;  //   64 x f64 vector value
+def v128f64  : ValueType<8192,  116>;  //  128 x f64 vector value
+def v256f64  : ValueType<16384, 117>;  //  256 x f64 vector value
 
-def nxv1i1  : ValueType<1,  114>;  // n x  1 x i1  vector value
-def nxv2i1  : ValueType<2,  115>;  // n x  2 x i1  vector value
-def nxv4i1  : ValueType<4,  116>;  // n x  4 x i1  vector value
-def nxv8i1  : ValueType<8,  117>;  // n x  8 x i1  vector value
-def nxv16i1 : ValueType<16, 118>;  // n x 16 x i1  vector value
-def nxv32i1 : ValueType<32, 119>;  // n x 32 x i1  vector value
-def nxv64i1 : ValueType<64, 120>;  // n x 64 x i1  vector value
+def nxv1i1  : ValueType<1,  118>;  // n x  1 x i1  vector value
+def nxv2i1  : ValueType<2,  119>;  // n x  2 x i1  vector value
+def nxv4i1  : ValueType<4,  120>;  // n x  4 x i1  vector value
+def nxv8i1  : ValueType<8,  121>;  // n x  8 x i1  vector value
+def nxv16i1 : ValueType<16, 122>;  // n x 16 x i1  vector value
+def nxv32i1 : ValueType<32, 123>;  // n x 32 x i1  vector value
+def nxv64i1 : ValueType<64, 124>;  // n x 64 x i1  vector value
 
-def nxv1i8  : ValueType<8,   121>;  // n x  1 x i8  vector value
-def nxv2i8  : ValueType<16,  122>;  // n x  2 x i8  vector value
-def nxv4i8  : ValueType<32,  123>;  // n x  4 x i8  vector value
-def nxv8i8  : ValueType<64,  124>;  // n x  8 x i8  vector value
-def nxv16i8 : ValueType<128, 125>;  // n x 16 x i8  vector value
-def nxv32i8 : ValueType<256, 126>;  // n x 32 x i8  vector value
-def nxv64i8 : ValueType<512, 127>;  // n x 64 x i8  vector value
+def nxv1i8  : ValueType<8,   125>;  // n x  1 x i8  vector value
+def nxv2i8  : ValueType<16,  126>;  // n x  2 x i8  vector value
+def nxv4i8  : ValueType<32,  127>;  // n x  4 x i8  vector value
+def nxv8i8  : ValueType<64,  128>;  // n x  8 x i8  vector value
+def nxv16i8 : ValueType<128, 129>;  // n x 16 x i8  vector value
+def nxv32i8 : ValueType<256, 130>;  // n x 32 x i8  vector value
+def nxv64i8 : ValueType<512, 131>;  // n x 64 x i8  vector value
 
-def nxv1i16  : ValueType<16,  128>;  // n x  1 x i16 vector value
-def nxv2i16  : ValueType<32,  129>;  // n x  2 x i16 vector value
-def nxv4i16  : ValueType<64,  130>;  // n x  4 x i16 vector value
-def nxv8i16  : ValueType<128, 131>;  // n x  8 x i16 vector value
-def nxv16i16 : ValueType<256, 132>;  // n x 16 x i16 vector value
-def nxv32i16 : ValueType<512, 133>;  // n x 32 x i16 vector value
+def nxv1i16  : ValueType<16,  132>;  // n x  1 x i16 vector value
+def nxv2i16  : ValueType<32,  133>;  // n x  2 x i16 vector value
+def nxv4i16  : ValueType<64,  134>;  // n x  4 x i16 vector value
+def nxv8i16  : ValueType<128, 135>;  // n x  8 x i16 vector value
+def nxv16i16 : ValueType<256, 136>;  // n x 16 x i16 vector value
+def nxv32i16 : ValueType<512, 137>;  // n x 32 x i16 vector value
 
-def nxv1i32  : ValueType<32,   134>;  // n x  1 x i32 vector value
-def nxv2i32  : ValueType<64,   135>;  // n x  2 x i32 vector value
-def nxv4i32  : ValueType<128,  136>;  // n x  4 x i32 vector value
-def nxv8i32  : ValueType<256,  137>;  // n x  8 x i32 vector value
-def nxv16i32 : ValueType<512,  138>;  // n x 16 x i32 vector value
-def nxv32i32 : ValueType<1024, 139>;  // n x 32 x i32 vector value
+def nxv1i32  : ValueType<32,   138>;  // n x  1 x i32 vector value
+def nxv2i32  : ValueType<64,   139>;  // n x  2 x i32 vector value
+def nxv4i32  : ValueType<128,  140>;  // n x  4 x i32 vector value
+def nxv8i32  : ValueType<256,  141>;  // n x  8 x i32 vector value
+def nxv16i32 : ValueType<512,  142>;  // n x 16 x i32 vector value
+def nxv32i32 : ValueType<1024, 143>;  // n x 32 x i32 vector value
 
-def nxv1i64  : ValueType<64,   140>;  // n x  1 x i64 vector value
-def nxv2i64  : ValueType<128,  141>;  // n x  2 x i64 vector value
-def nxv4i64  : ValueType<256,  142>;  // n x  4 x i64 vector value
-def nxv8i64  : ValueType<512,  143>;  // n x  8 x i64 vector value
-def nxv16i64 : ValueType<1024, 144>;  // n x 16 x i64 vector value
-def nxv32i64 : ValueType<2048, 145>;  // n x 32 x i64 vector value
+def nxv1i64  : ValueType<64,   144>;  // n x  1 x i64 vector value
+def nxv2i64  : ValueType<128,  145>;  // n x  2 x i64 vector value
+def nxv4i64  : ValueType<256,  146>;  // n x  4 x i64 vector value
+def nxv8i64  : ValueType<512,  147>;  // n x  8 x i64 vector value
+def nxv16i64 : ValueType<1024, 148>;  // n x 16 x i64 vector value
+def nxv32i64 : ValueType<2048, 149>;  // n x 32 x i64 vector value
 
-def nxv1f16  : ValueType<16,  146>;  // n x  1 x  f16 vector value
-def nxv2f16  : ValueType<32,  147>;  // n x  2 x  f16 vector value
-def nxv4f16  : ValueType<64,  148>;  // n x  4 x  f16 vector value
-def nxv8f16  : ValueType<128, 149>;  // n x  8 x  f16 vector value
-def nxv16f16 : ValueType<256, 150>;  // n x 16 x  f16 vector value
-def nxv32f16 : ValueType<512, 151>;  // n x 32 x  f16 vector value
+def nxv1f16  : ValueType<16,  150>;  // n x  1 x  f16 vector value
+def nxv2f16  : ValueType<32,  151>;  // n x  2 x  f16 vector value
+def nxv4f16  : ValueType<64,  152>;  // n x  4 x  f16 vector value
+def nxv8f16  : ValueType<128, 153>;  // n x  8 x  f16 vector value
+def nxv16f16 : ValueType<256, 154>;  // n x 16 x  f16 vector value
+def nxv32f16 : ValueType<512, 155>;  // n x 32 x  f16 vector value
 
-def nxv1bf16 : ValueType<16,  152>;  // n x  1 x bf16 vector value
-def nxv2bf16 : ValueType<32,  153>;  // n x  2 x bf16 vector value
-def nxv4bf16 : ValueType<64,  154>;  // n x  4 x bf16 vector value
-def nxv8bf16 : ValueType<128, 155>;  // n x  8 x bf16 vector value
+def nxv1bf16 : ValueType<16,  156>;  // n x  1 x bf16 vector value
+def nxv2bf16 : ValueType<32,  157>;  // n x  2 x bf16 vector value
+def nxv4bf16 : ValueType<64,  158>;  // n x  4 x bf16 vector value
+def nxv8bf16 : ValueType<128, 159>;  // n x  8 x bf16 vector value
 
-def nxv1f32  : ValueType<32,  156>;  // n x  1 x  f32 vector value
-def nxv2f32  : ValueType<64,  157>;  // n x  2 x  f32 vector value
-def nxv4f32  : ValueType<128, 158>;  // n x  4 x  f32 vector value
-def nxv8f32  : ValueType<256, 159>;  // n x  8 x  f32 vector value
-def nxv16f32 : ValueType<512, 160>;  // n x 16 x  f32 vector value
+def nxv1f32  : ValueType<32,  160>;  // n x  1 x  f32 vector value
+def nxv2f32  : ValueType<64,  161>;  // n x  2 x  f32 vector value
+def nxv4f32  : ValueType<128, 162>;  // n x  4 x  f32 vector value
+def nxv8f32  : ValueType<256, 163>;  // n x  8 x  f32 vector value
+def nxv16f32 : ValueType<512, 164>;  // n x 16 x  f32 vector value
 
-def nxv1f64  : ValueType<64,  161>;  // n x  1 x  f64 vector value
-def nxv2f64  : ValueType<128, 162>;  // n x  2 x  f64 vector value
-def nxv4f64  : ValueType<256, 163>;  // n x  4 x  f64 vector value
-def nxv8f64  : ValueType<512, 164>;  // n x  8 x  f64 vector value
+def nxv1f64  : ValueType<64,  165>;  // n x  1 x  f64 vector value
+def nxv2f64  : ValueType<128, 166>;  // n x  2 x  f64 vector value
+def nxv4f64  : ValueType<256, 167>;  // n x  4 x  f64 vector value
+def nxv8f64  : ValueType<512, 168>;  // n x  8 x  f64 vector value
 
-def x86mmx    : ValueType<64,   165>;  // X86 MMX value
-def FlagVT    : ValueType<0,    166>;  // Pre-RA sched glue
-def isVoid    : ValueType<0,    167>;  // Produces no value
-def untyped   : ValueType<8,    168>;  // Produces an untyped value
-def funcref   : ValueType<0,    169>;  // WebAssembly's funcref type
-def externref : ValueType<0,    170>;  // WebAssembly's externref type
-def x86amx    : ValueType<8192, 171>;  // X86 AMX value
+def x86mmx    : ValueType<64,   169>;  // X86 MMX value
+def FlagVT    : ValueType<0,    170>;  // Pre-RA sched glue
+def isVoid    : ValueType<0,    171>;  // Produces no value
+def untyped   : ValueType<8,    172>;  // Produces an untyped value
+def funcref   : ValueType<0,    173>;  // WebAssembly's funcref type
+def externref : ValueType<0,    174>;  // WebAssembly's externref type
+def x86amx    : ValueType<8192, 175>;  // X86 AMX value
 
 
 def token      : ValueType<0, 248>;  // TokenTy
diff --git a/llvm/include/llvm/Support/MachineValueType.h b/llvm/include/llvm/Support/MachineValueType.h
index 88ae8f8e6fc4..2895bce69eb4 100644
--- a/llvm/include/llvm/Support/MachineValueType.h
+++ b/llvm/include/llvm/Support/MachineValueType.h
@@ -101,76 +101,80 @@ namespace llvm {
       v3i32          =  50,   //    3 x i32
       v4i32          =  51,   //    4 x i32
       v5i32          =  52,   //    5 x i32
-      v8i32          =  53,   //    8 x i32
-      v16i32         =  54,   //   16 x i32
-      v32i32         =  55,   //   32 x i32
-      v64i32         =  56,   //   64 x i32
-      v128i32        =  57,   //  128 x i32
-      v256i32        =  58,   //  256 x i32
-      v512i32        =  59,   //  512 x i32
-      v1024i32       =  60,   // 1024 x i32
-      v2048i32       =  61,   // 2048 x i32
+      v6i32          =  53,   //    6 x i32
+      v7i32          =  54,   //    7 x i32
+      v8i32          =  55,   //    8 x i32
+      v16i32         =  56,   //   16 x i32
+      v32i32         =  57,   //   32 x i32
+      v64i32         =  58,   //   64 x i32
+      v128i32        =  59,   //  128 x i32
+      v256i32        =  60,   //  256 x i32
+      v512i32        =  61,   //  512 x i32
+      v1024i32       =  62,   // 1024 x i32
+      v2048i32       =  63,   // 2048 x i32
 
-      v1i64          =  62,   //   1 x i64
-      v2i64          =  63,   //   2 x i64
-      v4i64          =  64,   //   4 x i64
-      v8i64          =  65,   //   8 x i64
-      v16i64         =  66,   //  16 x i64
-      v32i64         =  67,   //  32 x i64
-      v64i64         =  68,   //  64 x i64
-      v128i64        =  69,   // 128 x i64
-      v256i64        =  70,   // 256 x i64
+      v1i64          =  64,   //   1 x i64
+      v2i64          =  65,   //   2 x i64
+      v4i64          =  66,   //   4 x i64
+      v8i64          =  67,   //   8 x i64
+      v16i64         =  68,   //  16 x i64
+      v32i64         =  69,   //  32 x i64
+      v64i64         =  70,   //  64 x i64
+      v128i64        =  71,   // 128 x i64
+      v256i64        =  72,   // 256 x i64
 
-      v1i128         =  71,   //  1 x i128
+      v1i128         =  73,   //  1 x i128
 
       FIRST_INTEGER_FIXEDLEN_VECTOR_VALUETYPE = v1i1,
       LAST_INTEGER_FIXEDLEN_VECTOR_VALUETYPE = v1i128,
 
-      v1f16          =  72,   //    1 x f16
-      v2f16          =  73,   //    2 x f16
-      v3f16          =  74,   //    3 x f16
-      v4f16          =  75,   //    4 x f16
-      v8f16          =  76,   //    8 x f16
-      v16f16         =  77,   //   16 x f16
-      v32f16         =  78,   //   32 x f16
-      v64f16         =  79,   //   64 x f16
-      v128f16        =  80,   //  128 x f16
-      v256f16        =  81,   //  256 x f16
-      v512f16        =  82,   //  256 x f16
+      v1f16          =  74,   //    1 x f16
+      v2f16          =  75,   //    2 x f16
+      v3f16          =  76,   //    3 x f16
+      v4f16          =  77,   //    4 x f16
+      v8f16          =  78,   //    8 x f16
+      v16f16         =  79,   //   16 x f16
+      v32f16         =  80,   //   32 x f16
+      v64f16         =  81,   //   64 x f16
+      v128f16        =  82,   //  128 x f16
+      v256f16        =  83,   //  256 x f16
+      v512f16        =  84,   //  256 x f16
 
-      v2bf16         =  83,   //    2 x bf16
-      v3bf16         =  84,   //    3 x bf16
-      v4bf16         =  85,   //    4 x bf16
-      v8bf16         =  86,   //    8 x bf16
-      v16bf16        =  87,   //   16 x bf16
-      v32bf16        =  88,   //   32 x bf16
-      v64bf16        =  89,   //   64 x bf16
-      v128bf16       =  90,   //  128 x bf16
+      v2bf16         =  85,   //    2 x bf16
+      v3bf16         =  86,   //    3 x bf16
+      v4bf16         =  87,   //    4 x bf16
+      v8bf16         =  88,   //    8 x bf16
+      v16bf16        =  89,   //   16 x bf16
+      v32bf16        =  90,   //   32 x bf16
+      v64bf16        =  91,   //   64 x bf16
+      v128bf16       =  92,   //  128 x bf16
 
-      v1f32          =  91,   //    1 x f32
-      v2f32          =  92,   //    2 x f32
-      v3f32          =  93,   //    3 x f32
-      v4f32          =  94,   //    4 x f32
-      v5f32          =  95,   //    5 x f32
-      v8f32          =  96,   //    8 x f32
-      v16f32         =  97,   //   16 x f32
-      v32f32         =  98,   //   32 x f32
-      v64f32         =  99,   //   64 x f32
-      v128f32        = 100,   //  128 x f32
-      v256f32        = 101,   //  256 x f32
-      v512f32        = 102,   //  512 x f32
-      v1024f32       = 103,   // 1024 x f32
-      v2048f32       = 104,   // 2048 x f32
+      v1f32          =  93,   //    1 x f32
+      v2f32          =  94,   //    2 x f32
+      v3f32          =  95,   //    3 x f32
+      v4f32          =  96,   //    4 x f32
+      v5f32          =  97,   //    5 x f32
+      v6f32          =  98,   //    6 x f32
+      v7f32          =  99,   //    7 x f32
+      v8f32          = 100,   //    8 x f32
+      v16f32         = 101,   //   16 x f32
+      v32f32         = 102,   //   32 x f32
+      v64f32         = 103,   //   64 x f32
+      v128f32        = 104,   //  128 x f32
+      v256f32        = 105,   //  256 x f32
+      v512f32        = 106,   //  512 x f32
+      v1024f32       = 107,   // 1024 x f32
+      v2048f32       = 108,   // 2048 x f32
 
-      v1f64          = 105,   //    1 x f64
-      v2f64          = 106,   //    2 x f64
-      v4f64          = 107,   //    4 x f64
-      v8f64          = 108,   //    8 x f64
-      v16f64         = 109,   //   16 x f64
-      v32f64         = 110,   //   32 x f64
-      v64f64         = 111,   //   64 x f64
-      v128f64        = 112,   //  128 x f64
-      v256f64        = 113,   //  256 x f64
+      v1f64          = 109,   //    1 x f64
+      v2f64          = 110,   //    2 x f64
+      v4f64          = 111,   //    4 x f64
+      v8f64          = 112,   //    8 x f64
+      v16f64         = 113,   //   16 x f64
+      v32f64         = 114,   //   32 x f64
+      v64f64         = 115,   //   64 x f64
+      v128f64        = 116,   //  128 x f64
+      v256f64        = 117,   //  256 x f64
 
       FIRST_FP_FIXEDLEN_VECTOR_VALUETYPE = v1f16,
       LAST_FP_FIXEDLEN_VECTOR_VALUETYPE = v256f64,
@@ -178,68 +182,68 @@ namespace llvm {
       FIRST_FIXEDLEN_VECTOR_VALUETYPE = v1i1,
       LAST_FIXEDLEN_VECTOR_VALUETYPE = v256f64,
 
-      nxv1i1         = 114,   // n x  1 x i1
-      nxv2i1         = 115,   // n x  2 x i1
-      nxv4i1         = 116,   // n x  4 x i1
-      nxv8i1         = 117,   // n x  8 x i1
-      nxv16i1        = 118,   // n x 16 x i1
-      nxv32i1        = 119,   // n x 32 x i1
-      nxv64i1        = 120,   // n x 64 x i1
+      nxv1i1         = 118,   // n x  1 x i1
+      nxv2i1         = 119,   // n x  2 x i1
+      nxv4i1         = 120,   // n x  4 x i1
+      nxv8i1         = 121,   // n x  8 x i1
+      nxv16i1        = 122,   // n x 16 x i1
+      nxv32i1        = 123,   // n x 32 x i1
+      nxv64i1        = 124,   // n x 64 x i1
 
-      nxv1i8         = 121,   // n x  1 x i8
-      nxv2i8         = 122,   // n x  2 x i8
-      nxv4i8         = 123,   // n x  4 x i8
-      nxv8i8         = 124,   // n x  8 x i8
-      nxv16i8        = 125,   // n x 16 x i8
-      nxv32i8        = 126,   // n x 32 x i8
-      nxv64i8        = 127,   // n x 64 x i8
+      nxv1i8         = 125,   // n x  1 x i8
+      nxv2i8         = 126,   // n x  2 x i8
+      nxv4i8         = 127,   // n x  4 x i8
+      nxv8i8         = 128,   // n x  8 x i8
+      nxv16i8        = 129,   // n x 16 x i8
+      nxv32i8        = 130,   // n x 32 x i8
+      nxv64i8        = 131,   // n x 64 x i8
 
-      nxv1i16        = 128,  // n x  1 x i16
-      nxv2i16        = 129,  // n x  2 x i16
-      nxv4i16        = 130,  // n x  4 x i16
-      nxv8i16        = 131,  // n x  8 x i16
-      nxv16i16       = 132,  // n x 16 x i16
-      nxv32i16       = 133,  // n x 32 x i16
+      nxv1i16        = 132,  // n x  1 x i16
+      nxv2i16        = 133,  // n x  2 x i16
+      nxv4i16        = 134,  // n x  4 x i16
+      nxv8i16        = 135,  // n x  8 x i16
+      nxv16i16       = 136,  // n x 16 x i16
+      nxv32i16       = 137,  // n x 32 x i16
 
-      nxv1i32        = 134,  // n x  1 x i32
-      nxv2i32        = 135,  // n x  2 x i32
-      nxv4i32        = 136,  // n x  4 x i32
-      nxv8i32        = 137,  // n x  8 x i32
-      nxv16i32       = 138,  // n x 16 x i32
-      nxv32i32       = 139,  // n x 32 x i32
+      nxv1i32        = 138,  // n x  1 x i32
+      nxv2i32        = 139,  // n x  2 x i32
+      nxv4i32        = 140,  // n x  4 x i32
+      nxv8i32        = 141,  // n x  8 x i32
+      nxv16i32       = 142,  // n x 16 x i32
+      nxv32i32       = 143,  // n x 32 x i32
 
-      nxv1i64        = 140,  // n x  1 x i64
-      nxv2i64        = 141,  // n x  2 x i64
-      nxv4i64        = 142,  // n x  4 x i64
-      nxv8i64        = 143,  // n x  8 x i64
-      nxv16i64       = 144,  // n x 16 x i64
-      nxv32i64       = 145,  // n x 32 x i64
+      nxv1i64        = 144,  // n x  1 x i64
+      nxv2i64        = 145,  // n x  2 x i64
+      nxv4i64        = 146,  // n x  4 x i64
+      nxv8i64        = 147,  // n x  8 x i64
+      nxv16i64       = 148,  // n x 16 x i64
+      nxv32i64       = 149,  // n x 32 x i64
 
       FIRST_INTEGER_SCALABLE_VECTOR_VALUETYPE = nxv1i1,
       LAST_INTEGER_SCALABLE_VECTOR_VALUETYPE = nxv32i64,
 
-      nxv1f16        = 146,  // n x  1 x f16
-      nxv2f16        = 147,  // n x  2 x f16
-      nxv4f16        = 148,  // n x  4 x f16
-      nxv8f16        = 149,  // n x  8 x f16
-      nxv16f16       = 150,  // n x 16 x f16
-      nxv32f16       = 151,  // n x 32 x f16
+      nxv1f16        = 150,  // n x  1 x f16
+      nxv2f16        = 151,  // n x  2 x f16
+      nxv4f16        = 152,  // n x  4 x f16
+      nxv8f16        = 153,  // n x  8 x f16
+      nxv16f16       = 154,  // n x 16 x f16
+      nxv32f16       = 155,  // n x 32 x f16
 
-      nxv1bf16       = 152,  // n x  1 x bf16
-      nxv2bf16       = 153,  // n x  2 x bf16
-      nxv4bf16       = 154,  // n x  4 x bf16
-      nxv8bf16       = 155,  // n x  8 x bf16
+      nxv1bf16       = 156,  // n x  1 x bf16
+      nxv2bf16       = 157,  // n x  2 x bf16
+      nxv4bf16       = 158,  // n x  4 x bf16
+      nxv8bf16       = 159,  // n x  8 x bf16
 
-      nxv1f32        = 156,  // n x  1 x f32
-      nxv2f32        = 157,  // n x  2 x f32
-      nxv4f32        = 158,  // n x  4 x f32
-      nxv8f32        = 159,  // n x  8 x f32
-      nxv16f32       = 160,  // n x 16 x f32
+      nxv1f32        = 160,  // n x  1 x f32
+      nxv2f32        = 161,  // n x  2 x f32
+      nxv4f32        = 162,  // n x  4 x f32
+      nxv8f32        = 163,  // n x  8 x f32
+      nxv16f32       = 164,  // n x 16 x f32
 
-      nxv1f64        = 161,  // n x  1 x f64
-      nxv2f64        = 162,  // n x  2 x f64
-      nxv4f64        = 163,  // n x  4 x f64
-      nxv8f64        = 164,  // n x  8 x f64
+      nxv1f64        = 165,  // n x  1 x f64
+      nxv2f64        = 166,  // n x  2 x f64
+      nxv4f64        = 167,  // n x  4 x f64
+      nxv8f64        = 168,  // n x  8 x f64
 
       FIRST_FP_SCALABLE_VECTOR_VALUETYPE = nxv1f16,
       LAST_FP_SCALABLE_VECTOR_VALUETYPE = nxv8f64,
@@ -250,19 +254,19 @@ namespace llvm {
       FIRST_VECTOR_VALUETYPE = v1i1,
       LAST_VECTOR_VALUETYPE  = nxv8f64,
 
-      x86mmx         = 165,    // This is an X86 MMX value
+      x86mmx         = 169,    // This is an X86 MMX value
 
-      Glue           = 166,    // This glues nodes together during pre-RA sched
+      Glue           = 170,    // This glues nodes together during pre-RA sched
 
-      isVoid         = 167,    // This has no value
+      isVoid         = 171,    // This has no value
 
-      Untyped        = 168,    // This value takes a register, but has
+      Untyped        = 172,    // This value takes a register, but has
                                // unspecified type.  The register class
                                // will be determined by the opcode.
 
-      funcref        = 169,    // WebAssembly's funcref type
-      externref      = 170,    // WebAssembly's externref type
-      x86amx         = 171,    // This is an X86 AMX value
+      funcref        = 173,    // WebAssembly's funcref type
+      externref      = 174,    // WebAssembly's externref type
+      x86amx         = 175,    // This is an X86 AMX value
 
       FIRST_VALUETYPE =  1,    // This is always the beginning of the list.
       LAST_VALUETYPE = x86amx, // This always remains at the end of the list.
@@ -570,6 +574,8 @@ namespace llvm {
       case v3i32:
       case v4i32:
       case v5i32:
+      case v6i32:
+      case v7i32:
       case v8i32:
       case v16i32:
       case v32i32:
@@ -635,6 +641,8 @@ namespace llvm {
       case v3f32:
       case v4f32:
       case v5f32:
+      case v6f32:
+      case v7f32:
       case v8f32:
       case v16f32:
       case v32f32:
@@ -759,6 +767,10 @@ namespace llvm {
       case nxv8bf16:
       case nxv8f32:
       case nxv8f64: return 8;
+      case v7i32:
+      case v7f32: return 7;
+      case v6i32:
+      case v6f32: return 6;
       case v5i32:
       case v5f32: return 5;
       case v4i1:
@@ -946,6 +958,10 @@ namespace llvm {
       case nxv2f64: return TypeSize::Scalable(128);
       case v5i32:
       case v5f32: return TypeSize::Fixed(160);
+      case v6i32:
+      case v6f32: return TypeSize::Fixed(192);
+      case v7i32:
+      case v7f32: return TypeSize::Fixed(224);
       case v256i1:
       case v32i8:
       case v16i16:
@@ -1196,6 +1212,8 @@ namespace llvm {
         if (NumElements == 3)    return MVT::v3i32;
         if (NumElements == 4)    return MVT::v4i32;
         if (NumElements == 5)    return MVT::v5i32;
+        if (NumElements == 6)    return MVT::v6i32;
+        if (NumElements == 7)    return MVT::v7i32;
         if (NumElements == 8)    return MVT::v8i32;
         if (NumElements == 16)   return MVT::v16i32;
         if (NumElements == 32)   return MVT::v32i32;
@@ -1249,6 +1267,8 @@ namespace llvm {
         if (NumElements == 3)    return MVT::v3f32;
         if (NumElements == 4)    return MVT::v4f32;
         if (NumElements == 5)    return MVT::v5f32;
+        if (NumElements == 6)    return MVT::v6f32;
+        if (NumElements == 7)    return MVT::v7f32;
         if (NumElements == 8)    return MVT::v8f32;
         if (NumElements == 16)   return MVT::v16f32;
         if (NumElements == 32)   return MVT::v32f32;
diff --git a/llvm/lib/CodeGen/ValueTypes.cpp b/llvm/lib/CodeGen/ValueTypes.cpp
index 28826bc48e42..d67b5c5f435b 100644
--- a/llvm/lib/CodeGen/ValueTypes.cpp
+++ b/llvm/lib/CodeGen/ValueTypes.cpp
@@ -274,6 +274,10 @@ Type *EVT::getTypeForEVT(LLVMContext &Context) const {
     return FixedVectorType::get(Type::getInt32Ty(Context), 4);
   case MVT::v5i32:
     return FixedVectorType::get(Type::getInt32Ty(Context), 5);
+  case MVT::v6i32:
+    return FixedVectorType::get(Type::getInt32Ty(Context), 6);
+  case MVT::v7i32:
+    return FixedVectorType::get(Type::getInt32Ty(Context), 7);
   case MVT::v8i32:
     return FixedVectorType::get(Type::getInt32Ty(Context), 8);
   case MVT::v16i32:
@@ -360,6 +364,10 @@ Type *EVT::getTypeForEVT(LLVMContext &Context) const {
     return FixedVectorType::get(Type::getFloatTy(Context), 4);
   case MVT::v5f32:
     return FixedVectorType::get(Type::getFloatTy(Context), 5);
+  case MVT::v6f32:
+    return FixedVectorType::get(Type::getFloatTy(Context), 6);
+  case MVT::v7f32:
+    return FixedVectorType::get(Type::getFloatTy(Context), 7);
   case MVT::v8f32:
     return FixedVectorType::get(Type::getFloatTy(Context), 8);
   case MVT::v16f32:
diff --git a/llvm/utils/TableGen/CodeGenTarget.cpp b/llvm/utils/TableGen/CodeGenTarget.cpp
index a1e67842b780..f78890360072 100644
--- a/llvm/utils/TableGen/CodeGenTarget.cpp
+++ b/llvm/utils/TableGen/CodeGenTarget.cpp
@@ -117,6 +117,8 @@ StringRef llvm::getEnumName(MVT::SimpleValueType T) {
   case MVT::v3i32:    return "MVT::v3i32";
   case MVT::v4i32:    return "MVT::v4i32";
   case MVT::v5i32:    return "MVT::v5i32";
+  case MVT::v6i32:    return "MVT::v6i32";
+  case MVT::v7i32:    return "MVT::v7i32";
   case MVT::v8i32:    return "MVT::v8i32";
   case MVT::v16i32:   return "MVT::v16i32";
   case MVT::v32i32:   return "MVT::v32i32";
@@ -160,6 +162,8 @@ StringRef llvm::getEnumName(MVT::SimpleValueType T) {
   case MVT::v3f32:    return "MVT::v3f32";
   case MVT::v4f32:    return "MVT::v4f32";
   case MVT::v5f32:    return "MVT::v5f32";
+  case MVT::v6f32:    return "MVT::v6f32";
+  case MVT::v7f32:    return "MVT::v7f32";
   case MVT::v8f32:    return "MVT::v8f32";
   case MVT::v16f32:   return "MVT::v16f32";
   case MVT::v32f32:   return "MVT::v32f32";