Skip to content

[RISCV] Order the implicit defs/uses of vl/vtype on MC instructions the same as the pseudo version. #129104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 27, 2025
Merged

[RISCV] Order the implicit defs/uses of vl/vtype on MC instructions the same as the pseudo version. #129104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad1adb5
[RISCV] Order the implicit defs on MC vset(i)vl(i) instructions the s…
topperc Feb 27, 2025
01175c2
fixup! reorder implicit uses too.
topperc Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions llvm/lib/Target/RISCV/RISCVInstrFormatsV.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ class RVInstSetiVLi<dag outs, dag ins, string opcodestr, string argstr>
let Inst{11-7} = rd;
let Inst{6-0} = OPC_OP_V.Value;

let Defs = [VTYPE, VL];
let Defs = [VL, VTYPE];
}

class RVInstSetVLi<dag outs, dag ins, string opcodestr, string argstr>
Expand All @@ -84,7 +84,7 @@ class RVInstSetVLi<dag outs, dag ins, string opcodestr, string argstr>
let Inst{11-7} = rd;
let Inst{6-0} = OPC_OP_V.Value;

let Defs = [VTYPE, VL];
let Defs = [VL, VTYPE];
}

class RVInstSetVL<dag outs, dag ins, string opcodestr, string argstr>
Expand All @@ -101,7 +101,7 @@ class RVInstSetVL<dag outs, dag ins, string opcodestr, string argstr>
let Inst{11-7} = rd;
let Inst{6-0} = OPC_OP_V.Value;

let Defs = [VTYPE, VL];
let Defs = [VL, VTYPE];
}

class RVInstVV<bits<6> funct6, RISCVVFormat opv, dag outs, dag ins,
Expand All @@ -120,7 +120,7 @@ class RVInstVV<bits<6> funct6, RISCVVFormat opv, dag outs, dag ins,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_OP_V.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand All @@ -140,7 +140,7 @@ class RVInstVX<bits<6> funct6, RISCVVFormat opv, dag outs, dag ins,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_OP_V.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand All @@ -159,7 +159,7 @@ class RVInstV2<bits<6> funct6, bits<5> vs2, RISCVVFormat opv, dag outs, dag ins,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_OP_V.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand All @@ -179,7 +179,7 @@ class RVInstIVI<bits<6> funct6, dag outs, dag ins, string opcodestr,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_OP_V.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand All @@ -198,7 +198,7 @@ class RVInstV<bits<6> funct6, bits<5> vs1, RISCVVFormat opv, dag outs,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_OP_V.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand All @@ -220,7 +220,7 @@ class RVInstVLU<bits<3> nf, bit mew, RISCVLSUMOP lumop,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_LOAD_FP.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand All @@ -242,7 +242,7 @@ class RVInstVLS<bits<3> nf, bit mew, bits<3> width,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_LOAD_FP.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand All @@ -264,7 +264,7 @@ class RVInstVLX<bits<3> nf, bit mew, RISCVMOP mop, bits<3> width,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_LOAD_FP.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand All @@ -286,7 +286,7 @@ class RVInstVSU<bits<3> nf, bit mew, RISCVLSUMOP sumop,
let Inst{11-7} = vs3;
let Inst{6-0} = OPC_STORE_FP.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
}

class RVInstVSS<bits<3> nf, bit mew, bits<3> width,
Expand All @@ -307,7 +307,7 @@ class RVInstVSS<bits<3> nf, bit mew, bits<3> width,
let Inst{11-7} = vs3;
let Inst{6-0} = OPC_STORE_FP.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
}

class RVInstVSX<bits<3> nf, bit mew, RISCVMOP mop, bits<3> width,
Expand All @@ -328,5 +328,5 @@ class RVInstVSX<bits<3> nf, bit mew, RISCVMOP mop, bits<3> width,
let Inst{11-7} = vs3;
let Inst{6-0} = OPC_STORE_FP.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
}
4 changes: 2 additions & 2 deletions llvm/lib/Target/RISCV/RISCVInstrInfoXRivos.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class CustomRivosVXI<bits<6> funct6, RISCVVFormat opv, dag outs, dag ins,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_CUSTOM_2.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = NoConstraint;
let Constraints = "$vd = $vd_wb";
}
Expand All @@ -47,7 +47,7 @@ class CustomRivosXVI<bits<6> funct6, RISCVVFormat opv, dag outs, dag ins,
let Inst{11-7} = rd;
let Inst{6-0} = OPC_CUSTOM_2.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = NoConstraint;
}

Expand Down
4 changes: 2 additions & 2 deletions llvm/lib/Target/RISCV/RISCVInstrInfoXSf.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class RVInstVCCustom2<bits<4> funct6_hi4, bits<3> funct3, dag outs, dag ins,
let Inst{11-7} = rd;
let Inst{6-0} = OPC_CUSTOM_2.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = NoConstraint;
let ElementsDependOn = EltDepsVLMask;
}
Expand All @@ -97,7 +97,7 @@ class RVInstVCFCustom2<bits<4> funct6_hi4, bits<3> funct3, dag outs, dag ins,
let Inst{11-7} = rd;
let Inst{6-0} = OPC_CUSTOM_2.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = NoConstraint;
let ElementsDependOn = EltDepsVLMask;
}
Expand Down
2 changes: 1 addition & 1 deletion llvm/lib/Target/RISCV/RISCVInstrInfoZvk.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class RVInstIVI_VROR<bits<6> funct6, dag outs, dag ins, string opcodestr,
let Inst{11-7} = vd;
let Inst{6-0} = OPC_OP_V.Value;

let Uses = [VTYPE, VL];
let Uses = [VL, VTYPE];
let RVVConstraint = VMConstraint;
}

Expand Down