Generalize benchmarks config

Author: dpanfilyonok

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksBFS.fs

@@ -13,23 +13,7 @@ open OpenCL.Net
 open GraphBLAS.FSharp.IO
 open QuickGraph
 
-type BFSConfig() =
-    inherit ManualConfig()
-
-    do
-        base.AddColumn(
-            MatrixShapeColumn("RowCount", fun mtxReader -> mtxReader.ReadMatrixShape().RowCount) :> IColumn,
-            MatrixShapeColumn("ColumnCount", fun mtxReader -> mtxReader.ReadMatrixShape().ColumnCount) :> IColumn,
-            MatrixShapeColumn("NNZ", fun mtxReader -> mtxReader.ReadMatrixShape().Nnz) :> IColumn,
-            TEPSColumn() :> IColumn,
-            StatisticColumn.Min,
-            StatisticColumn.Max
-        ) |> ignore
-
-[<IterationCount(10)>]
-[<WarmupCount(3)>]
-[<InvocationCount(3)>]
-[<Config(typeof<BFSConfig>)>]
+[<Config(typeof<CommonConfig>)>]
 type BFSBenchmarks() =
     let random = Random()
 

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksMxv.fs

@@ -7,23 +7,7 @@ open BenchmarkDotNet.Columns
 open System.IO
 open GraphBLAS.FSharp.IO
 
-type MxvConfig() =
-    inherit ManualConfig()
-
-    do
-        base.AddColumn(
-            MatrixShapeColumn("RowCount", fun mtxReader -> mtxReader.ReadMatrixShape().RowCount) :> IColumn,
-            MatrixShapeColumn("ColumnCount", fun mtxReader -> mtxReader.ReadMatrixShape().ColumnCount) :> IColumn,
-            MatrixShapeColumn("NNZ", fun mtxReader -> mtxReader.ReadMatrixShape().Nnz) :> IColumn,
-            TEPSColumn() :> IColumn,
-            StatisticColumn.Min,
-            StatisticColumn.Max
-        ) |> ignore
-
-[<IterationCount(10)>]
-[<WarmupCount(3)>]
-[<InvocationCount(3)>]
-[<Config(typeof<MxvConfig>)>]
+[<Config(typeof<CommonConfig>)>]
 type MxvBenchmarks() =
     let rand = System.Random()
 

benchmarks/GraphBLAS-sharp.Benchmarks/BenchmarksTranspose.fs

@@ -12,23 +12,7 @@ open Brahma.FSharp.OpenCL.WorkflowBuilder.Evaluation
 open OpenCL.Net
 open GraphBLAS.FSharp.IO
 
-type TransposeConfig() =
-    inherit ManualConfig()
-
-    do
-        base.AddColumn(
-            MatrixShapeColumn("RowCount", fun mtxReader -> mtxReader.ReadMatrixShape().RowCount) :> IColumn,
-            MatrixShapeColumn("ColumnCount", fun mtxReader -> mtxReader.ReadMatrixShape().ColumnCount) :> IColumn,
-            MatrixShapeColumn("NNZ", fun mtxReader -> mtxReader.ReadMatrixShape().Nnz) :> IColumn,
-            TEPSColumn() :> IColumn,
-            StatisticColumn.Min,
-            StatisticColumn.Max
-        ) |> ignore
-
-[<IterationCount(10)>]
-[<WarmupCount(3)>]
-[<InvocationCount(3)>]
-[<Config(typeof<MxvConfig>)>]
+[<Config(typeof<CommonConfig>)>]
 type TransposeBenchmarks() =
     let mutable matrix = Unchecked.defaultof<Matrix<float>>
 

benchmarks/GraphBLAS-sharp.Benchmarks/Helpers.fs

@@ -1,4 +1,4 @@
-namespace GraphBLAS.FSharp.Benchmarks
+namespace rec GraphBLAS.FSharp.Benchmarks
 
 open BenchmarkDotNet.Columns
 open BenchmarkDotNet.Reports
@@ -8,6 +8,28 @@ open OpenCL.Net
 open GraphBLAS.FSharp.IO
 open System.IO
 open System.Text.RegularExpressions
+open BenchmarkDotNet.Configs
+open BenchmarkDotNet.Jobs
+
+type CommonConfig() =
+    inherit ManualConfig()
+
+    do
+        base.AddColumn(
+            MatrixShapeColumn("RowCount", fun mtxReader -> mtxReader.ReadMatrixShape().RowCount) :> IColumn,
+            MatrixShapeColumn("ColumnCount", fun mtxReader -> mtxReader.ReadMatrixShape().ColumnCount) :> IColumn,
+            MatrixShapeColumn("NNZ", fun mtxReader -> mtxReader.ReadMatrixShape().Nnz) :> IColumn,
+            TEPSColumn() :> IColumn,
+            StatisticColumn.Min,
+            StatisticColumn.Max
+        ) |> ignore
+
+        base.AddJob(
+            Job.Dry
+                .WithWarmupCount(3)
+                .WithIterationCount(10)
+                .WithInvocationCount(3)
+        ) |> ignore
 
 type ClContext = ClContext of OpenCLEvaluationContext
 with

src/GraphBLAS-sharp/Backend/CSRMatrix/Convert.fs

@@ -110,12 +110,12 @@ module internal rec Convert =
                 fun (ndRange: _1D)
                     (nnzPerRowSparse: int[])
                     (nonZeroRowsIndices: int[])
-                    (off2: int[]) ->
+                    (expandedNnzPerRow: int[]) ->
 
                     let gid = ndRange.GlobalID0
 
                     if gid < totalSum then
-                        off2.[nonZeroRowsIndices.[gid] + 1] <- nnzPerRowSparse.[gid]
+                        expandedNnzPerRow.[nonZeroRowsIndices.[gid] + 1] <- nnzPerRowSparse.[gid]
             @>
 
         let expandedNnzPerRow = Array.zeroCreate (rowCount + 1)