Skip to content

Commit

Permalink
- refactored mergeParentNodes
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23394 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
Volker Waurich committed Nov 17, 2014
1 parent 2f52b93 commit 0b3a478
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 33 deletions.
59 changes: 34 additions & 25 deletions Compiler/BackEnd/HpcOmTaskGraph.mo
View file
Expand Up @@ -3443,39 +3443,43 @@ algorithm
//print("contractedTasksOut "+stringDelimitList(List.map(arrayList(contractedTasksOut),intString),"\n")+"\n");
end mergeSimpleNodes;

public function mergeParentNodes "author: marcusw
Merges parent nodes into child if this produces a shorter execution time. Only one merge set is determined. you have to repeat this function"
input TaskGraph iGraph;
input TaskGraphMeta iGraphData;
input list<Integer> doNotMerge;
output TaskGraph oGraph;
output TaskGraphMeta oGraphData;
output Boolean oChanged; //true if the structure has changed
public function mergeParentNodes "author: marcusw,waurich
Merges parent nodes into child if this produces a shorter execution time."
input TaskGraph graphIn;
input TaskGraph graphTIn;
input TaskGraphMeta graphDataIn;
input array<Integer> contractedTasksIn;
output TaskGraph graphOut;
output TaskGraph graphTOut;
output TaskGraphMeta graphDataOut;
output array<Integer> contractedTasksOut;
output Boolean changed;
protected
TaskGraph iGraphT;
array<Integer> alreadyMerged;
list<list<Integer>> mergedNodes;
algorithm
iGraphT := BackendDAEUtil.transposeMatrix(iGraph,arrayLength(iGraph));
mergedNodes := mergeParentNodes0(iGraph, iGraphT, iGraphData, doNotMerge, 1, {});
//(oGraph,oGraphData,_,_) := contractNodesInGraph(mergedNodes, iGraph, iGraph, iGraphData);
oGraph := iGraph;
oGraphData := iGraphData;
oChanged := List.isNotEmpty(mergedNodes);
alreadyMerged := arrayCreate(arrayLength(graphIn),0);
mergedNodes := mergeParentNodes0(graphIn, graphTIn, graphDataIn, contractedTasksIn, alreadyMerged, 1, {});
//print("mergedNodes "+stringDelimitList(List.map(mergedNodes,intLstString),"\n")+"\n");
(graphOut,graphTOut,graphDataOut,contractedTasksOut) := contractNodesInGraph(mergedNodes,graphIn,graphTIn,graphDataIn,contractedTasksIn);
changed := List.isNotEmpty(mergedNodes);
//print("contractedTasksOut "+stringDelimitList(List.map(arrayList(contractedTasksOut),intString),"\n")+"\n");
end mergeParentNodes;

