Fix benchmark plotting scripts

Author: ulfjack

scripts/BUILD

@@ -2,7 +2,7 @@
   name = "generate-" + t + "-" + f + "-csv",
   tools = [dep],
   outs = [t + "-" + f + ".csv"],
-  cmd = "$(location " + dep + ") " + o + " -samples=1000 -v > $@",
+  cmd = "$(location " + dep + ") " + o + " -classic -samples=1000 -v > $@",
 ) for (t,f,o,dep) in [
     ("c", "float", "-32", "//ryu/benchmark"),
     ("c", "double", "-64", "//ryu/benchmark"),
@@ -12,7 +12,7 @@
 
 CONVERSION_CMD="".join([
     "TMP_FILE=$$(mktemp /tmp/plot.XXXXXX)",
-    " && cat $(location gnuplot.template)",
+    " && cat $(location %s.template)",
     "  | sed \"s|INPUT_FILE|$<|g\"",
     "  | sed \"s|COMPARISON_NAME_1|%s|g\"",
     "  | sed \"s|COMPARISON_NAME_2|%s|g\"",
@@ -23,8 +23,8 @@ CONVERSION_CMD="".join([
 [genrule(
   name = "generate-" + t + "-" + f + "-pdf",
   srcs = [t + "-" + f + ".csv"],
-  tools = ["gnuplot.template"],
+  tools = [f + ".template"],
   outs = [t + "-" + f + ".pdf"],
-  cmd = CONVERSION_CMD % (c, d),
+  cmd = CONVERSION_CMD % (f, c, d),
 ) for (t,c,d) in [("c","Grisu3",""),("java","Jdk","Jaffer")] for f in ["float","double"]]
 

scripts/double.template

@@ -0,0 +1,13 @@
+set title ""
+set datafile separator ","
+set linetype 1 lc rgb '#396AB1'
+set linetype 2 lc rgb '#DA7C30'
+set linetype 3 lc rgb '#3E9651'
+set term pdf size 25cm, 15cm
+set key above left horizontal Left reverse samplen 0.1
+set ylabel "Time in ns"
+set xrange [0:18446744073709551616.0]
+set xtics ("0" 0, "2^{62}" 4611686018427387904.0, "2^{63}" 9223372036854775808.0, "2^{63}+2^{62}" 13835058055282163712.0, "2^{64}" 18446744073709551616.0)
+plot "INPUT_FILE" using 2:3 with points ps 0.5 title "Ryū", \
+     "INPUT_FILE" using 2:4 with points ps 0.5 title "COMPARISON_NAME_1", \
+     "INPUT_FILE" using 2:5 with points ps 0.5 title "COMPARISON_NAME_2",

scripts/float.template

@@ -0,0 +1,13 @@
+set title ""
+set datafile separator ","
+set linetype 1 lc rgb '#396AB1'
+set linetype 2 lc rgb '#DA7C30'
+set linetype 3 lc rgb '#3E9651'
+set term pdf size 25cm, 15cm
+set key above left horizontal Left reverse samplen 0.1
+set ylabel "Time in ns"
+set xrange [0:4294967296.0]
+set xtics ("0" 0, "2^{30}" 1073741824.0, "2^{31}" 2147483648.0, "2^{31}+2^{30}" 3221225472.0, "2^{32}" 4294967296.0)
+plot "INPUT_FILE" using 2:3 with points ps 0.5 title "Ryū", \
+     "INPUT_FILE" using 2:4 with points ps 0.5 title "COMPARISON_NAME_1", \
+     "INPUT_FILE" using 2:5 with points ps 0.5 title "COMPARISON_NAME_2",

scripts/gnuplot.template

@@ -44,7 +44,7 @@ public static void main(String[] args) {
     }
 
     if (verbose) {
-      System.out.println("float_bits_as_int,ryu_time_in_ns,jdk_time_in_ns,jaffer_time_in_ns");
+      System.out.println("output_ryu,float_bits_as_int,ryu_time_in_ns,jdk_time_in_ns,jaffer_time_in_ns");
     } else {
       System.out.printf("    Average & Stddev Ryu  Average & Stddev Jdk  Average & Stddev Jaffer\n");
     }
@@ -111,7 +111,12 @@ private static int bench32(int samples, int iterations, boolean verbose) {
       double delta2 = (stop - start) / (double) iterations;
       mv2.update(delta2);
       if (verbose) {
-        System.out.println(Integer.toUnsignedString(r) + "," + delta1 + "," + delta2 + ",");
+        System.out.printf(
+            "%s,%s,%s,%s,\n",
+            RyuFloat.floatToString(f),
+            Integer.toUnsignedString(r),
+            Double.valueOf(delta1),
+            Double.valueOf(delta2));
       }
     }
     if (!verbose) {
@@ -185,7 +190,13 @@ private static int bench64(int samples, int iterations, boolean verbose) {
       double delta3 = (stop - start) / (double) iterations;
       mv3.update(delta3);
       if (verbose) {
-        System.out.println(Long.toUnsignedString(r) + "," + delta1 + "," + delta2 + "," + delta3);
+        System.out.printf(
+            "%s,%s,%s,%s,%s\n",
+            RyuDouble.doubleToString(f),
+            Long.toUnsignedString(r),
+            Double.valueOf(delta1),
+            Double.valueOf(delta2),
+            Double.valueOf(delta3));
       }
     }
     if (!verbose) {