From a9af51356c4150a20da5beadd36509f496075a7e Mon Sep 17 00:00:00 2001
From: iamashwin99 <ashwin-kumar.karnad@mpsd.mpg.de>
Date: Mon, 3 Apr 2023 12:17:01 +0200
Subject: [PATCH] Set OPTIMISATION_LEVEL="-O3"

---
 octopus/foss2021a-cuda-mpi-config.sh | 7 ++++---
 octopus/foss2021a-mpi-config.sh      | 7 ++++---
 octopus/foss2021a-serial-config.sh   | 7 ++++---
 octopus/foss2022a-cuda-mpi-config.sh | 7 ++++---
 octopus/foss2022a-mpi-config.sh      | 7 ++++---
 octopus/foss2022a-serial-config.sh   | 7 ++++---
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/octopus/foss2021a-cuda-mpi-config.sh b/octopus/foss2021a-cuda-mpi-config.sh
index ff71c5c..6fd4947 100644
--- a/octopus/foss2021a-cuda-mpi-config.sh
+++ b/octopus/foss2021a-cuda-mpi-config.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 export CC="mpicc"
 MARCH_FLAG="-march=${GCC_ARCH:-native}"
-export CFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+OPTIMISATION_LEVEL="-O3"
+export CFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export CXX="mpicxx"
-export CXXFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+export CXXFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export FC="mpif90"
-export FCFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
+export FCFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
 
 #HG: ugly hack to include rpath while linking
 #    becomes necessary for spack >= 0.19, as it does not set LD_LIBRARY_PATH anymore
diff --git a/octopus/foss2021a-mpi-config.sh b/octopus/foss2021a-mpi-config.sh
index 2bdc994..8a8d399 100644
--- a/octopus/foss2021a-mpi-config.sh
+++ b/octopus/foss2021a-mpi-config.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 export CC="mpicc"
 MARCH_FLAG="-march=${GCC_ARCH:-native}"
-export CFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+OPTIMISATION_LEVEL="-O3"
+export CFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export CXX="mpicxx"
-export CXXFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+export CXXFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export FC="mpif90"
-export FCFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
+export FCFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
 
 #HG: ugly hack to include rpath while linking
 #    becomes necessary for spack >= 0.19, as it does not set LD_LIBRARY_PATH anymore
diff --git a/octopus/foss2021a-serial-config.sh b/octopus/foss2021a-serial-config.sh
index 0ab100e..ccf3fc4 100644
--- a/octopus/foss2021a-serial-config.sh
+++ b/octopus/foss2021a-serial-config.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 export CC="gcc"
 MARCH_FLAG="-march=${GCC_ARCH:-native}"
-export CFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+OPTIMISATION_LEVEL="-O3"
+export CFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export CXX="g++"
-export CXXFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+export CXXFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export FC="gfortran"
-export FCFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
+export FCFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
 
 #HG: ugly hack to include rpath while linking
 #    becomes necessary for spack >= 0.19, as it does not set LD_LIBRARY_PATH anymore
diff --git a/octopus/foss2022a-cuda-mpi-config.sh b/octopus/foss2022a-cuda-mpi-config.sh
index ff71c5c..6fd4947 100644
--- a/octopus/foss2022a-cuda-mpi-config.sh
+++ b/octopus/foss2022a-cuda-mpi-config.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 export CC="mpicc"
 MARCH_FLAG="-march=${GCC_ARCH:-native}"
-export CFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+OPTIMISATION_LEVEL="-O3"
+export CFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export CXX="mpicxx"
-export CXXFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+export CXXFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export FC="mpif90"
-export FCFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
+export FCFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
 
 #HG: ugly hack to include rpath while linking
 #    becomes necessary for spack >= 0.19, as it does not set LD_LIBRARY_PATH anymore
diff --git a/octopus/foss2022a-mpi-config.sh b/octopus/foss2022a-mpi-config.sh
index 2bdc994..8a8d399 100644
--- a/octopus/foss2022a-mpi-config.sh
+++ b/octopus/foss2022a-mpi-config.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 export CC="mpicc"
 MARCH_FLAG="-march=${GCC_ARCH:-native}"
-export CFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+OPTIMISATION_LEVEL="-O3"
+export CFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export CXX="mpicxx"
-export CXXFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+export CXXFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export FC="mpif90"
-export FCFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
+export FCFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
 
 #HG: ugly hack to include rpath while linking
 #    becomes necessary for spack >= 0.19, as it does not set LD_LIBRARY_PATH anymore
diff --git a/octopus/foss2022a-serial-config.sh b/octopus/foss2022a-serial-config.sh
index 4a2aaa7..24a8015 100644
--- a/octopus/foss2022a-serial-config.sh
+++ b/octopus/foss2022a-serial-config.sh
@@ -1,11 +1,12 @@
 #!/bin/sh
 export CC="gcc"
 MARCH_FLAG="-march=${GCC_ARCH:-native}"
-export CFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+OPTIMISATION_LEVEL="-O3"
+export CFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export CXX="g++"
-export CXXFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments"
+export CXXFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments"
 export FC="gfortran"
-export FCFLAGS="$MARCH_FLAG -O2 -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
+export FCFLAGS="$MARCH_FLAG $OPTIMISATION_LEVEL -g -fno-var-tracking-assignments -ffree-line-length-none -fallow-argument-mismatch -fallow-invalid-boz"
 
 #HG: ugly hack to include rpath while linking
 #    becomes necessary for spack >= 0.19, as it does not set LD_LIBRARY_PATH anymore
-- 
GitLab