LoopControl: Rewrite

Rewrite code in C++.
Remove dependency on GSL.
Modify algorithm; now traverses arrays bottom-up (by splitting the looping region into equal-sized blocks) instead of top-down (splitting the region into a certain number of blocks)
Make multi-threading dynamic
Support SMT (hyper-threading), i.e. threads which share the same cache

9 files changed, 56 insertions, 486 deletions

diff --git a/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.legacy.par b/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.legacy.par
deleted file mode 100644
index 09be6185d..000000000
--- a/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.legacy.par
+++ /dev/null
@@ -1,136 +0,0 @@
-Cactus::cctk_run_title = "Benchmark of McLachlan using Carpet with one refinement level"
-
-Cactus::cctk_itlast = @ITERATIONS@
-
-
-
-ActiveThorns = "Fortran"
-
-
-
-ActiveThorns = "LoopControl"
-
-LoopControl::printstats = yes
-
-LoopControl::legacy_init                      = yes
-LoopControl::use_random_restart_hill_climbing = no
-
-
-
-ActiveThorns = "IOUtil"
-
-IO::out_dir = $parfile
-
-
-
-ActiveThorns = "InitBase"
-
-
-
-ActiveThorns = "Carpet CarpetLib CarpetReduce"
-
-Carpet::domain_from_coordbase = yes
-
-driver::ghost_size = 3
-
-Carpet::init_fill_timelevels = yes
-
-CarpetLib::avoid_arraysize_bytes = 0
-
-CarpetLib::print_timestats_every = @ITERATIONS@
-CarpetLib::print_memstats_every  = @ITERATIONS@
-
-
-
-ActiveThorns = "Boundary CartGrid3D CoordBase SymBase"
-
-CoordBase::domainsize = "minmax"
-CoordBase::xmin       = 0.0
-CoordBase::ymin       = 0.0
-CoordBase::zmin       = 0.0
-CoordBase::xmax       = 1.0
-CoordBase::ymax       = 1.0
-CoordBase::zmax       = 1.0
-
-CoordBase::spacing  = "numcells"
-CoordBase::ncells_x = @NCELLSI@
-CoordBase::ncells_y = @NCELLSJ@
-CoordBase::ncells_z = @NCELLSK@
-
-CartGrid3D::type           = "coordbase"
-CartGrid3D::domain         = "octant"
-CartGrid3D::avoid_originx  = no
-CartGrid3D::avoid_originy  = no
-CartGrid3D::avoid_originz  = no
-
-CoordBase::boundary_size_x_lower = 3
-CoordBase::boundary_size_y_lower = 3
-CoordBase::boundary_size_z_lower = 3
-CoordBase::boundary_shiftout_x_lower = 1
-CoordBase::boundary_shiftout_y_lower = 1
-CoordBase::boundary_shiftout_z_lower = 1
-
-CoordBase::boundary_size_x_upper = 3
-CoordBase::boundary_size_y_upper = 3
-CoordBase::boundary_size_z_upper = 3
-
-
-
-ActiveThorns = "MoL NaNChecker Time"
-
-MoL::ODE_Method             = "RK4"
-MoL::MoL_Intermediate_Steps = 4
-MoL::MoL_Num_Scratch_Levels = 1
-
-Time::dtfac = 0.4
-
-
-
-ActiveThorns = "ADMBase ADMCoupling ADMMacros CoordGauge StaticConformal"
-
-ADMBase::initial_data    = "Cartesian Minkowski"
-ADMBase::initial_lapse   = "one"
-ADMBase::initial_shift   = "zero"
-ADMBase::initial_dtlapse = "zero"
-ADMBase::initial_dtshift = "zero"
-
-
-
-ActiveThorns = "GenericFD ML_BSSN ML_BSSN_Helper TmunuBase"
-
-ADMBase::evolution_method       = "ML_BSSN"
-ADMBase::lapse_evolution_method = "ML_BSSN"
-ADMBase::shift_evolution_method = "ML_BSSN"
-
-ML_BSSN::my_boundary_condition = "Minkowski"
-
-ML_BSSN::harmonicN       = 1      # 1+log
-ML_BSSN::harmonicF       = 2.0    # 1+log
-ML_BSSN::ShiftGammaCoeff = 0.75
-ML_BSSN::BetaDriver      = 0.5
-
-
-
-ActiveThorns = "CarpetIOBasic"
-
-IOBasic::outInfo_every = @ITERATIONS@
-#IOBasic::outInfo_vars  = "ADMBase::alp"
-
-
-
-#ActiveThorns = "CarpetIOASCII"
-#
-#IOASCII::out0D_every = @ITERATIONS@
-#IOASCII::out0D_vars  = "Carpet::timing"
-
-
-
-ActiveThorns = "TimerReport"
-
-TimerReport::output_all_timers          = yes
-TimerReport::all_timers_clock           = "cycle"
-TimerReport::out_every                  = @ITERATIONS@
-TimerReport::out_filename               = "TimerReport"
-TimerReport::output_all_timers_together = yes
-TimerReport::output_all_timers_readable = yes
-TimerReport::n_top_timers               = 20
diff --git a/Carpet/LoopControl/par/WaveToy_Carpet_1lev.hill.par b/Carpet/LoopControl/par/WaveToy_Carpet_1lev.hill.par
deleted file mode 100644
index 1dbeec5b1..000000000
--- a/Carpet/LoopControl/par/WaveToy_Carpet_1lev.hill.par
+++ /dev/null
@@ -1,69 +0,0 @@
-Cactus::cctk_run_title    = "Benchmark of WaveToy using Carpet with one refinement level"
-Cactus::cctk_timer_output = "full"
-
-Cactus::cctk_itlast = 10000
-
-
-
-#ActiveThorns = "MPIClock"
-
-
-
-ActiveThorns = "IOUtil"
-
-#IO::print_timing_info = yes
-
-
-
-Activethorns = "LoopControl"
-
-LoopControl::printstats = yes
-#LoopControl::verbose    = yes
-#LoopControl::debug      = yes
-
-LoopControl::use_random_restart_hill_climbing = yes
-
-
-
-ActiveThorns = "InitBase"
-
-InitBase::initial_data_setup_method = "init_two_levels"
-
-
-
-ActiveThorns = "Carpet CarpetLib CarpetReduce"
-
-Carpet::constant_load_per_processor = yes
-driver::global_nsize                = 80
-driver::ghost_size                  = 1
-
-
-
-ActiveThorns = "Boundary CartGrid3D CoordBase SymBase"
-
-grid::type = "box"
-
-
-
-ActiveThorns = "IDScalarWaveC WaveToyC"
-
-WaveToy::bound = "zero"
-
-
-
-ActiveThorns = "Time"
-
-Time::dtfac = 0.5
-
-
-
-ActiveThorns = "CarpetIOBasic"
-
-IOBasic::outInfo_every      = 1000
-IOBasic::outInfo_reductions = "maximum"
-IOBasic::outInfo_vars       = "
-        Carpet::grid_points_per_second
-        Carpet::grid_point_updates_count
-        Carpet::time_total
-        Carpet::time_computing
-"
diff --git a/Carpet/LoopControl/par/WaveToy_Carpet_1lev.legacy.par b/Carpet/LoopControl/par/WaveToy_Carpet_1lev.legacy.par
deleted file mode 100644
index 7a715bfe0..000000000
--- a/Carpet/LoopControl/par/WaveToy_Carpet_1lev.legacy.par
+++ /dev/null
@@ -1,69 +0,0 @@
-Cactus::cctk_run_title    = "Benchmark of WaveToy using Carpet with one refinement level"
-Cactus::cctk_timer_output = "full"
-
-Cactus::cctk_itlast = 10000
-
-
-
-#ActiveThorns = "MPIClock"
-
-
-
-ActiveThorns = "IOUtil"
-
-#IO::print_timing_info = yes
-
-
-
-Activethorns = "LoopControl"
-
-LoopControl::printstats = yes
-#LoopControl::verbose    = yes
-#LoopControl::debug      = yes
-
-LoopControl::legacy_init = yes
-
-
-
-ActiveThorns = "InitBase"
-
-InitBase::initial_data_setup_method = "init_two_levels"
-
-
-
-ActiveThorns = "Carpet CarpetLib CarpetReduce"
-
-Carpet::constant_load_per_processor = yes
-driver::global_nsize                = 80
-driver::ghost_size                  = 1
-
-
-
-ActiveThorns = "Boundary CartGrid3D CoordBase SymBase"
-
-grid::type = "box"
-
-
-
-ActiveThorns = "IDScalarWaveC WaveToyC"
-
-WaveToy::bound = "zero"
-
-
-
-ActiveThorns = "Time"
-
-Time::dtfac = 0.5
-
-
-
-ActiveThorns = "CarpetIOBasic"
-
-IOBasic::outInfo_every      = 1000
-IOBasic::outInfo_reductions = "maximum"
-IOBasic::outInfo_vars       = "
-        Carpet::grid_points_per_second
-        Carpet::grid_point_updates_count
-        Carpet::time_total
-        Carpet::time_computing
-"
diff --git a/Carpet/LoopControl/par/WaveToy_Carpet_1lev.standard.par b/Carpet/LoopControl/par/WaveToy_Carpet_1lev.standard.par
deleted file mode 100644
index c776d8ec6..000000000
--- a/Carpet/LoopControl/par/WaveToy_Carpet_1lev.standard.par
+++ /dev/null
@@ -1,67 +0,0 @@
-Cactus::cctk_run_title    = "Benchmark of WaveToy using Carpet with one refinement level"
-Cactus::cctk_timer_output = "full"
-
-Cactus::cctk_itlast = 10000
-
-
-
-#ActiveThorns = "MPIClock"
-
-
-
-ActiveThorns = "IOUtil"
-
-#IO::print_timing_info = yes
-
-
-
-Activethorns = "LoopControl"
-
-LoopControl::printstats = yes
-#LoopControl::verbose    = yes
-#LoopControl::debug      = yes
-
-
-
-ActiveThorns = "InitBase"
-
-InitBase::initial_data_setup_method = "init_two_levels"
-
-
-
-ActiveThorns = "Carpet CarpetLib CarpetReduce"
-
-Carpet::constant_load_per_processor = yes
-driver::global_nsize                = 80
-driver::ghost_size                  = 1
-
-
-
-ActiveThorns = "Boundary CartGrid3D CoordBase SymBase"
-
-grid::type = "box"
-
-
-
-ActiveThorns = "IDScalarWaveC WaveToyC"
-
-WaveToy::bound = "zero"
-
-
-
-ActiveThorns = "Time"
-
-Time::dtfac = 0.5
-
-
-
-ActiveThorns = "CarpetIOBasic"
-
-IOBasic::outInfo_every      = 1000
-IOBasic::outInfo_reductions = "maximum"
-IOBasic::outInfo_vars       = "
-        Carpet::grid_points_per_second
-        Carpet::grid_point_updates_count
-        Carpet::time_total
-        Carpet::time_computing
-"
diff --git a/Carpet/LoopControl/par/WaveToy_LoopControl.par b/Carpet/LoopControl/par/WaveToy_LoopControl.par
deleted file mode 100644
index 81fe68df6..000000000
--- a/Carpet/LoopControl/par/WaveToy_LoopControl.par
+++ /dev/null
@@ -1,6 +0,0 @@
-ActiveThorns = "LoopControl GSL"
-
-LoopControl::run_demo = yes
-LoopControl::nx = 300
-LoopControl::ny = 300
-LoopControl::nz = 300
diff --git a/Carpet/LoopControl/par/WaveToy_PUGH.standard.par b/Carpet/LoopControl/par/WaveToy_PUGH.standard.par
deleted file mode 100644
index a8e166190..000000000
--- a/Carpet/LoopControl/par/WaveToy_PUGH.standard.par
+++ /dev/null
@@ -1,63 +0,0 @@
-Cactus::cctk_run_title    = "Benchmark of WaveToy using Carpet with one refinement level"
-Cactus::cctk_timer_output = "full"
-
-Cactus::cctk_itlast = 10000
-
-
-
-#ActiveThorns = "MPIClock"
-
-
-
-ActiveThorns = "IOUtil"
-
-#IO::print_timing_info = yes
-
-
-
-Activethorns = "LoopControl"
-
-LoopControl::printstats = yes
-#LoopControl::verbose    = yes
-#LoopControl::debug      = yes
-
-
-
-ActiveThorns = "InitBase"
-
-InitBase::initial_data_setup_method = "init_two_levels"
-
-
-
-ActiveThorns = "PUGH PUGHInterp PUGHReduce PUGHSlab LocalReduce"
-
-PUGH::local_size_includes_ghosts = no
-driver::local_nsize              = 80
-driver::ghost_size               = 1
-
-
-
-ActiveThorns = "Boundary CartGrid3D CoordBase SymBase"
-
-grid::type = "box"
-
-
-
-ActiveThorns = "IDScalarWaveC WaveToyC"
-
-WaveToy::bound = "zero"
-
-
-
-ActiveThorns = "Time"
-
-Time::dtfac = 0.5
-
-
-
-ActiveThorns = "IOBasic"
-
-IOBasic::outInfo_every = 1000
-IOBasic::outInfo_vars  = "
-        WaveToy::phi
-"
diff --git a/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.standard.par b/Carpet/LoopControl/par/bench-minkowski-carpet-1lev-legacy.par
index 690b37c26..54f111a91 100644
--- a/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.standard.par
+++ b/Carpet/LoopControl/par/bench-minkowski-carpet-1lev-legacy.par
@@ -1,30 +1,31 @@
 Cactus::cctk_run_title    = "Benchmark of McLachlan using Carpet with one refinement level"
 Cactus::cctk_timer_output = "full"
 
