Got 3 benchmark reports working across 2 machines.

osh-parser, osh-runtime, and vm-baseline.

benchmarks/osh-runtime.sh

@@ -256,13 +256,17 @@ stage1() {

  mkdir -p $out_dir

  # Just copy for now
  cp -v $raw_dir/*.times.csv $out_dir/times.csv
  local times_csv=$out_dir/times.csv
  # Globs are in lexicographical order, which works for our dates.
  local -a a=($raw_dir/flanders.*.times.csv)
  local -a b=($raw_dir/lisa.*.times.csv)
  csv-concat ${a[-1]} ${b[-1]} > $times_csv

  local vm_csv=$out_dir/virtual-memory.csv

  local -a x=($raw_dir/lisa.*.virtual-memory)
  benchmarks/virtual_memory.py osh-runtime ${x[-1]} > $vm_csv
  local -a c=($raw_dir/flanders.*.virtual-memory)
  local -a d=($raw_dir/lisa.*.virtual-memory)
  benchmarks/virtual_memory.py osh-runtime ${c[-1]} ${d[-1]} > $vm_csv

  #local raw_dir=${1:-../benchmark-data/osh-parser}
}

benchmarks/report.R

@@ -261,12 +261,12 @@ RuntimeReport = function(in_dir, out_dir) {
  # Sort by osh elapsed ms.
  times %>%
    mutate(elapsed_ms = elapsed_secs * 1000,
           arg_label = basename(task_arg)) %>%
    select(-c(status, task_arg, elapsed_secs)) %>%
           task_arg = basename(task_arg)) %>%
    select(-c(status, elapsed_secs)) %>%
    spread(key = shell_label, value = elapsed_ms) %>%
    mutate(osh_to_bash_ratio = osh / bash) %>%
    arrange(task_type, osh) %>%
    select(c(host_label, task_type, arg_label, bash, dash, osh, osh_to_bash_ratio)) ->
    arrange(host_label, task_arg, osh) %>%
    select(c(host_label, task_arg, bash, dash, osh, osh_to_bash_ratio)) ->
    times

  print(summary(times))

benchmarks/report.sh

@@ -44,15 +44,15 @@ stage3() {
osh-parser() {
  local base_dir=_tmp/osh-parser

  benchmarks/osh-parser.sh stage1
  benchmarks/osh-parser.sh stage1 ../benchmark-data/osh-parser
  stage2 $base_dir
  stage3 $base_dir
}

osh-runtime() {
  local base_dir=_tmp/osh-runtime

  benchmarks/osh-runtime.sh stage1
  benchmarks/osh-runtime.sh stage1 ../benchmark-data/osh-runtime
  stage2 $base_dir
  stage3 $base_dir
}
@@ -61,7 +61,7 @@ osh-runtime() {
vm-baseline() {
  local base_dir=_tmp/vm-baseline

  benchmarks/vm-baseline.sh stage1
  benchmarks/vm-baseline.sh stage1 ../benchmark-data/vm-baseline
  stage2 $base_dir
  stage3 $base_dir
}
@@ -70,7 +70,7 @@ vm-baseline() {
oheap() {
  local base_dir=_tmp/oheap

  benchmarks/oheap.sh stage1
  benchmarks/oheap.sh stage1 
  stage2 $base_dir
  stage3 $base_dir
}