@@ -270,7 +270,7 @@ class SiFive7AnyToGPRBypass<SchedRead read, int cycles = 2>
270270// and floating point computation.
271271// The V pipeline is modeled by the VCQ, VA, VL, and VS resources. There can
272272// be one or two VA (Vector Arithmetic).
273- multiclass SiFive7ProcResources<bit extraVALU = false> {
273+ multiclass SiFive7ProcResources<bit dualVALU = false> {
274274 let BufferSize = 0 in {
275275 def PipeA : ProcResource<1>;
276276 def PipeB : ProcResource<1>;
@@ -279,7 +279,7 @@ multiclass SiFive7ProcResources<bit extraVALU = false> {
279279 def FDiv : ProcResource<1>; // FP Division/Sqrt
280280
281281 // Arithmetic sequencer(s)
282- if extraVALU then {
282+ if dualVALU then {
283283 // VA1 can handle any vector airthmetic instruction.
284284 def VA1 : ProcResource<1>;
285285 // VA2 generally can only handle simple vector arithmetic.
@@ -305,7 +305,7 @@ multiclass SiFive7ProcResources<bit extraVALU = false> {
305305 def PipeAB : ProcResGroup<[!cast<ProcResource>(NAME#"PipeA"),
306306 !cast<ProcResource>(NAME#"PipeB")]>;
307307
308- if extraVALU then
308+ if dualVALU then
309309 def VA1OrVA2 : ProcResGroup<[!cast<ProcResource>(NAME#"VA1"),
310310 !cast<ProcResource>(NAME#"VA2")]>;
311311}
@@ -1550,10 +1550,10 @@ multiclass SiFive7ReadAdvance {
15501550/// This multiclass is a "bundle" of (1) processor resources (i.e. pipes) and
15511551/// (2) WriteRes entries. It's parameterized by config values that will
15521552/// eventually be supplied by different SchedMachineModels.
1553- multiclass SiFive7SchedResources<int vlen, bit extraVALU ,
1553+ multiclass SiFive7SchedResources<int vlen, bit dualVALU ,
15541554 SiFive7FPLatencies fpLatencies,
15551555 bit hasFastGather> {
1556- defm SiFive7 : SiFive7ProcResources<extraVALU >;
1556+ defm SiFive7 : SiFive7ProcResources<dualVALU >;
15571557
15581558 // Pull out defs from SiFive7ProcResources so we can refer to them by name.
15591559 defvar SiFive7PipeA = !cast<ProcResource>(NAME # SiFive7PipeA);
@@ -1562,10 +1562,10 @@ multiclass SiFive7SchedResources<int vlen, bit extraVALU,
15621562 defvar SiFive7IDiv = !cast<ProcResource>(NAME # SiFive7IDiv);
15631563 defvar SiFive7FDiv = !cast<ProcResource>(NAME # SiFive7FDiv);
15641564 // Pass SiFive7VA for VA1 and VA1OrVA2 if there is only 1 VALU.
1565- defvar SiFive7VA1 = !if (extraVALU ,
1565+ defvar SiFive7VA1 = !if (dualVALU ,
15661566 !cast<ProcResource>(NAME # SiFive7VA1),
15671567 !cast<ProcResource>(NAME # SiFive7VA));
1568- defvar SiFive7VA1OrVA2 = !if (extraVALU ,
1568+ defvar SiFive7VA1OrVA2 = !if (dualVALU ,
15691569 !cast<ProcResGroup>(NAME # SiFive7VA1OrVA2),
15701570 !cast<ProcResource>(NAME # SiFive7VA));
15711571 defvar SiFive7VA = !cast<ProcResource>(NAME # SiFive7VA);
@@ -1608,7 +1608,7 @@ class SiFive7SchedMachineModel<int vlen> : SchedMachineModel {
16081608 HasStdExtZknh, HasStdExtZksed, HasStdExtZksh,
16091609 HasStdExtZkr];
16101610 int VLEN = vlen;
1611- bit HasExtraVALU = false;
1611+ bit HasDualVALU = false;
16121612
16131613 SiFive7FPLatencies FPLatencies;
16141614 bit HasFastGather = false;
@@ -1635,15 +1635,15 @@ def SiFive7VLEN512Model : SiFive7SchedMachineModel<512> {
16351635}
16361636
16371637def SiFive7VLEN1024X300Model : SiFive7SchedMachineModel<1024> {
1638- let HasExtraVALU = true;
1638+ let HasDualVALU = true;
16391639 let FPLatencies = SiFive7LowFPLatencies;
16401640 let HasFastGather = true;
16411641}
16421642
16431643/// Binding models to their scheduling resources.
16441644foreach model = [SiFive7VLEN512Model, SiFive7VLEN1024X300Model] in {
16451645 let SchedModel = model in
1646- defm model.Name : SiFive7SchedResources<model.VLEN, model.HasExtraVALU ,
1646+ defm model.Name : SiFive7SchedResources<model.VLEN, model.HasDualVALU ,
16471647 model.FPLatencies,
16481648 model.HasFastGather>;
16491649}
0 commit comments