-Cactus::cctk_itlast = @ITERATIONS@
+Cactus::cctk_itlast = 100
 
 
 
-ActiveThorns = "Fortran"
+ActiveThorns = "CycleClock Fortran hwloc MPI"
 
 
 
-ActiveThorns = "LoopControl"
+ActiveThorns = "IOUtil"
 
-#LoopControl::printstats = yes
+IO::out_dir = $parfile
 
-LoopControl::legacy_init                      = no
-LoopControl::use_random_restart_hill_climbing = no
 
 
+ActiveThorns = "InitBase"
 
-ActiveThorns = "IOUtil"
 
-#IO::print_timing_info = yes
 
+ActiveThorns = "LoopControl"
 
+LoopControl::verbose     = no
+LoopControl::veryverbose = no
+LoopControl::selftest    = no
 
-ActiveThorns = "InitBase"
+LoopControl::initial_setup = "legacy"
 
 
 
@@ -36,10 +37,8 @@ driver::ghost_size = 3
 
 Carpet::init_fill_timelevels = yes
 
-CarpetLib::combine_recompose = yes
-
 #CarpetLib::print_timestats_every = 1
-CarpetLib::print_memstats_every  = @ITERATIONS@
+CarpetLib::print_memstats_every  = 100
 
 
 
@@ -54,12 +53,11 @@ CoordBase::ymax       = 1.0
 CoordBase::zmax       = 1.0
 
 CoordBase::spacing  = "numcells"
