diff --git a/benchmark/README.md b/benchmark/README.md index c73c847..d945e98 100644 --- a/benchmark/README.md +++ b/benchmark/README.md @@ -1,5 +1,9 @@ # dmclock benchmarking +**IMPORTANT**: now that K_WAY_HEAP is no longer allowed to have the +value 1, the shell and Python scripts that generate the PDFs no longer +work exactly correctly. Some effort to debug is necessary. + This directory contains scripts to evaluate effects of different branching-factors (k=1 to k=11) in the IndirectIntrusiveHeap data-structure. IndirectIntrusiveHeap is now a k-way heap, so finding diff --git a/benchmark/data_gen.sh b/benchmark/data_gen.sh index 133da87..80a77bd 100755 --- a/benchmark/data_gen.sh +++ b/benchmark/data_gen.sh @@ -23,10 +23,10 @@ if [ "$3" != "" ]; then repeat="$3" fi -echo "k-way: $k_way, num_repeat:$repeat" +echo "k-way:$k_way, num_repeat:$repeat" # create simulators in different directories -k=1 +k=2 while [ $k -le $k_way ] do mkdir "build_$k" @@ -43,7 +43,7 @@ done echo '' > $output_file for config in "$config_dir"/*.conf do - k=1 + k=2 while [ $k -le $k_way ] do cd "build_$k" diff --git a/benchmark/data_parser.py b/benchmark/data_parser.py index f6f84d7..c90d85f 100755 --- a/benchmark/data_parser.py +++ b/benchmark/data_parser.py @@ -136,10 +136,10 @@ def create_header(num_cols): header = fields[0] #write add_req_{1, ...} for i in range(num_cols): - header = '%s %s_%i'%(header, fields[1], i+1) + header = '%s %s_%i'%(header, fields[1], i+2) #write complete_req_{1, ...} for i in range(num_cols): - header = '%s %s_%i'%(header, fields[2], i+1) + header = '%s %s_%i'%(header, fields[2], i+2) # new-line header = '%s\n'%(header) return header diff --git a/benchmark/run.sh b/benchmark/run.sh index 0d030cf..11432b5 100755 --- a/benchmark/run.sh +++ b/benchmark/run.sh @@ -1,8 +1,8 @@ #!/bin/bash # default value -k_way=2 #11 -repeat=3 #5 +k_way=3 #11 +repeat=2 #5 output_file="" if [ "$1" != "" ]; then @@ -21,4 +21,4 @@ python data_parser.py ${output_file} echo "now generating bar-chart" #gnuplot -e 'output_file=value' plot_gen.gnuplot sh plot_gen.sh ${output_file} ${k_way} -echo "done! check ${output_file}.pdf" \ No newline at end of file +echo "done! check ${output_file}.pdf"