diff --git a/llvm/lib/Target/RISCV/RISCVInstrFormatsV.td b/llvm/lib/Target/RISCV/RISCVInstrFormatsV.td
--- a/llvm/lib/Target/RISCV/RISCVInstrFormatsV.td
+++ b/llvm/lib/Target/RISCV/RISCVInstrFormatsV.td
@@ -64,7 +64,7 @@
   let Inst{30} = 1;
   let Inst{29-20} = vtypei{9-0};
   let Inst{19-15} = uimm;
-  let Inst{14-12} = 0b111;
+  let Inst{14-12} = OPCFG.Value;
   let Inst{11-7} = rd;
   let Opcode = OPC_OP_V.Value;
 
@@ -80,7 +80,7 @@
   let Inst{31} = 0;
   let Inst{30-20} = vtypei;
   let Inst{19-15} = rs1;
-  let Inst{14-12} = 0b111;
+  let Inst{14-12} = OPCFG.Value;
   let Inst{11-7} = rd;
   let Opcode = OPC_OP_V.Value;
 
@@ -97,7 +97,7 @@
   let Inst{30-25} = 0b000000;
   let Inst{24-20} = rs2;
   let Inst{19-15} = rs1;
-  let Inst{14-12} = 0b111;
+  let Inst{14-12} = OPCFG.Value;
   let Inst{11-7} = rd;
   let Opcode = OPC_OP_V.Value;