Skip to content

Commit

Permalink
Fix stack overflow in splitConnectEquationsExpandable
Browse files Browse the repository at this point in the history 
This fixes ticket:3863. It also makes performance faster.
  • Loading branch information
@sjoelund
sjoelund committed Apr 23, 2016
1 parent 00d2306 commit 6221cae
Show file tree
Hide file tree
Showing 2 changed files with 57 additions and 83 deletions.
17 changes: 2 additions & 15 deletions Compiler/FrontEnd/Inst.mo
View file
Expand Up @@ -1866,7 +1866,7 @@ algorithm
Option<DAE.Type> bc;
DAE.Mod mods,emods,mod_1,mods_1,checkMods;
Prefix.Prefix pre;
list<SCode.Equation> eqs,initeqs,eqs2,initeqs2,eqs_1,initeqs_1,expandableEqs;
list<SCode.Equation> eqs,initeqs,eqs2,initeqs2,eqs_1,initeqs_1;
list<SCode.AlgorithmSection> alg,initalg,alg2,initalg2,alg_1,initalg_1;
list<SCode.ConstraintSection> constrs;
list<Absyn.NamedArg> clsattrs;
Expand Down Expand Up @@ -2089,20 +2089,7 @@ algorithm
elementSource = ElementSource.createElementSource(info, FGraph.getScopePath(env3), pre);
csets1 = ConnectUtil.addConnectorVariablesFromDAE(zero_dims, ci_state1, pre, vars, info, elementSource, csets);

// Reorder the connect equations to have non-expandable connect first:
// connect(non_expandable, non_expandable);
// connect(non_expandable, expandable);
// connect(expandable, non_expandable);
// connect(expandable, expandable);
ErrorExt.setCheckpoint("expandableConnectorsOrder");
(cache, eqs_1, expandableEqs) = InstUtil.splitConnectEquationsExpandable(cache, env5, ih, pre, eqs_1, impl, {}, {});
// put expandable at the begining
eqs_1 = listAppend(expandableEqs, eqs_1);
// put expandable at the end
eqs_1 = listAppend(eqs_1, expandableEqs);
// duplicate expandable to get the union
eqs_1 = InstUtil.addExpandable(eqs_1, expandableEqs);
ErrorExt.rollBack("expandableConnectorsOrder");
(cache, eqs_1) = InstUtil.reorderConnectEquationsExpandable(cache, env5, eqs_1);

//Discretization of PDEs:
if intEq(Flags.getConfigEnum(Flags.GRAMMAR), Flags.PDEMODELICA) then
Expand Down
123 changes: 55 additions & 68 deletions Compiler/FrontEnd/InstUtil.mo
View file
Expand Up @@ -54,6 +54,7 @@ import HashTable;
import HashTable5;

protected
import DoubleEndedList;
import List;
import BaseHashTable;
import Expression;
Expand Down Expand Up @@ -920,21 +921,6 @@ algorithm
b := boolOr(b1, boolOr(b2, boolOr(b3, boolAnd(boolOr(b1,b2), b4))));
end checkDerivedRestriction;

public function addExpandable
input list<SCode.Equation> inEqs;
input list<SCode.Equation> inExpandable;
output list<SCode.Equation> outEqs;
algorithm
outEqs := match(inEqs, inExpandable)
// nothing
case (_, {}) then inEqs;
// if is only one, don't append!
case (_, {_}) then inEqs;
// if is more than one, append
else listAppend(inEqs, inExpandable);
end match;
end addExpandable;

public function matchModificationToComponents "
Author: BZ, 2009-05
This function is called from instClassDef, recursivly remove modifers on each component.
Expand Down Expand Up @@ -6063,70 +6049,71 @@ algorithm
end match;
end extractCurrentName;

public function splitConnectEquationsExpandable
public function reorderConnectEquationsExpandable
"@author: adrpo
Reorder the connect equations to have non-expandable connect first:
connect(non_expandable, non_expandable);
connect(non_expandable, expandable);
connect(expandable, non_expandable);
connect(expandable, expandable);"
input FCore.Cache inCache;
input FCore.Graph inEnv;
input InnerOuter.InstHierarchy inIH;
input Prefix.Prefix inPre;
input output FCore.Cache cache;
input FCore.Graph env;
input list<SCode.Equation> inEquations;
input Boolean impl;
input list<SCode.Equation> inAccumulatorNonExpandable;
input list<SCode.Equation> inAccumulatorExpandable;
output FCore.Cache outCache;
output list<SCode.Equation> outEquations;
output list<SCode.Equation> outExpandableEquations;
protected
DoubleEndedList<SCode.Equation> delst;
list<SCode.Equation> expandableEqs;
Absyn.ComponentRef crefLeft, crefRight;
DAE.Type ty1,ty2;
algorithm
(outCache,outEquations,outExpandableEquations) := matchcontinue(inCache, inEnv, inIH, inPre, inEquations, impl, inAccumulatorNonExpandable, inAccumulatorExpandable)
local
list<SCode.Equation> rest, eEq, nEq;
SCode.Equation eq;
Absyn.ComponentRef crefLeft, crefRight;
FCore.Cache cache;
FCore.Graph env;
SourceInfo info;
DAE.Type ty1,ty2;
DAE.ComponentRef c1_1,c2_1;

