From 0b17dd5e179f8d30e76445c121d88c0a0df24c2b Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Sat, 18 Feb 2023 17:59:53 +0100 Subject: [PATCH] Move the surf tesh tests with the other models' ones --- .gitignore | 8 +- teshsuite/models/CMakeLists.txt | 14 ++- .../core_usage/core_usage.cpp} | 4 +- teshsuite/models/core_usage/core_usage.tesh | 68 ++++++++++++++ .../core_usage2/core_usage2.cpp} | 4 +- teshsuite/models/core_usage2/core_usage2.tesh | 66 ++++++++++++++ .../{surf => models}/lmm_usage/lmm_usage.cpp | 30 +++---- teshsuite/models/lmm_usage/lmm_usage.tesh | 6 ++ .../maxmin_bench/maxmin_bench.cpp | 89 ++++++++++--------- .../maxmin_bench/maxmin_bench_large.tesh | 0 .../maxmin_bench/maxmin_bench_medium.tesh | 0 .../maxmin_bench/maxmin_bench_small.tesh | 0 teshsuite/surf/CMakeLists.txt | 33 ------- teshsuite/surf/lmm_usage/lmm_usage.tesh | 6 -- teshsuite/surf/surf_usage/surf_usage.tesh | 68 -------------- teshsuite/surf/surf_usage2/surf_usage2.tesh | 66 -------------- tools/cmake/DefinePackages.cmake | 1 - 17 files changed, 221 insertions(+), 242 deletions(-) rename teshsuite/{surf/surf_usage/surf_usage.cpp => models/core_usage/core_usage.cpp} (96%) create mode 100644 teshsuite/models/core_usage/core_usage.tesh rename teshsuite/{surf/surf_usage2/surf_usage2.cpp => models/core_usage2/core_usage2.cpp} (94%) create mode 100644 teshsuite/models/core_usage2/core_usage2.tesh rename teshsuite/{surf => models}/lmm_usage/lmm_usage.cpp (81%) create mode 100644 teshsuite/models/lmm_usage/lmm_usage.tesh rename teshsuite/{surf => models}/maxmin_bench/maxmin_bench.cpp (71%) rename teshsuite/{surf => models}/maxmin_bench/maxmin_bench_large.tesh (100%) rename teshsuite/{surf => models}/maxmin_bench/maxmin_bench_medium.tesh (100%) rename teshsuite/{surf => models}/maxmin_bench/maxmin_bench_small.tesh (100%) delete mode 100644 teshsuite/surf/CMakeLists.txt delete mode 100644 teshsuite/surf/lmm_usage/lmm_usage.tesh delete mode 100644 teshsuite/surf/surf_usage/surf_usage.tesh delete mode 100644 teshsuite/surf/surf_usage2/surf_usage2.tesh diff --git a/.gitignore b/.gitignore index 6f53812238..bd7820dd19 100644 --- a/.gitignore +++ b/.gitignore @@ -841,10 +841,10 @@ teshsuite/smpi/type-hvector/type-hvector teshsuite/smpi/type-indexed/type-indexed teshsuite/smpi/type-struct/type-struct teshsuite/smpi/type-vector/type-vector -teshsuite/surf/lmm_usage/lmm_usage -teshsuite/surf/maxmin_bench/maxmin_bench -teshsuite/surf/surf_usage/surf_usage -teshsuite/surf/surf_usage2/surf_usage2 +teshsuite/models/lmm_usage/lmm_usage +teshsuite/models/maxmin_bench/maxmin_bench +teshsuite/models/core_usage/core_usage +teshsuite/models/core_usage2/core_usage2 teshsuite/xbt/cmdline/cmdline teshsuite/xbt/log_large/log_large teshsuite/xbt/log_usage/log_usage diff --git a/teshsuite/models/CMakeLists.txt b/teshsuite/models/CMakeLists.txt index 2a3644e9a2..407b1bb124 100644 --- a/teshsuite/models/CMakeLists.txt +++ b/teshsuite/models/CMakeLists.txt @@ -6,7 +6,8 @@ else() set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) endforeach() endif() -foreach(x cloud-sharing ptask_L07_usage wifi_usage wifi_usage_decay cm02-set-lat-bw cm02-tcpgamma issue105 ${optional_examples}) +foreach(x lmm_usage core_usage core_usage2 + cloud-sharing ptask_L07_usage wifi_usage wifi_usage_decay cm02-set-lat-bw cm02-tcpgamma issue105 ${optional_examples}) add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.cpp) target_link_libraries(${x} simgrid) set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) @@ -34,6 +35,17 @@ foreach(x cm02-set-lat-bw) endif() endforeach() +# Benchmarking MaxMin +add_executable (maxmin_bench EXCLUDE_FROM_ALL maxmin_bench/maxmin_bench.cpp) +target_link_libraries(maxmin_bench simgrid) +set_target_properties(maxmin_bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/maxmin_bench) +set_property(TARGET maxmin_bench APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") +add_dependencies(tests maxmin_bench) +set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench/maxmin_bench.cpp) +foreach(x small medium large) + set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench/maxmin_bench_${x}.tesh) + ADD_TESH(tesh-maxmin-${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/models/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/models/maxmin_bench maxmin_bench_${x}.tesh) +endforeach() set(teshsuite_src ${teshsuite_src} PARENT_SCOPE) set(tesh_files ${tesh_files} PARENT_SCOPE) diff --git a/teshsuite/surf/surf_usage/surf_usage.cpp b/teshsuite/models/core_usage/core_usage.cpp similarity index 96% rename from teshsuite/surf/surf_usage/surf_usage.cpp rename to teshsuite/models/core_usage/core_usage.cpp index aa78b59ca1..a7388e0a14 100644 --- a/teshsuite/surf/surf_usage/surf_usage.cpp +++ b/teshsuite/models/core_usage/core_usage.cpp @@ -1,4 +1,4 @@ -/* A few basic tests for the surf library */ +/* A few basic tests for the model solving mechanism */ /* Copyright (c) 2004-2023. The SimGrid Team. All rights reserved. */ @@ -14,7 +14,7 @@ #include "src/kernel/resource/NetworkModel.hpp" #include "xbt/config.hpp" -XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(core_usage, "Messages specific to this test case"); static const char* string_action(simgrid::kernel::resource::Action::State state) { diff --git a/teshsuite/models/core_usage/core_usage.tesh b/teshsuite/models/core_usage/core_usage.tesh new file mode 100644 index 0000000000..6fc4741b26 --- /dev/null +++ b/teshsuite/models/core_usage/core_usage.tesh @@ -0,0 +1,68 @@ +#!/usr/bin/env tesh + +$ ${bindir:=.}/core_usage ${platfdir}/two_hosts_profiles.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02' +> [0.000000] [core_usage/INFO] actionA state: SURF_ACTION_RUNNING +> [0.000000] [core_usage/INFO] actionB state: SURF_ACTION_RUNNING +> [0.000000] [core_usage/INFO] actionC state: SURF_ACTION_RUNNING +> [0.200000] [core_usage/INFO] Next Event : 0.2 +> [0.200016] [core_usage/INFO] Next Event : 0.200016 +> [0.200016] [core_usage/INFO] Network Done action +> [1.000000] [core_usage/INFO] Next Event : 1 +> [1.000000] [core_usage/INFO] CPU Failed action +> [2.000000] [core_usage/INFO] Next Event : 2 +> [7.320000] [core_usage/INFO] Next Event : 7.32 +> [7.320000] [core_usage/INFO] CPU Done action +> [10.000000] [core_usage/INFO] Next Event : 10 +> [11.000000] [core_usage/INFO] Next Event : 11 +> [12.000000] [core_usage/INFO] Next Event : 12 +> [20.000000] [core_usage/INFO] Next Event : 20 +> [21.000000] [core_usage/INFO] Next Event : 21 +> [22.000000] [core_usage/INFO] Next Event : 22 +> [30.000000] [core_usage/INFO] Next Event : 30 +> [31.000000] [core_usage/INFO] Next Event : 31 +> [32.000000] [core_usage/INFO] Next Event : 32 +> [40.000000] [core_usage/INFO] Next Event : 40 +> [41.000000] [core_usage/INFO] Next Event : 41 +> [42.000000] [core_usage/INFO] Next Event : 42 +> [50.000000] [core_usage/INFO] Next Event : 50 +> [51.000000] [core_usage/INFO] Next Event : 51 +> [52.000000] [core_usage/INFO] Next Event : 52 +> [53.000000] [core_usage/INFO] Next Event : 53 +> [60.000000] [core_usage/INFO] Next Event : 60 +> [61.000000] [core_usage/INFO] Next Event : 61 +> [62.000000] [core_usage/INFO] Next Event : 62 +> [63.000000] [core_usage/INFO] Next Event : 63 +> [70.000000] [core_usage/INFO] Next Event : 70 +> [71.000000] [core_usage/INFO] Next Event : 71 +> [72.000000] [core_usage/INFO] Next Event : 72 +> [74.000000] [core_usage/INFO] Next Event : 74 +> [80.000000] [core_usage/INFO] Next Event : 80 +> [81.000000] [core_usage/INFO] Next Event : 81 +> [82.000000] [core_usage/INFO] Next Event : 82 +> [83.000000] [core_usage/INFO] Next Event : 83 +> [84.000000] [core_usage/INFO] Next Event : 84 +> [90.000000] [core_usage/INFO] Next Event : 90 +> [91.000000] [core_usage/INFO] Next Event : 91 +> [92.000000] [core_usage/INFO] Next Event : 92 +> [95.000000] [core_usage/INFO] Next Event : 95 +> [100.000000] [core_usage/INFO] Next Event : 100 +> [101.000000] [core_usage/INFO] Next Event : 101 +> [102.000000] [core_usage/INFO] Next Event : 102 +> [104.000000] [core_usage/INFO] Next Event : 104 +> [105.000000] [core_usage/INFO] Next Event : 105 +> [110.000000] [core_usage/INFO] Next Event : 110 +> [111.000000] [core_usage/INFO] Next Event : 111 +> [112.000000] [core_usage/INFO] Next Event : 112 +> [116.000000] [core_usage/INFO] Next Event : 116 +> [120.000000] [core_usage/INFO] Next Event : 120 +> [121.000000] [core_usage/INFO] Next Event : 121 +> [122.000000] [core_usage/INFO] Next Event : 122 +> [125.000000] [core_usage/INFO] Next Event : 125 +> [126.000000] [core_usage/INFO] Next Event : 126 +> [130.000000] [core_usage/INFO] Next Event : 130 +> [131.000000] [core_usage/INFO] Next Event : 131 +> [132.000000] [core_usage/INFO] Next Event : 132 +> [132.500000] [core_usage/INFO] Next Event : 132.5 +> [132.500000] [core_usage/INFO] CPU Done action diff --git a/teshsuite/surf/surf_usage2/surf_usage2.cpp b/teshsuite/models/core_usage2/core_usage2.cpp similarity index 94% rename from teshsuite/surf/surf_usage2/surf_usage2.cpp rename to teshsuite/models/core_usage2/core_usage2.cpp index 2bec300c2b..608c7ac1a8 100644 --- a/teshsuite/surf/surf_usage2/surf_usage2.cpp +++ b/teshsuite/models/core_usage2/core_usage2.cpp @@ -1,4 +1,4 @@ -/* A few basic tests for the surf library */ +/* A few basic tests for the model solving mechanism */ /* Copyright (c) 2004-2023. The SimGrid Team. All rights reserved. */ @@ -14,7 +14,7 @@ #include "src/kernel/resource/NetworkModel.hpp" #include "xbt/config.hpp" -XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(core_usage2, "Messages specific to this test case"); int main(int argc, char** argv) { diff --git a/teshsuite/models/core_usage2/core_usage2.tesh b/teshsuite/models/core_usage2/core_usage2.tesh new file mode 100644 index 0000000000..9be15bce43 --- /dev/null +++ b/teshsuite/models/core_usage2/core_usage2.tesh @@ -0,0 +1,66 @@ +#!/usr/bin/env tesh + +$ ${bindir:=.}/core_usage2 ${platfdir}/two_hosts_profiles.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02' +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' +> [0.200000] [core_usage2/INFO] Next Event : 0.2 +> [0.200016] [core_usage2/INFO] Next Event : 0.200016 +> [0.200016] [core_usage2/INFO] * Done Action +> [1.000000] [core_usage2/INFO] Next Event : 1 +> [1.000000] [core_usage2/INFO] * Done Action +> [2.000000] [core_usage2/INFO] Next Event : 2 +> [7.320000] [core_usage2/INFO] Next Event : 7.32 +> [7.320000] [core_usage2/INFO] * Done Action +> [10.000000] [core_usage2/INFO] Next Event : 10 +> [11.000000] [core_usage2/INFO] Next Event : 11 +> [12.000000] [core_usage2/INFO] Next Event : 12 +> [20.000000] [core_usage2/INFO] Next Event : 20 +> [21.000000] [core_usage2/INFO] Next Event : 21 +> [22.000000] [core_usage2/INFO] Next Event : 22 +> [30.000000] [core_usage2/INFO] Next Event : 30 +> [31.000000] [core_usage2/INFO] Next Event : 31 +> [32.000000] [core_usage2/INFO] Next Event : 32 +> [40.000000] [core_usage2/INFO] Next Event : 40 +> [41.000000] [core_usage2/INFO] Next Event : 41 +> [42.000000] [core_usage2/INFO] Next Event : 42 +> [50.000000] [core_usage2/INFO] Next Event : 50 +> [51.000000] [core_usage2/INFO] Next Event : 51 +> [52.000000] [core_usage2/INFO] Next Event : 52 +> [53.000000] [core_usage2/INFO] Next Event : 53 +> [60.000000] [core_usage2/INFO] Next Event : 60 +> [61.000000] [core_usage2/INFO] Next Event : 61 +> [62.000000] [core_usage2/INFO] Next Event : 62 +> [63.000000] [core_usage2/INFO] Next Event : 63 +> [70.000000] [core_usage2/INFO] Next Event : 70 +> [71.000000] [core_usage2/INFO] Next Event : 71 +> [72.000000] [core_usage2/INFO] Next Event : 72 +> [74.000000] [core_usage2/INFO] Next Event : 74 +> [80.000000] [core_usage2/INFO] Next Event : 80 +> [81.000000] [core_usage2/INFO] Next Event : 81 +> [82.000000] [core_usage2/INFO] Next Event : 82 +> [83.000000] [core_usage2/INFO] Next Event : 83 +> [84.000000] [core_usage2/INFO] Next Event : 84 +> [90.000000] [core_usage2/INFO] Next Event : 90 +> [91.000000] [core_usage2/INFO] Next Event : 91 +> [92.000000] [core_usage2/INFO] Next Event : 92 +> [95.000000] [core_usage2/INFO] Next Event : 95 +> [100.000000] [core_usage2/INFO] Next Event : 100 +> [101.000000] [core_usage2/INFO] Next Event : 101 +> [102.000000] [core_usage2/INFO] Next Event : 102 +> [104.000000] [core_usage2/INFO] Next Event : 104 +> [105.000000] [core_usage2/INFO] Next Event : 105 +> [110.000000] [core_usage2/INFO] Next Event : 110 +> [111.000000] [core_usage2/INFO] Next Event : 111 +> [112.000000] [core_usage2/INFO] Next Event : 112 +> [116.000000] [core_usage2/INFO] Next Event : 116 +> [120.000000] [core_usage2/INFO] Next Event : 120 +> [121.000000] [core_usage2/INFO] Next Event : 121 +> [122.000000] [core_usage2/INFO] Next Event : 122 +> [125.000000] [core_usage2/INFO] Next Event : 125 +> [126.000000] [core_usage2/INFO] Next Event : 126 +> [130.000000] [core_usage2/INFO] Next Event : 130 +> [131.000000] [core_usage2/INFO] Next Event : 131 +> [132.000000] [core_usage2/INFO] Next Event : 132 +> [132.500000] [core_usage2/INFO] Next Event : 132.5 +> [132.500000] [core_usage2/INFO] * Done Action +> [132.500000] [core_usage2/INFO] Simulation Terminated diff --git a/teshsuite/surf/lmm_usage/lmm_usage.cpp b/teshsuite/models/lmm_usage/lmm_usage.cpp similarity index 81% rename from teshsuite/surf/lmm_usage/lmm_usage.cpp rename to teshsuite/models/lmm_usage/lmm_usage.cpp index 3e40583aba..c37cfdc0c1 100644 --- a/teshsuite/surf/lmm_usage/lmm_usage.cpp +++ b/teshsuite/models/lmm_usage/lmm_usage.cpp @@ -14,7 +14,7 @@ #include #include -XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(test, "Messages specific for this example"); namespace lmm = simgrid::kernel::lmm; @@ -110,21 +110,21 @@ static void test3() } /*matrix that store the constraints/topology */ - A[0][1] = A[0][7] = 1.0; - A[1][1] = A[1][7] = A[1][8] = 1.0; - A[2][1] = A[2][8] = 1.0; - A[3][8] = 1.0; - A[4][0] = A[4][3] = A[4][9] = 1.0; - A[5][0] = A[5][3] = A[5][4] = A[5][9] = 1.0; - A[6][0] = A[6][4] = A[6][9] = A[6][10] = 1.0; + A[0][1] = A[0][7] = 1.0; + A[1][1] = A[1][7] = A[1][8] = 1.0; + A[2][1] = A[2][8] = 1.0; + A[3][8] = 1.0; + A[4][0] = A[4][3] = A[4][9] = 1.0; + A[5][0] = A[5][3] = A[5][4] = A[5][9] = 1.0; + A[6][0] = A[6][4] = A[6][9] = A[6][10] = 1.0; A[7][2] = A[7][4] = A[7][6] = A[7][9] = A[7][10] = 1.0; - A[8][2] = A[8][10] = 1.0; - A[9][5] = A[9][6] = A[9][9] = 1.0; - A[10][11] = 1.0; - A[11][12] = 1.0; - A[12][13] = 1.0; - A[13][14] = 1.0; - A[14][15] = 1.0; + A[8][2] = A[8][10] = 1.0; + A[9][5] = A[9][6] = A[9][9] = 1.0; + A[10][11] = 1.0; + A[11][12] = 1.0; + A[12][13] = 1.0; + A[13][14] = 1.0; + A[14][15] = 1.0; lmm::MaxMin Sys(false); diff --git a/teshsuite/models/lmm_usage/lmm_usage.tesh b/teshsuite/models/lmm_usage/lmm_usage.tesh new file mode 100644 index 0000000000..77ce1b73dc --- /dev/null +++ b/teshsuite/models/lmm_usage/lmm_usage.tesh @@ -0,0 +1,6 @@ +#!/usr/bin/env tesh + +$ ${bindir:=.}/lmm_usage +> [0.000000] [test/INFO] ***** Test 1 +> [0.000000] [test/INFO] ***** Test 2 +> [0.000000] [test/INFO] ***** Test 3 diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp b/teshsuite/models/maxmin_bench/maxmin_bench.cpp similarity index 71% rename from teshsuite/surf/maxmin_bench/maxmin_bench.cpp rename to teshsuite/models/maxmin_bench/maxmin_bench.cpp index d316afdf42..d905956d18 100644 --- a/teshsuite/surf/maxmin_bench/maxmin_bench.cpp +++ b/teshsuite/models/maxmin_bench/maxmin_bench.cpp @@ -5,8 +5,8 @@ /* 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/s4u/Engine.hpp" +#include "src/kernel/lmm/maxmin.hpp" #include "xbt/module.h" #include "xbt/random.hpp" #include "xbt/sysdep.h" /* time manipulation for benchmarking */ @@ -41,7 +41,7 @@ static double test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_li 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) + // Have a few variables with a concurrency share of two (e.g. cross-traffic in some cases) short concurrency_share = 1 + static_cast(simgrid::xbt::random::uniform_int(0, max_share - 1)); std::vector used(nb_cnst, 0); @@ -61,22 +61,22 @@ static double test(int nb_cnst, int nb_var, int nb_elem, unsigned int pw_base_li Sys.solve(); date = (xbt_os_time() - date) * 1e6; - if(mode==2){ - fprintf(stderr,"Max concurrency:\n"); - int l=0; + if (mode == 2) { + fprintf(stderr, "Max concurrency:\n"); + int l = 0; for (int i = 0; i < nb_cnst; i++) { 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); + xbt_assert(k < 0 || j <= k); + if (j > l) + l = j; + fprintf(stderr, "(%i):%i/%i ", i, j, k); constraints[i]->reset_concurrency_maximum(); xbt_assert(not constraints[i]->get_concurrency_maximum()); - if(i%10==9) - fprintf(stderr,"\n"); + if (i % 10 == 9) + fprintf(stderr, "\n"); } - fprintf(stderr,"\nTotal maximum concurrency is %i\n",l); + fprintf(stderr, "\nTotal maximum concurrency is %i\n", l); Sys.print(); } @@ -95,7 +95,7 @@ constexpr std::array, 4> TestClasses{{ {{20000, 20000, 7, 10}} // huge }}; -int main(int argc, char **argv) +int main(int argc, char** argv) { simgrid::s4u::Engine e(&argc, argv); @@ -104,12 +104,12 @@ int main(int argc, char **argv) double acc_date2 = 0.0; int testclass; - if(argc<3) { + if (argc < 3) { fprintf(stderr, "Syntax: [test|debug|perf]\n"); return -1; } - //what class? + // what class? if (not strcmp(argv[1], "small")) testclass = 0; else if (not strcmp(argv[1], "medium")) @@ -119,57 +119,58 @@ int main(int argc, char **argv) else if (not strcmp(argv[1], "huge")) testclass = 3; else { - fprintf(stderr, "Unknown class \"%s\", aborting!\n",argv[1]); + fprintf(stderr, "Unknown class \"%s\", aborting!\n", argv[1]); return -2; } - //How many times? - int testcount=atoi(argv[2]); + // How many times? + int testcount = atoi(argv[2]); - //Show me everything (debug or performance)! - int mode=0; - if(argc>=4 && strcmp(argv[3],"test")==0) - mode=1; - if(argc>=4 && strcmp(argv[3],"debug")==0) - mode=2; - if(argc>=4 && strcmp(argv[3],"perf")==0) - mode=3; + // Show me everything (debug or performance)! + int mode = 0; + if (argc >= 4 && strcmp(argv[3], "test") == 0) + mode = 1; + if (argc >= 4 && strcmp(argv[3], "debug") == 0) + mode = 2; + if (argc >= 4 && strcmp(argv[3], "perf") == 0) + mode = 3; - if(mode==1) + if (mode == 1) 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) + if (mode == 2) 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]; - 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 nb_cnst = TestClasses[testclass][0]; + 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) - //If you want to test concurrency, you need nb_elem >> 2^pw_base_limit: - unsigned int nb_elem= (1<> 2^pw_base_limit: + unsigned int nb_elem = (1 << pw_base_limit) + (1 << (8 * pw_max_limit / 10)); + // Otherwise, just set it to a constant value (and set rate_no_limit to 1.0): + // 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", + 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); return 0; } diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh b/teshsuite/models/maxmin_bench/maxmin_bench_large.tesh similarity index 100% rename from teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh rename to teshsuite/models/maxmin_bench/maxmin_bench_large.tesh diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh b/teshsuite/models/maxmin_bench/maxmin_bench_medium.tesh similarity index 100% rename from teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh rename to teshsuite/models/maxmin_bench/maxmin_bench_medium.tesh diff --git a/teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh b/teshsuite/models/maxmin_bench/maxmin_bench_small.tesh similarity index 100% rename from teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh rename to teshsuite/models/maxmin_bench/maxmin_bench_small.tesh diff --git a/teshsuite/surf/CMakeLists.txt b/teshsuite/surf/CMakeLists.txt deleted file mode 100644 index a9346ba940..0000000000 --- a/teshsuite/surf/CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ -foreach(x lmm_usage surf_usage surf_usage2) - add_executable (${x} EXCLUDE_FROM_ALL ${x}/${x}.cpp) - target_link_libraries(${x} simgrid) - set_target_properties(${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x}) - set_property(TARGET ${x} APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") - add_dependencies(tests ${x}) - - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh) - set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp) - - ADD_TESH(tesh-surf-${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/${x} ${x}.tesh) -endforeach() - -add_executable (maxmin_bench EXCLUDE_FROM_ALL maxmin_bench/maxmin_bench.cpp) -target_link_libraries(maxmin_bench simgrid) -set_target_properties(maxmin_bench PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/maxmin_bench) -set_property(TARGET maxmin_bench APPEND PROPERTY INCLUDE_DIRECTORIES "${INTERNAL_INCLUDES}") -add_dependencies(tests maxmin_bench) - -foreach(x small medium large) - set(tesh_files ${tesh_files} ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench/maxmin_bench_${x}.tesh) -endforeach() - -set(tesh_files ${tesh_files} PARENT_SCOPE) -set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench/maxmin_bench.cpp PARENT_SCOPE) - -ADD_TESH(tesh-surf-maxmin-large --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench_large.tesh) - -if(enable_debug) - foreach(x small medium) - ADD_TESH(tesh-surf-maxmin-${x} --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench_${x}.tesh) - endforeach() -endif() \ No newline at end of file diff --git a/teshsuite/surf/lmm_usage/lmm_usage.tesh b/teshsuite/surf/lmm_usage/lmm_usage.tesh deleted file mode 100644 index 1ab150d6b2..0000000000 --- a/teshsuite/surf/lmm_usage/lmm_usage.tesh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env tesh - -$ ${bindir:=.}/lmm_usage -> [0.000000] [surf_test/INFO] ***** Test 1 -> [0.000000] [surf_test/INFO] ***** Test 2 -> [0.000000] [surf_test/INFO] ***** Test 3 diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh deleted file mode 100644 index 083d5528b8..0000000000 --- a/teshsuite/surf/surf_usage/surf_usage.tesh +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env tesh - -$ ${bindir:=.}/surf_usage ${platfdir}/two_hosts_profiles.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02' -> [0.000000] [surf_test/INFO] actionA state: SURF_ACTION_RUNNING -> [0.000000] [surf_test/INFO] actionB state: SURF_ACTION_RUNNING -> [0.000000] [surf_test/INFO] actionC state: SURF_ACTION_RUNNING -> [0.200000] [surf_test/INFO] Next Event : 0.2 -> [0.200016] [surf_test/INFO] Next Event : 0.200016 -> [0.200016] [surf_test/INFO] Network Done action -> [1.000000] [surf_test/INFO] Next Event : 1 -> [1.000000] [surf_test/INFO] CPU Failed action -> [2.000000] [surf_test/INFO] Next Event : 2 -> [7.320000] [surf_test/INFO] Next Event : 7.32 -> [7.320000] [surf_test/INFO] CPU Done action -> [10.000000] [surf_test/INFO] Next Event : 10 -> [11.000000] [surf_test/INFO] Next Event : 11 -> [12.000000] [surf_test/INFO] Next Event : 12 -> [20.000000] [surf_test/INFO] Next Event : 20 -> [21.000000] [surf_test/INFO] Next Event : 21 -> [22.000000] [surf_test/INFO] Next Event : 22 -> [30.000000] [surf_test/INFO] Next Event : 30 -> [31.000000] [surf_test/INFO] Next Event : 31 -> [32.000000] [surf_test/INFO] Next Event : 32 -> [40.000000] [surf_test/INFO] Next Event : 40 -> [41.000000] [surf_test/INFO] Next Event : 41 -> [42.000000] [surf_test/INFO] Next Event : 42 -> [50.000000] [surf_test/INFO] Next Event : 50 -> [51.000000] [surf_test/INFO] Next Event : 51 -> [52.000000] [surf_test/INFO] Next Event : 52 -> [53.000000] [surf_test/INFO] Next Event : 53 -> [60.000000] [surf_test/INFO] Next Event : 60 -> [61.000000] [surf_test/INFO] Next Event : 61 -> [62.000000] [surf_test/INFO] Next Event : 62 -> [63.000000] [surf_test/INFO] Next Event : 63 -> [70.000000] [surf_test/INFO] Next Event : 70 -> [71.000000] [surf_test/INFO] Next Event : 71 -> [72.000000] [surf_test/INFO] Next Event : 72 -> [74.000000] [surf_test/INFO] Next Event : 74 -> [80.000000] [surf_test/INFO] Next Event : 80 -> [81.000000] [surf_test/INFO] Next Event : 81 -> [82.000000] [surf_test/INFO] Next Event : 82 -> [83.000000] [surf_test/INFO] Next Event : 83 -> [84.000000] [surf_test/INFO] Next Event : 84 -> [90.000000] [surf_test/INFO] Next Event : 90 -> [91.000000] [surf_test/INFO] Next Event : 91 -> [92.000000] [surf_test/INFO] Next Event : 92 -> [95.000000] [surf_test/INFO] Next Event : 95 -> [100.000000] [surf_test/INFO] Next Event : 100 -> [101.000000] [surf_test/INFO] Next Event : 101 -> [102.000000] [surf_test/INFO] Next Event : 102 -> [104.000000] [surf_test/INFO] Next Event : 104 -> [105.000000] [surf_test/INFO] Next Event : 105 -> [110.000000] [surf_test/INFO] Next Event : 110 -> [111.000000] [surf_test/INFO] Next Event : 111 -> [112.000000] [surf_test/INFO] Next Event : 112 -> [116.000000] [surf_test/INFO] Next Event : 116 -> [120.000000] [surf_test/INFO] Next Event : 120 -> [121.000000] [surf_test/INFO] Next Event : 121 -> [122.000000] [surf_test/INFO] Next Event : 122 -> [125.000000] [surf_test/INFO] Next Event : 125 -> [126.000000] [surf_test/INFO] Next Event : 126 -> [130.000000] [surf_test/INFO] Next Event : 130 -> [131.000000] [surf_test/INFO] Next Event : 131 -> [132.000000] [surf_test/INFO] Next Event : 132 -> [132.500000] [surf_test/INFO] Next Event : 132.5 -> [132.500000] [surf_test/INFO] CPU Done action diff --git a/teshsuite/surf/surf_usage2/surf_usage2.tesh b/teshsuite/surf/surf_usage2/surf_usage2.tesh deleted file mode 100644 index a89c4fe129..0000000000 --- a/teshsuite/surf/surf_usage2/surf_usage2.tesh +++ /dev/null @@ -1,66 +0,0 @@ -#!/usr/bin/env tesh - -$ ${bindir:=.}/surf_usage2 ${platfdir}/two_hosts_profiles.xml -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02' -> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01' -> [0.200000] [surf_test/INFO] Next Event : 0.2 -> [0.200016] [surf_test/INFO] Next Event : 0.200016 -> [0.200016] [surf_test/INFO] * Done Action -> [1.000000] [surf_test/INFO] Next Event : 1 -> [1.000000] [surf_test/INFO] * Done Action -> [2.000000] [surf_test/INFO] Next Event : 2 -> [7.320000] [surf_test/INFO] Next Event : 7.32 -> [7.320000] [surf_test/INFO] * Done Action -> [10.000000] [surf_test/INFO] Next Event : 10 -> [11.000000] [surf_test/INFO] Next Event : 11 -> [12.000000] [surf_test/INFO] Next Event : 12 -> [20.000000] [surf_test/INFO] Next Event : 20 -> [21.000000] [surf_test/INFO] Next Event : 21 -> [22.000000] [surf_test/INFO] Next Event : 22 -> [30.000000] [surf_test/INFO] Next Event : 30 -> [31.000000] [surf_test/INFO] Next Event : 31 -> [32.000000] [surf_test/INFO] Next Event : 32 -> [40.000000] [surf_test/INFO] Next Event : 40 -> [41.000000] [surf_test/INFO] Next Event : 41 -> [42.000000] [surf_test/INFO] Next Event : 42 -> [50.000000] [surf_test/INFO] Next Event : 50 -> [51.000000] [surf_test/INFO] Next Event : 51 -> [52.000000] [surf_test/INFO] Next Event : 52 -> [53.000000] [surf_test/INFO] Next Event : 53 -> [60.000000] [surf_test/INFO] Next Event : 60 -> [61.000000] [surf_test/INFO] Next Event : 61 -> [62.000000] [surf_test/INFO] Next Event : 62 -> [63.000000] [surf_test/INFO] Next Event : 63 -> [70.000000] [surf_test/INFO] Next Event : 70 -> [71.000000] [surf_test/INFO] Next Event : 71 -> [72.000000] [surf_test/INFO] Next Event : 72 -> [74.000000] [surf_test/INFO] Next Event : 74 -> [80.000000] [surf_test/INFO] Next Event : 80 -> [81.000000] [surf_test/INFO] Next Event : 81 -> [82.000000] [surf_test/INFO] Next Event : 82 -> [83.000000] [surf_test/INFO] Next Event : 83 -> [84.000000] [surf_test/INFO] Next Event : 84 -> [90.000000] [surf_test/INFO] Next Event : 90 -> [91.000000] [surf_test/INFO] Next Event : 91 -> [92.000000] [surf_test/INFO] Next Event : 92 -> [95.000000] [surf_test/INFO] Next Event : 95 -> [100.000000] [surf_test/INFO] Next Event : 100 -> [101.000000] [surf_test/INFO] Next Event : 101 -> [102.000000] [surf_test/INFO] Next Event : 102 -> [104.000000] [surf_test/INFO] Next Event : 104 -> [105.000000] [surf_test/INFO] Next Event : 105 -> [110.000000] [surf_test/INFO] Next Event : 110 -> [111.000000] [surf_test/INFO] Next Event : 111 -> [112.000000] [surf_test/INFO] Next Event : 112 -> [116.000000] [surf_test/INFO] Next Event : 116 -> [120.000000] [surf_test/INFO] Next Event : 120 -> [121.000000] [surf_test/INFO] Next Event : 121 -> [122.000000] [surf_test/INFO] Next Event : 122 -> [125.000000] [surf_test/INFO] Next Event : 125 -> [126.000000] [surf_test/INFO] Next Event : 126 -> [130.000000] [surf_test/INFO] Next Event : 130 -> [131.000000] [surf_test/INFO] Next Event : 131 -> [132.000000] [surf_test/INFO] Next Event : 132 -> [132.500000] [surf_test/INFO] Next Event : 132.5 -> [132.500000] [surf_test/INFO] * Done Action -> [132.500000] [surf_test/INFO] Simulation Terminated diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake index e2b8ac2557..d4b5d5c389 100644 --- a/tools/cmake/DefinePackages.cmake +++ b/tools/cmake/DefinePackages.cmake @@ -985,7 +985,6 @@ set(CMAKEFILES_TXT teshsuite/smpi/mpich3-test/rma/CMakeLists.txt teshsuite/smpi/mpich3-test/topo/CMakeLists.txt - teshsuite/surf/CMakeLists.txt teshsuite/xbt/CMakeLists.txt tools/CMakeLists.txt tools/graphicator/CMakeLists.txt -- 2.20.1