- attempts to get realtimeTick and realtimeTock for RT_CLOCK_BACKEND on the same level

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@16942 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: lochel

Compiler/BackEnd/OpenTURNS.mo

@@ -110,7 +110,8 @@ algorithm
 
   //print("strippedDae :");
   //BackendDump.dump(strippedDae);
-  (_,libs,fileDir,_,_,_) := SimCodeMain.generateModelCode(strippedDae,inProgram,inDAElist,inPath,cname_str,SOME(simSettings),Absyn.FUNCTIONARGS({},{}));
+  _ := System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND); // Is this necessary?
+  (_,libs,fileDir,_,_) := SimCodeMain.generateModelCode(strippedDae,inProgram,inDAElist,inPath,cname_str,SOME(simSettings),Absyn.FUNCTIONARGS({},{}));
 
   //print("..compiling, fileNamePrefix = "+&fileNamePrefix+&"\n");
   CevalScript.compileModel(fileNamePrefix , libs, fileDir, "");

Compiler/BackEnd/SimCodeMain.mo

@@ -104,9 +104,9 @@ algorithm
 end createSimulationSettings;
 
 
-public function generateModelCodeFMU
-  "Generates code for a model by creating a SimCode structure and calling the
-   template-based code generator on it."
+protected function generateModelCodeFMU "
+  Generates code for a model by creating a SimCode structure and calling the
+  template-based code generator on it."
   input BackendDAE.BackendDAE inBackendDAE;
   input Absyn.Program p;
   input DAE.DAElist dae;
@@ -116,26 +116,23 @@ public function generateModelCodeFMU
   output BackendDAE.BackendDAE outIndexedBackendDAE;
   output list<String> libs;
   output String fileDir;
-  output Real timeBackend;
   output Real timeSimCode;
   output Real timeTemplates;
 protected
   list<String> includes,includeDirs;
   list<SimCode.Function> functions;
-  // DAE.DAElist dae2;
   String filename, funcfilename;
   SimCode.SimCode simCode;
   list<SimCode.RecordDeclaration> recordDecls;
   BackendDAE.BackendDAE indexed_dlow,indexed_dlow_1;
   Absyn.ComponentRef a_cref;
   tuple<Integer,HashTableExpToIndex.HashTable,list<DAE.Exp>> literals;
 algorithm
-  timeBackend := System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND);
+  System.realtimeTick(GlobalScript.RT_CLOCK_SIMCODE);
   a_cref := Absyn.pathToCref(className);
   fileDir := CevalScript.getFileDir(a_cref, p);
-  System.realtimeTick(GlobalScript.RT_CLOCK_SIMCODE);
   (libs, includes, includeDirs, recordDecls, functions, outIndexedBackendDAE, _, literals) :=
-  SimCodeUtil.createFunctions(p, dae, inBackendDAE, className);
+    SimCodeUtil.createFunctions(p, dae, inBackendDAE, className);
   (simCode,_) := SimCodeUtil.createSimCode(outIndexedBackendDAE,
     className, filenamePrefix, fileDir, functions, includes, includeDirs, libs, simSettingsOpt, recordDecls, literals,Absyn.FUNCTIONARGS({},{}));
   timeSimCode := System.realtimeTock(GlobalScript.RT_CLOCK_SIMCODE);
@@ -147,9 +144,9 @@ algorithm
 end generateModelCodeFMU;
 
 
-public function generateModelCodeXML
-  "Generates code for a model by creating a SimCode structure and calling the
-   template-based code generator on it."
+protected function generateModelCodeXML "
+  Generates code for a model by creating a SimCode structure and calling the
+  template-based code generator on it."
   input BackendDAE.BackendDAE inBackendDAE;
   input Absyn.Program p;
   input DAE.DAElist dae;
@@ -159,26 +156,23 @@ public function generateModelCodeXML
   output BackendDAE.BackendDAE outIndexedBackendDAE;
   output list<String> libs;
   output String fileDir;
-  output Real timeBackend;
   output Real timeSimCode;
   output Real timeTemplates;
 protected
   list<String> includes,includeDirs;
   list<SimCode.Function> functions;
-  // DAE.DAElist dae2;
   String filename, funcfilename;
   SimCode.SimCode simCode;
   list<SimCode.RecordDeclaration> recordDecls;
   BackendDAE.BackendDAE indexed_dlow,indexed_dlow_1;
   Absyn.ComponentRef a_cref;
   tuple<Integer,HashTableExpToIndex.HashTable,list<DAE.Exp>> literals;
 algorithm