// if we have no expandable connectors, return the same
case (cache, _, _, _, _::_, _, _, _)
equation
false = System.getHasExpandableConnectors();
then
(cache, inEquations, {});

// handle empty case
case (cache, _, _, _, {}, _, eEq, nEq) then (cache, listReverse(eEq), listReverse(nEq));

// connect, both expandable
case (cache, env, _, _, (eq as SCode.EQUATION(SCode.EQ_CONNECT(crefLeft, crefRight, _, info)))::rest, _, eEq, nEq)
equation
(_, ty1, _) = Lookup.lookupConnectorVar(env, ComponentReference.toExpCref(crefLeft));
(_, ty2, _) = Lookup.lookupConnectorVar(env, ComponentReference.toExpCref(crefRight));
//(cache,SOME((DAE.CREF(),DAE.PROP(ty1,_),_))) = Static.elabCref(cache, env, crefLeft, impl, false, inPre, info);
//(cache,SOME((DAE.CREF(),DAE.PROP(ty2,_),_))) = Static.elabCref(cache, env, crefRight, impl, false, inPre, info);
if if listEmpty(inEquations) then true else (not System.getHasExpandableConnectors()) then
outEquations := inEquations;
return;
end if;
ErrorExt.setCheckpoint("expandableConnectorsOrder");
delst := DoubleEndedList.fromList({});
expandableEqs := list(
eq
for eq
guard matchcontinue eq
case SCode.EQUATION(SCode.EQ_CONNECT(crefLeft=crefLeft, crefRight=crefRight))
algorithm
(_, ty1, _) := Lookup.lookupConnectorVar(env, ComponentReference.toExpCref(crefLeft));
// type of left var is an expandable connector!
true := Types.isExpandableConnector(ty1);
(_, ty2, _) := Lookup.lookupConnectorVar(env, ComponentReference.toExpCref(crefRight));
// type of right left var is an expandable connector!
true := Types.isExpandableConnector(ty2);
then true;
else algorithm DoubleEndedList.push_back(delst, eq); then false;
end matchcontinue in inEquations
);

// type of left var is an expandable connector!
true = Types.isExpandableConnector(ty1);
// type of right left var is an expandable connector!
true = Types.isExpandableConnector(ty2);
(cache, eEq, nEq) = splitConnectEquationsExpandable(cache, env, inIH, inPre, rest, impl, eEq, eq::nEq);
then
(cache, eEq, nEq);
if listEmpty(expandableEqs) then
ErrorExt.delCheckpoint("expandableConnectorsOrder");
outEquations := inEquations; // Just to preserve referenceEq; does not really matter
return;
end if;
ErrorExt.rollBack("expandableConnectorsOrder");

// Reorder the connect equations to have non-expandable connect first:
// connect(non_expandable, non_expandable);
// connect(non_expandable, expandable);
// connect(expandable, non_expandable);
// connect(expandable, expandable);

// put expandable at the begining
DoubleEndedList.push_list_front(delst, expandableEqs);
// put expandable at the end
DoubleEndedList.push_list_back(delst, expandableEqs);
// duplicate expandable to get the union
_ := match expandableEqs
case _::_::_ algorithm DoubleEndedList.push_list_back(delst, expandableEqs); then (); // > length 1
else ();
end match;

// anything else, put at the begining (keep the order)
case (cache, _, _, _, eq::rest, _, eEq, nEq)
equation
(cache, eEq, nEq) = splitConnectEquationsExpandable(cache, inEnv, inIH, inPre, rest, impl, eq::eEq, nEq);
then
(cache, eEq, nEq);
end matchcontinue;
end splitConnectEquationsExpandable;
outEquations := DoubleEndedList.toListAndClear(delst);
end reorderConnectEquationsExpandable;

public function sortInnerFirstTplLstElementMod
"@author: adrpo
Expand Down

0 comments on commit 6221cae

Please sign in to comment.