From 00e4ce40b0af8e94f5b5e44945d73c6778cc9991 Mon Sep 17 00:00:00 2001 From: leochanj105 Date: Sun, 24 Oct 2021 20:47:48 -0400 Subject: 10-24 tmp --- Makefile | 26 +++++++++++++++++---- SD-VBS/dag_binaries/disparity_qcif_pair_no_litmus | Bin 0 -> 58176 bytes .../dag_binaries/disparity_qcif_single_no_litmus | Bin 0 -> 48768 bytes .../dag_binaries/localization_qcif_pair_no_litmus | Bin 0 -> 66832 bytes .../localization_qcif_single_no_litmus | Bin 0 -> 57424 bytes SD-VBS/dag_binaries/mser_qcif_pair_no_litmus | Bin 0 -> 61704 bytes SD-VBS/dag_binaries/mser_qcif_single_no_litmus | Bin 0 -> 48200 bytes SD-VBS/dag_binaries/multi_ncut_qcif_pair_no_litmus | Bin 0 -> 57816 bytes .../dag_binaries/multi_ncut_qcif_single_no_litmus | Bin 0 -> 48408 bytes SD-VBS/dag_binaries/sift_qcif_pair_no_litmus | Bin 0 -> 66928 bytes SD-VBS/dag_binaries/sift_qcif_single_no_litmus | Bin 0 -> 61616 bytes SD-VBS/dag_binaries/stitch_qcif_pair_no_litmus | Bin 0 -> 62200 bytes SD-VBS/dag_binaries/stitch_qcif_single_no_litmus | Bin 0 -> 52792 bytes SD-VBS/dag_binaries/svm_qcif_pair_no_litmus | Bin 0 -> 62184 bytes SD-VBS/dag_binaries/svm_qcif_single_no_litmus | Bin 0 -> 56880 bytes .../texture_synthesis_qcif_pair_no_litmus | Bin 0 -> 62896 bytes .../texture_synthesis_qcif_single_no_litmus | Bin 0 -> 57584 bytes SD-VBS/dag_binaries/tracking_qcif_pair_no_litmus | Bin 0 -> 62136 bytes SD-VBS/dag_binaries/tracking_qcif_single_no_litmus | Bin 0 -> 52736 bytes dag | 1 + deadline_misses | 17 +++++--------- extra.h | 10 ++++---- run_case_study_dag.py | 12 ++++++---- 23 files changed, 42 insertions(+), 24 deletions(-) create mode 100755 SD-VBS/dag_binaries/disparity_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/disparity_qcif_single_no_litmus create mode 100755 SD-VBS/dag_binaries/localization_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/localization_qcif_single_no_litmus create mode 100755 SD-VBS/dag_binaries/mser_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/mser_qcif_single_no_litmus create mode 100755 SD-VBS/dag_binaries/multi_ncut_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/multi_ncut_qcif_single_no_litmus create mode 100755 SD-VBS/dag_binaries/sift_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/sift_qcif_single_no_litmus create mode 100755 SD-VBS/dag_binaries/stitch_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/stitch_qcif_single_no_litmus create mode 100755 SD-VBS/dag_binaries/svm_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/svm_qcif_single_no_litmus create mode 100755 SD-VBS/dag_binaries/texture_synthesis_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/texture_synthesis_qcif_single_no_litmus create mode 100755 SD-VBS/dag_binaries/tracking_qcif_pair_no_litmus create mode 100755 SD-VBS/dag_binaries/tracking_qcif_single_no_litmus create mode 100644 dag diff --git a/Makefile b/Makefile index d2b1c23..6408505 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ case-study: sed -i "s/LITMUS 0/LITMUS 1/g" extra.h - $(MAKE) -C baseline all - $(MAKE) -C dis baseline + #$(MAKE) -C baseline all + #$(MAKE) -C dis baseline $(MAKE) -C SD-VBS/benchmarks compile benchmarks: @@ -10,7 +10,8 @@ benchmarks: #$(MAKE) -C baseline all #$(MAKE) -C all_pairs all #$(MAKE) -C dis pairs - $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile +# $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile + $(MAKE) -C SD-VBS/benchmarks compile benches := svm mser sift texture_synthesis tracking disparity localization multi_ncut stitch @@ -18,9 +19,13 @@ bench_path := SD-VBS/benchmarks dag_path := SD-VBS/dag_binaries single_suffix := _qcif_single pair_suffix := _qcif_pair + +single_suffix_no := _qcif_single_no_litmus +pair_suffix_no := _qcif_pair_no_litmus + dag-case-study: - sudo sed -i "s/LITMUS 0/LITMUS 1/g" extra.h sudo mkdir -p SD-VBS/dag_binaries + sudo sed -i "s/LITMUS 0/LITMUS 1/g" extra.h $(MAKE) -C SD-VBS/benchmarks compile @for v in $(benches) ; do \ # echo "$(dag_path)/$$v""$(single_suffix)"; \ @@ -31,3 +36,16 @@ dag-case-study: # echo "$(dag_path)/$$v""$(pair_suffix)"; \ sudo cp $(bench_path)/$$v/data/qcif/$$v "$(dag_path)/$$v""$(pair_suffix)"; \ done + + + sudo sed -i "s/LITMUS 1/LITMUS 0/g" extra.h + $(MAKE) -C SD-VBS/benchmarks compile + @for v in $(benches) ; do \ + # echo "$(dag_path)/$$v""$(single_suffix)"; \ + sudo cp $(bench_path)/$$v/data/qcif/$$v "$(dag_path)/$$v""$(single_suffix_no)"; \ + done + $(MAKE) -C SD-VBS/benchmarks CFLAGS=-DPAIRED compile + @for v in $(benches) ; do \ + # echo "$(dag_path)/$$v""$(pair_suffix)"; \ + sudo cp $(bench_path)/$$v/data/qcif/$$v "$(dag_path)/$$v""$(pair_suffix_no)"; \ + done diff --git a/SD-VBS/dag_binaries/disparity_qcif_pair_no_litmus b/SD-VBS/dag_binaries/disparity_qcif_pair_no_litmus new file mode 100755 index 0000000..2fe9663 Binary files /dev/null and b/SD-VBS/dag_binaries/disparity_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/disparity_qcif_single_no_litmus b/SD-VBS/dag_binaries/disparity_qcif_single_no_litmus new file mode 100755 index 0000000..d46e5ec Binary files /dev/null and b/SD-VBS/dag_binaries/disparity_qcif_single_no_litmus differ diff --git a/SD-VBS/dag_binaries/localization_qcif_pair_no_litmus b/SD-VBS/dag_binaries/localization_qcif_pair_no_litmus new file mode 100755 index 0000000..631d146 Binary files /dev/null and b/SD-VBS/dag_binaries/localization_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/localization_qcif_single_no_litmus b/SD-VBS/dag_binaries/localization_qcif_single_no_litmus new file mode 100755 index 0000000..0d21db9 Binary files /dev/null and b/SD-VBS/dag_binaries/localization_qcif_single_no_litmus differ diff --git a/SD-VBS/dag_binaries/mser_qcif_pair_no_litmus b/SD-VBS/dag_binaries/mser_qcif_pair_no_litmus new file mode 100755 index 0000000..019756d Binary files /dev/null and b/SD-VBS/dag_binaries/mser_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/mser_qcif_single_no_litmus b/SD-VBS/dag_binaries/mser_qcif_single_no_litmus new file mode 100755 index 0000000..b2234c4 Binary files /dev/null and b/SD-VBS/dag_binaries/mser_qcif_single_no_litmus differ diff --git a/SD-VBS/dag_binaries/multi_ncut_qcif_pair_no_litmus b/SD-VBS/dag_binaries/multi_ncut_qcif_pair_no_litmus new file mode 100755 index 0000000..ca4274c Binary files /dev/null and b/SD-VBS/dag_binaries/multi_ncut_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/multi_ncut_qcif_single_no_litmus b/SD-VBS/dag_binaries/multi_ncut_qcif_single_no_litmus new file mode 100755 index 0000000..676b869 Binary files /dev/null and b/SD-VBS/dag_binaries/multi_ncut_qcif_single_no_litmus differ diff --git a/SD-VBS/dag_binaries/sift_qcif_pair_no_litmus b/SD-VBS/dag_binaries/sift_qcif_pair_no_litmus new file mode 100755 index 0000000..bd1b8ef Binary files /dev/null and b/SD-VBS/dag_binaries/sift_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/sift_qcif_single_no_litmus b/SD-VBS/dag_binaries/sift_qcif_single_no_litmus new file mode 100755 index 0000000..a7a7096 Binary files /dev/null and b/SD-VBS/dag_binaries/sift_qcif_single_no_litmus differ diff --git a/SD-VBS/dag_binaries/stitch_qcif_pair_no_litmus b/SD-VBS/dag_binaries/stitch_qcif_pair_no_litmus new file mode 100755 index 0000000..54039eb Binary files /dev/null and b/SD-VBS/dag_binaries/stitch_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/stitch_qcif_single_no_litmus b/SD-VBS/dag_binaries/stitch_qcif_single_no_litmus new file mode 100755 index 0000000..8cd1d58 Binary files /dev/null and b/SD-VBS/dag_binaries/stitch_qcif_single_no_litmus differ diff --git a/SD-VBS/dag_binaries/svm_qcif_pair_no_litmus b/SD-VBS/dag_binaries/svm_qcif_pair_no_litmus new file mode 100755 index 0000000..dd5c643 Binary files /dev/null and b/SD-VBS/dag_binaries/svm_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/svm_qcif_single_no_litmus b/SD-VBS/dag_binaries/svm_qcif_single_no_litmus new file mode 100755 index 0000000..eac5d9e Binary files /dev/null and b/SD-VBS/dag_binaries/svm_qcif_single_no_litmus differ diff --git a/SD-VBS/dag_binaries/texture_synthesis_qcif_pair_no_litmus b/SD-VBS/dag_binaries/texture_synthesis_qcif_pair_no_litmus new file mode 100755 index 0000000..0e3dabe Binary files /dev/null and b/SD-VBS/dag_binaries/texture_synthesis_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/texture_synthesis_qcif_single_no_litmus b/SD-VBS/dag_binaries/texture_synthesis_qcif_single_no_litmus new file mode 100755 index 0000000..f414030 Binary files /dev/null and b/SD-VBS/dag_binaries/texture_synthesis_qcif_single_no_litmus differ diff --git a/SD-VBS/dag_binaries/tracking_qcif_pair_no_litmus b/SD-VBS/dag_binaries/tracking_qcif_pair_no_litmus new file mode 100755 index 0000000..fdec826 Binary files /dev/null and b/SD-VBS/dag_binaries/tracking_qcif_pair_no_litmus differ diff --git a/SD-VBS/dag_binaries/tracking_qcif_single_no_litmus b/SD-VBS/dag_binaries/tracking_qcif_single_no_litmus new file mode 100755 index 0000000..5332b31 Binary files /dev/null and b/SD-VBS/dag_binaries/tracking_qcif_single_no_litmus differ diff --git a/dag b/dag new file mode 100644 index 0000000..f298cf1 --- /dev/null +++ b/dag @@ -0,0 +1 @@ +0,multi_ncut_qcif, cut001, 5, 1, 1, 1, 10, 1, 0 \ No newline at end of file diff --git a/deadline_misses b/deadline_misses index 7025d8b..8448050 100644 --- a/deadline_misses +++ b/deadline_misses @@ -1,11 +1,6 @@ -(svm001/7932:2) HAZARDOUS: Level-B tardy 105144502 ns, relative tardiness 2.102890 -(localization001/7935:3) HAZARDOUS: Level-B tardy 121353473 ns, relative tardiness 2.427069 -(svm001/7932:3) HAZARDOUS: Level-B tardy 121694991 ns, relative tardiness 2.433900 -(localization001/7935:4) HAZARDOUS: Level-B tardy 137671344 ns, relative tardiness 2.753427 -(svm001/7932:4) HAZARDOUS: Level-B tardy 138065691 ns, relative tardiness 2.761314 -(localization001/7935:5) HAZARDOUS: Level-B tardy 154064855 ns, relative tardiness 3.081297 -(svm001/7932:5) HAZARDOUS: Level-B tardy 154402852 ns, relative tardiness 3.088057 -(localization001/7935:6) HAZARDOUS: Level-B tardy 170382265 ns, relative tardiness 3.407645 -(svm001/7932:6) HAZARDOUS: Level-B tardy 170731922 ns, relative tardiness 3.414638 -(localization001/7935:7) HAZARDOUS: Level-B tardy 186729966 ns, relative tardiness 3.734599 -(svm001/7932:7) HAZARDOUS: Level-B tardy 187062334 ns, relative tardiness 3.741247 +Usage: ./SD-VBS/dag_binaries/multi_ncut_qcif_single_no_litmus + string for logging. Name of this task. + integer number of iterations. -1 for infinite. + integer core number. Only used for LITMUS-RT. + string to append with .txt to yield output file name. + 1 to save results, 0 to discard. diff --git a/extra.h b/extra.h index 60917be..76fd8c0 100644 --- a/extra.h +++ b/extra.h @@ -30,7 +30,7 @@ extern int sched_getcpu(); #endif // This is a proxy for "case study mode" now -#define LITMUS 1 +#define LITMUS 0 #define MMDC_PROF 0 #if LITMUS @@ -85,11 +85,11 @@ struct control_page *_rt_cp; static void _rt_load_params_itrl(int argc, char **argv) { #ifdef PAIRED - if (argc != (9 + LITMUS*2) && argc != (10 + LITMUS*2)) { - fprintf(stderr, "Usage: %s \n", argv[0]); + if (argc != (8 + LITMUS*3) && argc != (9 + LITMUS*3)) { + fprintf(stderr, "Usage: %s \n", argv[0]); #else - if (argc != (7 + LITMUS*2)) { - fprintf(stderr, "Usage: %s \n", argv[0]); + if (argc != (6 + LITMUS*3)) { + fprintf(stderr, "Usage: %s \n", argv[0]); #endif /* PAIRED */ fprintf(stderr, " string for logging. Name of this task.\n"); fprintf(stderr, " integer number of iterations. -1 for infinite.\n"); diff --git a/run_case_study_dag.py b/run_case_study_dag.py index 0a5c5fe..516458f 100755 --- a/run_case_study_dag.py +++ b/run_case_study_dag.py @@ -87,6 +87,7 @@ def main(pathName): ### Allocate Cache Ways ### run('mount -t resctrl resctrl /sys/fs/resctrl') + # run('sudo echo "L3:0=0000;1=0000;2=0000;3=ffff" | sudo tee /sys/fs/resctrl/schemata') run('sudo echo "L3:0=0000;1=0000;2=0000;3=000f" | sudo tee /sys/fs/resctrl/schemata') for core in range(16): if core not in all_cores: @@ -98,10 +99,11 @@ def main(pathName): mask = mask[:in_ccx] +'f'+ mask[in_ccx+1:] if ccx == 0: run('echo "L3:0=' + mask + ';1=0000;2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core)) + # run('echo "L3:0=ffff;1=0000;2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core)) if ccx == 1: - run('echo "L3:0=0000;1=' + mask + ';2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core)) + run('echo "L3:0=0000;1=' + mask + ';2=0000;3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core)) if ccx == 2: - run('echo "L3:0=0000;1=0000;2='+ mask +';3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core)) + run('echo "L3:0=0000;1=0000;2=' + mask + ';3=0000" > /sys/fs/resctrl/core-{}/schemata'.format(core)) if ccx == 3: run('echo "L3:0=0000;1=0000;2=0000;3=' + mask + '" > /sys/fs/resctrl/core-{}/schemata'.format(core)) @@ -129,9 +131,11 @@ def main(pathName): return 1 # single tasks if launch[0] == '0': - binary = binary_path + binary_name + "_single" + # binary = binary_path + binary_name + "_single" + binary = binary_path + binary_name + "_single_no_litmus" # Arg format: - arg = " " + task_name + " " + num_iters +" " + core_num +" " + run_id +" " + save_result+" " + period +" " + crt_level + " "+ phase + # arg = " " + task_name + " " + num_iters +" " + core_num +" " + run_id +" " + save_result+" " + period +" " + crt_level + " "+ phase + arg = " " + task_name + " " + num_iters +" " + core_num +" " + run_id +" " + save_result+" " # print(input_cmd[binary_name] + " | numactl --interleave=all " + binary + arg) bench_tsk = subprocess.Popen(input_cmd[binary_name] + " | numactl --interleave=all " + binary + arg, shell=True, executable='/bin/bash', stderr=stderr_file) pid_str = ID2PID(binary + " " + task_name) -- cgit v1.2.2