[easywave] Print both total and compute-only times

Add an extra timer to measure just the computation
time without initialisation. Print both at the end.

Author: rafbiels

easywave/CUDA/src/EasyWave.cpp

@@ -83,8 +83,8 @@ int commandLineHelp(void);
 
 int main(int argc, char **argv)
 {
-    Timer tWallClock("WallClock");
-    tWallClock.Start();
+    Timer tWallClockTotal("WallClockTotal");
+    tWallClockTotal.Start();
     LOG("Starting CUDA main program. Process ID: " << Utility::GetProcessID());
     Utility::QueryCUDADevice();
 
@@ -149,6 +149,9 @@ int main(int argc, char **argv)
         ewStart2DOutput();
     }
 
+    Timer tWallClockCompute("WallClockCompute");
+    tWallClockCompute.Start();
+
     Node.copyToGPU();
 
     // Main loop
@@ -236,9 +239,11 @@ int main(int argc, char **argv)
     delete gNode;
 
     LOG("Program successfully completed");
-    tWallClock.Stop();
-    LOG("I/O Time            : " << dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
-    LOG("Total Execution Time: " << tWallClock.GetTime() - dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
+    tWallClockTotal.Stop();
+    tWallClockCompute.Stop();
+    LOG("I/O Time            : " << dAccumulatedIOWriteTime + dAccumulateIOReadTime << " s");
+    LOG("Compute Time        : " << tWallClockCompute.GetTime() << " s");
+    LOG("Total Execution Time: " << tWallClockTotal.GetTime() - dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
     return 0;
 }
 

easywave/HIP/src/EasyWaveGen.cpp

@@ -82,8 +82,8 @@ int commandLineHelp(void);
 
 int main(int argc, char **argv)
 {
-    Timer tWallClock("WallClock");
-    tWallClock.Start();
+    Timer tWallClockTotal("WallClockTotal");
+    tWallClockTotal.Start();
     LOG("Starting HIP main program. Process ID: " << Utility::GetProcessID());
     Utility::QueryHIPDevice();
 
@@ -149,6 +149,9 @@ int main(int argc, char **argv)
         ewStart2DOutput();
     }
 
+    Timer tWallClockCompute("WallClockCompute");
+    tWallClockCompute.Start();
+
     Node.copyToGPU();
 
     // Main loop
@@ -237,9 +240,11 @@ int main(int argc, char **argv)
     delete gNode;
 
     LOG("Program successfully completed");
-    tWallClock.Stop();
-    LOG("I/O Time            : " << dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
-    LOG("Total Execution Time: " << tWallClock.GetTime() - dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
+    tWallClockTotal.Stop();
+    tWallClockCompute.Stop();
+    LOG("I/O Time            : " << dAccumulatedIOWriteTime + dAccumulateIOReadTime << " s");
+    LOG("Compute Time        : " << tWallClockCompute.GetTime() << " s");
+    LOG("Total Execution Time: " << tWallClockTotal.GetTime() - dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
     return 0;
 }
 

easywave/SYCL/src/EasyWave.cpp

@@ -83,8 +83,8 @@ int commandLineHelp(void);
 
 int main(int argc, char **argv)
 {
-    Timer tWallClock("WallClock");
-    tWallClock.Start();
+    Timer tWallClockTotal("WallClockTotal");
+    tWallClockTotal.Start();
     LOG("Starting SYCL main program"); ///. Process ID: " << Utility::GetProcessID());
 
     std::vector<std::string> eWaveFiles(Utility::FileHandler::GetFilesFromDirectory(Utility::FileHandler::GetCurrentDirectory()));
@@ -148,6 +148,9 @@ int main(int argc, char **argv)
     if (Par.outPropagation)
         ewStart2DOutput();
 
+    Timer tWallClockCompute("WallClockCompute");
+    tWallClockCompute.Start();
+
     Node.copyToGPU();
 
     // Main loop
@@ -237,9 +240,11 @@ int main(int argc, char **argv)
     delete gNode;
 
     LOG("Program successfully completed");
-    tWallClock.Stop();
-    LOG("I/O Time            : " << dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
-    LOG("Total Execution Time: " << tWallClock.GetTime() - dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
+    tWallClockTotal.Stop();
+    tWallClockCompute.Stop();
+    LOG("I/O Time            : " << dAccumulatedIOWriteTime + dAccumulateIOReadTime << " s");
+    LOG("Compute Time        : " << tWallClockCompute.GetTime() << " s");
+    LOG("Total Execution Time: " << tWallClockTotal.GetTime() - dAccumulatedIOWriteTime - dAccumulateIOReadTime << " s");
     return 0;
 }