diff --git a/benchmark/eval_analysis_v2.R b/benchmark/eval_analysis_v2.R index d9669c236..19d869629 100755 --- a/benchmark/eval_analysis_v2.R +++ b/benchmark/eval_analysis_v2.R @@ -65,7 +65,7 @@ for (scale in c("linear")) { #aes(x=nn, y=bwMiB) + ggtitle(sprintf("%s independent random access to a shared file with IOR", lab_fs)) + facet_grid(ppn ~ lab_access + lab_count, labeller = labeller(nn = as_labeller(nn_lab), ppn = as_labeller(ppn_lab))) + - #facet_grid(lab_fs + ppn ~ lab_access, labeller = labeller(nn = as_labeller(nn_lab), ppn = as_labeller(ppn_lab))) + + #facet_grid(ppn ~ lab_access, labeller = labeller(nn = as_labeller(nn_lab), ppn = as_labeller(ppn_lab))) + xlab("Nodes") + ylab("Performance in MiB/s") + theme(axis.text.x=element_text(angle=90, hjust=0.95, vjust=0.5)) + @@ -87,8 +87,8 @@ for (scale in c("linear")) { filename_eps = sprintf("%s/%s_%s_performance.eps", folder_out, to_fn_str(lab_fs), scale) filename_png = sprintf("%s/%s_%s_performance.png", folder_out, to_fn_str(lab_fs), scale) - ggsave(filename_png, width = 10, height = 8) - ggsave(filename_eps, width = 10, height = 8) + ggsave(filename_png, width = 16, height = 8) + ggsave(filename_eps, width = 16, height = 8) #system(sprintf("epstopdf %s", filename_eps)) system(sprintf("rm %s", filename_eps)) @@ -97,7 +97,7 @@ for (scale in c("linear")) { #aes(x=nn, y=bwMiB) + ggtitle(sprintf('%s Infiniband throughput (PortRcvData and PortXmitData by "perfquery -x")', lab_fs)) + facet_grid(ppn ~ lab_access + lab_count, labeller = labeller(nn = as_labeller(nn_lab), ppn = as_labeller(ppn_lab))) + - #facet_grid(lab_fs + ppn ~ lab_access, labeller = labeller(nn = as_labeller(nn_lab), ppn = as_labeller(ppn_lab))) + + #facet_grid(ppn ~ lab_access, labeller = labeller(nn = as_labeller(nn_lab), ppn = as_labeller(ppn_lab))) + xlab("Nodes") + ylab("Performance in MiB/s") + theme(axis.text.x=element_text(angle=90, hjust=0.95, vjust=0.5)) + @@ -116,8 +116,8 @@ for (scale in c("linear")) { filename_eps = sprintf("%s/%s_%s_ib.eps", folder_out, to_fn_str(lab_fs), scale) filename_png = sprintf("%s/%s_%s_ib.png", folder_out, to_fn_str(lab_fs), scale) - ggsave(filename_png, width = 10, height = 8) - ggsave(filename_eps, width = 10, height = 8) + ggsave(filename_png, width = 16, height = 8) + ggsave(filename_eps, width = 16, height = 8) #system(sprintf("epstopdf %s", filename_eps)) system(sprintf("rm %s", filename_eps)) diff --git a/benchmark/mkdb.py b/benchmark/mkdb.py index 6e27a4957..4eae07adf 100755 --- a/benchmark/mkdb.py +++ b/benchmark/mkdb.py @@ -79,14 +79,14 @@ def _parseSysCounters(fn:str): if (m): res[m.group(1).lower()] = int(m.group(2)) - m = re.match("cpu([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)", line) - stat['cpu%d' % int(m.group(1)]['user'] = int(m.group(2)) - stat['cpu%d' % int(m.group(1)]['nice'] = int(m.group(3)) - stat['cpu%d' % int(m.group(1)]['system'] = int(m.group(4)) - stat['cpu%d' % int(m.group(1)]['idle'] = int(m.group(5)) - stat['cpu%d' % int(m.group(1)]['iowait'] = int(m.group(6)) - stat['cpu%d' % int(m.group(1)]['irq'] = int(m.group(7)) - stat['cpu%d' % int(m.group(1)]['softirq'] = int(m.group(8)) + #m = re.match("cpu([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)\s+([0-9]+)", line) + # stat['cpu%d' % int(m.group(1)]['user'] = int(m.group(2)) + # stat['cpu%d' % int(m.group(1)]['nice'] = int(m.group(3)) + # stat['cpu%d' % int(m.group(1)]['system'] = int(m.group(4)) + # stat['cpu%d' % int(m.group(1)]['idle'] = int(m.group(5)) + # stat['cpu%d' % int(m.group(1)]['iowait'] = int(m.group(6)) + # stat['cpu%d' % int(m.group(1)]['irq'] = int(m.group(7)) + # stat['cpu%d' % int(m.group(1)]['softirq'] = int(m.group(8)) if (m): res[m.group(1)] = int(m.group(2)) diff --git a/benchmark/results.db b/benchmark/results.db index 35b71a311..b66bf39ee 100644 Binary files a/benchmark/results.db and b/benchmark/results.db differ diff --git a/benchmark/results_v2.R b/benchmark/results_v2.R deleted file mode 100644 index e69de29bb..000000000