From 1195d3ca4bbf7e4cd2ce8c0c12e6f45af1dc705d Mon Sep 17 00:00:00 2001 From: suter Date: Mon, 26 Nov 2012 13:46:06 +0100 Subject: [PATCH] revalidate tesh outputs for simdag tests --- examples/simdag/dax/smalldax.tesh | 28 +++--- examples/simdag/dot/test_simdag_dotload.tesh | 97 ++++++++++---------- examples/simdag/scheduling/test_minmin.tesh | 51 +++++----- examples/simdag/test_simdag.tesh | 4 +- examples/simdag/test_simdag2.tesh | 2 +- examples/simdag/test_simdag_seq_access.tesh | 40 ++++---- 6 files changed, 112 insertions(+), 110 deletions(-) diff --git a/examples/simdag/dax/smalldax.tesh b/examples/simdag/dax/smalldax.tesh index 42c8194b3f..531d82d231 100644 --- a/examples/simdag/dax/smalldax.tesh +++ b/examples/simdag/dax/smalldax.tesh @@ -100,24 +100,24 @@ $ $SG_TEST_EXENV ${bindir:=.}/dax_test --log=no_loc ../2clusters.xml ./smalldax. > [0.000000] [sd_task/INFO] 3@task1_o3_end > [0.000000] [test/INFO] ------------------- Schedule tasks --------------------------- > [0.000000] [test/INFO] ------------------- Run the schedule --------------------------- -> [84.185919] [test/INFO] ------------------- Produce the trace file--------------------------- -> [84.185919] [test/INFO] Producing the trace of the run into ./smalldax.trace +> [84.066238] [test/INFO] ------------------- Produce the trace file--------------------------- +> [84.066238] [test/INFO] Producing the trace of the run into ./smalldax.trace $ cat ./smalldax.trace > [0.000000] C1-00 compute 0.000000 # root -> [0.030300] C1-01 compute 42000000000.000000 # 1@task1 -> [0.030300] C1-02 compute 42000000000.000000 # 2@task2 -> [42.060600] C1-03 compute 42000000000.000000 # 3@task1 +> [0.016300] C1-01 compute 42000000000.000000 # 1@task1 +> [0.016300] C1-02 compute 42000000000.000000 # 2@task2 +> [42.032600] C1-03 compute 42000000000.000000 # 3@task1 > [0.000000] C1-00 send C1-02 1000000.000000 # root_i2_2@task2 -> [0.030300] C1-02 recv C1-00 1000000.000000 # root_i2_2@task2 -> [42.030300] C1-01 send C1-03 1000000.000000 # 1@task1_o1_3@task1 -> [42.060600] C1-03 recv C1-01 1000000.000000 # 1@task1_o1_3@task1 -> [42.030300] C1-02 send C1-03 1000000.000000 # 2@task2_o2_3@task1 -> [42.060600] C1-03 recv C1-02 1000000.000000 # 2@task2_o2_3@task1 -> [84.060600] C1-03 send C1-00 4167312.000000 # 3@task1_o3_end -> [84.185919] C1-00 recv C1-03 4167312.000000 # 3@task1_o3_end +> [0.016300] C1-02 recv C1-00 1000000.000000 # root_i2_2@task2 +> [42.016300] C1-01 send C1-03 1000000.000000 # 1@task1_o1_3@task1 +> [42.032600] C1-03 recv C1-01 1000000.000000 # 1@task1_o1_3@task1 +> [42.016300] C1-02 send C1-03 1000000.000000 # 2@task2_o2_3@task1 +> [42.032600] C1-03 recv C1-02 1000000.000000 # 2@task2_o2_3@task1 +> [84.032600] C1-03 send C1-00 4167312.000000 # 3@task1_o3_end +> [84.066238] C1-00 recv C1-03 4167312.000000 # 3@task1_o3_end > [0.000000] C1-00 send C1-01 1000000.000000 # root_i1_1@task1 -> [0.030300] C1-01 recv C1-00 1000000.000000 # root_i1_1@task1 -> [84.185919] C1-00 compute 0.000000 # end +> [0.016300] C1-01 recv C1-00 1000000.000000 # root_i1_1@task1 +> [84.066238] C1-00 compute 0.000000 # end $ cmake -E remove -f ./dax.dot ./smalldax.trace diff --git a/examples/simdag/dot/test_simdag_dotload.tesh b/examples/simdag/dot/test_simdag_dotload.tesh index 3380667c11..fc54486575 100644 --- a/examples/simdag/dot/test_simdag_dotload.tesh +++ b/examples/simdag/dot/test_simdag_dotload.tesh @@ -186,38 +186,38 @@ $ $SG_TEST_EXENV ./dot_test ${srcdir:=.}/../2clusters.xml ${srcdir:=.}/dag.dot > [0.000000] [sd_task/INFO] 7->end > [0.000000] [test/INFO] ------------------- Schedule tasks --------------------------- > [0.000000] [test/INFO] ------------------- Run the schedule --------------------------- -> [131.443480] [test/INFO] ------------------- Produce the trace file--------------------------- -> [131.443480] [test/INFO] Producing the trace of the run into dag.trace +> [60.002281] [test/INFO] ------------------- Produce the trace file--------------------------- +> [60.002281] [test/INFO] Producing the trace of the run into dag.trace $ cat ${srcdir:=.}/dag.trace > [0.000000] C2-05 compute 0.000000 # root > [0.000000] C2-06 compute 10000000129.452715 # 0 -> [2.000600] C2-07 compute 10000000131.133657 # 1 -> [4.001200] C2-08 compute 10000000121.124870 # 2 -> [6.001800] C2-09 compute 10000000230.608025 # 3 -> [8.001800] C1-00 compute 10000000004.994019 # 4 -> [50.721440] C1-01 compute 10000000046.016401 # 5 -> [60.721440] C1-02 compute 10000000091.598791 # 6 -> [70.722040] C1-03 compute 10000000040.679438 # 7 -> [80.722640] C1-04 compute 10000000250.490017 # 8 -> [90.722641] C2-05 compute 10000000079.267649 # 9 -> [6.001200] C2-08 send C2-09 10001.781645 # 2->3 -> [6.001800] C2-09 recv C2-08 10001.781645 # 2->3 -> [70.721440] C1-02 send C1-03 10004.920415 # 6->7 -> [70.722040] C1-03 recv C1-02 10004.920415 # 6->7 +> [2.000380] C2-07 compute 10000000131.133657 # 1 +> [4.000760] C2-08 compute 10000000121.124870 # 2 +> [6.001140] C2-09 compute 10000000230.608025 # 3 +> [8.001140] C1-00 compute 10000000004.994019 # 4 +> [18.001520] C1-01 compute 10000000046.016401 # 5 +> [28.001520] C1-02 compute 10000000091.598791 # 6 +> [38.001901] C1-03 compute 10000000040.679438 # 7 +> [48.002281] C1-04 compute 10000000250.490017 # 8 +> [58.002281] C2-05 compute 10000000079.267649 # 9 +> [6.000760] C2-08 send C2-09 10001.781645 # 2->3 +> [6.001140] C2-09 recv C2-08 10001.781645 # 2->3 +> [38.001521] C1-02 send C1-03 10004.920415 # 6->7 +> [38.001901] C1-03 recv C1-02 10004.920415 # 6->7 > [0.000000] C2-05 send C1-01 10014000.000000 # root->5 -> [50.721440] C1-01 recv C2-05 10014000.000000 # root->5 -> [4.000600] C2-07 send C2-08 10004.164631 # 1->2 -> [4.001200] C2-08 recv C2-07 10004.164631 # 1->2 -> [80.722040] C1-03 send C2-05 10014000.000000 # 7->end -> [131.443480] C2-05 recv C1-03 10014000.000000 # 7->end +> [0.292217] C1-01 recv C2-05 10014000.000000 # root->5 +> [4.000380] C2-07 send C2-08 10004.164631 # 1->2 +> [4.000760] C2-08 recv C2-07 10004.164631 # 1->2 +> [48.001901] C1-03 send C2-05 10014000.000000 # 7->end +> [48.294118] C2-05 recv C1-03 10014000.000000 # 7->end > [2.000000] C2-06 send C2-07 10001.389601 # 0->1 -> [2.000600] C2-07 recv C2-06 10001.389601 # 0->1 -> [18.001800] C1-00 send C1-01 10029.262823 # 4->5 -> [18.002401] C1-01 recv C1-00 10029.262823 # 4->5 -> [80.722040] C1-03 send C1-04 10000.234049 # 7->8 -> [80.722640] C1-04 recv C1-03 10000.234049 # 7->8 -> [131.443480] C2-05 compute 0.000000 # end +> [2.000380] C2-07 recv C2-06 10001.389601 # 0->1 +> [18.001140] C1-00 send C1-01 10029.262823 # 4->5 +> [18.001520] C1-01 recv C1-00 10029.262823 # 4->5 +> [48.001901] C1-03 send C1-04 10000.234049 # 7->8 +> [48.002281] C1-04 recv C1-03 10000.234049 # 7->8 +> [60.002281] C2-05 compute 0.000000 # end $ rm -f dag.trace @@ -436,38 +436,39 @@ $ $SG_TEST_EXENV ./simulate_dot --log=no_loc ${srcdir:=.}/../2clusters.xml ${src > [0.000000] [sd_task/INFO] 7->end > [0.000000] [sd_task/INFO] 7 > [0.000000] [test/INFO] ------------------- Run the schedule --------------------------- -> [18.001306] [test/INFO] ------------------- Produce the trace file--------------------------- -> [18.001306] [test/INFO] Producing the trace of the run into dag_with_good_schedule.trace +> [18.000866] [test/INFO] ------------------- Produce the trace file--------------------------- +> [18.000866] [test/INFO] Producing the trace of the run into dag_with_good_schedule.trace $ cat ${srcdir:=.}/dag_with_good_schedule.trace > [0.000000] C2-05 compute 0.000000 # root > [0.000000] C2-06 compute 10000000129.452715 # 0 > [0.000000] C2-05 compute 10000000131.133657 # 1 -> [2.000600] C2-06 compute 10000000121.124870 # 2 -> [4.000635] C2-06 compute 10000000230.608025 # 3 -> [6.000635] C2-05 compute 10000000004.994019 # 4 -> [8.000670] C2-05 compute 10000000046.016401 # 5 -> [10.000670] C2-05 compute 10000000091.598791 # 6 -> [12.000706] C2-05 compute 10000000040.679438 # 7 -> [14.001306] C2-06 compute 10000000250.490017 # 8 -> [16.001306] C2-06 compute 10000000079.267649 # 9 -> [4.000600] C2-06 send C2-06 10001.781645 # 2->3 -> [4.000635] C2-06 recv C2-06 10001.781645 # 2->3 -> [12.000670] C2-05 send C2-05 10004.920415 # 6->7 -> [12.000706] C2-05 recv C2-05 10004.920415 # 6->7 +> [2.000380] C2-06 compute 10000000121.124870 # 2 +> [4.000415] C2-06 compute 10000000230.608025 # 3 +> [6.000415] C2-05 compute 10000000004.994019 # 4 +> [8.000450] C2-05 compute 10000000046.016401 # 5 +> [10.000450] C2-05 compute 10000000091.598791 # 6 +> [12.000485] C2-05 compute 10000000040.679438 # 7 +> [14.000865] C2-06 compute 10000000250.490017 # 8 +> [16.000866] C2-06 compute 10000000079.267649 # 9 +> [4.000380] C2-06 send C2-06 10001.781645 # 2->3 +> [4.000415] C2-06 recv C2-06 10001.781645 # 2->3 +> [12.000450] C2-05 send C2-05 10004.920415 # 6->7 +> [12.000485] C2-05 recv C2-05 10004.920415 # 6->7 > [0.000000] C2-05 send C2-05 10014000.000000 # root->5 > [0.020123] C2-05 recv C2-05 10014000.000000 # root->5 > [2.000000] C2-05 send C2-06 10004.164631 # 1->2 -> [2.000600] C2-06 recv C2-05 10004.164631 # 1->2 -> [14.000706] C2-05 send C2-05 10014000.000000 # 7->end -> [14.020829] C2-05 recv C2-05 10014000.000000 # 7->end +> [2.000380] C2-06 recv C2-05 10004.164631 # 1->2 +> [14.000485] C2-05 send C2-05 10014000.000000 # 7->end +> [14.020609] C2-05 recv C2-05 10014000.000000 # 7->end > [2.000000] C2-06 send C2-06 10001.389601 # 0->2 > [2.000035] C2-06 recv C2-06 10001.389601 # 0->2 -> [8.000635] C2-05 send C2-05 10029.262823 # 4->5 -> [8.000670] C2-05 recv C2-05 10029.262823 # 4->5 -> [14.000706] C2-05 send C2-06 10000.234049 # 7->8 -> [14.001306] C2-06 recv C2-05 10000.234049 # 7->8 -> [18.001306] C2-05 compute 0.000000 # end +> [8.000415] C2-05 send C2-05 10029.262823 # 4->5 +> [8.000450] C2-05 recv C2-05 10029.262823 # 4->5 +> [14.000485] C2-05 send C2-06 10000.234049 # 7->8 +> [14.000865] C2-06 recv C2-05 10000.234049 # 7->8 +> [18.000866] C2-05 compute 0.000000 # end + $ rm -f ${srcdir:=.}/dag_with_good_schedule.trace diff --git a/examples/simdag/scheduling/test_minmin.tesh b/examples/simdag/scheduling/test_minmin.tesh index 2e3f1a22e8..f45121a353 100644 --- a/examples/simdag/scheduling/test_minmin.tesh +++ b/examples/simdag/scheduling/test_minmin.tesh @@ -7,31 +7,32 @@ $ $SG_TEST_EXENV ${bindir:=.}/minmin_test --log=sd_daxparse.thresh:critical ${sr > [0.000000] [test/INFO] Schedule ID00002@mProjectPP on Host 27 > [0.000105] [test/INFO] Schedule ID00000@mProjectPP on Host 26 > [0.000120] [test/INFO] Schedule ID00003@mProjectPP on Host 30 -> [0.000327] [test/INFO] Schedule ID00004@mProjectPP on Host 27 -> [0.000434] [test/INFO] Schedule ID00001@mProjectPP on Host 32 -> [14.576439] [test/INFO] Schedule ID00010@mDiffFit on Host 26 +> [0.000325] [test/INFO] Schedule ID00004@mProjectPP on Host 27 +> [0.000433] [test/INFO] Schedule ID00001@mProjectPP on Host 32 +> [14.576312] [test/INFO] Schedule ID00010@mDiffFit on Host 26 > [17.049690] [test/INFO] Schedule ID00008@mDiffFit on Host 27 -> [29.541537] [test/INFO] Schedule ID00013@mDiffFit on Host 26 -> [32.637908] [test/INFO] Schedule ID00009@mDiffFit on Host 30 -> [32.638114] [test/INFO] Schedule ID00011@mDiffFit on Host 27 -> [32.638217] [test/INFO] Schedule ID00005@mDiffFit on Host 26 -> [32.638233] [test/INFO] Schedule ID00006@mDiffFit on Host 32 -> [32.638445] [test/INFO] Schedule ID00012@mDiffFit on Host 31 -> [32.638548] [test/INFO] Schedule ID00007@mDiffFit on Host 28 -> [60.428541] [test/INFO] Schedule ID00014@mConcatFit on Host 27 -> [61.220372] [test/INFO] Schedule ID00015@mBgModel on Host 27 -> [62.762602] [test/INFO] Schedule ID00016@mBackground on Host 27 -> [62.762618] [test/INFO] Schedule ID00017@mBackground on Host 26 -> [62.762724] [test/INFO] Schedule ID00020@mBackground on Host 30 -> [62.762824] [test/INFO] Schedule ID00018@mBackground on Host 27 -> [62.762840] [test/INFO] Schedule ID00019@mBackground on Host 32 -> [88.556582] [test/INFO] Schedule ID00021@mImgTbl on Host 27 -> [90.149741] [test/INFO] Schedule ID00022@mAdd on Host 27 -> [93.440428] [test/INFO] Schedule ID00023@mShrink on Host 27 -> [97.725800] [test/INFO] Schedule ID00024@mJPEG on Host 27 -> [98.218253] [test/INFO] Schedule end on Host 27 -> [98.218679] [test/INFO] Simulation Time: 98.218679 -> [98.218679] [test/INFO] ------------------- Produce the trace file--------------------------- -> [98.218679] [test/INFO] Producing the trace of the run into ./Montage_25.jed +> [29.541409] [test/INFO] Schedule ID00013@mDiffFit on Host 26 +> [32.620710] [test/INFO] Schedule ID00009@mDiffFit on Host 30 +> [32.620912] [test/INFO] Schedule ID00011@mDiffFit on Host 27 +> [32.621015] [test/INFO] Schedule ID00005@mDiffFit on Host 26 +> [32.621030] [test/INFO] Schedule ID00006@mDiffFit on Host 32 +> [32.621243] [test/INFO] Schedule ID00012@mDiffFit on Host 31 +> [32.621345] [test/INFO] Schedule ID00007@mDiffFit on Host 28 +> [60.411166] [test/INFO] Schedule ID00014@mConcatFit on Host 27 +> [61.202997] [test/INFO] Schedule ID00015@mBgModel on Host 27 +> [62.745225] [test/INFO] Schedule ID00016@mBackground on Host 27 +> [62.745241] [test/INFO] Schedule ID00017@mBackground on Host 26 +> [62.745347] [test/INFO] Schedule ID00020@mBackground on Host 30 +> [62.745447] [test/INFO] Schedule ID00018@mBackground on Host 27 +> [62.745463] [test/INFO] Schedule ID00019@mBackground on Host 32 +> [88.539205] [test/INFO] Schedule ID00021@mImgTbl on Host 27 +> [90.115680] [test/INFO] Schedule ID00022@mAdd on Host 27 +> [93.406367] [test/INFO] Schedule ID00023@mShrink on Host 27 +> [97.691739] [test/INFO] Schedule ID00024@mJPEG on Host 27 +> [98.184192] [test/INFO] Schedule end on Host 27 +> [98.184618] [test/INFO] Simulation Time: 98.184618 +> [98.184618] [test/INFO] ------------------- Produce the trace file--------------------------- +> [98.184618] [test/INFO] Producing the trace of the run into ./Montage_25.jed + $ cmake -E remove -f ${srcdir:=.}/Montage_25.jed \ No newline at end of file diff --git a/examples/simdag/test_simdag.tesh b/examples/simdag/test_simdag.tesh index 1bfccc1725..a345cffe5e 100644 --- a/examples/simdag/test_simdag.tesh +++ b/examples/simdag/test_simdag.tesh @@ -16,5 +16,5 @@ $ $SG_TEST_EXENV ./sd_test ${srcdir:=.}/../msg/msg_platform.xml > [0.000000] [sd_test/INFO] Communication time for 2000000.000000 bytes between Jacquelin and Intel: 4.306781 > [0.000000] [sd_test/INFO] Communication time for 3000000.000000 bytes between Intel and Jacquelin: 6.424864 > [0.000000] [sd_test/INFO] Estimated time for 'Task D': 6.432146 -> [42.510099] [sd_test/INFO] Task 'Task D' start time: 0.000000, finish time: 21.255050 -> [42.510099] [sd_test/INFO] Task 'Task B' start time: 21.255050, finish time: 42.510099 +> [21.322061] [sd_test/INFO] Task 'Task D' start time: 0.000000, finish time: 10.661030 +> [21.322061] [sd_test/INFO] Task 'Task B' start time: 10.661030, finish time: 21.322061 diff --git a/examples/simdag/test_simdag2.tesh b/examples/simdag/test_simdag2.tesh index 7a64e2ff10..7a4d4e75bd 100644 --- a/examples/simdag/test_simdag2.tesh +++ b/examples/simdag/test_simdag2.tesh @@ -4,4 +4,4 @@ p Simple test of simdag $ $SG_TEST_EXENV ./sd_test2 ${srcdir:=.}/2clusters.xml > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07 -> [9.811800] [sd_test/INFO] Simulation time: 9.811800 +> [3.251960] [sd_test/INFO] Simulation time: 3.251960 diff --git a/examples/simdag/test_simdag_seq_access.tesh b/examples/simdag/test_simdag_seq_access.tesh index eac2bdce14..6de37edb83 100644 --- a/examples/simdag/test_simdag_seq_access.tesh +++ b/examples/simdag/test_simdag_seq_access.tesh @@ -35,26 +35,26 @@ $ $SG_TEST_EXENV ./sd_seq_access ${srcdir:=.}/2clusters.xml > [4.000000] [sd_workstation/INFO] - power: 5000000000 > [4.000000] [sd_workstation/INFO] - available power: 1.00 > [4.000000] [sd_workstation/INFO] - access mode: Space shared -> [10.000300] [sd_seq_access/INFO] Simulation was suspended, check workstation states -> [10.000300] [sd_workstation/INFO] Displaying workstation C2-05 -> [10.000300] [sd_workstation/INFO] - power: 5000000000 -> [10.000300] [sd_workstation/INFO] - available power: 1.00 -> [10.000300] [sd_workstation/INFO] - access mode: Exclusive -> [10.000300] [sd_workstation/INFO] no task running -> [10.000300] [sd_workstation/INFO] Displaying workstation C2-06 -> [10.000300] [sd_workstation/INFO] - power: 5000000000 -> [10.000300] [sd_workstation/INFO] - available power: 1.00 -> [10.000300] [sd_workstation/INFO] - access mode: Space shared -> [14.000300] [sd_seq_access/INFO] Simulation was suspended, check workstation states -> [14.000300] [sd_workstation/INFO] Displaying workstation C2-05 -> [14.000300] [sd_workstation/INFO] - power: 5000000000 -> [14.000300] [sd_workstation/INFO] - available power: 1.00 -> [14.000300] [sd_workstation/INFO] - access mode: Exclusive -> [14.000300] [sd_workstation/INFO] no task running -> [14.000300] [sd_workstation/INFO] Displaying workstation C2-06 -> [14.000300] [sd_workstation/INFO] - power: 5000000000 -> [14.000300] [sd_workstation/INFO] - available power: 1.00 -> [14.000300] [sd_workstation/INFO] - access mode: Space shared +> [5.600300] [sd_seq_access/INFO] Simulation was suspended, check workstation states +> [5.600300] [sd_workstation/INFO] Displaying workstation C2-05 +> [5.600300] [sd_workstation/INFO] - power: 5000000000 +> [5.600300] [sd_workstation/INFO] - available power: 1.00 +> [5.600300] [sd_workstation/INFO] - access mode: Exclusive +> [5.600300] [sd_workstation/INFO] no task running +> [5.600300] [sd_workstation/INFO] Displaying workstation C2-06 +> [5.600300] [sd_workstation/INFO] - power: 5000000000 +> [5.600300] [sd_workstation/INFO] - available power: 1.00 +> [5.600300] [sd_workstation/INFO] - access mode: Space shared +> [9.600300] [sd_seq_access/INFO] Simulation was suspended, check workstation states +> [9.600300] [sd_workstation/INFO] Displaying workstation C2-05 +> [9.600300] [sd_workstation/INFO] - power: 5000000000 +> [9.600300] [sd_workstation/INFO] - available power: 1.00 +> [9.600300] [sd_workstation/INFO] - access mode: Exclusive +> [9.600300] [sd_workstation/INFO] no task running +> [9.600300] [sd_workstation/INFO] Displaying workstation C2-06 +> [9.600300] [sd_workstation/INFO] - power: 5000000000 +> [9.600300] [sd_workstation/INFO] - available power: 1.00 +> [9.600300] [sd_workstation/INFO] - access mode: Space shared > [22.000000] [sd_seq_access/INFO] Simulation was suspended, check workstation states > [22.000000] [sd_workstation/INFO] Displaying workstation C2-05 > [22.000000] [sd_workstation/INFO] - power: 5000000000 -- 2.20.1