Skip to content

Commit 18374ef

Browse files
committed
Adjust formatting, snake_case to camelCase
1 parent 1c19854 commit 18374ef

File tree

2 files changed

+19
-20
lines changed

2 files changed

+19
-20
lines changed

llvm/lib/Target/RISCV/RISCVInstrInfoVPseudos.td

+6-7
Original file line numberDiff line numberDiff line change
@@ -6764,9 +6764,8 @@ let mayLoad = 0, mayStore = 0, hasSideEffects = 0 in {
67646764
let HasVLOp = 1, HasSEWOp = 1, BaseInstr = VMV_S_X,
67656765
Constraints = "$rd = $rs1" in
67666766
def PseudoVMV_S_X: Pseudo<(outs VR:$rd),
6767-
(ins VR:$rs1, GPR:$rs2,
6768-
AVL:$vl, ixlenimm:$sew),
6769-
[]>,
6767+
(ins VR:$rs1, GPR:$rs2, AVL:$vl, ixlenimm:$sew),
6768+
[]>,
67706769
Sched<[WriteVIMovXV, ReadVIMovXV, ReadVIMovXX]>,
67716770
RISCVVPseudo;
67726771
}
@@ -7421,15 +7420,15 @@ foreach fvti = AllFloatVectors in {
74217420
(fvti.Scalar fvti.ScalarRegClass:$rs2),
74227421
GPR:$vl, fvti.Log2SEW)>;
74237422

7424-
defvar is_group = !isa<GroupVTypeInfo>(fvti);
7425-
defvar merge = !if(is_group,
7423+
defvar isGroup = !isa<GroupVTypeInfo>(fvti);
7424+
defvar merge = !if(isGroup,
74267425
(!cast<GroupVTypeInfo>(fvti).VectorM1
74277426
(EXTRACT_SUBREG $rs1, sub_vrm1_0)),
74287427
(fvti.Vector $rs1));
7429-
defvar vmv_s_x = (PseudoVMV_S_X merge, (XLenVT X0), GPR:$vl, fvti.Log2SEW);
7428+
defvar pseudo = (PseudoVMV_S_X merge, (XLenVT X0), GPR:$vl, fvti.Log2SEW);
74307429
def : Pat<(fvti.Vector (int_riscv_vfmv_s_f (fvti.Vector fvti.RegClass:$rs1),
74317430
(fvti.Scalar (fpimm0)), VLOpFrag)),
7432-
!if(is_group, (INSERT_SUBREG $rs1, vmv_s_x, sub_vrm1_0), vmv_s_x)>;
7431+
!if(isGroup, (INSERT_SUBREG $rs1, pseudo, sub_vrm1_0), pseudo)>;
74337432
}
74347433
}
74357434

llvm/lib/Target/RISCV/RISCVInstrInfoVVLPatterns.td

+13-13
Original file line numberDiff line numberDiff line change
@@ -2762,19 +2762,19 @@ foreach mti = AllMasks in {
27622762
// 16.4. Vector Register Gather Instruction
27632763
foreach vti = AllIntegerVectors in {
27642764
let Predicates = GetVTypePredicates<vti>.Predicates in {
2765-
defvar is_group = !isa<GroupVTypeInfo>(vti);
2766-
defvar merge = !if(is_group,
2765+
defvar isGroup = !isa<GroupVTypeInfo>(vti);
2766+
defvar merge = !if(isGroup,
27672767
(!cast<GroupVTypeInfo>(vti).VectorM1
27682768
(EXTRACT_SUBREG $merge, sub_vrm1_0)),
27692769
(vti.Vector $merge));
2770-
defvar vmv_s_x = (PseudoVMV_S_X merge,
2770+
defvar pseudo = (PseudoVMV_S_X merge,
27712771
(vti.Scalar vti.ScalarRegClass:$rs1),
27722772
GPR:$vl, vti.Log2SEW);
27732773
def : Pat<(vti.Vector (riscv_vmv_s_x_vl (vti.Vector vti.RegClass:$merge),
27742774
vti.ScalarRegClass:$rs1,
27752775
VLOpFrag)),
2776-
!if(is_group, (INSERT_SUBREG $merge, vmv_s_x, sub_vrm1_0),
2777-
vmv_s_x)>;
2776+
!if(isGroup, (INSERT_SUBREG $merge, pseudo, sub_vrm1_0),
2777+
pseudo)>;
27782778

27792779

27802780
def : Pat<(vti.Vector (riscv_vrgather_vv_vl vti.RegClass:$rs2,
@@ -2826,24 +2826,24 @@ foreach vti = AllIntegerVectors in {
28262826
// 16.2. Floating-Point Scalar Move Instructions
28272827
foreach vti = AllFloatVectors in {
28282828
let Predicates = GetVTypePredicates<vti>.Predicates in {
2829-
defvar is_group = !isa<GroupVTypeInfo>(vti);
2830-
defvar merge = !if(is_group,
2829+
defvar isGroup = !isa<GroupVTypeInfo>(vti);
2830+
defvar merge = !if(isGroup,
28312831
(!cast<GroupVTypeInfo>(vti).VectorM1
28322832
(EXTRACT_SUBREG $merge, sub_vrm1_0)),
28332833
(vti.Vector $merge));
2834-
defvar vmv_s_x_x0 = (PseudoVMV_S_X merge, (XLenVT X0), GPR:$vl, vti.Log2SEW);
2834+
defvar pseudoX0 = (PseudoVMV_S_X merge, (XLenVT X0), GPR:$vl, vti.Log2SEW);
28352835
def : Pat<(vti.Vector (riscv_vfmv_s_f_vl (vti.Vector vti.RegClass:$merge),
28362836
(vti.Scalar (fpimm0)),
28372837
VLOpFrag)),
2838-
!if(is_group, (INSERT_SUBREG $merge, vmv_s_x_x0, sub_vrm1_0),
2839-
vmv_s_x_x0)>;
2838+
!if(isGroup, (INSERT_SUBREG $merge, pseudoX0, sub_vrm1_0),
2839+
pseudoX0)>;
28402840

2841-
defvar vmv_s_x = (PseudoVMV_S_X merge, GPR:$imm, GPR:$vl, vti.Log2SEW);
2841+
defvar pseudo = (PseudoVMV_S_X merge, GPR:$imm, GPR:$vl, vti.Log2SEW);
28422842
def : Pat<(vti.Vector (riscv_vfmv_s_f_vl (vti.Vector vti.RegClass:$merge),
28432843
(vti.Scalar (SelectFPImm (XLenVT GPR:$imm))),
28442844
VLOpFrag)),
2845-
!if(is_group, (INSERT_SUBREG $merge, vmv_s_x, sub_vrm1_0),
2846-
vmv_s_x)>;
2845+
!if(isGroup, (INSERT_SUBREG $merge, pseudo, sub_vrm1_0),
2846+
pseudo)>;
28472847

28482848
def : Pat<(vti.Vector (riscv_vfmv_s_f_vl (vti.Vector vti.RegClass:$merge),
28492849
vti.ScalarRegClass:$rs1,

0 commit comments

Comments
 (0)