protected function mergeParentNodes0
input TaskGraph iGraph;
input TaskGraph iGraphT;
input TaskGraphMeta iGraphData;
input list<Integer> doNotMerge;
input array<Integer> contractedTasksIn;
input array<Integer> alreadyMerged;
input Integer iNodeIdx;
input list<list<Integer>> iMergedNodes;
output list<list<Integer>> oMergedNodes;
protected
TaskGraph tmpGraph;
TaskGraphMeta tmpGraphData;
Boolean tmpChanged;
Real exeCost, highestParentExeCost, sumParentExeCosts;
Real highestParentExeCost, sumParentExeCosts;
list<Integer> parentNodes, mergeNodeList;
Real highestCommCost;
array<tuple<Integer, Real>> exeCosts;
Expand All @@ -3485,14 +3489,17 @@ protected
list<list<Integer>> parentChilds;
list<list<Integer>> tmpMergedNodes;
algorithm
oMergedNodes := matchcontinue(iGraph, iGraphT, iGraphData, doNotMerge, iNodeIdx, iMergedNodes)
case(_,_,TASKGRAPHMETA(exeCosts=exeCosts, commCosts=commCosts),_,_,_)
oMergedNodes := matchcontinue(iGraph, iGraphT, iGraphData, contractedTasksIn, alreadyMerged, iNodeIdx, iMergedNodes)
case(_,_,TASKGRAPHMETA(exeCosts=exeCosts, commCosts=commCosts),_,_,_,_)
equation
true = intLe(iNodeIdx, arrayLength(iGraphT)); //Current index is in range
true = List.notMember(iNodeIdx,doNotMerge);
parentNodes = arrayGet(iGraphT, iNodeIdx);
false = List.exist1(parentNodes,listMember,doNotMerge);
true = intNe(arrayGet(contractedTasksIn,iNodeIdx),-1);
true = intNe(arrayGet(alreadyMerged,iNodeIdx),-1); // is not already in a merged task group
//print("HpcOmTaskGraph.mergeParentNodes0: looking at node " + intString(iNodeIdx) + "\n");
parentNodes = arrayGet(iGraphT, iNodeIdx);
parentNodes = filterContractedNodes(parentNodes,contractedTasksIn);
false = List.exist1(parentNodes,isRemoved,alreadyMerged);// dont consider nodes that are already merged in thsi iteration
//print("with the parents "+stringDelimitList(List.map(parentNodes,intString),", ")+"\n");
parentCommCosts = List.map2(parentNodes, getCommCostBetweenNodes, iNodeIdx, iGraphData);
COMMUNICATION(requiredTime=highestCommCost) = getHighestCommCost(parentCommCosts, COMMUNICATION(0,{},{},{},{},-1,-1.0));
parentExeCosts = List.map1(parentNodes, getExeCost, iGraphData);
Expand All @@ -3506,12 +3513,13 @@ algorithm
//print("HpcOmTaskGraph.mergeParentNodes0: mergeNodeList " + stringDelimitList(List.map(mergeNodeList,intString), ", ") + "\n");
//print("HpcOmTaskGraph.mergeParentNodes0: Merging " + intString(iNodeIdx) + " with " + stringDelimitList(List.map(parentNodes,intString), ", ") + "\n");
tmpMergedNodes = mergeNodeList :: iMergedNodes;
tmpMergedNodes = mergeParentNodes0(iGraph,iGraphT,iGraphData,listAppend(mergeNodeList,doNotMerge),iNodeIdx+1,tmpMergedNodes);
List.map_0(mergeNodeList,function Array.updateIndexFirst(inValue=-1,inArray=alreadyMerged));
tmpMergedNodes = mergeParentNodes0(iGraph,iGraphT,iGraphData,contractedTasksIn,alreadyMerged,iNodeIdx+1,tmpMergedNodes);
then tmpMergedNodes;
case(_,_,_,_,_,_)
case(_,_,_,_,_,_,_)
equation
true = intLe(iNodeIdx, arrayLength(iGraphT)); //Current index is in range
tmpMergedNodes = mergeParentNodes0(iGraph,iGraphT,iGraphData,doNotMerge,iNodeIdx+1,iMergedNodes);
tmpMergedNodes = mergeParentNodes0(iGraph,iGraphT,iGraphData,contractedTasksIn,alreadyMerged,iNodeIdx+1,iMergedNodes);
then tmpMergedNodes;
else iMergedNodes;
end matchcontinue;
Expand Down Expand Up @@ -3631,6 +3639,7 @@ algorithm
List.map_0(removeNodes,function Array.updateIndexFirst(inValue = -1, inArray=contractedTasksIn)); // mark in contrTask array
children = List.flatten(List.map(contrNodes,function Array.getIndexFirst(inArray = graphIn)));
children = filterContractedNodes(children,contractedTasksIn);
children = List.unique(children);
children = List.deleteMember(children,contrNode);
parents = List.flatten(List.map(contrNodes,function Array.getIndexFirst(inArray = graphTIn)));
parents = filterContractedNodes(parents,contractedTasksIn);
Expand Down
17 changes: 9 additions & 8 deletions Compiler/SimCode/HpcOmSimCodeMain.mo
View file
Expand Up @@ -469,20 +469,20 @@ author:Waurich 2014-11"
algorithm
(oTaskGraph,oTaskGraphMeta) := matchcontinue(iTaskGraph,iTaskGraphT,iTaskGraphMeta,contractedTasksIn,again)
local
Boolean changed;
Boolean changed,changed2;
case(_,_,_,_,true)
equation
//Merge nodes
(_,_,_,_,changed) = HpcOmTaskGraph.mergeSimpleNodes(iTaskGraph, iTaskGraphT, iTaskGraphMeta, contractedTasksIn);

//HpcOmTaskGraph.TASKGRAPHMETA(inComps=inComps,nodeMark=nodeMark) = taskGraphMeta1;
//doNotMerge = List.map3(doNotMergeIn,HpcOmTaskGraph.getCompInComps,1,inComps,nodeMark);
//(taskGraph1,taskGraphMeta1,changed2) = HpcOmTaskGraph.mergeParentNodes(taskGraph1, taskGraphMeta1, doNotMerge);

//changed = false;

(_,_,_,_,changed2) = HpcOmTaskGraph.mergeParentNodes(iTaskGraph, iTaskGraphT, iTaskGraphMeta, contractedTasksIn);
changed = changed or changed2;
//HpcOmTaskGraph.TASKGRAPHMETA(inComps=inComps,nodeMark=nodeMark) = taskGraphMeta1;
//doNotMerge = List.map3(doNotMergeIn,HpcOmTaskGraph.getCompInComps,1,inComps,nodeMark);
//(taskGraph1,taskGraphMeta1,changed3) = HpcOmTaskGraph.mergeSingleNodes(taskGraph1, taskGraphMeta1, doNotMerge);

then applyGRS1(iTaskGraph,iTaskGraphT,iTaskGraphMeta,contractedTasksIn,changed);
else (iTaskGraph, iTaskGraphMeta);
end matchcontinue;
Expand Down Expand Up @@ -532,10 +532,11 @@ algorithm
then (newGraph,newInComps);
case(node::rest,_,_,_,_,_,_,_)
equation
//print("node "+intString(node)+"\n");
//print("origNode "+intString(node)+" and newNode "+intString(newNode)+"\n");
row = arrayGet(origGraph,node);
row = HpcOmTaskGraph.filterContractedNodes(row,contrTasks);
row = HpcOmTaskGraph.updateContinuousEntriesInList(row,removedNodes);

comps = arrayGet(origInComps,node);
//print("comps1 "+stringDelimitList(List.map(comps,intString),", ")+"\n");
arrayUpdate(newGraph,newNode,row);
Expand Down

0 comments on commit 0b3a478

Please sign in to comment.