Changeset 23221

Timestamp:

09/05/18 09:58:54 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: added core solution profiling

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (1 diff)
• classes/Profiler.cpp (modified) (14 diffs)
• classes/Profiler.h (modified) (2 diffs)
• cores/masstransport_core.cpp (modified) (2 diffs)
• cores/stressbalance_core.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp ¶

@@ -254 +254 @@
         /*Before we delete the profiler, report statistics for this run: */
         profiler->Stop(TOTAL);  //final tagging
+
         _printf0_("\n");
-        _printf0_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<profiler->TotalTime(MPROCESSOR) << "\n");
-        _printf0_("   "<<setw(40)<<left<<"Core solution elapsed time:"<<profiler->TotalTime(CORE) << "\n");
-        _printf0_("   "<<setw(40)<<left<<"Solver elapsed time:"<<profiler->TotalTime(SOLVER) << "\n");
+        _printf0_("   "<<setw(40)<<left<<"FemModel initialization elapsed time:"<<setw(7)<<profiler->TotalTime(MPROCESSOR) << "\n");
+        /*Total times*/
+        _printf0_("   "<<setw(40)<<left<<"Total Core solution elapsed time:"<<setw(7)<<profiler->TotalTime(CORE) << "\n");
+        /*Individual cores*/
+        if(profiler->Used(STRESSBALANCECORE)) _printf0_("   "<<setw(40)<<left<<"Stress balance core elapsed time:"<<setw(7)<<profiler->TotalTime(STRESSBALANCECORE) << "\n");
+        if(profiler->Used(MASSTRANSPORTCORE)) _printf0_("   "<<setw(40)<<left<<"Mass transport core elapsed time:"<<setw(7)<<profiler->TotalTime(MASSTRANSPORTCORE) << "\n");
+        /*Linear solver only*/
+        _printf0_("   "<<setw(40)<<left<<"Linear solver elapsed time:"<<setw(7)<<profiler->TotalTime(SOLVER) << " ("<<setprecision(2)<<profiler->TotalTime(SOLVER)/profiler->TotalTime(CORE)*100.<<"%)\n");
         _printf0_("\n");
         _printf0_("   Total elapsed time: "

issm/trunk-jpl/src/c/classes/Profiler.cpp ¶

@@ -15 +15 @@
 /*Profiler constructors and destructors:*/
 Profiler::Profiler(){/*{{{*/
-        for(int i=0;i<MAXIMUMSIZE;i++){
+        for(int i=0;i<MAXPROFSIZE;i++){
                 this->time[i]          = 0.;
                 this->time_start[i]    = 0.;
@@ -23 +23 @@
                 this->memory_start[i]  = 0.;
                 this->running[i]       = false;
+                this->used[i]          = false;
         }
 } /*}}}*/
@@ -32 +33 @@
         Profiler* output=new Profiler();
 
-        for(int i=0;i<MAXIMUMSIZE;i++){
+        for(int i=0;i<MAXPROFSIZE;i++){
                 output->time[i]  =this->time[i];
                 output->flops[i] =this->flops[i];
@@ -49 +50 @@
 
         _printf_("Profiler:\n");
-        for(int i=0;i<MAXIMUMSIZE;i++){
+        for(int i=0;i<MAXPROFSIZE;i++){
                 _printf_("    Tag "<<i<<":\n");
                 _printf_("       flops:   "<<this->flops[i]<<"\n");
@@ -70 +71 @@
         MARSHALLING_ENUM(ProfilerEnum);
         pointer = &this->time[0];
-        MARSHALLING_DYNAMIC(pointer,IssmPDouble,MAXIMUMSIZE);
+        MARSHALLING_DYNAMIC(pointer,IssmPDouble,MAXPROFSIZE);
         pointer = &this->flops[0];
-        MARSHALLING_DYNAMIC(pointer,IssmPDouble,MAXIMUMSIZE);
+        MARSHALLING_DYNAMIC(pointer,IssmPDouble,MAXPROFSIZE);
         pointer = &this->memory[0];
-        MARSHALLING_DYNAMIC(pointer,IssmPDouble,MAXIMUMSIZE);
+        MARSHALLING_DYNAMIC(pointer,IssmPDouble,MAXPROFSIZE);
         bpointer = &this->running[0];
-        MARSHALLING_DYNAMIC(bpointer,bool,MAXIMUMSIZE);
+        MARSHALLING_DYNAMIC(bpointer,bool,MAXPROFSIZE);
 
 } /*}}}*/
@@ -88 +89 @@
         /*Get tag*/
         _assert_(tag>=0); 
-        _assert_(tag<MAXIMUMSIZE); 
+        _assert_(tag<MAXPROFSIZE); 
         if(this->running[tag]) _error_("Tag "<<tag<<" has not been stopped");
 
@@ -97 +98 @@
         /*Get tag*/
         _assert_(tag>=0); 
-        _assert_(tag<MAXIMUMSIZE); 
+        _assert_(tag<MAXPROFSIZE); 
         if(this->running[tag]) _error_("Tag "<<tag<<" has not been stopped");
 
@@ -130 +131 @@
         /*Get initial flops*/
         _assert_(tag>=0); 
-        _assert_(tag<MAXIMUMSIZE); 
+        _assert_(tag<MAXPROFSIZE); 
         if(this->running[tag]) _error_("Tag "<<tag<<" has not been stopped");
 
@@ -140 +141 @@
         /*Check tag*/
         _assert_(tag>=0); 
-        _assert_(tag<MAXIMUMSIZE); 
+        _assert_(tag<MAXPROFSIZE); 
         if(this->running[tag]) _error_("Tag "<<tag<<" is already running");
 
@@ -167 +168 @@
         /*Plug into this->time: */
         _assert_(tag>=0); 
-        _assert_(tag<MAXIMUMSIZE); 
+        _assert_(tag<MAXPROFSIZE); 
         this->time_start[tag]   = t;
         this->flops_start[tag]  = f;
@@ -174 +175 @@
         /*turn on running*/
         this->running[tag] = true;
+        this->used[tag]    = true;
 }/*}}}*/
 void  Profiler::Stop(int tag,bool dontmpisync){/*{{{*/
@@ -179 +181 @@
         /*Check tag*/
         _assert_(tag>=0); 
-        _assert_(tag<MAXIMUMSIZE); 
+        _assert_(tag<MAXPROFSIZE); 
         if(!this->running[tag]) _error_("Tag "<<tag<<" is not running");
 
@@ -206 +208 @@
         /*Plug into this->time: */
         _assert_(tag>=0); 
-        _assert_(tag<MAXIMUMSIZE); 
+        _assert_(tag<MAXPROFSIZE); 
         this->time[tag]   += t - this->time_start[tag];
         this->flops[tag]  += f - this->flops_start[tag];
@@ -214 +216 @@
         this->running[tag] = false;
 }/*}}}*/
+bool  Profiler::Used(int tag){/*{{{*/
+
+        /*Check tag*/
+        _assert_(tag>=0); 
+        _assert_(tag<MAXPROFSIZE); 
+        return this->used[tag];
+}/*}}}*/

issm/trunk-jpl/src/c/classes/Profiler.h ¶

@@ -11 +11 @@
 
 /*Macros*/
-#define TOTAL 0      /*Profiling Total time */ 
-#define MPROCESSOR 1 /*Profiling Model processor*/ 
-#define CORE 2       /*Profiling solution */ 
-#define SOLVER 3     /*Profiling solution */ 
-#define ADCORE 4     /*Profiling AD */ 
-#define MAXIMUMSIZE 5
+#define TOTAL              0 /*Profiling Total time */
+#define MPROCESSOR         1 /*Profiling Model processor*/
+#define CORE               2 /*Profiling solution */
+#define SOLVER             3 /*Profiling solution */
+#define ADCORE             4 /*Profiling AD */
+#define STRESSBALANCECORE  5 /*Profiling AD */
+#define MASSTRANSPORTCORE  6 /*Profiling AD */
+#define MAXPROFSIZE        7 /*Used to initialize static arrays*/
 
 class Profiler: public Object{
 
         public: 
-                IssmPDouble flops[MAXIMUMSIZE];
-                IssmPDouble flops_start[MAXIMUMSIZE];
-                IssmPDouble memory[MAXIMUMSIZE];
-                IssmPDouble memory_start[MAXIMUMSIZE];
-                IssmPDouble time[MAXIMUMSIZE];
-                IssmPDouble time_start[MAXIMUMSIZE];
-                bool        running[MAXIMUMSIZE];
+                IssmPDouble flops[MAXPROFSIZE];
+                IssmPDouble flops_start[MAXPROFSIZE];
+                IssmPDouble memory[MAXPROFSIZE];
+                IssmPDouble memory_start[MAXPROFSIZE];
+                IssmPDouble time[MAXPROFSIZE];
+                IssmPDouble time_start[MAXPROFSIZE];
+                bool        running[MAXPROFSIZE];
+                bool        used[MAXPROFSIZE];
 
                 /*Profiler constructors, destructors */
@@ -50 +53 @@
                 void         Start(int tagenum,bool dontmpisync=false);
                 void         Stop(int tagenum,bool dontmpisync=false);
+                bool         Used(int tagenum);
 };
 

issm/trunk-jpl/src/c/cores/masstransport_core.cpp ¶

@@ -11 +11 @@
 
 void masstransport_core(FemModel* femmodel){
+
+        /*Start profiler*/
+        femmodel->profiler->Start(MASSTRANSPORTCORE);
 
         /*parameters: */
@@ -81 +84 @@
         /*Free ressources:*/
         if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
+
+        /*profiler*/
+        femmodel->profiler->Stop(MASSTRANSPORTCORE);
 }

issm/trunk-jpl/src/c/cores/stressbalance_core.cpp ¶

@@ -12 +12 @@
 
 void stressbalance_core(FemModel* femmodel){
+
+        /*Start profiler*/
+        femmodel->profiler->Start(STRESSBALANCECORE);
 
         /*parameters: */
@@ -86 +89 @@
         /*Free ressources:*/    
         if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
+
+        /*End profiler*/
+        femmodel->profiler->Stop(STRESSBALANCECORE);
 }