Fix GPI-2 and enable TAGASPI

The rdma-core driver.h include is no longer installed: 56dd87acd2 So ibv_read_sysfs_file() is not defined. As the symbols is still distributed, we simply add the missing prototype manually. Similarly, the gaspi_size_t gaspi_get_system_mem() function is not available from the gaspi public headers, so we define it in the max_mem.c test. Fixes: rarias/bscpkgs#7
Build nOS-V with PAPI support
2025-09-12 13:40:59 +02:00 · 2025-08-01 13:12:48 +02:00
18 changed files with 85 additions and 103 deletions
--- a/overlay.nix
+++ b/overlay.nix
@@ -18,7 +18,7 @@ let
    clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; };
    clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { };
    #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
-    #gpi-2 = callPackage ./pkgs/gpi-2/default.nix { }; # Broken: https://jungle.bsc.es/git/rarias/bscpkgs/issues/7
+    gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
    intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };
    jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { };
    lmbench = callPackage ./pkgs/lmbench/default.nix { };
@@ -44,16 +44,11 @@ let
    stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; };
    stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; };
    stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
-    #tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; # Broken due gpi-2
+    tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
    tampi = callPackage ./pkgs/tampi/default.nix { };
    wxparaver = callPackage ./pkgs/paraver/default.nix { };
  };

-  allPkgs = collect isDerivation bscPkgs;
-
-  mkStrict = pkg: if pkg ? overrideAttrs then pkg.overrideAttrs { strictDeps = true; } else pkg;
-  strictPkgs = map mkStrict allPkgs;
-
 in bscPkgs // {
  # Prevent accidental usage of bsc attribute
  bsc = throw "the bsc attribute is deprecated, packages are now in the root";
@@ -94,7 +89,7 @@ in bscPkgs // {
    };

    pkgs = final.runCommand "ci-pkgs" { }
-      "printf '%s\n' ${toString strictPkgs} > $out";
+      "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";

    tests = final.runCommand "ci-tests" { }
      "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
--- a/pkgs/bench6/default.nix
+++ b/pkgs/bench6/default.nix
@@ -27,13 +27,10 @@ stdenv.mkDerivation rec {
    rev = gitCommit;
  };

-  nativeBuildInputs = [
-    cmake
-    clangOmpss2
-  ];
-
  buildInputs = [
    bigotes
+    cmake
+    clangOmpss2
    openmp
    openmpv
    nanos6
--- a/pkgs/bigotes/default.nix
+++ b/pkgs/bigotes/default.nix
@@ -4,7 +4,7 @@
 , cmake
 }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "bigotes";
  version = "9dce13";
  src = fetchFromGitHub {
@@ -13,5 +13,5 @@ stdenv.mkDerivation {
    rev = "9dce13446a8da30bea552d569d260d54e0188518";
    sha256 = "sha256-ktxM3pXiL8YXSK+/IKWYadijhYXqGoLY6adLk36iigE=";
  };
-  nativeBuildInputs = [ cmake ];
+  buildInputs = [ cmake ];
 }
--- a/pkgs/gpi-2/default.nix
+++ b/pkgs/gpi-2/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

+  patches = [ ./rdma-core.patch ./max-mem.patch ];
+
  preConfigure = ''
    patchShebangs autogen.sh
    ./autogen.sh
