TEMPORAL CLANG LINKER FIX FOR CROSS

Fix clang cross-build
2025-07-22 12:46:14 +02:00 · 2025-07-22 12:45:50 +02:00 · 2025-07-22 12:45:50 +02:00 · 2025-07-22 12:45:50 +02:00 · 2025-06-11 16:01:40 +02:00 · 2025-06-02 08:58:19 +02:00
15 changed files with 81 additions and 97 deletions
--- a/overlay.nix
+++ b/overlay.nix
@@ -21,7 +21,7 @@ let
    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 { }; # Broken
+    lmbench = callPackage ./pkgs/lmbench/default.nix { };
    mcxx = callPackage ./pkgs/mcxx/default.nix { };
    nanos6 = callPackage ./pkgs/nanos6/default.nix { };
    nanos6Debug = final.nanos6.override { enableDebug = true; };
@@ -40,13 +40,12 @@ let
    #pscom = callPackage ./pkgs/parastation/pscom.nix { }; # Unmaintaned
    #psmpi = callPackage ./pkgs/parastation/psmpi.nix { }; # Unmaintaned
    sonar = callPackage ./pkgs/sonar/default.nix { };
-    stdenvClangOmpss2 = final.stdenv.override { cc = final.clangOmpss2; allowedRequisites = null; };
-    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; };
+    stdenvClangOmpss2 = final.stdenv.override { cc = final.buildPackages.clangOmpss2; allowedRequisites = null; };
+    stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.buildPackages.clangOmpss2Nanos6; allowedRequisites = null; };
+    stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.buildPackages.clangOmpss2Nodes; allowedRequisites = null; };
+    stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.buildPackages.clangOmpss2NodesOmpv; allowedRequisites = null; };
    tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
    tampi = callPackage ./pkgs/tampi/default.nix { };
-    vivado = callPackage ./pkgs/vivado/default.nix { };
    wxparaver = callPackage ./pkgs/paraver/default.nix { };
  };

--- a/pkgs/bench6/default.nix
+++ b/pkgs/bench6/default.nix
@@ -7,7 +7,7 @@
 , mpi
 , tampi
 , gitBranch ? "master"
-, gitURL ? "ssh://git@bscpm03.bsc.es/rarias/bench6.git"
+, gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
 , gitCommit ? "1e6ce2aa8ad7b4eef38df1581d7ec48a8815f85d"
 }:

--- a/pkgs/cn6/default.nix
+++ b/pkgs/cn6/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
  ] ++ optionals (enableTest) [ mpi clangOmpss2 tampi ];

  src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rarias/cn6.git";
+    url = "ssh://git@bscpm04.bsc.es/rarias/cn6.git";
    ref = "master";
    rev = "c72c3b66b720c2a33950f536fc819051c8f20a69";
  };
--- a/pkgs/llvm-ompss2/clang.nix
+++ b/pkgs/llvm-ompss2/clang.nix
@@ -1,5 +1,6 @@
 {
-  llvmPackages_latest
+  stdenv
+, llvmPackages_latest
 , lib
 , fetchFromGitHub
 , cmake
@@ -11,16 +12,18 @@
 , libffi
 , zlib
 , pkg-config
-, gcc # needed to set the rpath of libstdc++ for clang-tblgen
 , enableDebug ? false
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/llvm-ompss/llvm-mono.git"
 , gitBranch ? "master"
 , gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
 }:

 let
