try to reduce memory usage

- use listReverseInPlace where possible - remove some recursions and matchcontinue
OpenModelica · Mar 4, 2016 · 8abe1ff · 8abe1ff
1 parent cc074b4
commit 8abe1ff
Show file tree

Hide file tree

Showing 16 changed files with 193 additions and 282 deletions.
diff --git a/Compiler/BackEnd/BackendDAEOptimize.mo b/Compiler/BackEnd/BackendDAEOptimize.mo
@@ -102,7 +102,7 @@ algorithm
       else eq::removedEqsList;
     end match;
   end for;
-  shared.removedEqs := BackendEquation.listEquation(listReverse(removedEqsList));
+  shared.removedEqs := BackendEquation.listEquation(MetaModelica.Dangerous.listReverseInPlace(removedEqsList));
   outDAE.shared := shared;
 end simplifyAllExpressions;
 
@@ -4291,7 +4291,7 @@ algorithm
             end if;
             expLst := e :: expLst;
           end for; // lhs
-          left := DAE.TUPLE(listReverse(expLst));
+          left := DAE.TUPLE(MetaModelica.Dangerous.listReverseInPlace(expLst));
           eqn := BackendDAE.COMPLEX_EQUATION(size, left, right, source, attr);
           eqns := BackendEquation.setAtIndex(eqns, i, eqn);
         end if; // lhs <-> rhs

diff --git a/Compiler/BackEnd/BackendDAETransform.mo b/Compiler/BackEnd/BackendDAETransform.mo
@@ -161,7 +161,7 @@ algorithm
     outComps := acomp :: outComps;
   end for;
 
-  outComps := listReverse(outComps);
+  outComps := MetaModelica.Dangerous.listReverseInPlace(outComps);
 end analyseStrongComponentsScalar;
 
 protected function analyseStrongComponentScalar "author: Frenkel TUD 2011-05"

diff --git a/Compiler/BackEnd/BackendEquation.mo b/Compiler/BackEnd/BackendEquation.mo
@@ -597,7 +597,7 @@ algorithm
     outEquations := eq::outEquations;
   end for;
 
-  outEquations := listReverse(outEquations);
+  outEquations := MetaModelica.Dangerous.listReverseInPlace(outEquations);
 end traverseExpsOfEquationList;
 
 public function traverseExpsOfEquationList_WithStop "author: Frenkel TUD 2012-09
@@ -1095,7 +1095,7 @@ algorithm
     outExpl := e :: outExpl;
   end for;
 
-   outExpl := listReverse(outExpl);
+   outExpl := MetaModelica.Dangerous.listReverseInPlace(outExpl);
 end traverseExpsOfExpList;
 
 protected function traverseExpsOfExpList_WithStop<T> "author Frenkel TUD

diff --git a/Compiler/BackEnd/CommonSubExpression.mo b/Compiler/BackEnd/CommonSubExpression.mo
@@ -111,7 +111,7 @@ algorithm
 
     eqs := syst::eqs;
   end for;
-  eqs := listReverse(eqs);
+  eqs := MetaModelica.Dangerous.listReverseInPlace(eqs);
 
   System.tmpTickSetIndex(index, Global.backendDAE_cseIndex);
   outDAE := BackendDAE.DAE(eqs, shared);

diff --git a/Compiler/BackEnd/Differentiate.mo b/Compiler/BackEnd/Differentiate.mo
@@ -2595,17 +2595,16 @@ algorithm
       tp = DAEUtil.getFunctionType(func);
       dtp = Types.extendsFunctionTypeArgs(tp, inputVarsDer, outputVarsDer, blst);
 
-      inputVars = listAppend(inputVars, inputVarsDer);
-      protectedVars = listAppend(protectedVars, protectedVarsDer);
-      funcbodyDer = listAppend(inputVars, outputVarsDer);
-      funcbodyDer = listAppend(funcbodyDer, protectedVars);
-
       //change output vars to protected vars and direction bidir
       newProtectedVars = List.map1(outputVars, DAEUtil.setElementVarVisibility, DAE.PROTECTED());
       newProtectedVars = List.map1(newProtectedVars, DAEUtil.setElementVarDirection, DAE.BIDIR());
-      funcbodyDer = listAppend(funcbodyDer, newProtectedVars);
 
-      funcbodyDer = listAppend(funcbodyDer, {DAE.ALGORITHM(DAE.ALGORITHM_STMTS(derbodyStmts), DAE.emptyElementSource)});
+      funcbodyDer = listAppend(newProtectedVars, {DAE.ALGORITHM(DAE.ALGORITHM_STMTS(derbodyStmts), DAE.emptyElementSource)});
+      funcbodyDer = listAppend(protectedVarsDer, funcbodyDer);
+      funcbodyDer = listAppend(protectedVars, funcbodyDer);
+      funcbodyDer = listAppend(outputVarsDer, funcbodyDer);
+      funcbodyDer = listAppend(inputVarsDer, funcbodyDer);
+      funcbodyDer = listAppend(inputVars, funcbodyDer);
 
       isImpure = DAEUtil.getFunctionImpureAttribute(func);
       dinl = DAEUtil.getFunctionInlineType(func);

diff --git a/Compiler/BackEnd/EvaluateFunctions.mo b/Compiler/BackEnd/EvaluateFunctions.mo
@@ -1053,7 +1053,7 @@ algorithm
         //print("scalars to check\n"+stringDelimitList(List.map(scalars,ComponentReference.printComponentRefStr),"\n")+"\n");
 
         false = listEmpty(scalars);
-        (constVars,_,_) = List.intersection1OnTrue(scalars,constCrefs,ComponentReference.crefEqual);
+        constVars = List.intersectionOnTrue(scalars,constCrefs,ComponentReference.crefEqual);
         //print("constVars\n"+stringDelimitList(List.map(constVars,ComponentReference.printComponentRefStr),"\n")+"\n");
 
         const = intEq(listLength(scalars),listLength(constVars));

diff --git a/Compiler/BackEnd/EvaluateParameter.mo b/Compiler/BackEnd/EvaluateParameter.mo
@@ -1210,7 +1210,7 @@ algorithm
       sys.removedEqs := remEqsSys;
       systs2 := sys::systs2;
     end for;
-    systs2 := listReverse(systs2);
+    systs2 := MetaModelica.Dangerous.listReverseInPlace(systs2);
 
     // replace all init eqs, removed eqs, external var-bindings and alias var bindings, event-infos
     initEqs := shared.initialEqs;

diff --git a/Compiler/BackEnd/IndexReduction.mo b/Compiler/BackEnd/IndexReduction.mo
@@ -1297,7 +1297,7 @@ algorithm
       osysts := syst :: osysts;
     end if;
   end for;
-  osysts := listReverse(osysts);
+  osysts := MetaModelica.Dangerous.listReverseInPlace(osysts);
 end mapdynamicStateSelection;
 
 protected function dynamicStateSelectionWork