--- a/pkgs/gpi-2/max-mem.patch
+++ b/pkgs/gpi-2/max-mem.patch
@@ -0,0 +1,10 @@
+--- a/tests/tests/segments/max_mem.c	2025-09-12 13:30:53.449353591 +0200
+++ b/tests/tests/segments/max_mem.c	2025-09-12 13:33:49.750352401 +0200
+@@ -1,5 +1,7 @@
+ #include <test_utils.h>
+ 
+gaspi_size_t gaspi_get_system_mem (void);
+
+ /* Test allocates 45% of system memory and creates a segment that
+    large or if several ranks per node exist, divided among that
+    number */
--- a/pkgs/gpi-2/rdma-core.patch
+++ b/pkgs/gpi-2/rdma-core.patch
@@ -0,0 +1,12 @@
+--- a/src/devices/ib/GPI2_IB.h	2025-09-12 13:25:31.564181121 +0200
+++ b/src/devices/ib/GPI2_IB.h	2025-09-12 13:24:49.105422150 +0200
+@@ -26,6 +26,9 @@ along with GPI-2. If not, see <http://ww
+ 
+ #include "GPI2_Dev.h"
+ 
+/* Missing prototype as driver.h is now private */
+int ibv_read_sysfs_file(const char *dir, const char *file, char *buf, size_t size);
+
+ #define GASPI_GID_INDEX   (0)
+ #define PORT_LINK_UP      (5)
+ #define MAX_INLINE_BYTES  (128)
--- a/pkgs/intel-oneapi/2023.nix
+++ b/pkgs/intel-oneapi/2023.nix
@@ -78,7 +78,7 @@ let
  uncompressDebs = debs: name: stdenv.mkDerivation {
    name = name;
    srcs = debs;
-    nativeBuildInputs = [ dpkg ];
+    buildInputs = [ dpkg ];
    phases = [ "installPhase" ];
    installPhase = ''
      mkdir -p $out
@@ -108,17 +108,14 @@ let
      "intel-oneapi-mpi-${version}"
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
-
    buildInputs = [
+      rsync
      libfabric
      zlib
      stdenv.cc.cc.lib
    ];

+    nativeBuildInputs = [ autoPatchelfHook ];
    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;
    installPhase = ''
@@ -157,6 +154,7 @@ let

    buildInputs = [
      intel-mpi
+      rsync
      libffi_3_3
      libelf
      libxml2
@@ -164,10 +162,7 @@ let
      stdenv.cc.cc.lib
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;

@@ -197,6 +192,7 @@ let
    buildInputs = [
      intel-mpi
      intel-tbb
+      rsync
      libffi_3_3
      libelf
      libxml2
@@ -205,10 +201,7 @@ let
      stdenv.cc.cc.lib
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
    phases = [ "installPhase" "fixupPhase" ];
    dontStrip = true;

@@ -261,6 +254,7 @@ let
    buildInputs = [
      intel-mpi
      intel-compiler-shared
+      rsync
      libffi_3_3
      libelf
      libxml2
@@ -268,10 +262,7 @@ let
      stdenv.cc.cc.lib
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
+    nativeBuildInputs = [ autoPatchelfHook ];

    phases = [ "installPhase" "fixupPhase" ];

@@ -346,6 +337,7 @@ let

    buildInputs = [
      intel-compiler-shared
+      rsync
      libffi_3_3
      libelf
      libxml2
@@ -353,10 +345,7 @@ let
      stdenv.cc.cc.lib
    ];

-    nativeBuildInputs = [
-      autoPatchelfHook
-      rsync
-    ];
+    nativeBuildInputs = [ autoPatchelfHook ];
    autoPatchelfIgnoreMissingDeps = [ "libtbb.so.12" "libtbbmalloc.so.2" "libze_loader.so.1" ];

    phases = [ "installPhase" "fixupPhase" ];
--- a/pkgs/llvm-ompss2/clang.nix
+++ b/pkgs/llvm-ompss2/clang.nix
@@ -57,20 +57,18 @@ in stdenv.mkDerivation rec {

  isClangWithOmpss = true;

-  nativeBuildInputs = [
-    bash
-    cmake
-    elfutils
-    llvmPackages_latest.lld
-    pkg-config
-    python3
-    perl
-    which
-    zlib
-  ];
+  nativeBuildInputs = [ zlib ];

  buildInputs = [
+    which
+    bash
+    python3
+    perl
+    cmake
+    llvmPackages_latest.lld
+    elfutils
    libffi
+    pkg-config
    zlib
    gcc.cc.lib # Required for libstdc++.so.6
  ];
--- a/pkgs/mcxx/default.nix
+++ b/pkgs/mcxx/default.nix
@@ -32,20 +32,17 @@ stdenv.mkDerivation rec {

  enableParallelBuilding = true;

-  nativeBuildInputs = [
+  buildInputs = [
    autoreconfHook
-    bison
-    flex
+    nanos6
+    gperf
    python3
    gfortran
    pkg-config
-    gperf
-    gcc
-  ];
-
-  buildInputs = [
-    nanos6
    sqlite.dev
+    bison
+    flex
+    gcc
  ];

  patches = [ ./intel.patch ];
--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@@ -88,19 +88,11 @@ in
    dontStrip = enableDebug;
    separateDebugInfo = true;

-    nativeBuildInputs = [
+    buildInputs = [
      autoconf
      automake
      libtool
      pkg-config
-
-      # TODO: papi_version is needed for configure:
-      # ./configure: line 27378: papi_version: command not found
-      # This probably breaks cross-compilation
-      papi
-    ];
-
-    buildInputs = [
      boost
      numactl
      hwloc
@@ -112,7 +104,7 @@ in
    postInstall = ''
      mkdir -p $out/nix-support
      echo "export NANOS6_HOME=$out" >> $out/nix-support/setup-hook
-    '';
+    ''; 

    meta = with lib; {
      homepage = "https://github.com/bsc-pm/nanos6";
--- a/pkgs/nosv/default.nix
+++ b/pkgs/nosv/default.nix
@@ -6,6 +6,8 @@
 , pkg-config
 , numactl
 , hwloc
+, papi
+, enablePapi ? true
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false
@@ -56,5 +58,5 @@ in
      numactl
      hwloc
      ovni
-    ];
+    ] ++ lib.optionals enablePapi [ papi ];
  }
--- a/pkgs/osu/default.nix
+++ b/pkgs/osu/default.nix
@@ -24,10 +24,9 @@ stdenv.mkDerivation rec {

  doCheck = true;
  enableParallelBuilding = true;
-  nativeBuildInputs = [ mpiAll ];
  buildInputs = [ mpiAll ];
  hardeningDisable = [ "all" ];
-  configureFlags = [
+  configureFlags = [ 
      "CC=mpicc"
      "CXX=mpicxx"
  ];
@@ -41,7 +40,7 @@ stdenv.mkDerivation rec {

  meta = {
    description = "OSU Micro-Benchmarks";
-    homepage = "http://mvapich.cse.ohio-state.edu/benchmarks/";
+    homepage = http://mvapich.cse.ohio-state.edu/benchmarks/;
    maintainers = [ ];
    platforms = lib.platforms.all;
  };
--- a/pkgs/ovni/default.nix
+++ b/pkgs/ovni/default.nix
@@ -13,6 +13,8 @@
 , useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
 }:

+with lib;
+
 let
  release = rec {
    version = "1.12.0";
@@ -43,7 +45,8 @@ in
    postPatch = ''
      patchShebangs --build test/
    '';
-    nativeBuildInputs = [ cmake ] ++ lib.optionals (useMpi) [ mpi ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = lib.optionals (useMpi) [ mpi ];
    cmakeBuildType = if (enableDebug) then "Debug" else "Release";
    cmakeFlags = [
      "-DOVNI_GIT_COMMIT=${src.shortRev}"
--- a/pkgs/paraver/default.nix
+++ b/pkgs/paraver/default.nix
@@ -60,17 +60,17 @@ stdenv.mkDerivation rec {
  ];

  nativeBuildInputs = [
-    autoconf
-    automake
-    autoreconfHook
    wrapGAppsHook
  ];

  buildInputs = [
+    autoreconfHook
    boost
    libxml2.dev
    xml2
    wx
+    autoconf
+    automake
    paraverKernel
    openssl.dev
  ];
--- a/pkgs/paraver/kernel.nix
+++ b/pkgs/paraver/kernel.nix
@@ -44,17 +44,14 @@ stdenv.mkDerivation rec {
    "--enable-openmp"
  ];

-  nativeBuildInputs = [
-    autoreconfHook
-    autoconf
-    automake
-    pkg-config
-  ];
-
  buildInputs = [
+    autoreconfHook
    boost
    libxml2.dev
    xml2
+    autoconf
+    automake
+    pkg-config
    zlib
  ];
 }
--- a/pkgs/paraver/release.nix
+++ b/pkgs/paraver/release.nix
@@ -61,16 +61,13 @@ stdenv.mkDerivation rec {
    "--with-wx-config=${wx}/bin/wx-config"
  ];

-  nativeBuildInputs = [
-    autoconf
-    automake
-  ];
-
  buildInputs = [
    boost
    xml2
    libxml2.dev
    wx
+    autoconf
+    automake
    openssl.dev
  ];

--- a/pkgs/sonar/default.nix
+++ b/pkgs/sonar/default.nix
@@ -18,12 +18,8 @@ stdenv.mkDerivation rec {
  hardeningDisable = [ "all" ];
  dontStrip = true;
  configureFlags = [ "--with-ovni=${ovni}" ];
-
-  nativeBuildInputs = [
-    autoreconfHook
-  ];
-
  buildInputs = [
+    autoreconfHook
    ovni
    mpi
  ];
--- a/pkgs/tampi/default.nix
+++ b/pkgs/tampi/default.nix
@@ -41,24 +41,20 @@ let
    };
  };
  source = if (useGit) then git else release;
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
  pname = "tampi";
  inherit (source) src version;
  enableParallelBuilding = true;
  separateDebugInfo = true;
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    autoreconfHook
-    gcc
-    gnumake
-    libtool
-  ];
-
  buildInputs = [
+    autoreconfHook
+    automake
+    autoconf
+    libtool
+    gnumake
    boost
    mpi
+    gcc
  ] ++ optional (enableOvni) ovni;
  configureFlags = optional (enableOvni) "--with-ovni=${ovni}";
  dontDisableStatic = true;