@@ -1773,28 +1773,27 @@ class getIns64 <RegisterOperand Src0RC, RegisterOperand Src1RC,
1773
1773
class getInsVOP3Base<RegisterOperand Src0RC, RegisterOperand Src1RC,
1774
1774
RegisterOperand Src2RC, int NumSrcArgs,
1775
1775
bit HasClamp, bit HasModifiers, bit HasSrc2Mods, bit HasOMod,
1776
- Operand Src0Mod, Operand Src1Mod, Operand Src2Mod, bit HasOpSel,
1777
- bit IsVOP3P> {
1776
+ Operand Src0Mod, Operand Src1Mod, Operand Src2Mod, bit HasOpSel> {
1778
1777
// getInst64 handles clamp and omod. implicit mutex between vop3p and omod
1779
1778
dag base = getIns64 <Src0RC, Src1RC, Src2RC, NumSrcArgs,
1780
1779
HasClamp, HasModifiers, HasSrc2Mods, HasOMod,
1781
1780
Src0Mod, Src1Mod, Src2Mod>.ret;
1782
1781
dag opsel = (ins op_sel0:$op_sel);
1783
- dag vop3pOpsel = (ins op_sel_hi0:$op_sel_hi);
1784
- dag vop3pFields = !con(!if(HasOpSel, vop3pOpsel, (ins)), (ins neg_lo0:$neg_lo, neg_hi0:$neg_hi));
1785
-
1786
- dag ret = !con(base,
1787
- !if(HasOpSel, opsel,(ins)),
1788
- !if(IsVOP3P, vop3pFields,(ins)));
1782
+ dag ret = !con(base, !if(HasOpSel, opsel, (ins)));
1789
1783
}
1790
1784
1791
1785
class getInsVOP3P <RegisterOperand Src0RC, RegisterOperand Src1RC,
1792
1786
RegisterOperand Src2RC, int NumSrcArgs, bit HasClamp, bit HasOpSel,
1793
1787
Operand Src0Mod, Operand Src1Mod, Operand Src2Mod> {
1794
- dag ret = getInsVOP3Base<Src0RC, Src1RC, Src2RC, NumSrcArgs,
1788
+ dag base = getInsVOP3Base<Src0RC, Src1RC, Src2RC, NumSrcArgs,
1795
1789
HasClamp, 1/*HasModifiers*/, 1/*HasSrc2Mods*/,
1796
- 0/*HasOMod*/, Src0Mod, Src1Mod, Src2Mod,
1797
- HasOpSel, 1/*IsVOP3P*/>.ret;
1790
+ 0/*HasOMod*/, Src0Mod, Src1Mod, Src2Mod, HasOpSel>.ret;
1791
+
1792
+ dag vop3pOpsel = (ins op_sel_hi0:$op_sel_hi);
1793
+ dag vop3p_neg = (ins neg_lo0:$neg_lo, neg_hi0:$neg_hi);
1794
+
1795
+ dag vop3pFields = !con(!if(HasOpSel, vop3pOpsel, (ins)), vop3p_neg);
1796
+ dag ret = !con(base, vop3pFields);
1798
1797
}
1799
1798
1800
1799
class getInsVOP3OpSel <RegisterOperand Src0RC, RegisterOperand Src1RC,
@@ -1804,7 +1803,7 @@ class getInsVOP3OpSel <RegisterOperand Src0RC, RegisterOperand Src1RC,
1804
1803
dag ret = getInsVOP3Base<Src0RC, Src1RC,
1805
1804
Src2RC, NumSrcArgs,
1806
1805
HasClamp, 1/*HasModifiers*/, 1/*HasSrc2Mods*/, HasOMod,
1807
- Src0Mod, Src1Mod, Src2Mod, 1 /*HasOpSel*/, 0 >.ret;
1806
+ Src0Mod, Src1Mod, Src2Mod, /*HasOpSel=*/1 >.ret;
1808
1807
}
1809
1808
1810
1809
class getInsDPPBase <RegisterOperand OldRC, RegisterClass Src0RC, RegisterClass Src1RC,
@@ -2390,9 +2389,15 @@ class VOPProfile <list<ValueType> _ArgVT, bit _EnableClamp = 0> {
2390
2389
field dag InsDPP8 = getInsDPP8<DstRCDPP, Src0DPP, Src1DPP, Src2DPP,
2391
2390
NumSrcArgs, HasModifiers,
2392
2391
Src0ModDPP, Src1ModDPP, Src2ModDPP>.ret;
2393
- field dag InsVOP3Base = getInsVOP3Base<Src0VOP3DPP, Src1VOP3DPP,
2392
+ defvar InsVOP3DPPBase = getInsVOP3Base<Src0VOP3DPP, Src1VOP3DPP,
2394
2393
Src2VOP3DPP, NumSrcArgs, HasClamp, HasModifiers, HasSrc2Mods, HasOMod,
2395
- Src0ModVOP3DPP, Src1ModVOP3DPP, Src2ModVOP3DPP, HasOpSel, IsVOP3P>.ret;
2394
+ Src0ModVOP3DPP, Src1ModVOP3DPP, Src2ModVOP3DPP, HasOpSel>.ret;
2395
+ defvar InsVOP3PDPPBase = getInsVOP3P<Src0VOP3DPP, Src1VOP3DPP,
2396
+ Src2VOP3DPP, NumSrcArgs, HasClamp, HasOpSel,
2397
+ Src0ModVOP3DPP, Src1ModVOP3DPP, Src2ModVOP3DPP>.ret;
2398
+
2399
+ field dag InsVOP3Base = !if(IsVOP3P, InsVOP3PDPPBase, InsVOP3DPPBase);
2400
+
2396
2401
field dag InsVOP3DPP = getInsVOP3DPP<InsVOP3Base, DstRCVOP3DPP, NumSrcArgs>.ret;
2397
2402
field dag InsVOP3DPP16 = getInsVOP3DPP16<InsVOP3Base, DstRCVOP3DPP, NumSrcArgs>.ret;
2398
2403
field dag InsVOP3DPP8 = getInsVOP3DPP8<InsVOP3Base, DstRCVOP3DPP, NumSrcArgs>.ret;
0 commit comments