From 33fcc3e868b31e8da6d0bbef7fa4a207a5a802dc Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 31 Mar 2018 01:00:17 +0200
Subject: [PATCH 1/1] cleanup the declaration and handling of the cpu/optim
 option

---
 src/simgrid/sg_config.cpp |  4 ----
 src/surf/cpu_cas01.cpp    | 36 +++++++++++++++++++++++++-----------
 src/surf/cpu_cas01.hpp    |  2 +-
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index 6c6dfec814..3fe0c43897 100644
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -301,10 +301,6 @@ void sg_config_init(int *argc, char **argv)
   describe_model(description, descsize, surf_cpu_model_description, "model", "The model to use for the CPU");
   xbt_cfg_register_string("cpu/model", "Cas01", &_sg_cfg_cb__cpu_model, description);
 
-  describe_model(description, descsize, surf_optimization_mode_description, "optimization mode",
-                 "The optimization modes to use for the CPU");
-  xbt_cfg_register_string("cpu/optim", "Lazy", &_sg_cfg_cb__optimization_mode, description);
-
   describe_model(description, descsize, surf_storage_model_description, "model", "The model to use for the storage");
   xbt_cfg_register_string("storage/model", "default", &_sg_cfg_cb__storage_mode, description);
 
diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp
index 808b78a949..019d540dc9 100644
--- a/src/surf/cpu_cas01.cpp
+++ b/src/surf/cpu_cas01.cpp
@@ -7,10 +7,27 @@
 #include "cpu_ti.hpp"
 #include "simgrid/sg_config.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
+#include "xbt/config.hpp"
 #include "xbt/utility.hpp"
+
 #include <algorithm>
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU IMPROVED module");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_cpu_cas, surf_cpu, "Logging specific to the SURF CPU module");
+
+static simgrid::config::Flag<std::string>
+    cpu_optim_opt("cpu/optim", "Optimization algorithm to use for CPU resources. ", "Lazy",
+
+                  std::map<std::string, std::string>({
+                      {"Lazy", "Lazy action management (partial invalidation in lmm + heap in action remaining)."},
+                      {"TI", "Trace integration. Highly optimized mode when using availability traces (only available "
+                             "for the Cas01 CPU model for now)."},
+                      {"Full", "Full update of remaining and variables. Slow but may be useful when debugging."},
+                  }),
+
+                  [](std::string const& val) {
+                    xbt_assert(_sg_cfg_init_status < 2,
+                               "Cannot change the optimization algorithm after the initialization");
+                  });
 
 /*********
  * Model *
@@ -20,40 +37,37 @@ void surf_cpu_model_init_Cas01()
   xbt_assert(not surf_cpu_model_pm);
   xbt_assert(not surf_cpu_model_vm);
 
-  if (xbt_cfg_get_string("cpu/optim") == "TI") {
+  if (cpu_optim_opt == "TI") {
     surf_cpu_model_init_ti();
     return;
   }
 
-  surf_cpu_model_pm = new simgrid::surf::CpuCas01Model();
+  surf_cpu_model_pm = new simgrid::surf::CpuCas01Model(cpu_optim_opt == "Lazy");
   all_existing_models->push_back(surf_cpu_model_pm);
 
-  surf_cpu_model_vm  = new simgrid::surf::CpuCas01Model();
+  surf_cpu_model_vm = new simgrid::surf::CpuCas01Model(cpu_optim_opt == "Lazy");
   all_existing_models->push_back(surf_cpu_model_vm);
 }
 
 namespace simgrid {
 namespace surf {
 
-CpuCas01Model::CpuCas01Model() : simgrid::surf::CpuModel()
+CpuCas01Model::CpuCas01Model(bool optim_lazy) : simgrid::surf::CpuModel()
 {
-  std::string optim = xbt_cfg_get_string("cpu/optim");
   bool select = xbt_cfg_get_boolean("cpu/maxmin-selective-update");
 
-  if (optim == "Full") {
-    setUpdateMechanism(Model::UpdateAlgo::Full);
-  } else if (optim == "Lazy") {
+  if (optim_lazy) {
     xbt_assert(select || xbt_cfg_is_default_value("cpu/maxmin-selective-update"),
                "You cannot disable cpu selective update when using the lazy update mechanism");
     setUpdateMechanism(Model::UpdateAlgo::Lazy);
     select = true;
   } else {
-    xbt_die("Unsupported optimization (%s) for this model", optim.c_str());
+    setUpdateMechanism(Model::UpdateAlgo::Full);
   }
 
   set_maxmin_system(new simgrid::kernel::lmm::System(select));
 
-  if (getUpdateMechanism() == Model::UpdateAlgo::Lazy)
+  if (optim_lazy)
     get_maxmin_system()->modified_set_ = new kernel::resource::Action::ModifiedSet();
 }
 
diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 7ed577b719..7683a0804f 100644
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -24,7 +24,7 @@ class XBT_PRIVATE CpuCas01Action;
 
 class CpuCas01Model : public simgrid::surf::CpuModel {
 public:
-  CpuCas01Model();
+  CpuCas01Model(bool optim_lazy);
   ~CpuCas01Model() override;
 
   Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core) override;
-- 
2.20.1