Skip to content

Commit

Permalink
[Janitor mode] Fix whitespace
Browse files Browse the repository at this point in the history
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20294 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
OpenModelica-Hudson committed Apr 28, 2014
1 parent cbac823 commit 88993e1
Show file tree
Hide file tree
Showing 12 changed files with 1,734 additions and 1,734 deletions.
2,936 changes: 1,468 additions & 1,468 deletions Compiler/BackEnd/HpcOmMemory.mo

Large diffs are not rendered by default.

76 changes: 38 additions & 38 deletions Compiler/BackEnd/HpcOmSimCode.mo
Expand Up @@ -40,43 +40,43 @@ encapsulated package HpcOmSimCode
HashTableCrILst.HashTable scVarNameIdxMapping; //maps each var-name to the scVar-idx
end MEMORYMAP_ARRAY;
end MemoryMap;
public uniontype Task
record CALCTASK //Task which calculates something
Integer weighting;
Integer index;
Real calcTime;
Real timeFinished;
Integer threadIdx;
list<Integer> eqIdc;
end CALCTASK;
record CALCTASK_LEVEL
list<Integer> eqIdc;
list<Integer> nodeIdc; //indices of the graph-node
end CALCTASK_LEVEL;
record ASSIGNLOCKTASK //Task which assignes a lock
String lockId;
end ASSIGNLOCKTASK;
record RELEASELOCKTASK //Task which releases a lock
String lockId;
end RELEASELOCKTASK;
record TASKEMPTY //Dummy Task
end TASKEMPTY;
end Task;
public uniontype Schedule // stores all scheduling-informations
record LEVELSCHEDULE
list<list<Task>> tasksOfLevels; //List of tasks solved in the same level in parallel
end LEVELSCHEDULE;
record THREADSCHEDULE
array<list<Task>> threadTasks; //List of tasks assigned to the thread <%idx%>
list<String> lockIdc;
end THREADSCHEDULE;
record TASKDEPSCHEDULE
list<tuple<Task,list<Integer>>> tasks; //topological sorted tasks with <taskIdx, parentTaskIdc>
end TASKDEPSCHEDULE;
record EMPTYSCHEDULE // a dummy schedule. used if there is no ODE-system
end EMPTYSCHEDULE;
end Schedule;

public uniontype Task
record CALCTASK //Task which calculates something
Integer weighting;
Integer index;
Real calcTime;
Real timeFinished;
Integer threadIdx;
list<Integer> eqIdc;
end CALCTASK;
record CALCTASK_LEVEL
list<Integer> eqIdc;
list<Integer> nodeIdc; //indices of the graph-node
end CALCTASK_LEVEL;
record ASSIGNLOCKTASK //Task which assignes a lock
String lockId;
end ASSIGNLOCKTASK;
record RELEASELOCKTASK //Task which releases a lock
String lockId;
end RELEASELOCKTASK;
record TASKEMPTY //Dummy Task
end TASKEMPTY;
end Task;

public uniontype Schedule // stores all scheduling-informations
record LEVELSCHEDULE
list<list<Task>> tasksOfLevels; //List of tasks solved in the same level in parallel
end LEVELSCHEDULE;
record THREADSCHEDULE
array<list<Task>> threadTasks; //List of tasks assigned to the thread <%idx%>
list<String> lockIdc;
end THREADSCHEDULE;
record TASKDEPSCHEDULE
list<tuple<Task,list<Integer>>> tasks; //topological sorted tasks with <taskIdx, parentTaskIdc>
end TASKDEPSCHEDULE;
record EMPTYSCHEDULE // a dummy schedule. used if there is no ODE-system
end EMPTYSCHEDULE;
end Schedule;

end HpcOmSimCode;
16 changes: 8 additions & 8 deletions Compiler/BackEnd/HpcOmSimCodeMain.mo
Expand Up @@ -202,7 +202,7 @@ algorithm

//Create Costs
//------------
taskGraphData = HpcOmTaskGraph.createCosts(inBackendDAE, filenamePrefix +& "_eqs_prof.xml" , simeqCompMapping, taskGraphData);
taskGraphData = HpcOmTaskGraph.createCosts(inBackendDAE, filenamePrefix +& "_eqs_prof.xml" , simeqCompMapping, taskGraphData);
Debug.execStat("hpcom create costs", GlobalScript.RT_CLOCK_EXECSTAT_HPCOM_MODULES);

//Get ODE System
Expand Down Expand Up @@ -243,7 +243,7 @@ algorithm
//Debug.fcall(Flags.HPCOM_DUMP,HpcOmTaskGraph.printTaskGraph,taskGraph1);
//Debug.fcall(Flags.HPCOM_DUMP,HpcOmTaskGraph.printTaskGraphMeta,taskGraphData1);


//Create schedule
//---------------
numProc = Flags.getConfigInt(Flags.NUM_PROC);
Expand All @@ -259,21 +259,21 @@ algorithm
//HpcOmScheduler.printSchedule(schedule);

Debug.execStat("hpcom dump schedule TaskGraph", GlobalScript.RT_CLOCK_EXECSTAT_HPCOM_MODULES);
SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, residualEquations, useSymbolicInitialization, useHomotopy, initialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, residualEquations, useSymbolicInitialization, useHomotopy, initialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, _, _, crefToSimVarHT, backendMapping) = simCode;

checkOdeSystemSize(taskGraphOde,odeEquations);
Debug.execStat("hpcom check ODE system size", GlobalScript.RT_CLOCK_EXECSTAT_HPCOM_MODULES);

optTmpMemoryMap = HpcOmMemory.createMemoryMap(modelInfo, taskGraph1, taskGraphData1, eqs, filenamePrefix, schedulerInfo, schedule, sccSimEqMapping, criticalPaths, criticalPathsWoC, criticalPathInfo, allComps);

simCode = SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, residualEquations, useSymbolicInitialization, useHomotopy, initialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
simCode = SimCode.SIMCODE(modelInfo, simCodeLiterals, simCodeRecordDecls, simCodeExternalFunctionIncludes, allEquations, odeEquations, algebraicEquations, residualEquations, useSymbolicInitialization, useHomotopy, initialEquations, startValueEquations, nominalValueEquations, minValueEquations, maxValueEquations,
parameterEquations, removedEquations, algorithmAndEquationAsserts, zeroCrossingsEquations, jacobianEquations, stateSets, constraints, classAttributes, zeroCrossings, relations, timeEvents, whenClauses,
discreteModelVars, extObjInfo, makefileParams, delayedExps, jacobianMatrixes, simulationSettingsOpt, fileNamePrefix, SOME(schedule), optTmpMemoryMap, crefToSimVarHT, backendMapping);

//evaluateCacheBehaviour(schedulerInfo,taskGraphData1,clTaskMapping, transposeCacheLineTaskMapping(clTaskMapping, arrayLength(taskGraph1)));

print("HpcOm is still under construction.\n");
then simCode;
else equation
Expand Down

0 comments on commit 88993e1

Please sign in to comment.