X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/59d7d4f62ea2f1d8e88aa15c3186c1dbc5bfcc0a..1363ce9624f4327f3ad5c934b15736a776637dfd:/src/mc/mc_config.cpp diff --git a/src/mc/mc_config.cpp b/src/mc/mc_config.cpp index 663961d2b2..bde1a6b886 100644 --- a/src/mc/mc_config.cpp +++ b/src/mc/mc_config.cpp @@ -8,40 +8,45 @@ #include "src/simgrid/sg_config.hpp" #include -#if SIMGRID_HAVE_MC +#if SIMGRID_HAVE_STATEFUL_MC #include #endif XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_cfg); -simgrid::mc::ModelCheckingMode simgrid::mc::model_checking_mode = simgrid::mc::ModelCheckingMode::NONE; +static simgrid::mc::ModelCheckingMode model_checking_mode = simgrid::mc::ModelCheckingMode::NONE; +simgrid::mc::ModelCheckingMode simgrid::mc::get_model_checking_mode() +{ + return model_checking_mode; +} +void simgrid::mc::set_model_checking_mode(simgrid::mc::ModelCheckingMode mode) +{ + model_checking_mode = mode; +} static void _mc_cfg_cb_check(const char* spec, bool more_check = true) { -#if SIMGRID_HAVE_MC xbt_assert(_sg_cfg_init_status == 0 || MC_is_active() || MC_record_replay_is_active() || not more_check, "Specifying a %s is only allowed within the model-checker. Please use simgrid-mc, or specify this option " "after the replay path.", spec); -#else - xbt_die("Specifying a %s is only allowed within the model-checker. Please enable it before the compilation.", spec); -#endif } /* Replay (this part is enabled even if MC it disabled) */ simgrid::config::Flag _sg_mc_record_path{ "model-check/replay", "Model-check path to replay (as reported by SimGrid when a violation is reported)", "", [](std::string_view value) { - xbt_assert(simgrid::mc::model_checking_mode == simgrid::mc::ModelCheckingMode::NONE || - simgrid::mc::model_checking_mode == simgrid::mc::ModelCheckingMode::REPLAY, + if (value.empty()) // Ignore default value + return; + xbt_assert(simgrid::mc::get_model_checking_mode() == simgrid::mc::ModelCheckingMode::NONE || + simgrid::mc::get_model_checking_mode() == simgrid::mc::ModelCheckingMode::REPLAY, "Specifying a MC replay path is not allowed when running the model-checker in mode %s. " "Either remove the model-check/replay parameter, or execute your code out of simgrid-mc.", - to_c_str(simgrid::mc::model_checking_mode)); - simgrid::mc::model_checking_mode = simgrid::mc::ModelCheckingMode::REPLAY; + to_c_str(simgrid::mc::get_model_checking_mode())); + simgrid::mc::set_model_checking_mode(simgrid::mc::ModelCheckingMode::REPLAY); MC_record_path() = value; }}; -#if SIMGRID_HAVE_MC simgrid::config::Flag _sg_mc_timeout{ "model-check/timeout", "Whether to enable timeouts for wait requests", false, [](bool) { _mc_cfg_cb_check("value to enable/disable timeout for wait requests", not MC_record_replay_is_active()); @@ -52,22 +57,26 @@ int _sg_mc_max_visited_states = 0; static simgrid::config::Flag cfg_mc_reduction{ "model-check/reduction", "Specify the kind of exploration reduction (either none or DPOR)", "dpor", [](std::string_view value) { - if (value != "none" && value != "dpor") - xbt_die("configuration option 'model-check/reduction' can only take 'none' or 'dpor' as a value"); + if (value != "none" && value != "dpor" && value != "sdpor" && value != "odpor" && value != "udpor") + xbt_die("configuration option 'model-check/reduction' must be one of the following: " + " 'none', 'dpor', 'sdpor', 'odpor', or 'udpor'"); }}; -simgrid::config::Flag _sg_mc_sleep_set{ - "model-check/sleep-set", "Whether to enable the use of sleep-set in the reduction algorithm", false, - [](bool) { _mc_cfg_cb_check("value to enable/disable the use of sleep-set in the reduction algorithm"); }}; - -simgrid::config::Flag _sg_mc_guided{ - "model-check/guided-mc", "Specify the the kind of heuristic to use for guided model-checking", "none", - [](std::string_view value) { - if (value != "none" && value != "nb_wait") - xbt_die("configuration option 'model-check/reduction' can only take 'none' or 'dpor' as a value"); +simgrid::config::Flag _sg_mc_strategy{ + "model-check/strategy", + "Specify the the kind of heuristic to use for guided model-checking", + "none", + {{"none", "No specific strategy: simply pick the first available transistion and act as a DFS."}, + {"max_match_comm", "Try to minimize the number of in-fly communication by appairing matching send and receive."}, + {"min_match_comm", "Try to maximize the number of in-fly communication by not appairing matching send and receive."}, + {"uniform", "No specific strategy: choices are made randomly based on a uniform sampling."} }}; +simgrid::config::Flag _sg_mc_random_seed{"model-check/rand-seed", + "give a specific random seed to initialize the uniform distribution", 0, + [](int) { _mc_cfg_cb_check("Random seed"); }}; +#if SIMGRID_HAVE_STATEFUL_MC simgrid::config::Flag _sg_mc_checkpoint{ "model-check/checkpoint", "Specify the amount of steps between checkpoints during stateful model-checking " "(default: 0 => stateless verification). If value=1, one checkpoint is saved for each " @@ -100,6 +109,7 @@ simgrid::config::Flag _sg_mc_unfolding_checker{ "Whether to enable the unfolding-based dynamic partial order reduction to MPI programs", false, [](bool) { _mc_cfg_cb_check("value to to enable/disable the unfolding-based dynamic partial order reduction to MPI programs"); }}; +#endif simgrid::config::Flag _sg_mc_buffering{ "smpi/buffering", @@ -129,13 +139,29 @@ simgrid::config::Flag _sg_mc_termination{ "model-check/termination", "Whether to enable non progressive cycle detection", false, [](bool) { _mc_cfg_cb_check("value to enable/disable the detection of non progressive cycles"); }}; -bool simgrid::mc::cfg_use_DPOR() +simgrid::mc::ReductionMode simgrid::mc::get_model_checking_reduction() { - if (cfg_mc_reduction.get() == "dpor" && _sg_mc_max_visited_states__ > 0) { + if ((cfg_mc_reduction.get() == "dpor" || cfg_mc_reduction.get() == "sdpor" || cfg_mc_reduction.get() == "odpor") && + _sg_mc_max_visited_states__ > 0) { XBT_INFO("Disabling DPOR since state-equality reduction is activated with 'model-check/visited'"); - return false; + return simgrid::mc::ReductionMode::none; } - return cfg_mc_reduction.get() == "dpor"; -} -#endif + if (cfg_mc_reduction.get() == "none") { + return ReductionMode::none; + } else if (cfg_mc_reduction.get() == "dpor") { + return ReductionMode::dpor; + } else if (cfg_mc_reduction.get() == "sdpor") { + return ReductionMode::sdpor; + } else if (cfg_mc_reduction.get() == "odpor") { + return ReductionMode::odpor; + } else if (cfg_mc_reduction.get() == "udpor") { + XBT_INFO("No reduction will be used: " + "UDPOR has a dedicated invocation 'model-check/unfolding-checker' " + "but is not yet fully supported in SimGrid"); + return ReductionMode::none; + } else { + XBT_INFO("Unknown reduction mode: defaulting to no reduction"); + return ReductionMode::none; + } +}