-CoordBase::ncells_x = @NCELLSI@
-CoordBase::ncells_y = @NCELLSJ@
-CoordBase::ncells_z = @NCELLSK@
+CoordBase::ncells_x = 30
+CoordBase::ncells_y = 30
+CoordBase::ncells_z = 30
 
 CartGrid3D::type           = "coordbase"
-CartGrid3D::domain         = "octant"
 CartGrid3D::avoid_originx  = no
 CartGrid3D::avoid_originy  = no
 CartGrid3D::avoid_originz  = no
@@ -67,10 +65,6 @@ CartGrid3D::avoid_originz  = no
 CoordBase::boundary_size_x_lower = 3
 CoordBase::boundary_size_y_lower = 3
 CoordBase::boundary_size_z_lower = 3
-CoordBase::boundary_shiftout_x_lower = 1
-CoordBase::boundary_shiftout_y_lower = 1
-CoordBase::boundary_shiftout_z_lower = 1
-
 CoordBase::boundary_size_x_upper = 3
 CoordBase::boundary_size_y_upper = 3
 CoordBase::boundary_size_z_upper = 3
@@ -114,14 +108,14 @@ ML_BSSN::BetaDriver      = 0.5
 
 ActiveThorns = "CarpetIOBasic"
 
-IOBasic::outInfo_every = @ITERATIONS@
-#IOBasic::outInfo_vars  = "ADMBase::alp"
+IOBasic::outInfo_every = 100
+IOBasic::outInfo_vars  = "ADMBase::alp"
 
 
 
 #ActiveThorns = "CarpetIOASCII"
 #
