From 06e3509f987adba93a8b004710448daa6da8725d Mon Sep 17 00:00:00 2001 From: navarrop Date: Mon, 22 Nov 2010 14:29:32 +0000 Subject: [PATCH] Add tests for floyd model. git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8603 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- buildtools/Cmake/AddTests.cmake | 1 + .../simdag/platforms/basic_parsing_test.tesh | 8 + .../simdag/platforms/four_hosts_floyd.xml | 32 +++ .../simdag/platforms/four_hosts_floyd_bis.xml | 43 ++++ teshsuite/simdag/platforms/get_full_link.tesh | 187 ++++++++++++++++++ 5 files changed, 271 insertions(+) create mode 100644 teshsuite/simdag/platforms/four_hosts_floyd.xml create mode 100644 teshsuite/simdag/platforms/four_hosts_floyd_bis.xml create mode 100644 teshsuite/simdag/platforms/get_full_link.tesh diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index fa7f83c94b..18d2fca269 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -91,6 +91,7 @@ ADD_TEST(tesh-simdag-parser ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTO ADD_TEST(tesh-simdag-parser-bogus-symmetric ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms two_hosts_asymetric.tesh) ADD_TEST(tesh-simdag-parser-sym-full ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh) ADD_TEST(tesh-simdag-flatifier ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms flatifier.tesh) +ADD_TEST(tesh-simdag-full_links ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh) ADD_TEST(tesh-simdag-basic0 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic0.tesh) ADD_TEST(tesh-simdag-basic1 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic1.tesh) ADD_TEST(tesh-simdag-basic2 ${CMAKE_BINARY_DIR}/bin/tesh --cd ${PROJECT_DIRECTORY}/teshsuite simdag/basic2.tesh) diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh index c29d9d85f0..f3ebc6ce75 100644 --- a/teshsuite/simdag/platforms/basic_parsing_test.tesh +++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh @@ -65,3 +65,11 @@ $ ./basic_parsing_test two_hosts_multi_hop.xml $ ./basic_parsing_test two_hosts_one_link.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 > Workstation number: 2, link number: 2 + +$ ./basic_parsing_test ./four_hosts_floyd.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 4, link number: 5 + +$ ./basic_parsing_test ./four_hosts_floyd_bis.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 5, link number: 7 \ No newline at end of file diff --git a/teshsuite/simdag/platforms/four_hosts_floyd.xml b/teshsuite/simdag/platforms/four_hosts_floyd.xml new file mode 100644 index 0000000000..0802abfbf8 --- /dev/null +++ b/teshsuite/simdag/platforms/four_hosts_floyd.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml new file mode 100644 index 0000000000..579e2ad60a --- /dev/null +++ b/teshsuite/simdag/platforms/four_hosts_floyd_bis.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/teshsuite/simdag/platforms/get_full_link.tesh b/teshsuite/simdag/platforms/get_full_link.tesh new file mode 100644 index 0000000000..c08776a7aa --- /dev/null +++ b/teshsuite/simdag/platforms/get_full_link.tesh @@ -0,0 +1,187 @@ +#! ./tesh + +$ ./basic_parsing_test ./four_hosts_floyd.xml FULL_LINK +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 4, link number: 5 +> Route between host1 and host1 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Route between host1 and host2 +> Route size 1 +> Link link1: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host1 and host3 +> Route size 1 +> Link link2: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host1 and host4 +> Route size 2 +> Link link2: latency = 0.000050, bandwidth = 125000000.000000 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host2 and host1 +> Route size 1 +> Link link1: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host2 and host2 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Route between host2 and host3 +> Route size 1 +> Link link3: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host2 and host4 +> Route size 2 +> Link link3: latency = 0.000050, bandwidth = 125000000.000000 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host3 and host1 +> Route size 1 +> Link link2: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host3 and host2 +> Route size 1 +> Link link3: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host3 and host3 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Route between host3 and host4 +> Route size 1 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host4 and host1 +> Route size 2 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Link link2: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host4 and host2 +> Route size 2 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Link link3: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host4 and host3 +> Route size 1 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host4 and host4 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 + + + +$ ./basic_parsing_test ./four_hosts_floyd_bis.xml FULL_LINK +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> Workstation number: 5, link number: 7 +> Route between host1 and host1 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Route between host1 and host2 +> Route size 1 +> Link link1: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host1 and host3 +> Route size 1 +> Link link2: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host1 and host4 +> Route size 2 +> Link link2: latency = 0.000050, bandwidth = 125000000.000000 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host1 and host5 +> Route size 2 +> Link link1: latency = 0.000050, bandwidth = 125000000.000000 +> Link link5: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host2 and host1 +> Route size 1 +> Link link1: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host2 and host2 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Route between host2 and host3 +> Route size 1 +> Link link3: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host2 and host4 +> Route size 2 +> Link link3: latency = 0.000050, bandwidth = 125000000.000000 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host2 and host5 +> Route size 1 +> Link link5: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host3 and host1 +> Route size 1 +> Link link2: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host3 and host2 +> Route size 1 +> Link link3: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host3 and host3 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Route between host3 and host4 +> Route size 1 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host3 and host5 +> Route size 1 +> Link link6: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host4 and host1 +> Route size 2 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Link link2: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host4 and host2 +> Route size 2 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Link link3: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host4 and host3 +> Route size 1 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host4 and host4 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 +> Route between host4 and host5 +> Route size 2 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Link link6: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host5 and host1 +> Route size 2 +> Link link5: latency = 0.000050, bandwidth = 125000000.000000 +> Link link1: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host5 and host2 +> Route size 1 +> Link link5: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host5 and host3 +> Route size 1 +> Link link6: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000050, route bandwidth = 125000000.000000 +> Route between host5 and host4 +> Route size 2 +> Link link6: latency = 0.000050, bandwidth = 125000000.000000 +> Link link4: latency = 0.000050, bandwidth = 125000000.000000 +> Route latency = 0.000100, route bandwidth = 125000000.000000 +> Route between host5 and host5 +> Route size 1 +> Link __loopback__: latency = 0.000015, bandwidth = 498000000.000000 +> Route latency = 0.000015, route bandwidth = 498000000.000000 \ No newline at end of file -- 2.20.1