Fix nanos6 cross-compilation for riscv

Even if we do an override to papi get the proper configure flags for
cross-compiling, the memory fences are not defined for risc-v:

mb.h:67:2: error: #error Need to define rmb for this architecture!

flake.nix

@@ -17,7 +17,7 @@
       legacyPackages.${system} = pkgs;
 
       hydraJobs = {
-        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
+        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs cross;
       };
 
       # propagate nixpkgs lib, so we can do bscpkgs.lib

overlay.nix

@@ -96,6 +96,10 @@ in bscPkgs // {
     tests = final.runCommand "ci-tests" { }
       "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
 
+    cross = prev.lib.genAttrs [ "riscv64" ] (target:
+      final.pkgsCross.${target}.bsc-ci.pkgs
+    );
+
     all = final.runCommand "ci-all" { }
     ''
       deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"

pkgs/bench6/default.nix

@@ -27,10 +27,13 @@ stdenv.mkDerivation rec {
     rev = gitCommit;
   };
 
-  buildInputs = [
-    bigotes
+  nativeBuildInputs = [
     cmake
     clangOmpss2
+  ];
+
+  buildInputs = [
+    bigotes
     openmp
     openmpv
     nanos6

pkgs/bigotes/default.nix

@@ -4,7 +4,7 @@
 , cmake
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "bigotes";
   version = "9dce13";
   src = fetchFromGitHub {
@@ -13,5 +13,5 @@ stdenv.mkDerivation rec {
     rev = "9dce13446a8da30bea552d569d260d54e0188518";
     sha256 = "sha256-ktxM3pXiL8YXSK+/IKWYadijhYXqGoLY6adLk36iigE=";
   };
-  buildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 }

pkgs/extrae/default.nix

@@ -20,6 +20,7 @@
 #, python3Packages
 , installShellFiles
 , symlinkJoin
+, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 }:
 
 let
@@ -87,7 +88,7 @@ stdenv.mkDerivation rec {
       --enable-sampling
       --with-unwind=${libunwind.dev}
       --with-xml-prefix=${libxml2.dev}
-      --with-papi=${papi}
+      ${lib.optionalString enablePapi "--with-papi=${papi}"}
       ${if (mpi != null) then ''--with-mpi=${mpi}''
         else ''--without-mpi''}
       --without-dyninst)

pkgs/intel-oneapi/2023.nix

@@ -78,7 +78,7 @@ let
   uncompressDebs = debs: name: stdenv.mkDerivation {
     name = name;
     srcs = debs;
-    buildInputs = [ dpkg ];
+    nativeBuildInputs = [ dpkg ];
     phases = [ "installPhase" ];
     installPhase = ''
       mkdir -p $out
@@ -108,14 +108,17 @@ let
       "intel-oneapi-mpi-${version}"
     ];
 
-    buildInputs = [
+    nativeBuildInputs = [
+      autoPatchelfHook
       rsync
+    ];
+
+    buildInputs = [
       libfabric
       zlib
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [ autoPatchelfHook ];
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
     installPhase = ''
@@ -154,7 +157,6 @@ let
 
     buildInputs = [
       intel-mpi
-      rsync
       libffi_3_3
       libelf
       libxml2
@@ -162,7 +164,10 @@ let
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [ autoPatchelfHook ];
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rsync
+    ];
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
 
@@ -192,7 +197,6 @@ let
     buildInputs = [
       intel-mpi
       intel-tbb
-      rsync
       libffi_3_3
       libelf
       libxml2
@@ -201,7 +205,10 @@ let
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [ autoPatchelfHook ];
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rsync
+    ];
     phases = [ "installPhase" "fixupPhase" ];
     dontStrip = true;
 
@@ -254,7 +261,6 @@ let
     buildInputs = [
       intel-mpi
       intel-compiler-shared
-      rsync
       libffi_3_3
       libelf
       libxml2
@@ -262,7 +268,10 @@ let
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [ autoPatchelfHook ];
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rsync
+    ];
 
     phases = [ "installPhase" "fixupPhase" ];
 
@@ -337,7 +346,6 @@ let
 
     buildInputs = [
       intel-compiler-shared
-      rsync
       libffi_3_3
       libelf
       libxml2
@@ -345,7 +353,10 @@ let
       stdenv.cc.cc.lib
     ];
 
-    nativeBuildInputs = [ autoPatchelfHook ];
+    nativeBuildInputs = [
+      autoPatchelfHook
+      rsync
+    ];
     autoPatchelfIgnoreMissingDeps = [ "libtbb.so.12" "libtbbmalloc.so.2" "libze_loader.so.1" ];
 
     phases = [ "installPhase" "fixupPhase" ];

pkgs/llvm-ompss2/clang.nix

@@ -43,32 +43,36 @@ let
 
   source = if (useGit) then git else release;
 
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "clang-ompss2";
   inherit (source) src version;
 
   enableParallelBuilding = true;
-  isClang = true;
 
   passthru = {
     CC = "clang";
     CXX = "clang++";
+
+    isClang = true;
+    isClangWithOmpss = true;
+
+    inherit gcc zlib;
   };
 
-  isClangWithOmpss = true;
-
-  nativeBuildInputs = [ zlib ];
-
-  buildInputs = [
-    which
+  nativeBuildInputs = [
     bash
+    cmake
+    elfutils
+    llvmPackages_latest.lld
+    pkg-config
     python3
     perl
-    cmake
-    llvmPackages_latest.lld
-    elfutils
+    which
+    zlib
+  ];
+
+  buildInputs = [
     libffi
-    pkg-config
     zlib
     gcc.cc.lib # Required for libstdc++.so.6
   ];

pkgs/lmbench/default.nix

@@ -22,7 +22,11 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ libtirpc ];
-  patches = [ ./fix-install.patch ./gcc-14.patch ];
+  patches = [
+    ./fix-install.patch
+    ./gcc-14.patch
+    ./fix-cross.patch
+  ];
 
   hardeningDisable = [ "all" ];
 
@@ -35,6 +39,8 @@ stdenv.mkDerivation rec {
       CFLAGS=-Wno-implicit-int
       CPPFLAGS=-I${libtirpc.dev}/include/tirpc
       LDFLAGS=-ltirpc
+      CC=${stdenv.cc.targetPrefix}cc
+      AR=${stdenv.cc.targetPrefix}ar
     )
   '';
 

pkgs/lmbench/fix-cross.patch

@@ -0,0 +1,13 @@
+diff --git a/src/Makefile b/src/Makefile
+index 2555014..356eeb3 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -36,7 +36,7 @@ SHELL=/bin/sh
+ 
+ CC=`../scripts/compiler`
+ MAKE=`../scripts/make`
+-AR=ar
++AR?=ar
+ ARCREATE=cr
+ 
+ # base of installation location

pkgs/mcxx/default.nix

@@ -32,19 +32,22 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [
+  nativeBuildInputs = [
     autoreconfHook
-    nanos6
-    gperf
+    bison
+    flex
     python3
     gfortran
     pkg-config
-    sqlite.dev
-    bison
-    flex
+    gperf
     gcc
   ];
 
+  buildInputs = [
+    nanos6
+    sqlite.dev
+  ];
+
   patches = [ ./intel.patch ];
 
   preConfigure = ''

pkgs/nanos6/default.nix

@@ -16,6 +16,7 @@
 , jemallocNanos6 ? null
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
+, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
@@ -47,6 +48,8 @@ let
   };
 
   source = if (useGit) then git else release;
+
+  isCross = stdenv.hostPlatform != stdenv.buildPlatform;
 in
   stdenv.mkDerivation (source // {
     pname = "nanos6";
@@ -71,9 +74,11 @@ in
       "--disable-all-instrumentations"
       "--enable-ovni-instrumentation"
       "--with-ovni=${ovni}"
+      "--with-boost=${boost.dev}"
     ] ++
       (optional enableJemalloc "--with-jemalloc=${jemallocNanos6}") ++
-      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG");
+      (optional enableGlibcxxDebug "CXXFLAGS=-D_GLIBCXX_DEBUG") ++
+      (optional isCross "--with-symbol-resolution=ifunc");
 
     postConfigure = lib.optionalString (!enableDebug) ''
       # Disable debug
@@ -88,23 +93,29 @@ in
     dontStrip = enableDebug;
     separateDebugInfo = true;
 
-    buildInputs = [
+    nativeBuildInputs = [
       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
+    ] ++ lib.optionals enablePapi [ papi ];
+
+    buildInputs = [
       boost
       numactl
       hwloc
-      papi
       ovni
-    ];
+    ] ++ lib.optionals enablePapi [ papi ];
 
     # Create a script that sets NANOS6_HOME
     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";

pkgs/nosv/default.nix

@@ -7,7 +7,7 @@
 , numactl
 , hwloc
 , papi
-, enablePapi ? true
+, enablePapi ? stdenv.hostPlatform == stdenv.buildPlatform # Disabled when cross-compiling
 , cacheline ? 64 # bits
 , ovni ? null
 , useGit ? false

pkgs/osu/default.nix

@@ -24,9 +24,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
   enableParallelBuilding = true;
+  nativeBuildInputs = [ mpiAll ];
   buildInputs = [ mpiAll ];
   hardeningDisable = [ "all" ];
-  configureFlags = [ 
+  configureFlags = [
       "CC=mpicc"
       "CXX=mpicxx"
   ];
@@ -40,7 +41,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;
   };

pkgs/ovni/default.nix

@@ -13,8 +13,6 @@
 , useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
 }:
 
-with lib;
-
 let
   release = rec {
     version = "1.12.0";
@@ -45,7 +43,7 @@ in
     postPatch = ''
       patchShebangs --build test/
     '';
-    nativeBuildInputs = [ cmake ];
+    nativeBuildInputs = [ cmake ] ++ lib.optionals (useMpi) [ mpi ];
     buildInputs = lib.optionals (useMpi) [ mpi ];
     cmakeBuildType = if (enableDebug) then "Debug" else "Release";
     cmakeFlags = [

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
   ];

pkgs/paraver/kernel.nix

@@ -44,14 +44,17 @@ stdenv.mkDerivation rec {
     "--enable-openmp"
   ];
 
-  buildInputs = [
+  nativeBuildInputs = [
     autoreconfHook
-    boost
-    libxml2.dev
-    xml2
     autoconf
     automake
     pkg-config
+  ];
+
+  buildInputs = [
+    boost
+    libxml2.dev
+    xml2
     zlib
   ];
 }

pkgs/paraver/release.nix

@@ -61,13 +61,16 @@ stdenv.mkDerivation rec {
     "--with-wx-config=${wx}/bin/wx-config"
   ];
 
+  nativeBuildInputs = [
+    autoconf
+    automake
+  ];
+
   buildInputs = [
     boost
     xml2
     libxml2.dev
     wx
-    autoconf
-    automake
     openssl.dev
   ];
 

pkgs/sonar/default.nix

@@ -18,8 +18,12 @@ stdenv.mkDerivation rec {
   hardeningDisable = [ "all" ];
   dontStrip = true;
   configureFlags = [ "--with-ovni=${ovni}" ];
-  buildInputs = [
+
+  nativeBuildInputs = [
     autoreconfHook
+  ];
+
+  buildInputs = [
     ovni
     mpi
   ];

pkgs/tampi/default.nix

@@ -8,7 +8,6 @@
 , gnumake
 , boost
 , mpi
-, gcc
 , autoreconfHook
 , enableOvni ? true
 , ovni ? null
@@ -41,20 +40,23 @@ let
     };
   };
   source = if (useGit) then git else release;
-in stdenv.mkDerivation rec {
+in stdenv.mkDerivation {
   pname = "tampi";
   inherit (source) src version;
   enableParallelBuilding = true;
   separateDebugInfo = true;
-  buildInputs = [
-    autoreconfHook
-    automake
+
+  nativeBuildInputs = [
     autoconf
-    libtool
+    automake
+    autoreconfHook
     gnumake
+    libtool
+  ];
+
+  buildInputs = [
     boost
     mpi
-    gcc
   ] ++ optional (enableOvni) ovni;
   configureFlags = optional (enableOvni) "--with-ovni=${ovni}";
   dontDisableStatic = true;