-#IOASCII::out0D_every = @ITERATIONS@
+#IOASCII::out0D_every = 100
 #IOASCII::out0D_vars  = "Carpet::timing"
 
 
diff --git a/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.par b/Carpet/LoopControl/par/bench-minkowski-carpet-1lev-test.par
index ab607feca..8c13b89f2 100644
--- a/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.par
+++ b/Carpet/LoopControl/par/bench-minkowski-carpet-1lev-test.par
@@ -1,30 +1,31 @@
 Cactus::cctk_run_title    = "Benchmark of McLachlan using Carpet with one refinement level"
 Cactus::cctk_timer_output = "full"
 
-Cactus::cctk_itlast = @ITERATIONS@
+Cactus::cctk_itlast = 100
 
 
 
-ActiveThorns = "Fortran"
+ActiveThorns = "CycleClock Fortran hwloc MPI"
 
 
 
-ActiveThorns = "LoopControl"
+ActiveThorns = "IOUtil"
 
-#LoopControl::printstats = yes
+IO::out_dir = $parfile
 
-LoopControl::legacy_init                      = @LEGACY_INIT@
-LoopControl::use_random_restart_hill_climbing = @HILL_CLIMBING@
 
 
+ActiveThorns = "InitBase"
 
-ActiveThorns = "IOUtil"
 
