From 0e0f1b265fa9976d5b9cbcc91f694d26a7f5c403 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Thu, 1 Apr 2021 19:02:35 +0200
Subject: [PATCH] saiph: add extra parameters for the app

---
 garlic/apps/index.nix         |  2 ++
 garlic/apps/saiph/default.nix | 58 ++++++++++++++++++++---------------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/garlic/apps/index.nix b/garlic/apps/index.nix
index ce2fefe..ac2ccfd 100644
--- a/garlic/apps/index.nix
+++ b/garlic/apps/index.nix
@@ -13,6 +13,8 @@
 
   saiph = callPackage ./saiph/default.nix {
     cc = bsc.clangOmpss2;
+    L3SizeKB = garlic.targetMachine.config.hw.cacheSizeKB.L3;
+    cachelineBytes = garlic.targetMachine.config.hw.cachelineBytes;
   };
 
   creams = callPackage ./creams/default.nix {
diff --git a/garlic/apps/saiph/default.nix b/garlic/apps/saiph/default.nix
index b298e70..1e3d867 100644
--- a/garlic/apps/saiph/default.nix
+++ b/garlic/apps/saiph/default.nix
@@ -20,11 +20,20 @@
 , enableVectFlags ? false
 , enableDebugFlags ? false
 , enableAsanFlags ? false
-, cachelineBytes ? 64
-, l3sizeKBytes ? 33792
+, cachelineBytes ? null
+, L3SizeKB ? null
+# Problem size:
+, sizex ? 3
+, sizey ? 4
+, sizez ? 4
 }:
 
+assert enableManualDist -> (nbgx != null);
+assert enableManualDist -> (nbgy != null);
+assert enableManualDist -> (nbgz != null);
+
 with stdenv.lib;
+with stdenv.lib.versions;
 
 stdenv.mkDerivation rec {
   name = "saiph";
@@ -33,9 +42,9 @@ stdenv.mkDerivation rec {
   src = builtins.fetchGit ({
     url = "ssh://git@bscpm03.bsc.es/DSLs/saiph.git";
     ref = "${gitBranch}";
-  } // (if (gitCommit != null) then {
-    rev = gitCommit;
-  } else {}));
+  } // (optionalAttrs (gitCommit != null) {
+    rev = "${gitCommit}";
+  }));
 
   programPath = "/bin/Heat3D_vect";
 
@@ -53,36 +62,37 @@ stdenv.mkDerivation rec {
   ];
 
   # Required for nanos6
-  hardeningDisable = [ "bindnow" ];
+  hardeningDisable = [ "all" ];
   
   preBuild = ''
     cd saiphv2/cpp/src 
-    export VTK_VERSION=8.2
+    export VTK_VERSION=${majorMinor (getVersion vtk.name)}
     export VTK_HOME=${vtk}
     make clean
-  '';
 
-  #NIX_CFLAGS_COMPILE = "-O1 -g";
-  #NIX_DEBUG = 5;
+    sed -i '/SIZEX =/s/3/${toString sizex}/g' testApp/Heat3D_vect.cpp
+    sed -i '/SIZEY =/s/4/${toString sizey}/g' testApp/Heat3D_vect.cpp
+    sed -i '/SIZEZ =/s/4/${toString sizez}/g' testApp/Heat3D_vect.cpp
+  '';
 
   makeFlags = [
     "-f" "Makefile.${cc.CC}"
     "apps"
     "APP=Heat3D_vect"
-    "ROW_ALIGNMENT=${toString cachelineBytes}"
-    "L3_SIZE_K=${toString l3sizeKBytes}"
-  ] ++ optional (enableManualDist) "DIST_SET=1"
-    ++ optional (enableManualDist) "NBG_X=${toString nbgx}"
-    ++ optional (enableManualDist) "NBG_Y=${toString nbgy}"
-    ++ optional (enableManualDist) "NBG_Z=${toString nbgz}"
-    ++ optional (nblx != null) "NBL_X=${toString nblx}"
-    ++ optional (nbly != null) "NBL_Y=${toString nbly}"
-    ++ optional (nblz != null) "NBL_Z=${toString nblz}"
-    ++ optional (nsteps != null) "NSTEPS=${toString nsteps}"
-    ++ optional (numComm != null) "NUM_COMM=${toString numComm}"
-    ++ optional (enableVectFlags) "VECT_CHECKS=1"
-    ++ optional (enableDebugFlags) "DEBUG_CHECKS=1"
-    ++ optional (enableAsanFlags) "SANITIZE_CHECKS=1"
+  ] ++ optional (cachelineBytes != null) "ROW_ALIGNMENT=${toString cachelineBytes}"
+    ++ optional (L3SizeKB != null)  "L3_SIZE_K=${toString L3SizeKB}"
+    ++ optional (enableManualDist)  "DIST_SET=1"
+    ++ optional (enableManualDist)  "NBG_X=${toString nbgx}"
+    ++ optional (enableManualDist)  "NBG_Y=${toString nbgy}"
+    ++ optional (enableManualDist)  "NBG_Z=${toString nbgz}"
+    ++ optional (nblx != null)      "NBL_X=${toString nblx}"
+    ++ optional (nbly != null)      "NBL_Y=${toString nbly}"
+    ++ optional (nblz != null)      "NBL_Z=${toString nblz}"
+    ++ optional (nsteps != null)    "NSTEPS=${toString nsteps}"
+    ++ optional (numComm != null)   "NUM_COMM=${toString numComm}"
+    ++ optional (enableVectFlags)   "VECT_CHECKS=1"
+    ++ optional (enableDebugFlags)  "DEBUG_CHECKS=1"
+    ++ optional (enableAsanFlags)   "SANITIZE_CHECKS=1"
     ;
     
   installPhase = ''