More timing

Author: filikat

highs/ipm/hipo/factorhighs/DataCollector.cpp

@@ -182,6 +182,21 @@ void DataCollector::printTimes(const Log& log) const {
              << fix(times[kTimeDenseFact_convert], 8, 4) << "\n";
   log_stream << "\t\tpivoting:       "
              << fix(times[kTimeDenseFact_pivoting], 8, 4) << "\n";
+  log_stream << "\tResize:                 "
+             << fix(times[kTimeFactoriseResize], 8, 4) << " ("
+             << fix(times[kTimeFactoriseResize] / times[kTimeFactorise] * 100,
+                    4, 1)
+             << "%)\n";
+  log_stream << "\tMove:                   "
+             << fix(times[kTimeFactoriseMove], 8, 4) << " ("
+             << fix(times[kTimeFactoriseMove] / times[kTimeFactorise] * 100, 4,
+                    1)
+             << "%)\n";
+  log_stream << "\tProcess:                "
+             << fix(times[kTimeFactoriseProcess], 8, 4) << " ("
+             << fix(times[kTimeFactoriseProcess] / times[kTimeFactorise] * 100,
+                    4, 1)
+             << "%)\n";
 #endif
 
   log_stream << "----------------------------------------------------\n";

highs/ipm/hipo/factorhighs/Factorise.cpp

@@ -401,7 +401,9 @@ bool Factorise::run(Numeric& num) {
   Clock clock;
 #endif
 
-  TaskGroupSpecial tg;
+#if HIPO_TIMING_LEVEL >= 2
+  Clock clock2;
+#endif
 
   total_reg_.assign(n_, 0.0);
 
@@ -414,7 +416,12 @@ bool Factorise::run(Numeric& num) {
   // the memory of previous factorisations.
   sn_columns_.resize(S_.sn());
 
+#if HIPO_TIMING_LEVEL >= 2
+  data_.sumTime(kTimeFactoriseResize, clock2.stop());
+#endif
+
   if (S_.parTree()) {
+    TaskGroupSpecial tg;
     Int spawned_roots{};
     // spawn tasks for root supernodes
     for (Int sn = 0; sn < S_.sn(); ++sn) {
@@ -427,18 +434,33 @@ bool Factorise::run(Numeric& num) {
     // sync tasks for root supernodes
     tg.taskWait();
   } else {
+#if HIPO_TIMING_LEVEL >= 2
+    clock2.start();
+#endif
     // processing the tree in serial requires a CliqueStack
     if (!stack_) return true;
     if (stack_->empty()) stack_->init(S_.maxStackSize());
+#if HIPO_TIMING_LEVEL >= 2
+    data_.sumTime(kTimeFactoriseResize, clock2.stop());
+#endif
 
+#if HIPO_TIMING_LEVEL >= 2
+    clock2.start();
+#endif
     // go through each supernode serially
     for (Int sn = 0; sn < S_.sn(); ++sn) {
       processSupernode(sn);
     }
+#if HIPO_TIMING_LEVEL >= 2
+    data_.sumTime(kTimeFactoriseProcess, clock2.stop());
+#endif
   }
 
   if (flag_stop_) return true;
 
+#if HIPO_TIMING_LEVEL >= 2
+  clock2.start();
+#endif
   // move factorisation to numerical object
   num.S_ = &S_;
   num.sn_columns_ = &sn_columns_;
@@ -447,6 +469,10 @@ bool Factorise::run(Numeric& num) {
   num.pivot_2x2_ = std::move(pivot_2x2_);
   num.data_ = &data_;
 
+#if HIPO_TIMING_LEVEL >= 2
+  data_.sumTime(kTimeFactoriseMove, clock2.stop());
+#endif
+
 #if HIPO_TIMING_LEVEL >= 1
   data_.sumTime(kTimeFactorise, clock.stop());
 #endif

highs/ipm/hipo/factorhighs/Timing.h

@@ -24,6 +24,9 @@ enum TimeItems {
   kTimeDenseFact_convert,                 // TIMING_LEVEL 2
   kTimeDenseFact_pivoting,                // TIMING_LEVEL 2
   kTimeFactoriseTerminate,                // TIMING_LEVEL 2
+  kTimeFactoriseResize,
+  kTimeFactoriseMove,
+  kTimeFactoriseProcess,
   kTimeSolve,                             // TIMING_LEVEL 1
   kTimeSolvePrepare,                      // TIMING_LEVEL 2
   kTimeSolveSolve,                        // TIMING_LEVEL 2