Update benchmarks, using Gadfly now for better control over colors.

Author: chriselrod

benchmark/benchmarkflops.jl

@@ -58,9 +58,9 @@ function matmul_bench!(br, C, A, B, i)
     br[8,i] = n_gflop / @belapsed iegemm!($C, $A, $B)
     @assert C ≈ Cblas "i-eigen gemm wrong?"; fill!(C, NaN)
     br[9,i] = n_gflop / @belapsed fgemm_builtin!($C, $A, $B)
-    @assert C ≈ Cblas "Fort intrinsic gemm wrong?"; fill!(C, NaN)
+    @assert C ≈ Cblas "Fort builtin gemm wrong?"; fill!(C, NaN)
     br[10,i] = n_gflop / @belapsed ifgemm_builtin!($C, $A, $B)
-    @assert C ≈ Cblas "ifort intrinsic gemm wrong?"; fill!(C, NaN)
+    @assert C ≈ Cblas "ifort builtin gemm wrong?"; fill!(C, NaN)
     br[11,i] = n_gflop / @belapsed mul!($C, $A, $B)
     br[12,i] = n_gflop / @belapsed dgemmmkl!($C, $A, $B)
     @assert C ≈ Cblas "MKL JIT gemm wrong?"; fill!(C, NaN)
@@ -107,7 +107,7 @@ blastests() = [
     "Julia", "Clang",
     "GFortran", "icc", "ifort",
     "g++ & Eigen-3", "icpc & Eigen-3",
-    "GFort-intrinsic", "ifort-intrinsic",
+    "GFortran-builtin", "ifort-builtin",
     BLAS.vendor() === :mkl ? "IntelMKL" : "OpenBLAS", "MKL"
 ]    
 

benchmark/driver.jl

@@ -21,6 +21,7 @@ end
 
 # sizes = 23:23
 sizes = 256:-1:2
+selfdot_bench = benchmark_selfdot(sizes)
 
 AmulB_bench = benchmark_AmulB(sizes)
 AmulBt_bench = benchmark_AmulBt(sizes)
@@ -35,7 +36,6 @@ filter2d_unrolled_bench = benchmark_filter2dunrolled(sizes)#512:-1:2)
 
 dot3_bench = benchmark_dot3(sizes)
 dot_bench = benchmark_dot(sizes)
-selfdot_bench = benchmark_selfdot(sizes)
 sse_bench = benchmark_sse(sizes)
 aplusBc_bench = benchmark_aplusBc(sizes)
 AplusAt_bench = benchmark_AplusAt(sizes)
@@ -44,26 +44,30 @@ randomaccess_bench = benchmark_random_access(sizes)
 logdettriangle_bench = benchmark_logdettriangle(sizes)
 
 v = 1
-filetype = "svg"
+using Cairo, Fontconfig
 const PICTURES = joinpath(pkgdir(LoopVectorization), "docs", "src", "assets")
-save(joinpath(PICTURES, "bench_filter2d_dynamic_v$v.$filetype"), plot(filter2d_dynamic_bench));
-save(joinpath(PICTURES, "bench_filter2d_3x3_v$v.$filetype"), plot(filter2d_3x3_bench));
-save(joinpath(PICTURES, "bench_filter2d_unrolled_v$v.$filetype"), plot(filter2d_unrolled_bench));
-save(joinpath(PICTURES, "bench_dot_v$v.$filetype"), plot(dot_bench));
-save(joinpath(PICTURES, "bench_selfdot_v$v.$filetype"), plot(selfdot_bench));
-save(joinpath(PICTURES, "bench_dot3_v$v.$filetype"), plot(dot3_bench));
-save(joinpath(PICTURES, "bench_sse_v$v.$filetype"), plot(sse_bench));
-save(joinpath(PICTURES, "bench_aplusBc_v$v.$filetype"), plot(aplusBc_bench));
-save(joinpath(PICTURES, "bench_AplusAt_v$v.$filetype"), plot(AplusAt_bench));
-save(joinpath(PICTURES, "bench_exp_v$v.$filetype"), plot(vexp_bench));
-save(joinpath(PICTURES, "bench_random_access_v$v.$filetype"), plot(randomaccess_bench));
-save(joinpath(PICTURES, "bench_logdettriangle_v$v.$filetype"), plot(logdettriangle_bench));
-save(joinpath(PICTURES, "bench_AmulB_v$v.$filetype"), plot(AmulB_bench));
-save(joinpath(PICTURES, "bench_AmulBt_v$v.$filetype"), plot(AmulBt_bench));
-save(joinpath(PICTURES, "bench_AtmulB_v$v.$filetype"), plot(AtmulB_bench));
-save(joinpath(PICTURES, "bench_AtmulBt_v$v.$filetype"), plot(AtmulBt_bench));
-save(joinpath(PICTURES, "bench_Amulvb_v$v.$filetype"), plot(Amulvb_bench));
-save(joinpath(PICTURES, "bench_Atmulvb_v$v.$filetype"), plot(Atmulvb_bench));
+function saveplot(f, br)
+    draw(PNG(joinpath(PICTURES, f * "$v.png"), 12inch, 8inch), plot(br))
+end
+
+saveplot("bench_filter2d_dynamic_v", filter2d_dynamic_bench);
+saveplot("bench_filter2d_3x3_v", filter2d_3x3_bench);
+saveplot("bench_filter2d_unrolled_v", filter2d_unrolled_bench);
+saveplot("bench_dot_v", dot_bench);
+saveplot("bench_selfdot_v", selfdot_bench);
+saveplot("bench_dot3_v", dot3_bench);
+saveplot("bench_sse_v", sse_bench);
+saveplot("bench_aplusBc_v", aplusBc_bench);
+saveplot("bench_AplusAt_v", AplusAt_bench);
+saveplot("bench_exp_v", vexp_bench);
+saveplot("bench_random_access_v", randomaccess_bench);
+saveplot("bench_logdettriangle_v", logdettriangle_bench);
+saveplot("bench_AmulB_v", AmulB_bench);
+saveplot("bench_AmulBt_v", AmulBt_bench);
+saveplot("bench_AtmulB_v", AtmulB_bench);
+saveplot("bench_AtmulBt_v", AtmulBt_bench);
+saveplot("bench_Amulvb_v", Amulvb_bench);
+saveplot("bench_Atmulvb_v", Atmulvb_bench);
 
 
 

