From 1f71bc8e902436022b45fe26bb52956eb0f32aca Mon Sep 17 00:00:00 2001
From: Rodrigo Arias <rodrigo.arias@bsc.es>
Date: Fri, 11 Apr 2025 14:35:37 +0200
Subject: [PATCH] Add bench6 to run benchmark tests

---
 CHANGELOG.md |  1 +
 flake.nix    | 23 ++++++++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a0eef9..250783f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add support OpenMP label and task ID views.
 - Add support for nOS-V non-blocking scheduler server events (`VSN` and `VSn`).
 - Add OpenMP simple breakdown view.
+- Add bench6 package to run full mini-apps for tests.
 
 ## [1.11.0] - 2024-11-08
 
diff --git a/flake.nix b/flake.nix
index 287ba97..5093576 100644
--- a/flake.nix
+++ b/flake.nix
@@ -32,6 +32,25 @@
         gitBranch = "master";
         gitCommit = "403fcf764e908b793cb8015d41dec119a2374a69";
       };
+      bench6 = prev.bench6.overrideAttrs (old: rec {
+        src = builtins.fetchGit {
+          url = "ssh://git@bscpm04.bsc.es/rarias/bench6.git";
+          ref = "master";
+          rev = "62f5970779b315fcb8939280727716748a3f3ca5";
+        };
+        version = src.shortRev;
+        cmakeFlags = [ "-DCMAKE_C_COMPILER=clang" "-DCMAKE_CXX_COMPILER=clang++" ];
+        env = with final; {
+          NANOS6_HOME = nanos6;
+          NODES_HOME = nodes;
+          NOSV_HOME = nosv;
+        };
+        buildInputs = with final; [ bigotes cmake clangOmpss2 openmp openmpv
+          nanos6 nodes nosv mpi tampi tagaspi gpi-2 openblas openblas.dev ovni
+        ];
+        hardeningDisable = [ "all" ];
+        dontStrip = true;
+      });
 
       # Use a fixed commit for libovni
       ovniFixed = prev.ovni.override {
@@ -116,7 +135,9 @@
         # We need to be able to exit the chroot to run Nanos6 tests, as they
         # require access to /sys for hwloc
         __noChroot = true;
-        buildInputs = old.buildInputs ++ (with pkgs; [ pkg-config nosv nanos6 nodes openmpv ]);
+        buildInputs = old.buildInputs ++ (with pkgs; [
+          pkg-config nosv nanos6 nodes openmpv bench6
+        ]);
         cmakeFlags = old.cmakeFlags ++ [ "-DENABLE_ALL_TESTS=ON" ];
         preConfigure = old.preConfigure or "" + ''
           export NOSV_HOME="${pkgs.nosv}"