summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--extra.h5
-rwxr-xr-xrun_bench.sh4
3 files changed, 8 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 0e0db96..b7e90f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,15 +26,19 @@
26**/adpcm_dec 26**/adpcm_dec
27**/adpcm_enc 27**/adpcm_enc
28**/ammunition 28**/ammunition
29**/anagram
30**/audiobeam
29**/cjpeg_transupp 31**/cjpeg_transupp
30**/cjpeg_wrbmp 32**/cjpeg_wrbmp
31**/dijkstra 33**/dijkstra
32**/epic 34**/epic
33**/fmref 35**/fmref
36**/g723_enc
34**/gsm_dec 37**/gsm_dec
35**/gsm_enc 38**/gsm_enc
36**/h264_dec 39**/h264_dec
37**/huff_enc 40**/huff_enc
41**/huff_dec
38**/mpeg2 42**/mpeg2
39**/ndes 43**/ndes
40**/petrinet 44**/petrinet
diff --git a/extra.h b/extra.h
index 9f27a80..990d2e0 100644
--- a/extra.h
+++ b/extra.h
@@ -83,7 +83,7 @@ long unsigned int _rt_period;
83static void _rt_load_params_itrl(int argc, char **argv) { 83static void _rt_load_params_itrl(int argc, char **argv) {
84#ifdef PAIRED 84#ifdef PAIRED
85 if (argc != (8 + LITMUS*2) && argc != (9 + LITMUS*2)) { 85 if (argc != (8 + LITMUS*2) && argc != (9 + LITMUS*2)) {
86 fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?>\n", argv[0]); 86 fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?> <pairID>\n", argv[0]);
87#else 87#else
88 if (argc != (6 + LITMUS*2)) { 88 if (argc != (6 + LITMUS*2)) {
89 fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]); 89 fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);
@@ -120,7 +120,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
120 _rt_will_output = atoi(argv[7]); 120 _rt_will_output = atoi(argv[7]);
121 char *pairId; 121 char *pairId;
122 int end; 122 int end;
123 if (argc > 7) { 123 if (argc > 8) {
124 pairId = argv[8]; 124 pairId = argv[8];
125 end = 9; 125 end = 9;
126 } else { 126 } else {
@@ -218,7 +218,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
218 rt_param.phase = 0; 218 rt_param.phase = 0;
219 rt_param.priority = LITMUS_LOWEST_PRIORITY; 219 rt_param.priority = LITMUS_LOWEST_PRIORITY;
220 rt_param.cls = crit; 220 rt_param.cls = crit;
221 rt_param.release_policy = TASK_PERIODIC;
222 rt_param.budget_policy = NO_ENFORCEMENT; 221 rt_param.budget_policy = NO_ENFORCEMENT;
223 rt_param.cpu = _rt_core; 222 rt_param.cpu = _rt_core;
224 rt_param.release_policy = TASK_PERIODIC; 223 rt_param.release_policy = TASK_PERIODIC;
diff --git a/run_bench.sh b/run_bench.sh
index ddc6bcc..6c92fd5 100755
--- a/run_bench.sh
+++ b/run_bench.sh
@@ -363,10 +363,10 @@ for (( i = 0; i < ${#bench[@]} ; i++ )); do
363 # Synchronize between pairs - original hard real-time SMT approach 363 # Synchronize between pairs - original hard real-time SMT approach
364 if [[ -v $LITMUS ]]; then 364 if [[ -v $LITMUS ]]; then
365 echo "${input[$i]}" | numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 & PID1=$!; 365 echo "${input[$i]}" | numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 & PID1=$!;
366 echo "${input[$j]}" | numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 2 & PID2=$!; 366 echo "${input[$j]}" | numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 1 & PID2=$!;
367 else 367 else
368 echo "${input[$i]}" | chrt -r 97 numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 & PID1=$!; 368 echo "${input[$i]}" | chrt -r 97 numactl $numa_arg0 taskset -c $core $prefix/${bench[$i]} ${bench[$i]} $maxJobs $core $core_two ${bench[$j]} $runID-$userRunID-A 1 & PID1=$!;
369 echo "${input[$j]}" | chrt -r 97 numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 2 & PID2=$!; 369 echo "${input[$j]}" | chrt -r 97 numactl $numa_arg1 taskset -c $core_two $prefix/${bench[$j]} ${bench[$j]} $maxJobs $core_two $core ${bench[$i]} $runID-$userRunID-B 1 & PID2=$!;
370 fi 370 fi
371 # We launched them asynchronously, so we have to wait 371 # We launched them asynchronously, so we have to wait
372 wait $PID1 $PID2 372 wait $PID1 $PID2