-#IO::print_timing_info = yes
 
+ActiveThorns = "LoopControl"
 
+LoopControl::verbose     = no
+LoopControl::veryverbose = no
+LoopControl::selftest    = yes
 
-ActiveThorns = "InitBase"
+LoopControl::initial_setup = "tiled"
 
 
 
@@ -36,10 +37,8 @@ driver::ghost_size = 3
 
 Carpet::init_fill_timelevels = yes
 
-CarpetLib::combine_recompose = yes
-
 #CarpetLib::print_timestats_every = 1
-CarpetLib::print_memstats_every  = @ITERATIONS@
+CarpetLib::print_memstats_every  = 100
 
 
 
@@ -54,12 +53,11 @@ CoordBase::ymax       = 1.0
 CoordBase::zmax       = 1.0
 
 CoordBase::spacing  = "numcells"
-CoordBase::ncells_x = @NCELLSI@
-CoordBase::ncells_y = @NCELLSJ@
-CoordBase::ncells_z = @NCELLSK@
+CoordBase::ncells_x = 30
+CoordBase::ncells_y = 30
+CoordBase::ncells_z = 30
 
 CartGrid3D::type           = "coordbase"
-CartGrid3D::domain         = "octant"
 CartGrid3D::avoid_originx  = no
 CartGrid3D::avoid_originy  = no
 CartGrid3D::avoid_originz  = no
@@ -67,10 +65,6 @@ CartGrid3D::avoid_originz  = no
 CoordBase::boundary_size_x_lower = 3
 CoordBase::boundary_size_y_lower = 3
 CoordBase::boundary_size_z_lower = 3
-CoordBase::boundary_shiftout_x_lower = 1
-CoordBase::boundary_shiftout_y_lower = 1
-CoordBase::boundary_shiftout_z_lower = 1
-
 CoordBase::boundary_size_x_upper = 3
 CoordBase::boundary_size_y_upper = 3
 CoordBase::boundary_size_z_upper = 3
@@ -114,14 +108,14 @@ ML_BSSN::BetaDriver      = 0.5
 
 ActiveThorns = "CarpetIOBasic"
 
-IOBasic::outInfo_every = @ITERATIONS@
-#IOBasic::outInfo_vars  = "ADMBase::alp"
+IOBasic::outInfo_every = 100
+IOBasic::outInfo_vars  = "ADMBase::alp"
 
 
 
 #ActiveThorns = "CarpetIOASCII"
 #
-#IOASCII::out0D_every = @ITERATIONS@
+#IOASCII::out0D_every = 100
 #IOASCII::out0D_vars  = "Carpet::timing"
 
 
