Enable ColumnChart PerMethod with params (#29)

Author: bitfaster

Benchly.Benchmarks/Md5VsSha256Params.cs

@@ -5,7 +5,7 @@
 namespace Benchly.Benchmarks
 {
     [BoxPlot(Title = "Box Plot")]
-    [ColumnChart(Title = "Column Chart ({JOB})", Output=OutputMode.PerJob)]
+    [ColumnChart(Title = "Hashing ({METHOD})", Output=OutputMode.PerMethod)]
     [Histogram]
     [Timeline]
     [MemoryDiagnoser, SimpleJob(RuntimeMoniker.Net60), SimpleJob(RuntimeMoniker.Net48)]

Benchly/ColumnChartExporter.cs

@@ -38,6 +38,29 @@ private IEnumerable<string> PerMethod(Summary summary)
         {
             var files = new List<string>();
 
+            if (summary.Reports[0].BenchmarkCase.HasParameters)
+            {
+                int paramCount = summary.Reports[0].BenchmarkCase.Parameters.Count;
+
+                if (paramCount == 1)
+                {
+                    var subPlots = GetSubPlots(summary);
+
+                    foreach (var method in summary.Reports.Select(r => r.BenchmarkCase.Descriptor.WorkloadMethodDisplayInfo).Distinct())
+                    {
+                        var title = TitleFormatter.Format(this.Info, summary, string.Join(",", summary.Reports.Select(r => r.BenchmarkCase.Job.ResolvedId).Distinct()), method);
+                        var file = Path.Combine(summary.ResultsDirectoryPath, ExporterBase.GetFileName(summary) + "-" + method + "-columnchart");
+                        var methodSubPlots = subPlots.ToPerMethod(method);
+                        ColumnChartRenderer.Render(methodSubPlots, title, file, Info.Width, Info.Height, ColorMap.GetColorList(Info));
+                        files.Add(file + ".svg");
+                    }
+
+                    return files;
+                }
+
+                return Array.Empty<string>();
+            }
+
             foreach (var report in summary.Reports) 
             {
                 if (!report.Success)
@@ -47,7 +70,7 @@ private IEnumerable<string> PerMethod(Summary summary)
 
                 int paramCount = report.BenchmarkCase.Parameters.Count;
 
-                var title = TitleFormatter.Format(this.Info, summary, report.BenchmarkCase.Job.ResolvedId);
+                var title = TitleFormatter.Format(this.Info, summary, report.BenchmarkCase.Job.ResolvedId, report.BenchmarkCase.Descriptor.WorkloadMethodDisplayInfo);
                 var fileSlug = paramCount == 0
                     ? report.BenchmarkCase.Job.ResolvedId + "-" + report.BenchmarkCase.Descriptor.WorkloadMethodDisplayInfo
                     : report.BenchmarkCase.Job.ResolvedId + "-" + report.BenchmarkCase.Descriptor.WorkloadMethodDisplayInfo + "-" + report.BenchmarkCase.Parameters.PrintInfo;
@@ -83,7 +106,7 @@ private IEnumerable<string> PerJob(Summary summary)
                     {
                         var title = TitleFormatter.Format(this.Info, summary, job);
                         var file = Path.Combine(summary.ResultsDirectoryPath, ExporterBase.GetFileName(summary) + "-" + job + "-columnchart");
-                        var jobSubPlots = subPlots.Select(s => new SubPlot() { Title = s.Title, Traces = s.Traces.Where(t => t.TraceName == job).ToList() });
+                        var jobSubPlots = subPlots.ToPerJob(job);
                         ColumnChartRenderer.Render(jobSubPlots, title, file, Info.Width, Info.Height, ColorMap.GetColorList(Info));
                         files.Add(file + ".svg");
                     }

Benchly/ColumnChartRenderer.cs

@@ -1,7 +1,9 @@
-using Microsoft.FSharp.Core;
+using BenchmarkDotNet.Jobs;
+using Microsoft.FSharp.Core;
 using Plotly.NET;
 using Plotly.NET.ImageExport;
 using Plotly.NET.LayoutObjects;
+using System.Collections.Generic;
 using static Plotly.NET.StyleParam;
 
 namespace Benchly
@@ -27,6 +29,57 @@ internal class SubPlot
         public List<TraceInfo> Traces { get; set; }
     }
 
+    internal static class SubPlotExt
+    {
+        internal static List<SubPlot> ToPerJob(this List<SubPlot> subPlots, string job)
+        {
+            return subPlots.Select(s => new SubPlot() { Title = s.Title, Traces = s.Traces.Where(t => t.TraceName == job).ToList() }).ToList();
+        }
+
+        internal static List<SubPlot> ToPerMethod(this List<SubPlot> subPlots, string method)
+        {
+            List<SubPlot> perMethod = new List<SubPlot>();
+
+            foreach (var subPlot in subPlots)
+            {
+                var methodSubPlot = new SubPlot();
+
+                // suppress the per plot label
+                methodSubPlot.Title = string.Empty;
+                methodSubPlot.Traces = new List<TraceInfo>();
+
+                foreach (var t in subPlot.Traces)
+                {
+                    
+                    var trace = new TraceInfo() { TraceName = t.TraceName };
+
+                    var values = new List<double>();
+
+                    for (int i = 0; i < t.Values.Length; i++)
+                    { 
+                        if (t.Keys[i] == method)
+                        {
+                            values.Add(t.Values[i]);
+                        }
+                    }
+
+                    // label the x axis using the paremeter name+value
+                    trace.Values = values.ToArray();
+                    trace.Keys = Enumerable.Range(0, trace.Values.Length).Select(_ => subPlot.Title).ToArray();
+
+                    if (trace.Values.Length > 0)
+                    {
+                        methodSubPlot.Traces.Add(trace);
+                    }
+                }
+
+                perMethod.Add(methodSubPlot);
+            }
+
+            return perMethod;
+        }
+    }
+
     internal class ColumnChartRenderer
     {
         public static void Render(IEnumerable<TraceInfo> traces, string title, string file, int width, int height, bool showLegend)

Benchly/TitleFormatter.cs

@@ -4,13 +4,13 @@ namespace Benchly
 {
     internal class TitleFormatter
     {
-        public static string Format(PlotInfo Info, Summary summary, string currentJob)
+        public static string Format(PlotInfo Info, Summary summary, string currentJob, string currentMethod = null)
         {
             if (!string.IsNullOrEmpty(Info.Title))
             {
                 var title = Info.Title;
 
-                return title.Replace("{JOB}", currentJob);
+                return title.Replace("{JOB}", currentJob).Replace("{METHOD}", currentMethod);
             }
 
             return summary.Title;