From 37e11c749f0729e473deb4ba6ac45ad229163ef1 Mon Sep 17 00:00:00 2001
From: Sandra <smacia@bsc.es>
Date: Fri, 19 Feb 2021 11:10:44 +0100
Subject: [PATCH] saiph: add cacheline compilation parameter

---
 garlic/apps/saiph/default.nix    |  3 ++-
 garlic/exp/saiph/granularity.nix | 10 ++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/garlic/apps/saiph/default.nix b/garlic/apps/saiph/default.nix
index f9e315ff..6e26f931 100644
--- a/garlic/apps/saiph/default.nix
+++ b/garlic/apps/saiph/default.nix
@@ -13,7 +13,7 @@
 , nby ? null
 , nbz ? null
 , vectFlags ? null
-#, breakpointHook
+, cachelineBytes ? 64
 }:
 
 with stdenv.lib;
@@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
     "-f" "Makefile.${cc.CC}"
     "apps"
     "APP=Heat3D_vect"
+    "ROW_ALIGNMENT=${toString cachelineBytes}"
   ] ++ optional (nbx != null) "NB_X=${toString nbx}"
     ++ optional (nby != null) "NB_Y=${toString nby}"
     ++ optional (nbz != null) "NB_Z=${toString nbz}"
diff --git a/garlic/exp/saiph/granularity.nix b/garlic/exp/saiph/granularity.nix
index 43e251a2..af466e24 100644
--- a/garlic/exp/saiph/granularity.nix
+++ b/garlic/exp/saiph/granularity.nix
@@ -25,16 +25,18 @@ let
     nby = c.nb;
     nbz = c.nb;
     mpi = impi;
-    gitBranch = "garlic/tampi+isend+oss+task+simd";
+    gitBranch = "garlic/tampi+isend+omp+task+simd";
 
-    # Repeat the execution of each unit 50 times
-    loops = 10;
+    # Repeat the execution of each unit 30 times
+    loops = 30;
 
     # Resources
+    cachelineBytes = hw.cachelineBytes;
     qos = "debug";
     time = "02:00:00";
     ntasksPerNode = 1;
     nodes = 1;
+    ntasksPerNode = hw.socketsPerNode;
     cpusPerTask = hw.cpusPerSocket;
     jobName = "${unitName}-${gitBranch}";
   };
@@ -57,7 +59,7 @@ let
     customPkgs = stdexp.replaceMpi conf.mpi;
   in
     customPkgs.apps.saiph.override {
-      inherit nbx nby nbz mpi gitBranch;
+      inherit nbx nby nbz mpi gitBranch cachelineBytes;
     };
 
   pipeline = stdexp.stdPipeline ++ [ exec program ];