diff --git a/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.hill.par b/Carpet/LoopControl/par/bench-minkowski-carpet-1lev-tiled.par
index 93fb29489..798387945 100644
--- a/Carpet/LoopControl/par/Bench_McLachlan_Carpet_1lev.hill.par
+++ b/Carpet/LoopControl/par/bench-minkowski-carpet-1lev-tiled.par
@@ -1,29 +1,31 @@
-Cactus::cctk_run_title = "Benchmark of McLachlan using Carpet with one refinement level"
+Cactus::cctk_run_title    = "Benchmark of McLachlan using Carpet with one refinement level"
+Cactus::cctk_timer_output = "full"
 
-Cactus::cctk_itlast = @ITERATIONS@
+Cactus::cctk_itlast = 100
 
 
 
-ActiveThorns = "Fortran"
+ActiveThorns = "CycleClock Fortran hwloc MPI"
 
 
 
-ActiveThorns = "LoopControl"
+ActiveThorns = "IOUtil"
 
-LoopControl::printstats = yes
+IO::out_dir = $parfile
 
-LoopControl::legacy_init                      = no
-LoopControl::use_random_restart_hill_climbing = yes
 
 
+ActiveThorns = "InitBase"
 
-ActiveThorns = "IOUtil"
 
-IO::out_dir = $parfile
 
+ActiveThorns = "LoopControl"
 
+LoopControl::verbose     = no
+LoopControl::veryverbose = no
+LoopControl::selftest    = no
 
-ActiveThorns = "InitBase"
+LoopControl::initial_setup = "tiled"
 
 
 
@@ -35,8 +37,8 @@ driver::ghost_size = 3
 
 Carpet::init_fill_timelevels = yes
 
-CarpetLib::print_timestats_every = @ITERATIONS@
-CarpetLib::print_memstats_every  = @ITERATIONS@
+#CarpetLib::print_timestats_every = 1
+CarpetLib::print_memstats_every  = 100
 
 
 
@@ -51,12 +53,11 @@ CoordBase::ymax       = 1.0
 CoordBase::zmax       = 1.0
 
 CoordBase::spacing  = "numcells"
-CoordBase::ncells_x = @NCELLSI@
-CoordBase::ncells_y = @NCELLSJ@
-CoordBase::ncells_z = @NCELLSK@
+CoordBase::ncells_x = 30
+CoordBase::ncells_y = 30
+CoordBase::ncells_z = 30
 
 CartGrid3D::type           = "coordbase"
-CartGrid3D::domain         = "octant"
 CartGrid3D::avoid_originx  = no
 CartGrid3D::avoid_originy  = no
 CartGrid3D::avoid_originz  = no
@@ -64,10 +65,6 @@ CartGrid3D::avoid_originz  = no
 CoordBase::boundary_size_x_lower = 3
 CoordBase::boundary_size_y_lower = 3
 CoordBase::boundary_size_z_lower = 3
-CoordBase::boundary_shiftout_x_lower = 1
-CoordBase::boundary_shiftout_y_lower = 1
-CoordBase::boundary_shiftout_z_lower = 1
-
 CoordBase::boundary_size_x_upper = 3
 CoordBase::boundary_size_y_upper = 3
 CoordBase::boundary_size_z_upper = 3
@@ -111,24 +108,19 @@ ML_BSSN::BetaDriver      = 0.5
 
 ActiveThorns = "CarpetIOBasic"
 
-IOBasic::outInfo_every = @ITERATIONS@
-#IOBasic::outInfo_vars  = "ADMBase::alp"
+IOBasic::outInfo_every = 100
+IOBasic::outInfo_vars  = "ADMBase::alp"
 
 
 
 #ActiveThorns = "CarpetIOASCII"
 #
-#IOASCII::out0D_every = @ITERATIONS@
+#IOASCII::out0D_every = 100
 #IOASCII::out0D_vars  = "Carpet::timing"
 
 
 
 ActiveThorns = "TimerReport"
 
-TimerReport::output_all_timers          = yes
-TimerReport::all_timers_clock           = "cycle"
-TimerReport::out_every                  = @ITERATIONS@
-TimerReport::out_filename               = "TimerReport"
-TimerReport::output_all_timers_together = yes
-TimerReport::output_all_timers_readable = yes
-TimerReport::n_top_timers               = 20
+TimerReport::output_all_timers = yes
+TimerReport::all_timers_clock  = "cycle"