benchmark/plotbenchmarks.jl

@@ -10,31 +10,76 @@ function Base.show(io::IO, br::BenchmarkResult)
     )
 end
 
-using VegaLite, IndexedTables
-function plot(br::BenchmarkResult)
-    res = vec(br.sizedresults.results)
-    brsizes = br.sizedresults.sizes
-    sizes = Vector{eltype(brsizes)}(undef, length(res))
-    ntests = length(br.tests) - 1
-    for i ∈ 0:length(brsizes)-1
-        si = brsizes[i+1]
-        for j ∈ 1:ntests
-            sizes[j + i*ntests] = si
-        end
+
+using Colors, Gadfly
+const COLORS = distinguishable_colors(21, [RGB(1,1,1), RGB(0,0,0)])
+const COLOR_MAP = Dict{String,RGB{Colors.N0f8}}()
+function getcolor(s::String)
+    get!(COLOR_MAP, s) do
+        COLORS[length(COLOR_MAP) + 2]
     end
-    names = ["$(i > 9 ? string(i) : "0$i"). $test" for (i,test) ∈ enumerate(@view(br.tests[2:end]))]
-    tests = reduce(vcat, (names for _ ∈ eachindex(brsizes)))
-    t = table((GFLOPS = res, Size = sizes, Method = tests))
-    t |> @vlplot(
-        :line,
-        x = :Size,
-        y = :GFLOPS,
-        width = 900,
-        height = 600,
-        color={
-            :Method,
-            scale={scheme="category20"}
-        }
+end
+
+
+function Gadfly.plot(br::BenchmarkResult)
+    res = br.sizedresults.results
+    sizes = br.sizedresults.sizes
+    # sizes = Vector{eltype(brsizes)}(undef, length(res))
+    tests = @view(br.tests[2:end])
+    ntests = length(tests)
+    colors = getcolor.(tests)
+    
+    xt = 0:20:260
+    maxres = maximum(res)
+    maxtick = 10round(Int, 0.1maxres)
+    yt = if iszero(maxtick)
+        maxtick = 10round(0.1maxres)
+        range(0, maxtick, length = 20)
+    elseif maxtick < 50
+        0:5:maxtick
+    elseif maxtick < 20
+        0:2:maxtick
+    elseif maxtick < 10
+        0:1:maxtick
+    else
+        0:10:maxtick
+    end
+    p = Gadfly.plot(
+        Gadfly.Guide.manual_color_key("Methods", tests, colors),
+        Guide.xlabel("Size"), Guide.ylabel("GFLOPS"),
+        Guide.xticks(ticks=collect(xt)), Guide.yticks(ticks=collect(yt))
     )
+    for i ∈ eachindex(tests)
+        push!(p, layer(x = sizes, y = res[i,:], Geom.line, Theme(default_color=colors[i])))
+    end
+    p
 end
 
+# using VegaLite, IndexedTables
+# function plot(br::BenchmarkResult)
+#     res = vec(br.sizedresults.results)
+#     brsizes = br.sizedresults.sizes
+#     sizes = Vector{eltype(brsizes)}(undef, length(res))
+#     ntests = length(br.tests) - 1
+#     for i ∈ 0:length(brsizes)-1
+#         si = brsizes[i+1]
+#         for j ∈ 1:ntests
+#             sizes[j + i*ntests] = si
+#         end
+#     end
+#     names = ["$(i > 9 ? string(i) : "0$i"). $test" for (i,test) ∈ enumerate(@view(br.tests[2:end]))]
+#     tests = reduce(vcat, (names for _ ∈ eachindex(brsizes)))
+#     t = table((GFLOPS = res, Size = sizes, Method = tests))
+#     t |> @vlplot(
+#         :line,
+#         x = :Size,
+#         y = :GFLOPS,
+#         width = 900,
+#         height = 600,
+#         color={
+#             :Method,
+#             scale={scheme="category20"}
+#         }
+#     )
+# end
+