X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/af4023f2adc7976a736077c23829d217e7b89637..298475b7a7f5b043d8d6870ac51626a9d8bd3777:/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 be01e1dd8b..4ba0a96ea4 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp +++ b/teshsuite/surf/maxmin_bench/maxmin_bench.cpp @@ -1,88 +1,68 @@ -/* A crash few tests for the maxmin library */ +/* A few crash tests for the maxmin library */ -/* Copyright (c) 2004-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2020. 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 "surf/maxmin.hpp" -#include "simgrid/msg.h" +#include "src/kernel/lmm/maxmin.hpp" +#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 -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) -{ - return ((max * myrand()) / (MYRANDMAX + 1.0)); -} - -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) + double rate_no_limit, int max_share, int mode) { - lmm_constraint_t cnst[nb_cnst]; - lmm_variable_t var[nb_var]; - int used[nb_cnst]; + auto* cnst = new simgrid::kernel::lmm::Constraint*[nb_cnst]; + auto* var = new simgrid::kernel::lmm::Variable*[nb_var]; + auto* used = new int[nb_cnst]; - lmm_system_t Sys = new s_lmm_system_t(true); + /* We cannot activate the selective update as we pass nullptr as an Action when creating the variables */ + auto* Sys = new simgrid::kernel::lmm::System(false); for (int i = 0; i < nb_cnst; i++) { - cnst[i] = Sys->constraint_new(NULL, float_random(10.0)); + cnst[i] = Sys->constraint_new(NULL, 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< 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[i]->set_concurrency_limit(l); } for (int i = 0; i < nb_var; i++) { var[i] = Sys->variable_new(NULL, 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); + short concurrency_share = 1 + static_cast(simgrid::xbt::random::uniform_int(0, max_share - 1)); var[i]->set_concurrency_share(concurrency_share); for (int j = 0; j < nb_cnst; j++) used[j] = 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(cnst[k], var[i], simgrid::xbt::random::uniform_real(0.0, 1.5)); + Sys->expand_add(cnst[k], var[i], simgrid::xbt::random::uniform_real(0.0, 1.5)); used[k]++; } } - fprintf(stderr,"Starting to solve(%i)\n",myrand()%1000); + fprintf(stderr, "Starting to solve(%i)\n", simgrid::xbt::random::uniform_int(0, 999)); date = xbt_os_time() * 1000000; - lmm_solve(Sys); + Sys->solve(); date = xbt_os_time() * 1000000 - date; if(mode==2){ @@ -108,6 +88,9 @@ static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limi for (int i = 0; i < nb_var; i++) Sys->variable_free(var[i]); delete Sys; + delete[] cnst; + delete[] var; + delete[] used; } unsigned int TestClasses [][4]= @@ -120,11 +103,11 @@ unsigned int TestClasses [][4]= 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) { @@ -159,8 +142,8 @@ 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("surf/maxmin.threshold:DEBUG surf/maxmin.fmt:\'[%r]: [%c/%p] %m%n\' " + "surf.threshold:DEBUG surf.fmt:\'[%r]: [%c/%p] %m%n\' "); if(mode==2) xbt_log_control_set("surf/maxmin.threshold:DEBUG surf.threshold:DEBUG"); @@ -177,15 +160,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",