wip

overlay.nix

@@ -20,7 +20,6 @@ let
     #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
     gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
     intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };
-    intelPackages = final.intelPackages_2023;
     jemallocNanos6 = callPackage ./pkgs/nanos6/jemalloc.nix { };
     #lmbench = callPackage ./pkgs/lmbench/default.nix { }; # Broken
     mcxx = callPackage ./pkgs/mcxx/default.nix { };
@@ -47,6 +46,7 @@ let
     stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.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 { };
   };
 
@@ -61,7 +61,6 @@ in bscPkgs // {
       #sigsegv = callPackage ./test/reproducers/sigsegv.nix { };
       hello-c = callPackage ./test/compilers/hello-c.nix { };
       hello-cpp = callPackage ./test/compilers/hello-cpp.nix { };
-      hello-sycl = callPackage ./test/compilers/hello-sycl.nix { };
       lto = callPackage ./test/compilers/lto.nix { };
       asan = callPackage ./test/compilers/asan.nix { };
       intel2023-icx-c   = hello-c.override   { stdenv = final.intelPackages_2023.stdenv; };

pkgs/bench6/default.nix

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

pkgs/cn6/default.nix

@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals (enableTest) [ mpi clangOmpss2 tampi ];
 
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm04.bsc.es/rarias/cn6.git";
+    url = "ssh://git@bscpm03.bsc.es/rarias/cn6.git";
     ref = "master";
     rev = "c72c3b66b720c2a33950f536fc819051c8f20a69";
   };

pkgs/intel-oneapi/2023.nix

@@ -313,9 +313,6 @@ let
       "intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-common-${version}"
       "intel-oneapi-compiler-dpcpp-cpp-and-cpp-classic-runtime-${version}"
       "intel-oneapi-compiler-dpcpp-cpp-classic-fortran-shared-runtime-${version}"
-      "intel-oneapi-compiler-shared-${version}"
-      "intel-oneapi-compiler-shared-common-${version}"
-      "intel-oneapi-compiler-shared-runtime-${version}"
     ];
     # From https://aur.archlinux.org/packages/intel-oneapi-compiler:
     # - intel-oneapi-compiler-cpp-eclipse-cfg-2023.0.0-25370_all.deb
@@ -332,9 +329,9 @@ let
     # - intel-oneapi-compiler-fortran-common-2023.0.0-2023.0.0-25370_all.deb
     # - intel-oneapi-compiler-fortran-runtime-2023.0.0-2023.0.0-25370_amd64.deb
     # - intel-oneapi-compiler-fortran-runtime-2023.0.0-25370_amd64.deb
-    # + intel-oneapi-compiler-shared-2023.0.0-2023.0.0-25370_amd64.deb
+    # - intel-oneapi-compiler-shared-2023.0.0-2023.0.0-25370_amd64.deb
-    # + intel-oneapi-compiler-shared-common-2023.0.0-2023.0.0-25370_all.deb
+    # - intel-oneapi-compiler-shared-common-2023.0.0-2023.0.0-25370_all.deb
-    # + intel-oneapi-compiler-shared-runtime-2023.0.0-2023.0.0-25370_amd64.deb
+    # - intel-oneapi-compiler-shared-runtime-2023.0.0-2023.0.0-25370_amd64.deb
     # - intel-oneapi-dpcpp-cpp-2023.0.0-2023.0.0-25370_amd64.deb
     # - intel-oneapi-openmp-2023.0.0-2023.0.0-25370_amd64.deb
     # - intel-oneapi-openmp-common-2023.0.0-2023.0.0-25370_all.deb
@@ -401,15 +398,6 @@ let
         echo "-L${intel-compiler-shared}/lib" >> $out/nix-support/cc-ldflags
         echo "-L${cc}/lib" >> $out/nix-support/cc-ldflags
 
-        echo "--gcc-toolchain=${mygcc.cc}" >> $out/nix-support/libcxx-cxxflags
-
-        for dir in ${mygcc.cc}/include/c++/*; do
-          echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
-        done
-        for dir in ${mygcc.cc}/include/c++/*/${targetConfig}; do
-          echo "-isystem $dir" >> $out/nix-support/libcxx-cxxflags
-        done
-
         # Need the gcc in the path
         echo 'export "PATH=${mygcc}/bin:$PATH"' >> $out/nix-support/cc-wrapper-hook
 

pkgs/llvm-ompss2/clang.nix