-  timeBackend := System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND);
+  System.realtimeTick(GlobalScript.RT_CLOCK_SIMCODE);
   a_cref := Absyn.pathToCref(className);
   fileDir := CevalScript.getFileDir(a_cref, p);
-  System.realtimeTick(GlobalScript.RT_CLOCK_SIMCODE);
   (libs, includes, includeDirs, recordDecls, functions, outIndexedBackendDAE, _, literals) :=
-  SimCodeUtil.createFunctions(p, dae, inBackendDAE, className);
+    SimCodeUtil.createFunctions(p, dae, inBackendDAE, className);
   (simCode,_) := SimCodeUtil.createSimCode(outIndexedBackendDAE,
     className, filenamePrefix, fileDir, functions, includes, includeDirs, libs, simSettingsOpt, recordDecls, literals,Absyn.FUNCTIONARGS({},{}));
   timeSimCode := System.realtimeTock(GlobalScript.RT_CLOCK_SIMCODE);
@@ -230,14 +224,18 @@ algorithm
         //(cache,Values.STRING(filenameprefix),SOME(_)) = Ceval.ceval(cache,env, fileprefix, true, SOME(st),NONE(), msg);
         (cache,env,dae,st) = CevalScript.runFrontEnd(cache,env,className,st,false);
         timeFrontend = System.realtimeTock(GlobalScript.RT_CLOCK_FRONTEND);
+        
         System.realtimeTick(GlobalScript.RT_CLOCK_BACKEND);
         funcs = Env.getFunctionTree(cache);
         dae = DAEUtil.transformationsBeforeBackend(cache,env,dae);
         dlow = BackendDAECreate.lower(dae,cache,env);
         dlow_1 = BackendDAEUtil.getSolvedSystem(dlow,NONE(), NONE(), NONE(), NONE());
         Debug.fprintln(Flags.DYN_LOAD, "translateModel: Generating simulation code and functions.");
-        (indexed_dlow_1,libs,file_dir,timeBackend,timeSimCode,timeTemplates) =
+        timeBackend = System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND);
+        
+        (indexed_dlow_1,libs,file_dir,timeSimCode,timeTemplates) =
           generateModelCodeFMU(dlow_1, p, dae,  className, filenameprefix, inSimSettingsOpt);
+          
         resultValues =
         {("timeTemplates",Values.REAL(timeTemplates)),
           ("timeSimCode",  Values.REAL(timeSimCode)),
@@ -305,7 +303,9 @@ algorithm
         dlow = BackendDAECreate.lower(dae,cache,env);
         dlow_1 = BackendDAEUtil.getSolvedSystem(dlow,NONE(), NONE(), NONE(), NONE());
         Debug.fprintln(Flags.DYN_LOAD, "translateModel: Generating simulation code and functions.");
-        (indexed_dlow_1,libs,file_dir,timeBackend,timeSimCode,timeTemplates) =
+        timeBackend = System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND);
+        
+        (indexed_dlow_1,libs,file_dir,timeSimCode,timeTemplates) =
           generateModelCodeXML(dlow_1, p, dae,  className, filenameprefix, inSimSettingsOpt);
         resultValues =
         {("timeTemplates",Values.REAL(timeTemplates)),
@@ -329,10 +329,9 @@ end translateModelXML;
 
 
 
-public function generateModelCode
-  "Generates code for a model by creating a SimCode structure and calling the
-   template-based code generator on it."
-
+public function generateModelCode "
+  Generates code for a model by creating a SimCode structure and calling the
+  template-based code generator on it."
   input BackendDAE.BackendDAE inBackendDAE;
   input Absyn.Program p;
   input DAE.DAElist dae;
@@ -343,14 +342,11 @@ public function generateModelCode
   output BackendDAE.BackendDAE outIndexedBackendDAE;
   output list<String> libs;
   output String fileDir;
-  output Real timeBackend;
   output Real timeSimCode;
   output Real timeTemplates;
 protected
-
   list<String> includes,includeDirs;
   list<SimCode.Function> functions;
-  // DAE.DAElist dae2;
   String filename, funcfilename;
   SimCode.SimCode simCode;
   list<SimCode.RecordDeclaration> recordDecls;
@@ -360,15 +356,13 @@ protected
   tuple<Integer,HashTableExpToIndex.HashTable,list<DAE.Exp>> literals;
   list<SimCode.JacobianMatrix> LinearMatrices;
 algorithm
-  timeBackend := System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND);
+  System.realtimeTick(GlobalScript.RT_CLOCK_SIMCODE);
   a_cref := Absyn.pathToCref(className);
   fileDir := CevalScript.getFileDir(a_cref, p);
