- level scheduling structure is now using the task-uniontype

Marcus Walther · Marcus Walther · commit 7f20c6eb052a · 2014-03-19T11:55:45.000Z
- nodeMark-multiplicator will now be applied on dumping - added code generation and scheduler for OpenMP 4.0 task dependencies - remove comment-signs before "applyFilters..." git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19629 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
diff --git a/Compiler/BackEnd/HpcOmScheduler.mo b/Compiler/BackEnd/HpcOmScheduler.mo
diff --git a/Compiler/BackEnd/HpcOmSimCode.mo b/Compiler/BackEnd/HpcOmSimCode.mo
diff --git a/Compiler/BackEnd/HpcOmTaskGraph.mo b/Compiler/BackEnd/HpcOmTaskGraph.mo
@@ -69,7 +69,7 @@ public uniontype TaskGraphMeta   // stores all the metadata for the TaskGraph
     array<String> nodeDescs;  // a description of the nodes for the graphml generation
     array<tuple<Integer,Real>> exeCosts;  // the execution cost for the nodes <numberOfOperations, requiredCycles
     array<list<tuple<Integer,Integer,Integer>>> commCosts;  // the communication cost tuple(_,numberOfVars,requiredCycles) for an edge from array[parentNode] to tuple(childNode,_) 
-    array<Integer> nodeMark;  // put some additional stuff in here -> this is currently not a nodeMark, its a componentMark
+    array<Integer> nodeMark;  // used for level informations -> this is currently not a nodeMark, its a componentMark
   end TASKGRAPHMETA;
 end TaskGraphMeta; //TODO: Remove rootNodes from structure
   
@@ -2428,7 +2428,7 @@ algorithm
         ((_,calcTime)) = arrayGet(exeCosts,primalComp);
         ((opCount,calcTime)) = arrayGet(exeCosts,primalComp);
         calcTimeString = realString(calcTime);
-        yCoord = arrayGet(nodeMark,primalComp);
+        yCoord = arrayGet(nodeMark,primalComp)*80;
         calcTimeString = realString(calcTime);
         opCountString = intString(opCount);
         yCoordString = intString(yCoord);
@@ -5367,10 +5367,11 @@ protected
   Integer levelInterval;
   tuple<Integer,Integer> coords;
 algorithm
-  levelInterval := 80;
+  //levelInterval := 80;
   parallelSetIdx := getParallelSetForComp(compIdx,1,parallelSets);
   ((xCoord,yCoord)) := arrayGet(nodeCoordsIn,compIdx);
-  coords := ((xCoord,parallelSetIdx*levelInterval));
+  //coords := ((xCoord,parallelSetIdx*levelInterval));
+  coords := ((xCoord,parallelSetIdx));
   nodeCoordsOut := arrayUpdate(nodeCoordsIn,compIdx,coords);
 end getYCoordForNode;
 
diff --git a/Compiler/Template/CodegenC.tpl b/Compiler/Template/CodegenC.tpl
@@ -2136,9 +2136,10 @@ end functionXXX_systems_HPCOM;
 
 template functionXXX_system_HPCOM(list<SimEqSystem> derivativEquations, String name, Integer n, Option<ScheduleSimCode> hpcOmScheduleOpt, String modelNamePrefixStr)
 ::=
+  let type = getConfigString(HPCOM_CODE)
   match hpcOmScheduleOpt 
     case SOME(hpcOmSchedule as LEVELSCHEDULESC(__)) then
