From fb55eed3fcaec103e31e5fcdbd2435303b75e8b7 Mon Sep 17 00:00:00 2001 From: suter Date: Wed, 20 Jun 2012 16:14:14 +0200 Subject: [PATCH 1/1] Add 2 tesh files for new stuff and make them part of the testsuite --- buildtools/Cmake/AddTests.cmake | 6 ++++-- examples/simdag/CMakeLists.txt | 2 ++ examples/simdag/test_simdag_comm_throttling.tesh | 13 +++++++++++++ examples/simdag/test_simdag_typed_tasks.tesh | 13 +++++++++++++ 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 examples/simdag/test_simdag_comm_throttling.tesh create mode 100644 examples/simdag/test_simdag_typed_tasks.tesh diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake index 631af8ca46..0d1bf41646 100644 --- a/buildtools/Cmake/AddTests.cmake +++ b/buildtools/Cmake/AddTests.cmake @@ -349,9 +349,11 @@ ENDIF(${ARCH_32_BITS}) # simdag examples ADD_TEST(simdag-test-simdag ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag.tesh) ADD_TEST(simdag-test-simdag2 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag2.tesh) -ADD_TEST(simdag-test-simdag-seq-access ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_seq_access.tesh) +ADD_TEST(simdag-test-seq-access ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_seq_access.tesh) +ADD_TEST(simdag-test-typed-tasks ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_typed_tasks.tesh) +ADD_TEST(simdag-test-comm-throttling ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_comm_throttling.tesh) ADD_TEST(simdag-test-prop ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/properties/test_prop.tesh) -ADD_TEST(simdag-minmin-test ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh) +ADD_TEST(simdag-test-minmin-scheduling ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh) ADD_TEST(msg-gtnets-crosstraffic-thread ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets-crosstraffic.tesh) if(CONTEXT_UCONTEXT) diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt index 6a619bb0f1..10b42fd579 100644 --- a/examples/simdag/CMakeLists.txt +++ b/examples/simdag/CMakeLists.txt @@ -55,6 +55,8 @@ set(tesh_files ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag2.tesh ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_seq_access.tesh ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_typed_tasks.tesh + ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_comm_throttling.tesh PARENT_SCOPE ) set(xml_files diff --git a/examples/simdag/test_simdag_comm_throttling.tesh b/examples/simdag/test_simdag_comm_throttling.tesh new file mode 100644 index 0000000000..ccc1313d02 --- /dev/null +++ b/examples/simdag/test_simdag_comm_throttling.tesh @@ -0,0 +1,13 @@ +#! ./tesh +p Modify the rate of communication tasks even when they are auto-scheduled + +$ $SG_TEST_EXENV ./sd_comm_throttling ${srcdir:=.}/2clusters.xml +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> [1.000000] [sd_comm_throttling/INFO] Simulation stopped after 1.0000 seconds +> [1.000000] [sd_comm_throttling/INFO] Task 'Task A' start time: 0.000000, finish time: 1.000000 +> [2.300300] [sd_comm_throttling/INFO] Simulation stopped after 2.3003 seconds +> [2.300300] [sd_comm_throttling/INFO] Task 'Task B' start time: 1.000000, finish time: 1.300300 +> [2.300300] [sd_comm_throttling/INFO] Task 'Task C' start time: 1.300300, finish time: 2.300300 +> [5.300600] [sd_comm_throttling/INFO] Simulation stopped after 5.3006 seconds +> [5.300600] [sd_comm_throttling/INFO] Task 'Task D' start time: 2.300300, finish time: 4.300600 +> [5.300600] [sd_comm_throttling/INFO] Task 'Task E' start time: 4.300600, finish time: 5.300600 diff --git a/examples/simdag/test_simdag_typed_tasks.tesh b/examples/simdag/test_simdag_typed_tasks.tesh new file mode 100644 index 0000000000..da1bc5af22 --- /dev/null +++ b/examples/simdag/test_simdag_typed_tasks.tesh @@ -0,0 +1,13 @@ +#! ./tesh +p Usage test of simdag's typed tasks + +$ $SG_TEST_EXENV ./sd_typed_tasks_test --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/2clusters.xml +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304' +> [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 +> [2.080300] [sd_typed_tasks_test/INFO] Task 'Seq. comp. 1' start time: 0.000000, finish time: 1.000000 +> [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 1' start time: 0.000000, finish time: 0.080000 +> [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 3' start time: 0.000000, finish time: 0.400000 +> [2.080300] [sd_typed_tasks_test/INFO] Task 'MxN redist' start time: 0.080000, finish time: 0.480300 +> [2.080300] [sd_typed_tasks_test/INFO] Task 'Par. Comp. 2' start time: 0.480300, finish time: 0.520300 +> [2.080300] [sd_typed_tasks_test/INFO] Task 'E2E comm.' start time: 1.000000, finish time: 1.080300 +> [2.080300] [sd_typed_tasks_test/INFO] Task 'Seq. comp 2.' start time: 1.080300, finish time: 2.080300 \ No newline at end of file -- 2.20.1