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 'actor-yield' of github.com:Takishipp/simgrid into actor-yield
[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
bc5bbe5
..
d3408b1
100644
(file)
--- a/
teshsuite/surf/maxmin_bench/maxmin_bench.cpp
+++ b/
teshsuite/surf/maxmin_bench/maxmin_bench.cpp
@@
-1,21
+1,22
@@
/* A crash few tests for the maxmin library */
/* A crash few tests for the maxmin library */
-/* Copyright (c) 2004-201
5
. The SimGrid Team.
+/* Copyright (c) 2004-201
7
. 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. */
* 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.h"
+#include "surf/maxmin.hpp"
+#include "simgrid/msg.h"
#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
#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;
@@
-38,10
+39,9
@@
static unsigned int int_random(int 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 = xbt_new0(lmm_constraint_t, nb_cnst);
- lmm_variable_t *var = xbt_new0(lmm_variable_t, nb_var);
- int *used = xbt_new0(int, nb_cnst);
- int concurrency_share;
+ lmm_constraint_t cnst[nb_cnst];
+ lmm_variable_t var[nb_var];
+ int used[nb_cnst];
lmm_system_t Sys = lmm_system_new(1);
lmm_system_t Sys = lmm_system_new(1);
@@
-49,7
+49,7
@@
static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limi
cnst[i] = lmm_constraint_new(Sys, NULL, float_random(10.0));
int l;
if(rate_no_limit>float_random(1.0))
cnst[i] = lmm_constraint_new(Sys, NULL, float_random(10.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;
else
//Badly logarithmically random concurrency limit in [2^pw_base_limit+1,2^pw_base_limit+2^pw_max_limit]
@@
-61,7
+61,7
@@
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++) {
var[i] = lmm_variable_new(Sys, NULL, 1.0, -1.0, nb_elem);
//Have a few variables with a concurrency share of two (e.g. cross-traffic in some cases)
for (int i = 0; i < nb_var; i++) {
var[i] = lmm_variable_new(Sys, NULL, 1.0, -1.0, nb_elem);
//Have a few variables with a concurrency share of two (e.g. cross-traffic in some cases)
-
concurrency_share=1+
int_random(max_share);
+
int concurrency_share = 1 +
int_random(max_share);
lmm_variable_concurrency_share_set(var[i],concurrency_share);
for (int j = 0; j < nb_cnst; j++)
lmm_variable_concurrency_share_set(var[i],concurrency_share);
for (int j = 0; j < nb_cnst; j++)
@@
-94,7
+94,7
@@
static void test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_limi
l=j;
fprintf(stderr,"(%i):%i/%i ",i,j,k);
lmm_constraint_concurrency_maximum_reset(cnst[i]);
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]));
+ xbt_assert(
not
lmm_constraint_concurrency_maximum_get(cnst[i]));
if(i%10==9)
fprintf(stderr,"\n");
}
if(i%10==9)
fprintf(stderr,"\n");
}
@@
-106,21
+106,20
@@
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++)
lmm_variable_free(Sys, var[i]);
lmm_system_free(Sys);
for (int i = 0; i < nb_var; i++)
lmm_variable_free(Sys, var[i]);
lmm_system_free(Sys);
- free(cnst);
- free(var);
- free(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)
{
+ MSG_init(&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;
@@
-132,14
+131,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;
@@
-168,7
+167,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));
@@
-183,13
+182,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);