A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of framagit.org:simgrid/simgrid
[simgrid.git]
/
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
7d4323c
..
493c17d
100644
(file)
--- a/
teshsuite/surf/maxmin_bench/maxmin_bench.cpp
+++ b/
teshsuite/surf/maxmin_bench/maxmin_bench.cpp
@@
-1,21
+1,19
@@
-/* A
crash few
tests for the maxmin library */
+/* A
few crash
tests for the maxmin library */
-/* Copyright (c) 2004-2015. 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. */
/* 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.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "src/kernel/lmm/maxmin.hpp"
#include "xbt/module.h"
#include "xbt/module.h"
+#include "xbt/sysdep.h" /* time manipulation for benchmarking */
#include "xbt/xbt_os_time.h"
#include "xbt/xbt_os_time.h"
-#include "xbt/sysdep.h" /* time manipulation for benchmarking */
-#define MYRANDMAX 1000
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdint.h>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
double date;
int64_t seedx = 0;
double date;
int64_t seedx = 0;
@@
-27,42
+25,43
@@
static int myrand() {
static double float_random(double max)
{
static double float_random(double max)
{
+ constexpr double MYRANDMAX = 1000.0;
return ((max * myrand()) / (MYRANDMAX + 1.0));
}
static unsigned int int_random(int max)
{
return ((max * myrand()) / (MYRANDMAX + 1.0));
}
static unsigned int int_random(int max)
{
- return static_cast<uint32_t>(
((max * 1.0) * myrand()) / (MYRANDMAX + 1.0
));
+ return static_cast<uint32_t>(
float_random(max
));
}
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)
{
}
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)
{
- lmm_constraint_t cnst[nb_cnst];
- lmm_variable_t var[nb_var];
- int used[nb_cnst];
- int concurrency_share;
+ simgrid::kernel::lmm::Constraint** cnst = new simgrid::kernel::lmm::Constraint*[nb_cnst];
+ simgrid::kernel::lmm::Variable** var = new simgrid::kernel::lmm::Variable*[nb_var];
+ int* used = new int[nb_cnst];
- lmm_system_t Sys = lmm_system_new(1);
+ /* We cannot activate the selective update as we pass nullptr as an Action when creating the variables */
+ simgrid::kernel::lmm::System* Sys = new simgrid::kernel::lmm::System(false);
for (int i = 0; i < nb_cnst; i++) {
for (int i = 0; i < nb_cnst; i++) {
- cnst[i] =
lmm_constraint_new(Sys,
NULL, float_random(10.0));
+ cnst[i] =
Sys->constraint_new(
NULL, float_random(10.0));
int l;
if(rate_no_limit>float_random(1.0))
int l;
if(rate_no_limit>float_random(1.0))
- //Look at what happens when there is no concurrency limit
+ //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<<int_random(pw_max_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<<int_random(pw_max_limit));
-
lmm_constraint_concurrency_limit_set(cnst[i],l
);
+
cnst[i]->set_concurrency_limit(l
);
}
for (int i = 0; i < nb_var; i++) {
}
for (int i = 0; i < nb_var; i++) {
- var[i] =
lmm_variable_new(Sys,
NULL, 1.0, -1.0, nb_elem);
+ 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)
//Have a few variables with a concurrency share of two (e.g. cross-traffic in some cases)
-
concurrency_share=1+
int_random(max_share);
-
lmm_variable_concurrency_share_set(var[i],
concurrency_share);
+
int concurrency_share = 1 +
int_random(max_share);
+
var[i]->set_concurrency_share(
concurrency_share);
for (int j = 0; j < nb_cnst; j++)
used[j] = 0;
for (int j = 0; j < nb_cnst; j++)
used[j] = 0;
@@
-72,52
+71,57
@@
static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limi
j--;
continue;
}
j--;
continue;
}
-
lmm_expand(Sys,
cnst[k], var[i], float_random(1.5));
-
lmm_expand_add(Sys,
cnst[k], var[i], float_random(1.5));
+
Sys->expand(
cnst[k], var[i], float_random(1.5));
+
Sys->expand_add(
cnst[k], var[i], float_random(1.5));
used[k]++;
}
}
fprintf(stderr,"Starting to solve(%i)\n",myrand()%1000);
date = xbt_os_time() * 1000000;
used[k]++;
}
}
fprintf(stderr,"Starting to solve(%i)\n",myrand()%1000);
date = xbt_os_time() * 1000000;
-
lmm_solve(Sys
);
+
Sys->solve(
);
date = xbt_os_time() * 1000000 - date;
if(mode==2){
fprintf(stderr,"Max concurrency:\n");
int l=0;
for (int i = 0; i < nb_cnst; i++) {
date = xbt_os_time() * 1000000 - date;
if(mode==2){
fprintf(stderr,"Max concurrency:\n");
int l=0;
for (int i = 0; i < nb_cnst; i++) {
- int j
=lmm_constraint_concurrency_maximum_get(cnst[i]
);
- int k
=lmm_constraint_concurrency_limit_get(cnst[i]
);
+ int j
= cnst[i]->get_concurrency_maximum(
);
+ int k
= cnst[i]->get_concurrency_limit(
);
xbt_assert(k<0 || j<=k);
if(j>l)
l=j;
fprintf(stderr,"(%i):%i/%i ",i,j,k);
xbt_assert(k<0 || j<=k);
if(j>l)
l=j;
fprintf(stderr,"(%i):%i/%i ",i,j,k);
-
lmm_constraint_concurrency_maximum_reset(cnst[i]
);
- xbt_assert(
!lmm_constraint_concurrency_maximum_get(cnst[i]
));
+
cnst[i]->reset_concurrency_maximum(
);
+ xbt_assert(
not cnst[i]->get_concurrency_maximum(
));
if(i%10==9)
fprintf(stderr,"\n");
}
fprintf(stderr,"\nTotal maximum concurrency is %i\n",l);
if(i%10==9)
fprintf(stderr,"\n");
}
fprintf(stderr,"\nTotal maximum concurrency is %i\n",l);
-
lmm_print(Sys
);
+
Sys->print(
);
}
for (int i = 0; i < nb_var; i++)
}
for (int i = 0; i < nb_var; i++)
- lmm_variable_free(Sys, var[i]);
- lmm_system_free(Sys);
+ Sys->variable_free(var[i]);
+ delete Sys;
+ delete[] cnst;
+ delete[] var;
+ delete[] used;
}
unsigned int TestClasses [][4]=
}
unsigned int TestClasses [][4]=
- //Nbcnst Nbvar Baselimit Maxlimit
+ //Nbcnst Nbvar Baselimit Maxlimit
{{ 10 ,10 ,1 ,2 }, //small
{ 100 ,100 ,3 ,6 }, //medium
{ 2000,2000 ,5 ,8 }, //big
{ 20000,20000 ,7 ,10} //huge
{{ 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)
{
int main(int argc, char **argv)
{
+ simgrid::s4u::Engine e(&argc, argv);
+
float rate_no_limit=0.2;
float acc_date=0;
float acc_date2=0;
float rate_no_limit=0.2;
float acc_date=0;
float acc_date2=0;
@@
-129,14
+133,14
@@
int main(int argc, char **argv)
}
//what class?
}
//what class?
- if
(!strcmp(argv[1],
"small"))
-
testclass=
0;
- else if
(!strcmp(argv[1],
"medium"))
-
testclass=
1;
- else if
(!strcmp(argv[1],
"big"))
-
testclass=
2;
- else if
(!strcmp(argv[1],
"huge"))
-
testclass=
3;
+ if
(not strcmp(argv[1],
"small"))
+
testclass =
0;
+ else if
(not strcmp(argv[1],
"medium"))
+
testclass =
1;
+ else if
(not strcmp(argv[1],
"big"))
+
testclass =
2;
+ else if
(not strcmp(argv[1],
"huge"))
+
testclass =
3;
else {
fprintf(stderr, "Unknown class \"%s\", aborting!\n",argv[1]);
return -2;
else {
fprintf(stderr, "Unknown class \"%s\", aborting!\n",argv[1]);
return -2;
@@
-155,8
+159,8
@@
int main(int argc, char **argv)
mode=3;
if(mode==1)
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");
if(mode==2)
xbt_log_control_set("surf/maxmin.threshold:DEBUG surf.threshold:DEBUG");
@@
-165,7
+169,7
@@
int main(int argc, char **argv)
unsigned int nb_var= TestClasses[testclass][1];
unsigned int pw_base_limit= TestClasses[testclass][2];
unsigned int pw_max_limit= TestClasses[testclass][3];
unsigned int nb_var= TestClasses[testclass][1];
unsigned int pw_base_limit= TestClasses[testclass][2];
unsigned int pw_max_limit= TestClasses[testclass][3];
- unsigned int max_share
=2; //1<<(pw_base_limit/2+1);
+ unsigned int max_share
= 2; // 1<<(pw_base_limit/2+1)
//If you want to test concurrency, you need nb_elem >> 2^pw_base_limit:
unsigned int nb_elem= (1<<pw_base_limit)+(1<<(8*pw_max_limit/10));
//If you want to test concurrency, you need nb_elem >> 2^pw_base_limit:
unsigned int nb_elem= (1<<pw_base_limit)+(1<<(8*pw_max_limit/10));
@@
-180,13
+184,13
@@
int main(int argc, char **argv)
acc_date2+=date*date;
}
acc_date2+=date*date;
}
- float mean_date= acc_date/(float)testcount;
+ float mean_date= acc_date/(float)testcount;
float stdev_date= sqrt(acc_date2/(float)testcount-mean_date*mean_date);
float stdev_date= sqrt(acc_date2/(float)testcount-mean_date*mean_date);
- fprintf(stderr,
- "%ix One shot execution time for a total of %d constraints, "
-
"%d variables with %d active constraint each, concurrency in [%i,%i] and max concurrency share %i\n"
,
-
testcount,nb_cnst, nb_var, nb_elem, (1<<pw_base_limit), (1<<pw_base_limit)+(1<<pw_max_limit),
max_share);
+ 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",
+
testcount, nb_cnst, nb_var, nb_elem, (1 << pw_base_limit), (1 << pw_base_limit) + (1 << pw_max_limit)
,
+ max_share);
if(mode==3)
fprintf(stderr, "Execution time: %g +- %g microseconds \n",mean_date, stdev_date);
if(mode==3)
fprintf(stderr, "Execution time: %g +- %g microseconds \n",mean_date, stdev_date);