Fix nanos6 boost detection when cross-compiling

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!

.gitea/workflows/ci.yaml

@@ -1,15 +0,0 @@
-name: CI
-on:
-  push:
-    branches:
-      - master
-  pull_request:
-    branches:
-      - master
-
-jobs:
-  build:all:
-    runs-on: native
-    steps:
-      - uses: https://gitea.com/ScMi1/checkout@v1.4
-      - run: nix build -L --no-link --print-out-paths .#bsc-ci.all

flake.nix

@@ -17,7 +17,11 @@
       legacyPackages.${system} = pkgs;
 
       hydraJobs = {
-        inherit (self.legacyPackages.${system}.bsc-ci) tests pkgs cross;
+        inherit (self.legacyPackages.${system}.bsc-ci) test pkgs;
+
+        cross = self.lib.genAttrs [ "riscv64" ] (target:
+          self.legacyPackages.${system}.pkgsCross.${target}.bsc-ci.pkgs
+        );
       };
 
       # propagate nixpkgs lib, so we can do bscpkgs.lib

overlay.nix

@@ -6,6 +6,9 @@ with final.lib;
 let
   callPackage = final.callPackage;
 
+  mkDeps = name: pkgs: final.runCommand name { }
+    "printf '%s\n' ${toString (collect (x: x ? outPath) pkgs)} > $out";
+
   bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
     bigotes = callPackage ./pkgs/bigotes/default.nix { };
@@ -46,74 +49,58 @@ let
     wxparaver = callPackage ./pkgs/paraver/default.nix { };
   };
 
