From 7d8f86eaad9a1da035026bebea5c40d9030fa6d6 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Fri, 3 Jul 2020 11:13:41 +0200
Subject: [PATCH] saiph: sanitize address and compile for avx2

---
 bsc/apps/saiph/.default.nix.swp | Bin 0 -> 12288 bytes
 bsc/apps/saiph/default.nix      |  15 +++++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 bsc/apps/saiph/.default.nix.swp

diff --git a/bsc/apps/saiph/.default.nix.swp b/bsc/apps/saiph/.default.nix.swp
new file mode 100644
index 0000000000000000000000000000000000000000..da7dcd725b35345098f20e653362681cc44a5b85
GIT binary patch
literal 12288
zcmYc?2=nw+u+TGNU|?VnU|_iO^<Uhd(n$=8`xzOE5{ohui$N0jaYbr=o`E@jH6YnK
zh=KY^#mTyPnH2@u>BS(nequpEv3_x4W<iF2N@`kSX-<h=US<VI$0!~Rfzc44UI_3q
z7#kTHfXq`?QdAHY3I#Do@n{H)hQMeDjE2By2#kinXb6mkz-S1JhQJ63fsz77hI$4D
z1}3O~Eub_b8V%)+QllX-8UmvsFd71*Aut*OqaiRF0;3@?8UmvsFd71*Aut*OLofsq
zQy3VwaWgP%;(^Tn!}|aK_!$_!@-r~J;b&lY#?QcTkDr0zIzI!$MScc`ll%+}$M_i-
zj`A}wtmbE6n90w;FoU0gp@yG<!JVIhL6x6@L4luvL7tz1fs3Dkfs>zs;RPQ9!xcUT
zhFyFN3_JN47?$%fFwEg&V3@+kz|h6Vz|hFYz);D@z>v?!z>vkqz>vwuz!1sDz~IEk
zz~IQoz`)PP!0?5af#D`E1H(aH28JG928K3X28LE%28L2z28L)}28IA$1_pax1_mo$
z1_n!B1_o7L1_pj!28N$J3=G$J7#Mc(FfeT4f%x@0$iG7{zDAuq8UmvsFd71*Aut*O
zqaiRF0;3@?8UiCL1Zo)+6x7wN859&06p{-Rk}~u3T`N3N6H63S@=HtfL4258eo~fx
zPG%B#X>pm6UU5D|Nls>xK3GX^c1mWEf^GpsI4Ls^i)c<}5`%(5W?pegVopv#Mq+WQ
zf~|tOIs=1(LM+4)N{#^mwh$*MfelasEog=^b<>m-lzbDjQ`0hYQuUH^67$kQGP#M_
zsct!m>BS1R3eh05U_MH%D9A4=QSkGOh<A4LadZ!kclP%U@bq!jwpCKlO)E~!%Ph&P
zO0`W)NhwM#E(V#Upa9hr?C2Tb5%1ye>uRe9b_i5FEW{fks#0B6k_`$!xE7F9m}^k5
zr@x;qXc0IlP>WMj6m&BciuH@LD{~UFQ*{%|DohQH^po?8z-%M^bOo4?v_NiGP)JTu
zfCjRDazTN9aZxgZf<i%2s#9rZP6~Q>CFSQAmw??@R+0^-bCWA7z>Jc_+=5In3r6Q9
z=H(ZgF(@b`fsFFZD=002hgoV~Vp2}3OKMVSdU|GFx`M4jNl|GkC{j}L^GbqCiZTn3
z#2~5z5{nXZa#C}^E<@JDprD{!T$HR}tDs+!TL4*(ZVmEXEyzFxg`(6n1zQEBu+-#|
z{G!a_#FEVXyx`ITP;4ndRFoFwfK(J0XISa$r)QQpBo!wY<Qf?1B^4*@r55YE1p7dj
zx$C88mVh-uEChM2Br~sAFD<nsIm11(M4=jFab99BD6J`hLsrR}p|~U^HLpxBH`^t(
yD6<Ug0EME|WRT)oD+V0}NVw`KfI?MA0UV|}3Xl-hQ2>RfjsiS1A!adDGXMZyXFnGJ

literal 0
HcmV?d00001

diff --git a/bsc/apps/saiph/default.nix b/bsc/apps/saiph/default.nix
index 3405431..45abfd9 100644
--- a/bsc/apps/saiph/default.nix
+++ b/bsc/apps/saiph/default.nix
@@ -11,16 +11,16 @@
 stdenv.mkDerivation rec {
   name = "saiph";
 
-#  src = builtins.fetchGit {
-#    url = "ssh://git@bscpm02.bsc.es/DSLs/saiph.git";
-#    #rev = "a8372abf9fc7cbc2db0778de80512ad4af244c29";
-#    ref = "VectorisationSupport";
-#  };
+  src = builtins.fetchGit {
+    url = "ssh://git@bscpm02.bsc.es/DSLs/saiph.git";
+    ref = "VectorisationSupport";
+  };
 
-  src = /tmp/saiph;
+  #src = /tmp/saiph;
 
   enableParallelBuilding = true;
   dontStrip = true;
+  enableDebugging = true;
 
   buildInputs = [
     nanos6
@@ -33,9 +33,12 @@ stdenv.mkDerivation rec {
 
   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 = [