X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7f3527d281baac664d10ce7086e0d0138e1389d7..919a006452206f935fe271499ab68eb8cf875854:/teshsuite/surf/maxmin_bench/maxmin_bench.cpp diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp index 108223882f..91da7e5ff1 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp +++ b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp @@ -1,129 +1,108 @@ /* A few crash tests for the maxmin library */ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/lmm/maxmin.hpp" -#include "simgrid/msg.h" +#include "simgrid/s4u/Engine.hpp" #include "xbt/module.h" +#include "xbt/random.hpp" #include "xbt/sysdep.h" /* time manipulation for benchmarking */ #include "xbt/xbt_os_time.h" -#define MYRANDMAX 1000 - +#include #include #include #include -using namespace simgrid::surf; - -double date; -int64_t seedx = 0; - -static int myrand() { - seedx=seedx * 16807 % 2147483647; - return static_cast(seedx%1000); -} - -static double float_random(double max) +static double test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limit, unsigned int pw_max_limit, + double rate_no_limit, int max_share, int mode) { - return ((max * myrand()) / (MYRANDMAX + 1.0)); -} + std::vector constraints(nb_cnst); + std::vector variables(nb_var); -static unsigned int int_random(int max) -{ - return static_cast(((max * 1.0) * myrand()) / (MYRANDMAX + 1.0)); -} - -static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limit, unsigned int pw_max_limit, - float rate_no_limit, int max_share, int mode) -{ - simgrid::kernel::lmm::Constraint* cnst[nb_cnst]; - simgrid::kernel::lmm::Variable* var[nb_var]; - int used[nb_cnst]; + /* We cannot activate the selective update as we pass nullptr as an Action when creating the variables */ + simgrid::kernel::lmm::MaxMin Sys(false); - lmm_system_t Sys = new simgrid::kernel::lmm::System(true); - - for (int i = 0; i < nb_cnst; i++) { - cnst[i] = Sys->constraint_new(NULL, float_random(10.0)); + for (auto& cnst : constraints) { + cnst = Sys.constraint_new(nullptr, simgrid::xbt::random::uniform_real(0.0, 10.0)); int l; - if(rate_no_limit>float_random(1.0)) - //Look at what happens when there is no concurrency limit - l=-1; - else - //Badly logarithmically random concurrency limit in [2^pw_base_limit+1,2^pw_base_limit+2^pw_max_limit] - l=(1<set_concurrency_limit(l); + if (rate_no_limit > simgrid::xbt::random::uniform_real(0.0, 1.0)) { + // Look at what happens when there is no concurrency limit + l = -1; + } else { + // Badly logarithmically random concurrency limit in [2^pw_base_limit+1,2^pw_base_limit+2^pw_max_limit] + l = (1 << pw_base_limit) + (1 << simgrid::xbt::random::uniform_int(0, pw_max_limit - 1)); + } + cnst->set_concurrency_limit(l); } - for (int i = 0; i < nb_var; i++) { - var[i] = Sys->variable_new(NULL, 1.0, -1.0, nb_elem); + for (auto& var : variables) { + var = Sys.variable_new(nullptr, 1.0, -1.0, nb_elem); //Have a few variables with a concurrency share of two (e.g. cross-traffic in some cases) - int concurrency_share = 1 + int_random(max_share); - var[i]->set_concurrency_share(concurrency_share); + short concurrency_share = 1 + static_cast(simgrid::xbt::random::uniform_int(0, max_share - 1)); + var->set_concurrency_share(concurrency_share); - for (int j = 0; j < nb_cnst; j++) - used[j] = 0; + std::vector used(nb_cnst, 0); for (int j = 0; j < nb_elem; j++) { - int k = int_random(nb_cnst); - if (used[k]>=concurrency_share) { - j--; - continue; - } - Sys->expand(cnst[k], var[i], float_random(1.5)); - Sys->expand_add(cnst[k], var[i], float_random(1.5)); + int k; + do { + k = simgrid::xbt::random::uniform_int(0, nb_cnst - 1); + } while (used[k] >= concurrency_share); + Sys.expand(constraints[k], var, simgrid::xbt::random::uniform_real(0.0, 1.5)); + Sys.expand_add(constraints[k], var, simgrid::xbt::random::uniform_real(0.0, 1.5)); used[k]++; } } - fprintf(stderr,"Starting to solve(%i)\n",myrand()%1000); - date = xbt_os_time() * 1000000; - lmm_solve(Sys); - date = xbt_os_time() * 1000000 - date; + fprintf(stderr, "Starting to solve(%i)\n", simgrid::xbt::random::uniform_int(0, 999)); + double date = xbt_os_time(); + Sys.solve(); + date = (xbt_os_time() - date) * 1e6; if(mode==2){ fprintf(stderr,"Max concurrency:\n"); int l=0; for (int i = 0; i < nb_cnst; i++) { - int j = cnst[i]->get_concurrency_maximum(); - int k = cnst[i]->get_concurrency_limit(); + int j = constraints[i]->get_concurrency_maximum(); + int k = constraints[i]->get_concurrency_limit(); xbt_assert(k<0 || j<=k); if(j>l) l=j; fprintf(stderr,"(%i):%i/%i ",i,j,k); - cnst[i]->reset_concurrency_maximum(); - xbt_assert(not cnst[i]->get_concurrency_maximum()); + constraints[i]->reset_concurrency_maximum(); + xbt_assert(not constraints[i]->get_concurrency_maximum()); if(i%10==9) fprintf(stderr,"\n"); } fprintf(stderr,"\nTotal maximum concurrency is %i\n",l); - Sys->print(); + Sys.print(); } - for (int i = 0; i < nb_var; i++) - Sys->variable_free(var[i]); - delete Sys; + for (auto const& var : variables) + Sys.variable_free(var); + + return date; } -unsigned int TestClasses [][4]= - //Nbcnst Nbvar Baselimit Maxlimit - {{ 10 ,10 ,1 ,2 }, //small - { 100 ,100 ,3 ,6 }, //medium - { 2000,2000 ,5 ,8 }, //big - { 20000,20000 ,7 ,10} //huge - }; +constexpr std::array, 4> TestClasses{{ + // Nbcnst Nbvar Baselimit Maxlimit + {{10, 10, 1, 2}}, // small + {{100, 100, 3, 6}}, // medium + {{2000, 2000, 5, 8}}, // big + {{20000, 20000, 7, 10}} // huge +}}; int main(int argc, char **argv) { - MSG_init(&argc, argv); + simgrid::s4u::Engine e(&argc, argv); - float rate_no_limit=0.2; - float acc_date=0; - float acc_date2=0; + double rate_no_limit = 0.2; + double acc_date = 0.0; + double acc_date2 = 0.0; int testclass; if(argc<3) { @@ -158,11 +137,11 @@ int main(int argc, char **argv) mode=3; if(mode==1) - xbt_log_control_set("surf/maxmin.threshold:DEBUG surf/maxmin.fmt:\'[%r]: [%c/%p] %m%n\' " - "surf.threshold:DEBUG surf.fmt:\'[%r]: [%c/%p] %m%n\' "); + xbt_log_control_set("ker_lmm.threshold:DEBUG ker_lmm.fmt:\'[%r]: [%c/%p] %m%n\' " + "kernel.threshold:DEBUG kernel.fmt:\'[%r]: [%c/%p] %m%n\' "); if(mode==2) - xbt_log_control_set("surf/maxmin.threshold:DEBUG surf.threshold:DEBUG"); + xbt_log_control_set("ker_lmm.threshold:DEBUG kernel.threshold:DEBUG"); unsigned int nb_cnst= TestClasses[testclass][0]; unsigned int nb_var= TestClasses[testclass][1]; @@ -176,15 +155,15 @@ int main(int argc, char **argv) //nb_elem=200 for(int i=0;i(testcount); + double stdev_date = sqrt(acc_date2 / static_cast(testcount) - mean_date * mean_date); fprintf(stderr, "%ix One shot execution time for a total of %u constraints, " "%u variables with %u active constraint each, concurrency in [%i,%i] and max concurrency share %u\n",