review notes

NilFoundation · Nov 27, 2024 · 62552c7 · 62552c7
1 parent b89179a
commit 62552c7
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/flake.nix b/flake.nix
@@ -40,13 +40,6 @@
             enableDebug = false;
             sanitize = true;
           });
-          crypto3-clang-sanitize-bench = (pkgs.callPackage ./crypto3.nix {
-            stdenv = pkgs.llvmPackages_19.stdenv;
-            runTests = true;
-            enableDebug = false;
-            sanitize = true;
-            benchmarkTests = true;
-          });
           crypto3-clang-bench = (pkgs.callPackage ./crypto3.nix {
             runTests = true;
             enableDebug = false;
@@ -66,6 +59,11 @@
             runTests = true;
             enableDebug = false;
           });
+          parallel-crypto3-clang-bench = (pkgs.callPackage ./parallel-crypto3.nix {
+            runTests = true;
+            enableDebug = false;
+            benchmarkTests = true;
+          });
           parallel-crypto3-debug-tests = (pkgs.callPackage ./parallel-crypto3.nix {
             enableDebug = true;
             runTests = true;
@@ -129,17 +127,21 @@
             enableDebug = false;
             sanitize = true;
           });
-          crypto3-clang-sanitize-bench = (pkgs.callPackage ./crypto3.nix {
+          crypto3-clang-bench = (pkgs.callPackage ./crypto3.nix {
             stdenv = pkgs.llvmPackages_19.stdenv;
             runTests = true;
             enableDebug = false;
-            sanitize = true;
             benchmarkTests = true;
           });
 
           parallel-crypto3-gcc = (pkgs.callPackage ./parallel-crypto3.nix {
             runTests = true;
             enableDebug = false;
+            benchmarkTests = true;
+          });
+          parallel-crypto3-gcc-bench = (pkgs.callPackage ./parallel-crypto3.nix {
+            runTests = true;
+            enableDebug = false;
           });
           parallel-crypto3-clang = (pkgs.callPackage ./parallel-crypto3.nix {
             stdenv = pkgs.llvmPackages_19.stdenv;
@@ -151,6 +153,12 @@
             runTests = true;
             enableDebug = false;
           });
+          parallel-crypto3-clang-bench = (pkgs.callPackage ./parallel-crypto3.nix {
+            stdenv = pkgs.llvmPackages_19.stdenv;
+            runTests = true;
+            enableDebug = false;
+            benchmarkTests = true;
+          });
 
           proof-producer-gcc = (pkgs.callPackage ./proof-producer.nix {
             runTests = true;

diff --git a/parallel-crypto3.nix b/parallel-crypto3.nix
@@ -11,6 +11,7 @@
   enableDebug ? false,
   runTests ? false,
   sanitize? false,
+  benchmarkTests ? false,
   }:
 let
   inherit (lib) optional;
@@ -34,6 +35,7 @@ in stdenv.mkDerivation {
       (if runTests then "-DBUILD_PARALLEL_CRYPTO3_TESTS=TRUE" else "")
       (if enableDebug then "-DCMAKE_BUILD_TYPE=Debug" else "-DCMAKE_BUILD_TYPE=Release")
       (if sanitize then "-DSANITIZE=ON" else "-DSANITIZE=OFF")
+      (if benchmarkTests then "-DENABLE_BENCHMARKS=ON" else "-DENABLE_BENCHMARKS=OFF")
       "-DPARALLEL_CRYPTO3_ENABLE=TRUE"
     ];