-      let odeEqs = hpcOmSchedule.eqsOfLevels |> eqs => functionXXX_system0_HPCOM_Level(derivativEquations,name,eqs,modelNamePrefixStr); separator="\n"
+      let odeEqs = hpcOmSchedule.tasksOfLevels |> tasks => functionXXX_system0_HPCOM_Level(derivativEquations,name,tasks,type,modelNamePrefixStr); separator="\n"
       <<
       void terminateHpcOmThreads()
       {
@@ -2150,8 +2151,6 @@ template functionXXX_system_HPCOM(list<SimEqSystem> derivativEquations, String n
       }
       >>
    case SOME(hpcOmSchedule as THREADSCHEDULESC(__)) then
-      let type = getConfigString(HPCOM_CODE)
-      
       let locks = hpcOmSchedule.lockIdc |> idx => function_HPCOM_createLock(idx, "lock", type); separator="\n"
       let initlocks = hpcOmSchedule.lockIdc |> idx => function_HPCOM_initializeLock(idx, "lock", type); separator="\n"
       let assignLocks = hpcOmSchedule.lockIdc |> idx => function_HPCOM_assignLock(idx, "lock", type); separator="\n"
@@ -2310,10 +2309,9 @@ template functionXXX_system_HPCOM(list<SimEqSystem> derivativEquations, String n
    
 end functionXXX_system_HPCOM;
 
-template functionXXX_system0_HPCOM_Level(list<SimEqSystem> derivativEquations, String name, list<Integer> eqsOfLevel, String modelNamePrefixStr)
+template functionXXX_system0_HPCOM_Level(list<SimEqSystem> derivativEquations, String name, list<Task> tasksOfLevel, String iType, String modelNamePrefixStr)
 ::=
-  //let odeEqs = "#pragma omp parallel sections\n{"
-  let odeEqs = eqsOfLevel |> eq => equationNamesHPCOM_(eq,derivativEquations,contextSimulationNonDiscrete,modelNamePrefixStr); separator="\n"
+  let odeEqs = tasksOfLevel |> task => function_HPCOM_Task(derivativEquations,name,task,iType,modelNamePrefixStr); separator="\n"
   <<
   if (omp_get_dynamic())
     omp_set_dynamic(0);
@@ -2379,6 +2377,11 @@ template function_HPCOM_Task(list<SimEqSystem> derivativEquations, String name,
       <%odeEqs%>
       // End Task <%task.index%>
       >>
+    case (task as CALCTASK_LEVEL(__)) then
+      let odeEqs = task.eqIdc |> eq => equationNamesHPCOM_Thread_(eq,derivativEquations,contextSimulationNonDiscrete,modelNamePrefixStr); separator="\n"
+      <<
+      <%odeEqs%>
+      >>
     case (task as ASSIGNLOCKTASK(__)) then
       let assLck = function_HPCOM_assignLock(task.lockId, "lock", iType); separator="\n"
       <<
diff --git a/Compiler/Template/CodegenCppHpcom.tpl b/Compiler/Template/CodegenCppHpcom.tpl
@@ -362,10 +362,11 @@ template update2(list<SimEqSystem> allEquationsPlusWhen, Absyn.Path name, list<S
   let reinit = (whenClauses |> when hasindex i0 =>
          genreinits(when, &varDecls,i0,simCode,context)
     ;separator="\n";empty)
+  let type = getConfigString(HPCOM_CODE)
     
   match hpcOmScheduleOpt 
     case SOME(hpcOmSchedule as LEVELSCHEDULESC(__)) then
-      let odeEqs = hpcOmSchedule.eqsOfLevels |> eqs => functionXXX_system0_HPCOM_Level(allEquationsPlusWhen, eqs, &varDecls, simCode); separator="\n"
+      let odeEqs = hpcOmSchedule.tasksOfLevels |> tasks => functionXXX_system0_HPCOM_Level(allEquationsPlusWhen, tasks, type, &varDecls, simCode); separator="\n"
       <<
           bool <%lastIdentOfPath(name)%>::evaluate(const UPDATETYPE command)
           {
@@ -378,7 +379,6 @@ template update2(list<SimEqSystem> allEquationsPlusWhen, Absyn.Path name, list<S
           }
       >>
    case SOME(hpcOmSchedule as THREADSCHEDULESC(__)) then
-      let type = getConfigString(HPCOM_CODE)
       
       match type 
         case ("openmp") then
@@ -418,11 +418,27 @@ template update2(list<SimEqSystem> allEquationsPlusWhen, Absyn.Path name, list<S
             return state_var_reinitialized;
           }
           >>
+    case SOME(hpcOmSchedule as TASKDEPSCHEDULESC(__)) then
+        let taskEqs = functionXXX_system0_HPCOM_TaskDep(hpcOmSchedule.tasks, allEquationsPlusWhen, type, &varDecls, simCode); separator="\n"
+        <<
+        //using type: <%type%>
+        bool <%lastIdentOfPath(name)%>::evaluate(const UPDATETYPE command)
+        {
+          bool state_var_reinitialized = false;
+          omp_set_dynamic(1);
+            
+          <%&varDecls%>
+          <%taskEqs%>
+          <%reinit%>
+           
+          return state_var_reinitialized;
+        }
+        >>
 end update2;
 
-template functionXXX_system0_HPCOM_Level(list<SimEqSystem> allEquationsPlusWhen, list<Integer> eqsOfLevel, Text &varDecls, SimCode simCode)
+template functionXXX_system0_HPCOM_Level(list<SimEqSystem> allEquationsPlusWhen, list<Task> tasksOfLevel, String iType, Text &varDecls, SimCode simCode)
 ::=
-  let odeEqs = eqsOfLevel |> eq => equationNamesHPCOMLevel_(eq,allEquationsPlusWhen,contextSimulationNonDiscrete, &varDecls, simCode); separator="\n"
+  let odeEqs = tasksOfLevel |> task => function_HPCOM_Task(allEquationsPlusWhen,task,iType, &varDecls, simCode); separator="\n"
   <<
   if (omp_get_dynamic())
     omp_set_dynamic(0);
@@ -433,6 +449,37 @@ template functionXXX_system0_HPCOM_Level(list<SimEqSystem> allEquationsPlusWhen,
   >>
 end functionXXX_system0_HPCOM_Level;
 
+template functionXXX_system0_HPCOM_TaskDep(list<tuple<Task,list<Integer>>> tasks, list<SimEqSystem> allEquationsPlusWhen, String iType, Text &varDecls, SimCode simCode)
+::=
+  let odeEqs = tasks |> t => functionXXX_system0_HPCOM_TaskDep0(t,allEquationsPlusWhen, iType, &varDecls, simCode); separator="\n"
+  <<
+  
+  int t[0];
+  #pragma omp parallel
+  {
+    #pragma omp master
+    {
+        <%odeEqs%>
+    }
+  }
+  >>
+end functionXXX_system0_HPCOM_TaskDep;
+
+template functionXXX_system0_HPCOM_TaskDep0(tuple<Task,list<Integer>> taskIn, list<SimEqSystem> allEquationsPlusWhen, String iType, Text &varDecls, SimCode simCode)
+::=
+  match taskIn 
+    case ((task as CALCTASK(__),parents)) then
+        let taskEqs = function_HPCOM_Task(allEquationsPlusWhen,task,iType,&varDecls,simCode); separator="\n"
+        let parentDependencies = parents |> p => 't[<%p%>]'; separator = ","
+        let depIn = if intGt(listLength(parents),0) then 'depend(in:<%parentDependencies%>)' else ""
+        <<
+        #pragma omp task <%depIn%> depend(out:t[<%task.index%>])
+        {
+            <%taskEqs%>
+        }
+        >>
+end functionXXX_system0_HPCOM_TaskDep0;
+
 template functionXXX_system0_HPCOM_Thread(list<SimEqSystem> allEquationsPlusWhen, list<list<Task>> threadTasks, String iType, Text &varDecls, SimCode simCode)
 ::=
   match iType 
@@ -508,6 +555,11 @@ template function_HPCOM_Task(list<SimEqSystem> allEquationsPlusWhen, Task iTask,
       <%odeEqs%>
       // End Task <%task.index%>
       >>
+    case (task as CALCTASK_LEVEL(__)) then
+      let odeEqs = task.eqIdc |> eq => equationNamesHPCOM_(eq,allEquationsPlusWhen,contextSimulationNonDiscrete,&varDecls, simCode); separator="\n"
+      <<
+      <%odeEqs%>
+      >>
     case (task as ASSIGNLOCKTASK(__)) then
       let assLck = function_HPCOM_assignLock(task.lockId, "lock", iType); separator="\n"
       <<
diff --git a/Compiler/Template/SimCodeTV.mo b/Compiler/Template/SimCodeTV.mo
@@ -2993,6 +2993,9 @@ package HpcOmScheduler
       Integer threadIdx;
       list<Integer> eqIdc;
     end CALCTASK;
+	  record CALCTASK_LEVEL
+	    list<Integer> eqIdc;
+	  end CALCTASK_LEVEL;
     record ASSIGNLOCKTASK //Task which assignes a lock
       String lockId;
     end ASSIGNLOCKTASK;
@@ -3005,12 +3008,15 @@ package HpcOmScheduler
   
   uniontype ScheduleSimCode
     record LEVELSCHEDULESC
-      list<list<Integer>> eqsOfLevels;
+      list<list<Task>> tasksOfLevels;
     end LEVELSCHEDULESC;
     record THREADSCHEDULESC
       list<list<Task>> threadTasks;
       list<String> lockIdc;
     end THREADSCHEDULESC;
+	  record TASKDEPSCHEDULESC
+	    list<tuple<Task,list<Integer>>> tasks;
+	  end TASKDEPSCHEDULESC;
   end ScheduleSimCode;
 end HpcOmScheduler;
 
diff --git a/Compiler/Util/Flags.mo b/Compiler/Util/Flags.mo
@@ -823,7 +823,7 @@ constant ConfigFlag CORBA_OBJECT_REFERENCE_FILE_PATH = CONFIG_FLAG(49, "corbaObj
 
 constant ConfigFlag HPCOM_SCHEDULER = CONFIG_FLAG(50, "hpcomScheduler",
   NONE(), EXTERNAL(), STRING_FLAG(""), NONE(),
-  Util.gettext("Sets the scheduler for task graph scheduling (list | level | levelr | ext | mcp). Default: list."));
+  Util.gettext("Sets the scheduler for task graph scheduling (list | level | levelr | ext | mcp | taskdep). Default: list."));
   
 constant ConfigFlag TEARING_HEURISTIC = CONFIG_FLAG(51, "tearingHeuristic",
   NONE(), EXTERNAL(), STRING_FLAG("cellier"),
