Add NO_LOG option to SLOTHY scripts

slothy-optimizer · Mar 15, 2024 · 51f3fde · 51f3fde
1 parent bef2aaf
commit 51f3fde
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 9 deletions.
diff --git a/paper/scripts/slothy_dilithium_ntt_a55.sh b/paper/scripts/slothy_dilithium_ntt_a55.sh
@@ -17,6 +17,9 @@ LOG_DIR=logs
 mkdir -p $LOG_DIR
 
 REDIRECT_OUTPUT="--log --logdir=${LOG_DIR}"
+if [ "$NO_LOG" = "Y" ]; then
+    REDIRECT_OUTPUT=""
+fi
 if [ "$SILENT" = "Y" ]; then
     REDIRECT_OUTPUT="${REDIRECT_OUTPUT} --silent"
 fi

diff --git a/paper/scripts/slothy_dilithium_ntt_a72.sh b/paper/scripts/slothy_dilithium_ntt_a72.sh
@@ -17,6 +17,9 @@ LOG_DIR=logs
 mkdir -p $LOG_DIR
 
 REDIRECT_OUTPUT="--log --logdir=${LOG_DIR}"
+if [ "$NO_LOG" = "Y" ]; then
+    REDIRECT_OUTPUT=""
+fi
 if [ "$SILENT" = "Y" ]; then
     REDIRECT_OUTPUT="${REDIRECT_OUTPUT} --silent"
 fi

diff --git a/paper/scripts/slothy_fft.sh b/paper/scripts/slothy_fft.sh
@@ -15,6 +15,9 @@ LOG_DIR=logs
 mkdir -p $LOG_DIR
 
 REDIRECT_OUTPUT="--log --logdir=${LOG_DIR}"
+if [ "$NO_LOG" = "Y" ]; then
+    REDIRECT_OUTPUT=""
+fi
 if [ "$SILENT" = "Y" ]; then
     REDIRECT_OUTPUT="${REDIRECT_OUTPUT} --silent"
 fi

diff --git a/paper/scripts/slothy_kyber_ntt_a55.sh b/paper/scripts/slothy_kyber_ntt_a55.sh
@@ -17,6 +17,10 @@ LOG_DIR=logs
 mkdir -p $LOG_DIR
 
 REDIRECT_OUTPUT="--log --logdir=${LOG_DIR}"
+if [ "$NO_LOG" = "Y" ]; then
+    REDIRECT_OUTPUT=""
+fi
+
 if [ "$SILENT" = "Y" ]; then
     REDIRECT_OUTPUT="${REDIRECT_OUTPUT} --silent"
 fi

diff --git a/paper/scripts/slothy_kyber_ntt_a72.sh b/paper/scripts/slothy_kyber_ntt_a72.sh
@@ -17,6 +17,9 @@ LOG_DIR=logs
 mkdir -p $LOG_DIR
 
 REDIRECT_OUTPUT="--log --logdir=${LOG_DIR}"
+if [ "$NO_LOG" = "Y" ]; then
+    REDIRECT_OUTPUT=""
+fi
 if [ "$SILENT" = "Y" ]; then
     REDIRECT_OUTPUT="${REDIRECT_OUTPUT} --silent"
 fi

diff --git a/paper/scripts/slothy_ntt_helium.py b/paper/scripts/slothy_ntt_helium.py
@@ -65,7 +65,7 @@ def __init__(self, infile, name=None, funcname=None, suffix="opt",
     def core(self, slothy):
         slothy.optimize()
 
-    def run(self, silent=False):
+    def run(self, silent=False, no_log=False):
         logdir = "logs"
 
         handlers = []
@@ -80,13 +80,14 @@ def run(self, silent=False):
             h_info.addFilter(lambda r: r.levelno == logging.INFO)
             handlers.append(h_info)
 
-        # By default, use time stamp and input file
-        file_base = os.path.basename(self.outfile_full).replace('.','_')
-        logfile = f"slothy_log_{int(time.time())}_{file_base}.log"
-        logfile = f"{logdir}/{logfile}"
-        h_log = logging.FileHandler(logfile)
-        h_log.setLevel(logging.DEBUG)
-        handlers.append(h_log)
+        if no_log is False:
+            # By default, use time stamp and input file
+            file_base = os.path.basename(self.outfile_full).replace('.','_')
+            logfile = f"slothy_log_{int(time.time())}_{file_base}.log"
+            logfile = f"{logdir}/{logfile}"
+            h_log = logging.FileHandler(logfile)
+            h_log.setLevel(logging.DEBUG)
+            handlers.append(h_log)
 
         logging.basicConfig(
             level = logging.INFO,
@@ -281,6 +282,8 @@ def main():
         help=f"The list of examples to be run, comma-separated list from {all_example_names}."
     )
     parser.add_argument("--iterations", type=int, default=1)
+    parser.add_argument("--no-log", default=False, action='store_true',
+                        help="Don't store logfiles")
     parser.add_argument("--silent", default=False, action='store_true',
                         help="""Silent mode: Only print warnings and errors""")
 
@@ -299,7 +302,7 @@ def run_example(name, silent=False):
                 break
         if ex == None:
             raise Exception(f"Could not find example {name} (known: {list(e.name for e in examples)}")
-        ex.run(silent=silent)
+        ex.run(silent=silent, no_log=args.no_log)
 
     for e in todo:
         for _ in range(iterations):

diff --git a/paper/scripts/slothy_ntt_helium.sh b/paper/scripts/slothy_ntt_helium.sh
@@ -13,6 +13,9 @@ ARGS=""
 if [ "$SILENT" = "Y" ]; then
     ARGS="$ARGS --silent"
 fi
+if [ "$NO_LOG" = "Y" ]; then
+    ARGS="$ARGS --no-log"
+fi
 
 export PYTHONPATH=../../
 

diff --git a/paper/scripts/slothy_sqmag.sh b/paper/scripts/slothy_sqmag.sh
@@ -12,6 +12,9 @@ LOG_DIR=logs
 mkdir -p $LOG_DIR
 
 REDIRECT_OUTPUT="--log --logdir=${LOG_DIR}"
+if [ "$NO_LOG" = "Y" ]; then
+    REDIRECT_OUTPUT=""
+fi
 if [ "$SILENT" = "Y" ]; then
     REDIRECT_OUTPUT="${REDIRECT_OUTPUT} --silent"
 fi

diff --git a/paper/scripts/slothy_x25519.sh b/paper/scripts/slothy_x25519.sh
@@ -17,6 +17,9 @@ LOG_DIR=logs
 mkdir -p $LOG_DIR
 
 REDIRECT_OUTPUT="--log --logdir=${LOG_DIR}"
+if [ "$NO_LOG" = "Y" ]; then
+    REDIRECT_OUTPUT=""
+fi
 if [ "$SILENT" = "Y" ]; then
     REDIRECT_OUTPUT="${REDIRECT_OUTPUT} --silent"
 fi