-  tests = rec {
-    #hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
-    #sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
-    hello-c = callPackage ./test/compilers/hello-c.nix { };
-    hello-cpp = callPackage ./test/compilers/hello-cpp.nix { };
-    lto = callPackage ./test/compilers/lto.nix { };
-    asan = callPackage ./test/compilers/asan.nix { };
-    intel2023-icx-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv; };
-    intel2023-icc-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv-icc; };
-    intel2023-icx-cpp = hello-cpp.override { stdenv = final.intelPackages_2023.stdenv; };
-    intel2023-icc-cpp = hello-cpp.override { stdenv = final.intelPackages_2023.stdenv-icc; };
-    intel2023-ifort   = callPackage ./test/compilers/hello-f.nix {
-      stdenv = final.intelPackages_2023.stdenv-ifort;
-    };
-    clangOmpss2-lto   = lto.override       { stdenv = final.stdenvClangOmpss2Nanos6; };
-    clangOmpss2-asan  = asan.override      { stdenv = final.stdenvClangOmpss2Nanos6; };
-    clangOmpss2-task  = callPackage ./test/compilers/ompss2.nix {
-      stdenv = final.stdenvClangOmpss2Nanos6;
-    };
-    clangNodes-task = callPackage ./test/compilers/ompss2.nix {
-      stdenv = final.stdenvClangOmpss2Nodes;
-    };
-    clangNosvOpenmp-task = callPackage ./test/compilers/clang-openmp.nix {
-      stdenv = final.stdenvClangOmpss2Nodes;
-    };
-    clangNosvOmpv-nosv = callPackage ./test/compilers/clang-openmp-nosv.nix {
-      stdenv = final.stdenvClangOmpss2NodesOmpv;
-    };
-    clangNosvOmpv-ld = callPackage ./test/compilers/clang-openmp-ld.nix {
-      stdenv = final.stdenvClangOmpss2NodesOmpv;
-    };
-  };
-
-  pkgs = filterAttrs (_: isDerivation) bscPkgs;
-
-  crossTargets = [ "riscv64" ];
-  cross = prev.lib.genAttrs crossTargets (target:
-    final.pkgsCross.${target}.bsc-ci.pkgs
-  );
-
-  buildList = name: paths:
-    final.runCommandLocal name { } ''
-      printf '%s\n' ${toString paths} | tee $out
-    '';
-
-  buildList' = name: paths:
-    final.runCommandLocal name { } ''
-      deps="${toString paths}"
-      cat $deps
-      printf '%s\n' $deps >$out
-    '';
-
-  crossList = builtins.mapAttrs (t: v: buildList t (builtins.attrValues v)) cross;
-
-  pkgsList = buildList "ci-pkgs" (builtins.attrValues pkgs);
-  testList = buildList "ci-tests" (collect isDerivation tests);
-
-  all = buildList' "ci-all" [ pkgsList testList ];
-
 in bscPkgs // {
   # Prevent accidental usage of bsc attribute
   bsc = throw "the bsc attribute is deprecated, packages are now in the root";
 
   # Internal for our CI tests
   bsc-ci = {
-    inherit pkgs pkgsList;
+    test = rec {
-    inherit tests testList;
+      #hwloc = callPackage ./test/bugs/hwloc.nix { }; # Broken, no /sys
-    inherit cross crossList;
+      #sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
-    inherit all;
+      hello-c = callPackage ./test/compilers/hello-c.nix { };
+      hello-cpp = callPackage ./test/compilers/hello-cpp.nix { };
+      lto = callPackage ./test/compilers/lto.nix { };
+      asan = callPackage ./test/compilers/asan.nix { };
+      intel2023-icx-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv; };
+      intel2023-icc-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv-icc; };
+      intel2023-icx-cpp = hello-cpp.override { stdenv = final.intelPackages_2023.stdenv; };
+      intel2023-icc-cpp = hello-cpp.override { stdenv = final.intelPackages_2023.stdenv-icc; };
+      intel2023-ifort   = callPackage ./test/compilers/hello-f.nix {
+        stdenv = final.intelPackages_2023.stdenv-ifort;
+      };
+      clangOmpss2-lto   = lto.override       { stdenv = final.stdenvClangOmpss2Nanos6; };
+      clangOmpss2-asan  = asan.override      { stdenv = final.stdenvClangOmpss2Nanos6; };
+      clangOmpss2-task  = callPackage ./test/compilers/ompss2.nix {
+        stdenv = final.stdenvClangOmpss2Nanos6;
+      };
+      clangNodes-task = callPackage ./test/compilers/ompss2.nix {
+        stdenv = final.stdenvClangOmpss2Nodes;
+      };
+      clangNosvOpenmp-task = callPackage ./test/compilers/clang-openmp.nix {
+        stdenv = final.stdenvClangOmpss2Nodes;
+      };
+      clangNosvOmpv-nosv = callPackage ./test/compilers/clang-openmp-nosv.nix {
+        stdenv = final.stdenvClangOmpss2NodesOmpv;
+      };
+      clangNosvOmpv-ld = callPackage ./test/compilers/clang-openmp-ld.nix {
+        stdenv = final.stdenvClangOmpss2NodesOmpv;
+      };
+    };
+
+    pkgs = filterAttrs (_: isDerivation) bscPkgs;
+
+    pkgsList = final.runCommand "ci-pkgs" { }
+      "printf '%s\n' ${toString (collect isDerivation bscPkgs)} > $out";
+
+    tests = final.runCommand "ci-tests" { }
+      "printf '%s\n' ${toString (collect isDerivation final.bsc-ci.test)} > $out";
+
+    all = final.runCommand "ci-all" { }
+    ''
+      deps="${toString [ final.bsc-ci.pkgsList final.bsc-ci.tests ]}"
+      cat $deps
+      printf '%s\n' $deps > $out
+    '';
   };
 }

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/lmbench/default.nix

@@ -35,6 +35,7 @@ stdenv.mkDerivation rec {
       CFLAGS=-Wno-implicit-int
       CPPFLAGS=-I${libtirpc.dev}/include/tirpc
       LDFLAGS=-ltirpc
+      CC=${stdenv.cc.targetPrefix}cc
     )
   '';
 

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"
@@ -71,6 +72,7 @@ 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");
@@ -97,16 +99,14 @@ in
       # TODO: papi_version is needed for configure:
       # ./configure: line 27378: papi_version: command not found
       # This probably breaks cross-compilation
-      papi
+    ] ++ lib.optionals enablePapi [ papi ];
-    ];
 
     buildInputs = [
       boost
       numactl
       hwloc
-      papi
       ovni
-    ];
+    ] ++ lib.optionals enablePapi [ papi ];
 
     # Create a script that sets NANOS6_HOME
     postInstall = ''

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