Add saiph experiments

bsc/apps/saiph/default.nix

@@ -1,56 +0,0 @@
-{
-  stdenv
-, nanos6
-, mpi
-, tampi
-, mcxx
-, vtk
-, boost
-}:
-
-stdenv.mkDerivation rec {
-  name = "saiph";
-
-  src = builtins.fetchGit {
-    url = "ssh://git@bscpm02.bsc.es/DSLs/saiph.git";
-    ref = "VectorisationSupport";
-  };
-
-  #src = /tmp/saiph;
-
-  enableParallelBuilding = true;
-  dontStrip = true;
-  enableDebugging = true;
-
-  buildInputs = [
-    nanos6
-    mpi
-    tampi
-    mcxx
-    vtk
-    boost
-  ];
-
-  preBuild = ''
-    cd saiphv2/cpp/src
-
-    sed -i s/skylake-avx512/core-avx2/g Makefile*
-    export VTK_VERSION=8.2
-    export VTK_HOME=${vtk}
-    export SAIPH_HOME=.
-    export NIX_CFLAGS_COMPILE+=" -fsanitize=address"
-  '';
-
-  makeFlags = [
-    "-f" "Makefile.clang"
-    "apps"
-    "APP=ExHeat"
-  ];
-
-  installPhase = ''
-    mkdir -p $out/lib
-    mkdir -p $out/bin
-    cp obj/libsaiphv2.so $out/lib/
-    cp bin/ExHeat $out/bin/
-  '';
-}

bsc/dummy/default.nix

@@ -14,7 +14,8 @@ stdenv.mkDerivation rec {
 
     cat > $out/bin/dummy <<EOF
     #!/bin/sh
-    echo Hello world!
+    echo Hello worlda!
+
     EOF
 
     chmod +x $out/bin/dummy

bsc/llvm-ompss2/clang.nix

@@ -76,7 +76,6 @@ stdenv.mkDerivation rec {
 
   src = builtins.fetchGit {
     url = "ssh://git@bscpm02.bsc.es/llvm-ompss/llvm-mono.git";
-    rev = "e1c73c3691d2685a99d99e14c6110d2c880662c6";
     ref = "master";
   };
 }

bsc/llvm-ompss2/default.nix

@@ -2,7 +2,7 @@
   stdenv
 , gcc
 , nanos6
-, clang-ompss2-unwrapped
+, clangOmpss2Unwrapped
 , wrapCCWith
 }:
 
@@ -11,7 +11,7 @@ let
   targetConfig = stdenv.targetPlatform.config;
   inherit gcc nanos6;
 in wrapCCWith rec {
-  cc = clang-ompss2-unwrapped;
+  cc = clangOmpss2Unwrapped;
   extraBuildCommands = ''
     echo "-target ${targetConfig}" >> $out/nix-support/cc-cflags
     echo "-B${gcc.cc}/lib/gcc/${targetConfig}/${gcc.version}" >> $out/nix-support/cc-cflags

bsc/mcxx/default.nix

@@ -1,5 +1,4 @@
 { stdenv
-, fetchgit
 , autoreconfHook
 , nanos6
 , gperf
@@ -13,9 +12,8 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "mcxx";
-  #version attribute ignored when using fetchgit:
-  #version = "2.2.0-70a299cf";
+  pname = "mcxx";
+  version = "${src.shortRev}";
 
   passthru = {
     CC = "mcc";
@@ -23,10 +21,9 @@ stdenv.mkDerivation rec {
   };
 
   # Use patched Extrae version
-  src = fetchgit {
+  src = builtins.fetchGit {
     url = "https://github.com/bsc-pm/mcxx";
-    rev = "70a299cfeb1f96735e6b9835aee946451f1913b2";
-    sha256 = "1n8y0h47jm2ll67xbz930372xkl9647z12lfwz2472j3y86yxpmw";
+    ref = "master";
   };
 
   enableParallelBuilding = true;
@@ -55,5 +52,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-ompss-2"
     "--with-nanos6=${nanos6}"
+# Fails with "memory exhausted" with bison 3.7.1
+#    "--enable-bison-regeneration"
   ];
 }

bsc/mcxx/rarias.nix

@@ -49,6 +49,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-ompss-2"
     "--with-nanos6=${nanos6}"
+#    "--enable-bison-regeneration"
   ];
 
   # Regenerate ia32 builtins to add the ones for gcc9