Changeset 3b96b9d9 in OpenModelica

Timestamp:

2021-11-24T14:12:51+01:00 (2 years ago)

Author:

Per Östlund <perost86@…>

Parents:

7c3ddb9c

git-author:

Per Östlund <perost86@…> (11/24/21 12:52:33)

git-committer:

Per Östlund <perost86@…> (11/24/21 14:12:51)

Message:

Improve flattening without scalarization

• Flatten equations and algorithms with an empty prefix when not doing scalarization, to get rid of any remaining split indices.

Files:

• OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo (modified) (8 diffs)
• testsuite/flattening/modelica/scodeinst/ArrayConnect3.mo (modified) (3 diffs)
• testsuite/flattening/modelica/scodeinst/PrintRecordTypes1.mo (modified) (1 diff)

OMCompiler/Compiler/NFFrontEnd/NFFlatten.mo

@@ -137 +137 @@
 end FlattenSettings;
 
+constant ComponentRef EMPTY_PREFIX = ComponentRef.EMPTY();
+
 function flatten
   input InstNode classInst;
@@ -165 +167 @@
   deleted_vars := UnorderedSet.new(ComponentRef.hash, ComponentRef.isEqual);
 
-  (vars, sections) := flattenClass(InstNode.getClass(classInst), ComponentRef.EMPTY(),
+  (vars, sections) := flattenClass(InstNode.getClass(classInst), EMPTY_PREFIX,
     Visibility.PUBLIC, NONE(), {}, sections, deleted_vars, settings);
   vars := listReverseInPlace(vars);
@@ -737 +739 @@
       algorithm
         for eqn in listReverse(sects.equations) loop
-          sections := Sections.prependEquation(vectorizeEquation(eqn, dimensions, prefix), sections);
+          sections := Sections.prependEquation(vectorizeEquation(eqn, dimensions, prefix, settings), sections);
         end for;
         for eqn in listReverse(sects.initialEquations) loop
-          sections := Sections.prependEquation(vectorizeEquation(eqn, dimensions, prefix), sections, true);
+          sections := Sections.prependEquation(vectorizeEquation(eqn, dimensions, prefix, settings), sections, true);
         end for;
         for alg in listReverse(sects.algorithms) loop
@@ -753 +755 @@
 
 function vectorizeEquation
-  input Equation eqn;
+  input output Equation eqn;
   input list<Dimension> dimensions;
   input ComponentRef prefix;
-  output Equation veqn;
-algorithm
-  veqn := match eqn
+  input FlattenSettings settings;
+algorithm
+  // Flatten with an empty prefix to get rid of any split indices.
+  {eqn} := flattenEquation(eqn, EMPTY_PREFIX, {}, settings);
+
+  eqn := match eqn
     local
       InstNode iter;
@@ -776 +781 @@
         (iters, ranges, subs) := makeIterators(prefix, dimensions);
         subs := listReverseInPlace(subs);
-        veqn := Equation.mapExp(eqn, function addIterator(prefix = prefix, subscripts = subs));
+        eqn := Equation.mapExp(eqn, function addIterator(prefix = prefix, subscripts = subs));
         src := Equation.source(eqn);
 
         iter :: iters := iters;
         range :: ranges := ranges;
-        veqn := Equation.FOR(iter, SOME(range), {veqn}, src);
+        eqn := Equation.FOR(iter, SOME(range), {eqn}, src);
 
         while not listEmpty(iters) loop
           iter :: iters := iters;
           range :: ranges := ranges;
-          veqn := Equation.FOR(iter, SOME(range), {veqn}, src);
+          eqn := Equation.FOR(iter, SOME(range), {eqn}, src);
         end while;
       then
-        veqn;
+        eqn;
 
   end match;
@@ -795 +800 @@
 
 function vectorizeAlgorithm
-  input Algorithm alg;
+  input output Algorithm alg;
   input list<Dimension> dimensions;
   input ComponentRef prefix;
-  output Algorithm valg;
-algorithm
-  valg := match alg
+algorithm
+  // Flatten with an empty prefix to get rid of any split indices.
+  alg.statements := flattenStatements(alg.statements, EMPTY_PREFIX);
+
+  alg := match alg
     local
       InstNode iter;
@@ -1201 +1208 @@
       algorithm
         if settings.arrayConnect then
+          eq.body := flattenEquations(eq.body, EMPTY_PREFIX, settings);
           eql := eq :: equations;
         elseif not settings.scalarize then
@@ -1423 +1431 @@
 algorithm
   Equation.FOR(iter, range, body, src) := forLoop;
+  body := flattenEquations(body, EMPTY_PREFIX, settings);
   (connects, non_connects) := splitForLoop2(body);
 

testsuite/flattening/modelica/scodeinst/ArrayConnect3.mo

@@ -57 +57 @@
 //   Real[1000, 100] cells.l.e;
 // equation
+//   for $i1 in 2:1000 loop
+//     for $i2 in 1:99 loop
+//       cells[$i1,$i2].u.e = cells[$i1 - 1,$i2].d.e;
+//     end for;
+//   end for;
+//   for $i1 in 1:999 loop
+//     for $i2 in 1:99 loop
+//       cells[$i1,$i2].d.f + cells[$i1 + 1,$i2].u.f = 0.0;
+//     end for;
+//   end for;
 //   for $i1 in 1:999 loop
 //     for $i2 in 2:100 loop
@@ -67 +77 @@
 //     end for;
 //   end for;
-//   for $i1 in 2:1000 loop
-//     for $i2 in 1:99 loop
-//       cells[$i1,$i2].u.e = cells[$i1 - 1,$i2].d.e;
-//     end for;
-//   end for;
-//   for $i1 in 1:999 loop
-//     for $i2 in 1:99 loop
-//       cells[$i1,$i2].d.f + cells[$i1 + 1,$i2].u.f = 0.0;
-//     end for;
-//   end for;
 //   for $i1 in 1:1000 loop
 //     cells[$i1,1].l.e = cells[$i1,100].r.e;
@@ -84 +84 @@
 //   end for;
 //   for $i2 in 1:100 loop
+//     cells[1000,$i2].d.e = S.n.e;
+//   end for;
+//   sum(cells[1000,:].d.f) + S.n.f = 0.0;
+//   for $i2 in 1:100 loop
 //     cells[1,$i2].u.e = S.p.e;
 //   end for;
 //   sum(cells[1,:].u.f) + S.p.f = 0.0;
-//   for $i2 in 1:100 loop
-//     cells[1000,$i2].d.e = S.n.e;
-//   end for;
-//   sum(cells[1000,:].d.f) + S.n.f = 0.0;
 //   for $i1 in 1:999 loop
 //     cells[$i1,100].d.f = 0.0;

testsuite/flattening/modelica/scodeinst/PrintRecordTypes1.mo

@@ -46 +46 @@
 // equation
 //   for i in 1:100 loop
+//     b[i].c[10] = R2(R1(1.0, 0.0), R1(/*Real*/(i), 1.0));
 //     b[i].c[1].rb = R1(/*Real*/(i), 0.0);
-//     b[i].c[10] = R2(R1(1.0, 0.0), R1(/*Real*/(i), 1.0));
 //   end for;
 // end PrintRecordTypes1;