Skip to content

Commit 2f05b89

Browse files
committed
[RISCV] Move VPseudoBinaryNoMask multiclass to RISCVInstrInfoZvk.td and rename it. NFC
Rename to VPseudoBinaryNoMaskTU_Zvk. This more consistent with the naming of the class it instantiates and the _Zvk suffix is used elsewhere in RISCVInstrInfoZvk.td.
1 parent c09b6fa commit 2f05b89

File tree

2 files changed

+15
-15
lines changed

2 files changed

+15
-15
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2133,19 +2133,6 @@ multiclass VPseudoBinary<VReg RetClass,
21332133
}
21342134
}
21352135

2136-
multiclass VPseudoBinaryNoMask<VReg RetClass,
2137-
VReg Op1Class,
2138-
DAGOperand Op2Class,
2139-
LMULInfo MInfo,
2140-
string Constraint = "",
2141-
int sew = 0> {
2142-
let VLMul = MInfo.value, SEW=sew in {
2143-
defvar suffix = !if(sew, "_" # MInfo.MX # "_E" # sew, "_" # MInfo.MX);
2144-
def suffix : VPseudoBinaryNoMaskTU<RetClass, Op1Class, Op2Class,
2145-
Constraint>;
2146-
}
2147-
}
2148-
21492136
multiclass VPseudoBinaryRoundingMode<VReg RetClass,
21502137
VReg Op1Class,
21512138
DAGOperand Op2Class,

llvm/lib/Target/RISCV/RISCVInstrInfoZvk.td

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,19 @@ class VPseudoTernaryNoMask_Zvk<VReg RetClass,
233233
let BaseInstr = !cast<Instruction>(PseudoToVInst<NAME>.VInst);
234234
}
235235

236+
multiclass VPseudoBinaryNoMaskTU_Zvk<VReg RetClass,
237+
VReg Op1Class,
238+
DAGOperand Op2Class,
239+
LMULInfo MInfo,
240+
string Constraint = "",
241+
int sew = 0> {
242+
let VLMul = MInfo.value, SEW=sew in {
243+
defvar suffix = !if(sew, "_" # MInfo.MX # "_E" # sew, "_" # MInfo.MX);
244+
def suffix : VPseudoBinaryNoMaskTU<RetClass, Op1Class, Op2Class,
245+
Constraint>;
246+
}
247+
}
248+
236249
multiclass VPseudoTernaryNoMask_Zvk<VReg RetClass,
237250
VReg Op1Class,
238251
DAGOperand Op2Class,
@@ -306,7 +319,7 @@ multiclass VPseudoVALU_VI_NoMaskTU_Zvk {
306319
defvar WriteVIALUV_MX = !cast<SchedWrite>("WriteVIALUV_" # mx);
307320
defvar ReadVIALUV_MX = !cast<SchedRead>("ReadVIALUV_" # mx);
308321

309-
defm _VI : VPseudoBinaryNoMask<m.vrclass, m.vrclass, uimm5, m>,
322+
defm _VI : VPseudoBinaryNoMaskTU_Zvk<m.vrclass, m.vrclass, uimm5, m>,
310323
Sched<[WriteVIALUV_MX, ReadVIALUV_MX, ReadVIALUV_MX, ReadVMask]>;
311324
}
312325
}
@@ -317,7 +330,7 @@ multiclass VPseudoVALU_VV_NoMaskTU_Zvk {
317330
defvar WriteVIALUV_MX = !cast<SchedWrite>("WriteVIALUV_" # mx);
318331
defvar ReadVIALUV_MX = !cast<SchedRead>("ReadVIALUV_" # mx);
319332

320-
defm _VV : VPseudoBinaryNoMask<m.vrclass, m.vrclass, m.vrclass, m>,
333+
defm _VV : VPseudoBinaryNoMaskTU_Zvk<m.vrclass, m.vrclass, m.vrclass, m>,
321334
Sched<[WriteVIALUV_MX, ReadVIALUV_MX, ReadVIALUV_MX, ReadVMask]>;
322335
}
323336
}

0 commit comments

Comments
 (0)