misc fixes / stats work

Author: fhackett

omnilink/lib/include/omnilink/pack.hpp

@@ -52,6 +52,8 @@ struct pack<std::variant<Variants...>> {
     }
 };
 
+#if __cplusplus >= 202002L
+
 template <typename T, std::size_t extent>
 struct pack<std::span<T, extent>> {
     template <typename Stream>
@@ -64,6 +66,8 @@ struct pack<std::span<T, extent>> {
     }
 };
 
+#endif
+
 template <>
 struct pack<omnilink::Packable> {
     template <typename Stream>

omnilink/package.mill

@@ -960,6 +960,8 @@ trait TracingConfigModule extends Module:
                   success = success,
                   duration = Duration.between(startTime, endTime),
                   peakMemory = peakMemory,
+                  threadCount = threadCount,
+                  operationCount = operationCount,
                 )
             ,
             porcupine = porcupine.headOption.map:
@@ -968,6 +970,8 @@ trait TracingConfigModule extends Module:
                   success = success,
                   duration = Duration.between(startTime, endTime),
                   peakMemory = peakMemory,
+                  threadCount = threadCount,
+                  operationCount = operationCount,
                 ),
           )
       end stats
@@ -988,5 +992,7 @@ object TracingConfigModule:
       success: Boolean,
       duration: Duration,
       peakMemory: Long,
+      threadCount: Int,
+      operationCount: Int,
   ) derives upickle.default.ReadWriter
 end TracingConfigModule

omnilink/plots/env.nix

@@ -0,0 +1,11 @@
+{
+  mkShell,
+  python313Packages,
+  python313
+}:
+mkShell {
+  packages = [
+    python313Packages.matplotlib
+    python313
+  ];
+}

omnilink/plots/flake.nix

@@ -6,25 +6,31 @@ import java.time.Duration
 import mill.api.TaskCtx
 
 object `package` extends Module:
-  def flake = Task.Source(os.sub / "flake.nix")
-
   def setbenchPorcupineTimePlotScript =
     Task.Source(os.sub / "setbench_porcupine_time_plt.py")
   def setbenchPorcupineMemPlotScript =
     Task.Source(os.sub / "setbench_porcupine_mem_plt.py")
 
   def setbenchPorcupinePlots(eval: Evaluator) =
     Task.Command(exclusive = true)[Unit]:
-      val stats: Seq[(String, Int, build.omnilink.TracingConfigModule.Stats)] =
+      val modules = Seq[build.omnilink.setbench.SetBenchTracingConfigModule](
+        build.omnilink.setbench.brown_ext_chromatic_augment_lf,
+        build.omnilink.setbench.brown_ext_chromatic_augment_lf_bug1,
+        build.omnilink.setbench.brown_ext_chromatic_augment_lf_bug2,
+        build.omnilink.setbench.brown_ext_chromatic_augment_lf_bug3,
+        build.omnilink.setbench.brown_ext_chromatic_augment_lf_bug4,
+      )
+      val stats: Seq[build.omnilink.TracingConfigModule.Stats] =
         eval
           .execute:
-            ???
-            // build.omnilink.setbench.brown_ext_chromatic_augment_lf.opCountScan.crossModules
-            //   .map: m =>
-            //     m.traces.crossModules.map(
-            //       _.stats.map((m.configId, m.operationCount * m.threadCount, _)),
-            //     )
-            //   .flatten
+            modules
+              .map: m =>
+                m.opCountScan.crossModules
+                  .map: m =>
+                    m.traces.crossModules.map: t =>
+                      t.stats
+                  .flatten
+              .flatten
           .values
           .get
 
@@ -36,18 +42,14 @@ object `package` extends Module:
           )
 
       val data = stats.flatMap:
-        case (
-              _,
-              opCount,
-              build.omnilink.TracingConfigModule
-                .Stats(omnilinkOpt, porcupineOpt),
-            ) =>
+        case build.omnilink.TracingConfigModule
+              .Stats(omnilinkOpt, porcupineOpt) =>
           omnilinkOpt.toList
             .map: stats =>
               (
                 "omnilink",
                 stats.success,
-                opCount,
+                stats.operationCount,
                 stats.duration,
                 stats.peakMemory,
               )
@@ -56,7 +58,7 @@ object `package` extends Module:
               (
                 "porcupine",
                 stats.success,
-                opCount,
+                stats.operationCount,
                 stats.duration,
                 stats.peakMemory,
               )