-  stdenv = llvmPackages_latest.stdenv;
+  llvmPackages = llvmPackages_latest;
+  llvmStdenv = llvmPackages.stdenv;
+  # needed to set the rpath of libstdc++ for clang-tblgen
+  gcc = stdenv.cc;

  release = rec {
    version = "2024.11";
@@ -43,7 +46,7 @@ let

  source = if (useGit) then git else release;

-in stdenv.mkDerivation rec {
+in llvmStdenv.mkDerivation rec {
  pname = "clang-ompss2";
  inherit (source) src version;

@@ -57,20 +60,23 @@ in stdenv.mkDerivation rec {

  isClangWithOmpss = true;

-  nativeBuildInputs = [ zlib ];
+  nativeBuildInputs = [
+    zlib
+    gcc.cc.lib # Required for libstdc++.so.6
+    cmake
+    python3
+    llvmPackages.lld
+  ];

  buildInputs = [
    which
    bash
-    python3
    perl
-    cmake
-    llvmPackages_latest.lld
+    llvmPackages.lld
    elfutils
    libffi
    pkg-config
    zlib
-    gcc.cc.lib # Required for libstdc++.so.6
  ];

  # Error with -D_FORTIFY_SOURCE=2, see https://bugs.gentoo.org/636604:
@@ -86,6 +92,7 @@ in stdenv.mkDerivation rec {

  dontUseCmakeBuildDir = true;

+
  # Fix the host triple, as it has changed in a newer config.guess:
  # https://git.savannah.gnu.org/gitweb/?p=config.git;a=commitdiff;h=ca9bfb8cc75a2be1819d89c664a867785c96c9ba
  preConfigure = ''
@@ -93,8 +100,13 @@ in stdenv.mkDerivation rec {
    cd build
    cmakeDir="../llvm"
    cmakeFlagsArray=(
-      "-DLLVM_HOST_TRIPLE=${stdenv.targetPlatform.config}"
+      "-DLLVM_HOST_TRIPLE=${llvmStdenv.targetPlatform.config}"
+    '' + (if "${llvmStdenv.targetPlatform.config}" == "riscv64-unknown-linux-gnu" then ''
+      "-DLLVM_DEFAULT_TARGET_TRIPLE=riscv64-unknown-linux-gnu"
+      "-DLLVM_TARGETS_TO_BUILD=RISCV"
+    '' else ''
      "-DLLVM_TARGETS_TO_BUILD=host"
+    '') + ''
      "-DLLVM_BUILD_LLVM_DYLIB=ON"
      "-DLLVM_LINK_LLVM_DYLIB=ON"
      # Required to run clang-ast-dump and clang-tblgen during build
@@ -103,7 +115,8 @@ in stdenv.mkDerivation rec {
      "-DCMAKE_CXX_FLAGS_DEBUG=-g -ggnu-pubnames"
      "-DCMAKE_EXE_LINKER_FLAGS_DEBUG=-Wl,--gdb-index"
      "-DLLVM_LIT_ARGS=-sv --xunit-xml-output=xunit.xml"
-      "-DLLVM_ENABLE_PROJECTS=clang;compiler-rt;lld"
+      "-DLLVM_ENABLE_PROJECTS=clang;lld"
+      #"-DLLVM_ENABLE_PROJECTS=clang;compiler-rt;lld"
      "-DLLVM_ENABLE_ASSERTIONS=ON"
      "-DLLVM_INSTALL_TOOLCHAIN_ONLY=ON"
      "-DCMAKE_INSTALL_BINDIR=bin"
@@ -113,8 +126,8 @@ in stdenv.mkDerivation rec {
      # install
      "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON"
      "-DCMAKE_INSTALL_RPATH=${zlib}/lib:${gcc.cc.lib}/lib"
-      "-DLLVM_APPEND_VC_REV=ON"
-      "-DLLVM_FORCE_VC_REVISION=${source.version}"
+      #"-DLLVM_APPEND_VC_REV=ON"
+      #"-DLLVM_FORCE_VC_REVISION=${source.version}"
    )
  '';

--- a/pkgs/llvm-ompss2/default.nix
+++ b/pkgs/llvm-ompss2/default.nix
@@ -9,12 +9,14 @@
 , ompss2rt ? null
 }:

+with lib;
+
 let
  usingNodesAndOmpv = (openmp.pname == "openmp-v" && ompss2rt.pname == "nodes");
  sameNosv = openmp.nosv == ompss2rt.nosv;
 in

-assert lib.assertMsg (usingNodesAndOmpv -> sameNosv) "OpenMP-V and NODES must share the same nOS-V";
+assert assertMsg (usingNodesAndOmpv -> sameNosv) "OpenMP-V and NODES must share the same nOS-V";

 let
  homevar = if ompss2rt.pname == "nanos6" then "NANOS6_HOME" else "NODES_HOME";
@@ -34,14 +36,16 @@ let
  targetConfig = stdenv.targetPlatform.config;
  inherit gcc;
  cc = clangOmpss2Unwrapped;
+  gccVersion = with versions; let v = gcc.version; in concatStringsSep "." [(major v) (minor v) (patch v)];
 in wrapCCWith {
  inherit cc bintools;
  # extraPackages adds packages to depsTargetTargetPropagated
-  extraPackages = lib.optional (openmp != null) openmp;
+  extraPackages = optional (openmp != null) openmp;
  extraBuildCommands = ''
    echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
-    echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags
-    echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-ldflags
+    #echo "-fuse-ld=lld" >> $out/nix-support/cc-cflags
+    echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-cflags
+    echo "-L${gcc.cc}/lib/gcc/${targetConfig}/${gccVersion}" >> $out/nix-support/cc-ldflags
    echo "-L${gcc.cc.lib}/lib" >> $out/nix-support/cc-ldflags

    for dir in ${gcc.cc}/include/c++/*; do
@@ -53,14 +57,15 @@ in wrapCCWith {

    echo "--gcc-toolchain=${gcc}" >> $out/nix-support/cc-cflags

-    wrap clang++  $wrapper $ccPath/clang++
+    wrap ${targetConfig}clang++  $wrapper $ccPath/clang++
+    wrap ${targetConfig}clang    $wrapper $ccPath/clang

-  '' + lib.optionalString (openmp != null) ''
+  '' + optionalString (openmp != null) ''
    echo "export OPENMP_RUNTIME=${ompname}" >> $out/nix-support/cc-wrapper-hook
-  '' + lib.optionalString (ompss2rt != null) ''
+  '' + optionalString (ompss2rt != null) ''
    echo "export OMPSS2_RUNTIME=${rtname}" >> $out/nix-support/cc-wrapper-hook
    echo "export ${homevar}=${ompss2rt}"   >> $out/nix-support/cc-wrapper-hook
-  '' + lib.optionalString (ompss2rt != null && ompss2rt.pname == "nodes") ''
+  '' + optionalString (ompss2rt != null && ompss2rt.pname == "nodes") ''
    echo "export NOSV_HOME=${ompss2rt.nosv}" >> $out/nix-support/cc-wrapper-hook
  '';
 }
--- a/pkgs/llvm-ompss2/openmp.nix
+++ b/pkgs/llvm-ompss2/openmp.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation rec {
    perl
    pkg-config
    python3
+  ];
+
+  buildInputs = [
  ] ++ lib.optionals enableNosv [
    nosv
  ] ++ lib.optionals enableOvni [
@@ -68,6 +71,7 @@ stdenv.mkDerivation rec {
    rm -f $out/lib/libiomp*
  '' + lib.optionalString enableNosv ''
    rm -f $out/lib/libomp.*
+    rm -f $out/libllvmrt/libomp.*
  '';

  passthru = {
--- a/pkgs/lmbench/default.nix
+++ b/pkgs/lmbench/default.nix
@@ -1,19 +1,20 @@
 {
  lib,
  stdenv,
+  libtirpc,
  fetchFromGitHub
 }:

 stdenv.mkDerivation rec {
  pname = "lmbench";
-  version = "701c6c35";
+  version = "941a0dcc";

  # We use the intel repo as they have fixed some problems
  src = fetchFromGitHub {
    owner = "intel";
    repo = pname;
-    rev = "701c6c35b0270d4634fb1dc5272721340322b8ed";
-    sha256 = "0sf6zk03knkardsfd6qx7drpm56nhg53n885cylkggk83r38idyr";
+    rev = "941a0dcc0e7bdd9bb0dee05d7f620e77da8c43af";
+    sha256 = "sha256-SzwplRBO3V0R3m3p15n71ivYBMGoLsajFK2TapYxdqk=";
  };

  postUnpack = ''
@@ -24,12 +25,19 @@ stdenv.mkDerivation rec {
    sed -i "s@/bin/rm@rm@g" $(find . -name Makefile)
  '';

+  buildInputs = [ libtirpc ];
+  patches = [ ./fix-install.patch ];
+
  hardeningDisable = [ "all" ];

  enableParallelBuilding = false;

  preBuild = ''
-    makeFlagsArray+=(BASE=$out)
+    makeFlagsArray+=(
+      BASE=$out
+      CPPFLAGS=-I${libtirpc.dev}/include/tirpc
+      LDFLAGS=-ltirpc
+    )
  '';

  meta = {
--- a/pkgs/lmbench/fix-install.patch
+++ b/pkgs/lmbench/fix-install.patch
@@ -0,0 +1,10 @@
+--- a/Makefile
+++ b/Makefile
+@@ -144,6 +144,7 @@ install-target:
+ 	if [ ! -d $(BASE)/include ]; then mkdir $(BASE)/include; fi
+ 	if [ ! -d $(BASE)/lib ]; then mkdir $(BASE)/lib; fi
+ 	cp $(EXES) $(BASE)/bin
+	cp $(OPT_EXES) $(BASE)/bin
+ 	cp $(INCS) $(BASE)/include
+ 	cp $O/lmbench.a $(BASE)/lib/libmbench.a
+ 	cd ../doc; env MAKEFLAGS="$(MAKEFLAGS)" make CC="${CC}" OS="${OS}" BASE="$(BASE)" install
--- a/pkgs/mcxx/git.nix
+++ b/pkgs/mcxx/git.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
  };

  src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/mercurium/mcxx";
+    url = "ssh://git@bscpm04.bsc.es/mercurium/mcxx";
    ref = "master";
  };

--- a/pkgs/mcxx/rarias.nix
+++ b/pkgs/mcxx/rarias.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {

  #src = /home/Computational/rarias/mcxx;
  src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rarias/mcxx";
+    url = "ssh://git@bscpm04.bsc.es/rarias/mcxx";
    rev = "44129a6ac05b8f78b06e9e2eff71438b5ca4d29f";
  };

--- a/pkgs/nanos6/default.nix
+++ b/pkgs/nanos6/default.nix
@@ -17,7 +17,7 @@
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
 , gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4"
 }:
@@ -48,7 +48,7 @@ let

  source = if (useGit) then git else release;
 in
-  stdenv.mkDerivation (source // rec {
+  stdenv.mkDerivation (source // {
    pname = "nanos6";

    prePatch = ''
@@ -62,7 +62,7 @@ in
      export CACHELINE_WIDTH=${toString cachelineBytes}
      ./autogen.sh
    '' + lib.optionalString (useGit) ''
-      export NANOS6_GIT_VERSION=${src.rev}
+      export NANOS6_GIT_VERSION=${gitCommit}
      export NANOS6_GIT_BRANCH=${gitBranch}
    '';

--- a/pkgs/nixtools/default.nix
+++ b/pkgs/nixtools/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
  pname = "nixtools";
  version = "${src.shortRev}";
  src = builtins.fetchGit {
-    url = "ssh://git@bscpm03.bsc.es/rarias/nixtools";
+    url = "ssh://git@bscpm04.bsc.es/rarias/nixtools";
    ref = "master";
    rev = "a103e392048ace3ed88ce74648b32c9e6ed094da";
  };
--- a/pkgs/ovni/default.nix
+++ b/pkgs/ovni/default.nix
@@ -6,7 +6,7 @@
 , fetchFromGitHub
 , useGit ? false
 , gitBranch ? "master"
-, gitUrl ? "ssh://git@bscpm03.bsc.es/rarias/ovni.git"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/rarias/ovni.git"
 , gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4"
 , enableDebug ? false
 # Only enable MPI if the build is native (fails on cross-compilation)
--- a/pkgs/tampi/default.nix
+++ b/pkgs/tampi/default.nix
@@ -13,7 +13,7 @@
 , enableOvni ? true
 , ovni ? null
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm03.bsc.es/interoperability/tampi.git"
+, gitUrl ? "ssh://git@bscpm04.bsc.es/interoperability/tampi.git"
 , gitBranch ? "master"
 , gitCommit ? "a5c93bf8ab045b71ad4a8d5e2c991ce774db5cbc"
 }:
--- a/pkgs/vivado/default.nix
+++ b/pkgs/vivado/default.nix
@@ -1,55 +0,0 @@
-# Thanks to MLabs to made the switch.
-
-{
-  stdenv
-, lib
-, ncurses5
-, libxcrypt-legacy
-, zlib
-, libuuid
-, xorg
-, freetype
-, fontconfig
-, buildFHSEnv
-}:
-
-with lib;
-
-let
-  vivadoDeps = pkgs:
-    let
-      # Apply patch from https://github.com/nix-community/nix-environments/pull/54
-      # to fix ncurses libtinfo.so's soname issue
-      ncurses' = ncurses5.overrideAttrs (old: {
-        configureFlags = old.configureFlags ++ ["--with-termlib"];
-        postFixup = "";
-      });
-    in [
-      libxcrypt-legacy
-      (ncurses'.override {unicodeSupport = false;})
-      zlib
-      libuuid
-      xorg.libSM
-      xorg.libICE
-      xorg.libXrender
-      xorg.libX11
-      xorg.libXext
-      xorg.libXtst
-      xorg.libXi
-      freetype
-      fontconfig
-    ];
-
-  vivadoEnv = buildFHSEnv {
-    name = "vivado-env";
-    targetPkgs = vivadoDeps;
-  };
-
-  vivado = buildFHSEnv {
-    name = "vivado";
-    targetPkgs = vivadoDeps;
-    profile = "set -e; source /opt/Xilinx/Vivado/2024.2/settings64.sh";
-    runScript = "vivado";
-  };
-in
-  vivadoEnv
Author	SHA1	Message	Date
Aleix Roca Nonell	4de42f117a	TEMPORAL CLANG LINKER FIX FOR CROSS	2025-07-22 12:46:14 +02:00
Aleix Roca Nonell	0093075cc6	Fix clang cross-build	2025-07-22 12:45:50 +02:00
Aleix Roca Nonell	1a810c35b7	Fix clang cross-build	2025-07-22 12:45:50 +02:00
Aleix Roca Nonell	f0d2601697	Split OpenMP dependencies into build and run	2025-07-22 12:45:50 +02:00
Rodrigo Arias Mallo	9d1944c658	Upgrade and fix lmbench package Now it needs libtirpc to provide rpc/rpc.h, as it seems it is gone from libc. We also fix the install target so it installs the additional benchmarks. Reviewed-by: Aleix Boné <abonerib@bsc.es> Tested-by: Aleix Boné <abonerib@bsc.es>	2025-06-11 16:01:40 +02:00
Aleix Roca Nonell	8e5b2dc5cc	Fix C runtime objects path in OmpSs-2 LLVM Some gcc versions append an extension to the patch version number, but this extension is not part of the installation path. This patch removes the extension to the patch version. Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es> Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>	2025-06-02 08:58:19 +02:00
Aleix Roca Nonell	f89cd4d7e2	Remove dangling libomp.so symlink Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>	2025-06-02 08:57:23 +02:00
Aleix Boné	f962816eab	Update PM gitlab URL to new server bscpm04.bsc.es The old server has died, so we move to the new URL at bscpm04.bsc.es. Reviewed-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es> Tested-by: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>	2025-03-07 15:21:11 +01:00
Rodrigo Arias Mallo	c4583f787d	Fix Nanos6 build from git The src.rev attribute is not available as it comes from source before the recursive operator. Instead, simply get it from the function inputs. Cc: Aleix Boné <aleix.boneribo@bsc.es> Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>	2025-02-28 13:36:00 +01:00