add GC time

Author: mcabbott

src/execution.jl

@@ -572,13 +572,17 @@ macro btime(args...)
         local $trialmin = $BenchmarkTools.minimum($trial)
         local $trialmean = $BenchmarkTools.mean($trial)
         local $trialallocs = $BenchmarkTools.allocs($trialmin)
-        println("  min ", $BenchmarkTools.prettytime($BenchmarkTools.time($trialmin)),
-                ", mean ", $BenchmarkTools.prettytime($BenchmarkTools.time($trialmean)),
-                " (", $trialallocs , " allocation",
-                $trialallocs == 1 ? "" : "s", 
-                $trialallocs == 0 ? "" : ": " * 
-                    $BenchmarkTools.prettymemory($BenchmarkTools.memory($trialmin)), 
-                ")")
+        $print("  min ", $BenchmarkTools.prettytime($BenchmarkTools.time($trialmin)),
+            ", mean ", $BenchmarkTools.prettytime($BenchmarkTools.time($trialmean)),
+            " (", $trialallocs , " allocation", $trialallocs == 1 ? "" : "s")
+        if $trialallocs == 0
+            $println(")")
+        else
+            $println(", ", $prettymemory($memory($trialmin)),
+                ". GC mean ", $prettytime($gctime($trialmean); short=true),
+                ", ", $prettypercent($gctime($trialmean) / $time($trialmean)), ")"
+                )
+        end
         $result
     end)
 end

src/trials.jl

@@ -253,7 +253,7 @@ function prettydiff(p)
     return string(diff >= 0.0 ? "+" : "", @sprintf("%.2f", diff * 100), "%")
 end
 
-function prettytime(t)
+function prettytime(t; short=false)
     if t < 1e3
         value, units = t, "ns"
     elseif t < 1e6
@@ -263,7 +263,11 @@ function prettytime(t)
     else
         value, units = t / 1e9, "s"
     end
-    return string(@sprintf("%.3f", value), " ", units)
+    if short
+        string(@sprintf("%.0f", value), " ", units)
+    else
+        string(@sprintf("%.3f", value), " ", units)
+    end
 end
 
 function prettymemory(b)