-  System.realtimeTick(GlobalScript.RT_CLOCK_SIMCODE);
   (libs, includes, includeDirs, recordDecls, functions, outIndexedBackendDAE, _, literals) :=
-  SimCodeUtil.createFunctions(p, dae, inBackendDAE, className);
-  simCode := createSimCode(outIndexedBackendDAE,
+    SimCodeUtil.createFunctions(p, dae, inBackendDAE, className);
+  simCode := createSimCode(outIndexedBackendDAE, 
     className, filenamePrefix, fileDir, functions, includes, includeDirs, libs, simSettingsOpt, recordDecls, literals, args);
-
   timeSimCode := System.realtimeTock(GlobalScript.RT_CLOCK_SIMCODE);
   Debug.execStat("SimCode",GlobalScript.RT_CLOCK_SIMCODE);
 
@@ -548,12 +542,16 @@ algorithm
       System.realtimeTick(GlobalScript.RT_CLOCK_FRONTEND);
       (cache, env, dae, st) = CevalScript.runFrontEnd(cache, env, className, st, false);
       timeFrontend = System.realtimeTock(GlobalScript.RT_CLOCK_FRONTEND);
+      
       System.realtimeTick(GlobalScript.RT_CLOCK_BACKEND);
       dae = DAEUtil.transformationsBeforeBackend(cache, env, dae);
       dlow = BackendDAECreate.lower(dae, cache, env);
       dlow_1 = BackendDAEUtil.getSolvedSystem(dlow, NONE(), NONE(), NONE(), NONE());
-      (indexed_dlow_1, libs, file_dir, timeBackend, timeSimCode, timeTemplates) =
-      generateModelCode(dlow_1, p, dae, className, filenameprefix, inSimSettingsOpt, args);
+      timeBackend = System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND);
+      
+      (indexed_dlow_1, libs, file_dir, timeSimCode, timeTemplates) = 
+        generateModelCode(dlow_1, p, dae, className, filenameprefix, inSimSettingsOpt, args);
+        
       resultValues = {("timeTemplates", Values.REAL(timeTemplates)),
                       ("timeSimCode", Values.REAL(timeSimCode)),
                       ("timeBackend", Values.REAL(timeBackend)),

Compiler/Main/Main.mo

@@ -763,8 +763,8 @@ end optimizeDae;
 //   end matchcontinue;
 // end modpar;
 
-protected function simcodegen
-"Genereates simulation code using the SimCode module"
+protected function simcodegen "
+  Genereates simulation code using the SimCode module"
   input BackendDAE.BackendDAE inBackendDAE5;
   input Absyn.Path inPath;
   input Absyn.Program inProgram3;
@@ -788,7 +788,8 @@ algorithm
         Print.clearBuf();
         cname_str = Absyn.pathString(classname);
         simSettings = SimCodeMain.createSimulationSettings(0.0, 1.0, 500, 1e-6,"dassl","","mat",".*",false,"");
-        (_,_,_,_,_,_) = SimCodeMain.generateModelCode(dlow,ap,dae,classname,cname_str,SOME(simSettings),Absyn.FUNCTIONARGS({},{}));
+        _ = System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND); // Is this necessary?
+        (_,_,_,_,_) = SimCodeMain.generateModelCode(dlow,ap,dae,classname,cname_str,SOME(simSettings),Absyn.FUNCTIONARGS({},{}));
         Debug.execStat("Codegen Done",GlobalScript.RT_CLOCK_EXECSTAT_MAIN);
       then
         ();
@@ -804,7 +805,8 @@ algorithm
         Print.clearBuf();
         cname_str = Absyn.pathString(classname);
         simSettings = SimCodeMain.createSimulationSettings(0.0, 1.0, 1, 1e-6,"dassl","","plt",".*",false,"");
-        (_,_,_,_,_,_) = SimCodeMain.generateModelCode(dlow,ap,dae,classname,cname_str,SOME(simSettings),Absyn.FUNCTIONARGS({},{}));
+        _ = System.realtimeTock(GlobalScript.RT_CLOCK_BACKEND); // Is this necessary?
+        (_,_,_,_,_) = SimCodeMain.generateModelCode(dlow,ap,dae,classname,cname_str,SOME(simSettings),Absyn.FUNCTIONARGS({},{}));
         Debug.execStat("Codegen Done",GlobalScript.RT_CLOCK_EXECSTAT_MAIN);
       then
         ();