@@ -14,7 +14,7 @@
 , gcc # needed to set the rpath of libstdc++ for clang-tblgen
 , enableDebug ? false
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm04.bsc.es/llvm-ompss/llvm-mono.git"
+, gitUrl ? "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git"
 , gitBranch ? "master"
 , gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
 }:

pkgs/mcxx/git.nix

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

pkgs/mcxx/rarias.nix

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

pkgs/nanos6/default.nix

@@ -17,7 +17,7 @@
 , cachelineBytes ? 64
 , enableGlibcxxDebug ? false
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
+, gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
 , gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4"
 }:
@@ -48,7 +48,7 @@ let
 
   source = if (useGit) then git else release;
 in
-  stdenv.mkDerivation (source // {
+  stdenv.mkDerivation (source // rec {
     pname = "nanos6";
 
     prePatch = ''
@@ -62,7 +62,7 @@ in
       export CACHELINE_WIDTH=${toString cachelineBytes}
       ./autogen.sh
     '' + lib.optionalString (useGit) ''
-      export NANOS6_GIT_VERSION=${gitCommit}
+      export NANOS6_GIT_VERSION=${src.rev}
       export NANOS6_GIT_BRANCH=${gitBranch}
     '';
 

pkgs/nixtools/default.nix

@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   pname = "nixtools";
   version = "${src.shortRev}";
   src = builtins.fetchGit {
-    url = "ssh://git@bscpm04.bsc.es/rarias/nixtools";
+    url = "ssh://git@bscpm03.bsc.es/rarias/nixtools";
     ref = "master";
     rev = "a103e392048ace3ed88ce74648b32c9e6ed094da";
   };

pkgs/ovni/default.nix

@@ -6,7 +6,7 @@
 , fetchFromGitHub
 , useGit ? false
 , gitBranch ? "master"
-, gitUrl ? "ssh://git@bscpm04.bsc.es/rarias/ovni.git"
+, gitUrl ? "ssh://git@bscpm03.bsc.es/rarias/ovni.git"
 , gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4"
 , enableDebug ? false
 # Only enable MPI if the build is native (fails on cross-compilation)

pkgs/tampi/default.nix

@@ -13,7 +13,7 @@
 , enableOvni ? true
 , ovni ? null
 , useGit ? false
-, gitUrl ? "ssh://git@bscpm04.bsc.es/interoperability/tampi.git"
+, gitUrl ? "ssh://git@bscpm03.bsc.es/interoperability/tampi.git"
 , gitBranch ? "master"
 , gitCommit ? "a5c93bf8ab045b71ad4a8d5e2c991ce774db5cbc"
 }:

pkgs/vivado/default.nix

@@ -0,0 +1,55 @@
+# 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

test/compilers/hello-sycl.nix

@@ -1,55 +0,0 @@
-{ intelPackages,  writeText, strace }:
-
-let
-  stdenv = intelPackages.stdenv;
-  hello_sycl = writeText "hello.cpp" ''
-    #include <sycl/sycl.hpp>
-
-    class hello_world;
-
-    int main(int argc, char** argv) try {
-        auto device_selector = sycl::default_selector_v;
-
-        sycl::queue queue(device_selector);
-
-        std::cout << "Running on: "
-                  << queue.get_device().get_info<sycl::info::device::name>()
-                  << std::endl;
-
-        queue.submit([&] (sycl::handler& cgh) {
-            auto os = sycl::stream{128, 128, cgh};
-            cgh.single_task<hello_world>([=]() {
-                os << "Hello World! (on device)\n";
-            });
-        });
-
-        return 0;
-    } catch (sycl::exception &e) {
-        std::cout << "SYCL exception: " << e.what() << std::endl;
-        return 0; // we excpect to fail since no devices should be available;
-    }
-  '';
-in
-
-stdenv.mkDerivation {
-  version = "0.0.1";
-  name = "hello-sycl";
-  buildInputs = [ stdenv strace ];
-  src = hello_sycl;
-  dontUnpack = true;
-  dontConfigure = true;
-  NIX_DEBUG = 0;
-  buildPhase = ''
-    cp $src hello.cpp
-    set -x
-    echo CXX=$CXX
-    command -v $CXX
-    $CXX -fsycl hello.cpp -o hello
-    ./hello
-    set +x
-  '';
-
-  installPhase = ''
-    touch $out
-  '';
-}