@@ -105,7 +107,9 @@ object `package` extends Module:
         cmd = List[os.Shellable](
           "nix",
           "develop",
-          flake().path,
+          "--impure",
+          "--expr",
+          s"(import ${build.omnilink.pkgs().path}).omnilink.plots_env",
           "-c",
           "python",
           setbenchPorcupineTimePlotScript().path,
@@ -120,7 +124,9 @@ object `package` extends Module:
         cmd = List[os.Shellable](
           "nix",
           "develop",
-          flake().path,
+          "--impure",
+          "--expr",
+          s"(import ${build.omnilink.pkgs().path}).omnilink_plots_env",
           "-c",
           "python",
           setbenchPorcupineMemPlotScript().path,

omnilink/plots/package.mill

@@ -10,13 +10,6 @@ object `package` extends Module:
 
   object brown_ext_chromatic_augment_lf extends SetBenchTracingConfigModule:
     def nixName = "omnilink.setbench.workload.brown_ext_chromatic_augment_lf"
-
-    trait opCountScanModule extends Cross.Module[Int], ConfigModule:
-      def threadCount = 5
-      def operationCount = crossValue
-    end opCountScanModule
-
-    object opCountScan extends Cross[opCountScanModule](100 to 100000 by 10000)
   end brown_ext_chromatic_augment_lf
 
   object brown_ext_chromatic_augment_lf_bug1
@@ -37,6 +30,12 @@ object `package` extends Module:
       "omnilink.setbench.workload.brown_ext_chromatic_augment_lf_linbug3"
   end brown_ext_chromatic_augment_lf_bug3
 
+  object brown_ext_chromatic_augment_lf_bug4
+      extends SetBenchTracingConfigModule:
+    def nixName =
+      "omnilink.setbench.workload.brown_ext_chromatic_augment_lf_linbug4"
+  end brown_ext_chromatic_augment_lf_bug4
+
   object brown_ext_chromatic_delegateSingle_lf
       extends SetBenchTracingConfigModule:
     def nixName =
@@ -91,9 +90,9 @@ object `package` extends Module:
   // TODO: this one "works" but crashes on insert-replace as it is unsupported.
   // Fix this somehow.
 
-  object ellen_augmented_ext_bst_lf extends SetBenchTracingConfigModule:
-    def nixName = "omnilink.setbench.workload.ellen_augmented_ext_bst_lf"
-  end ellen_augmented_ext_bst_lf
+  // object ellen_augmented_ext_bst_lf extends SetBenchTracingConfigModule:
+  //   def nixName = "omnilink.setbench.workload.ellen_augmented_ext_bst_lf"
+  // end ellen_augmented_ext_bst_lf
 
   trait SetBenchTracingConfigModule extends build.omnilink.TracingConfigModule:
     def nixName: String
@@ -125,5 +124,21 @@ object `package` extends Module:
       def threadCount = 5
       def operationCount = 1000000
     end longConfig2
+
+    trait opCountScanModule extends Cross.Module[Int], ConfigModule:
+      def threadCount = 5
+      def operationCount = crossValue
+    end opCountScanModule
+
+    object opCountScan extends Cross[opCountScanModule](100 to 100000 by 10000)
+
+    trait threadCountScanModule extends Cross.Module[Int], ConfigModule:
+      def threadCount = crossValue
+      def operationCount = 100
+    end threadCountScanModule
+
+    object threadCountScan
+        extends Cross[threadCountScanModule](1, 5, 10, 15, 20, 25, 30, 35, 40,
+          45, 50)
   end SetBenchTracingConfigModule
 end `package`

omnilink/setbench/package.mill

@@ -4,6 +4,8 @@ final: prev: {
 
     porcupine = final.callPackage ./porcupine/package.nix {};
 
+    plots_env = final.callPackage ./plots/env.nix {};
+
     # WiredTiger
     wiredtiger = (prev.omnilink.wiredtiger or {}) // {
       lib.v11_3_1 = final.callPackage ./wiredtiger/wiredtiger.nix {
@@ -69,6 +71,10 @@ final: prev: {
         ghRev = "e4c751792e4d98ac68b8a7d50b7964e09f942997";
         setbenchSubdir = "ds/brown_ext_chromatic_augment_lf";
       };
+      brown_ext_chromatic_augment_lf_linbug4 = final.callPackage ./setbench/workload.nix {
+        ghRev = "cb4562bb8459b848685738fb1f00c2a015b56be2";
+        setbenchSubdir = "ds/brown_ext_chromatic_augment_lf";
+      };
       brown_ext_chromatic_delegateSingle_lf_linbug1 = final.callPackage ./setbench/workload.nix {
         ghRev = "938927dac7a3e8e0b767a04f84f02ea03c316bd1";
         setbenchSubdir = "ds/brown_ext_chromatic_delegateSingle_lf";