diff --git a/scripts/compile-all.sh b/scripts/compile-all.sh
index 0165002631076cc1c2ee7b4e92647e2b630976a7..0f4ec0573d89c252fa28fcc2b9cb1ba3dd293513 100755
--- a/scripts/compile-all.sh
+++ b/scripts/compile-all.sh
@@ -60,12 +60,12 @@ for DIR in */; do
        echo "${DIR} ${CC} ${CFLAGS}" >> ../../compilation-errors
     fi
     rm make_output.txt
-  done < ../../scripts/flags-gcc.txt
+  done < ../../scripts/flags-clang.txt
 
 
   CC=icx
   CXX=icpx
-  OMP_FLAG=-qopenmp
+
   while read -r line; do
     make clean
 
@@ -77,7 +77,7 @@ for DIR in */; do
       mkdir -p "${TARGET_DIR}"
     fi
 
-    if make CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" &> make_output.txt; then
+    if make CC="${CC}" CXX="${CXX}" CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" OMP_FLAG="-qopenmp" &> make_output.txt; then
       EXEC=$(basename "${DIR}")
       if [ -f "${EXEC}" ]; then
         cp "${EXEC}" "${TARGET_DIR}"
@@ -127,7 +127,7 @@ for DIR in */; do
        echo "${DIR} aocc ${CFLAGS}" >> ../../compilation-errors
     fi
     rm make_output.txt
-  done < ../../scripts/flags-gcc.txt
+  done < ../../scripts/flags-clang.txt
 
   cd ..
 done
diff --git a/scripts/flags-clang-nv.txt b/scripts/flags-clang-nv.txt
deleted file mode 100644
index ea6eddde588944f287a48a47dd1dc1897d2d50cd..0000000000000000000000000000000000000000
--- a/scripts/flags-clang-nv.txt
+++ /dev/null
@@ -1 +0,0 @@
--O3 -funroll-loops -mfma -march=native -fno-tree-vectorize -fno-tree-slp-vectorize
diff --git a/scripts/flags-clang.txt b/scripts/flags-clang.txt
new file mode 100644
index 0000000000000000000000000000000000000000..e09d0412bf277694ff60c8547e457de897975c48
--- /dev/null
+++ b/scripts/flags-clang.txt
@@ -0,0 +1,8 @@
+-O1
+-O2
+-O3
+-O3 -mfma
+-O3 -march=native
+-O3 -march=native -mprefer-vector-width=256
+-O3 -march=native -ffast-math
+-O3 -march=native -fno-tree-vectorize -fno-tree-slp-vectorize
diff --git a/scripts/flags-gcc-nv.txt b/scripts/flags-gcc-nv.txt
deleted file mode 100644
index 9df4a9d07f82e201116e55e9849ae5909ef2165e..0000000000000000000000000000000000000000
--- a/scripts/flags-gcc-nv.txt
+++ /dev/null
@@ -1 +0,0 @@
--O3 -funroll-loops -mfma -march=native -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize
diff --git a/scripts/flags-gcc.txt b/scripts/flags-gcc.txt
index f5f099f67b309fbbd92186feacd8c5f5e2708212..5081fafb9da0869973aa8bc1aecdb9a38742ea14 100644
--- a/scripts/flags-gcc.txt
+++ b/scripts/flags-gcc.txt
@@ -1,12 +1,10 @@
 -O1
 -O2
 -O2 -funroll-loops
--O2 -mfma
--O2 -march=native
--O2 -funroll-loops -mfma -march=native
 -O3
 -O3 -funroll-loops
--O3 -mfma
--O3 -march=native
--O3 -funroll-loops -mfma -march=native
--O3 -funroll-loops -mfma -march=native -mprefer-vector-width=256
+-O3 -funroll-loops -mfma
+-O3 -funroll-loops -march=native
+-O3 -funroll-loops -march=native -mprefer-vector-width=256
+-O3 -funroll-loops -march=native -ffast-math
+-O3 -funroll-loops -march=native -fno-tree-vectorize -fno-tree-loop-vectorize -fno-tree-slp-vectorize
diff --git a/scripts/flags-icx-nv.txt b/scripts/flags-icx-nv.txt
deleted file mode 100644
index 76fd612fb16d4b66edc8922b6c3cc3641e2bec95..0000000000000000000000000000000000000000
--- a/scripts/flags-icx-nv.txt
+++ /dev/null
@@ -1 +0,0 @@
--O3 -fma -march=core-avx2 -no-vec
diff --git a/scripts/flags-icx.txt b/scripts/flags-icx.txt
index 4345e8fd9c4f4351667fb440a9fdea9265b5749e..6d0eb27c82b273c6accef28bf27023dd7f1cec81 100644
--- a/scripts/flags-icx.txt
+++ b/scripts/flags-icx.txt
@@ -1,9 +1,9 @@
--O1
--O2
--O2 -fma
--O2 -march=core-avx2
--O2 -fma -march=core-avx2
--O3
--O3 -fma
--O3 -march=core-avx2
--O3 -fma -march=core-avx2
+-O1 -fp-model=precise
+-O2 -fp-model=precise
+-O3 -fp-model=precise
+-O3 -fma -fp-model=precise
+-O3 -march=core-avx2 -fp-model=precise
+-O3 -fma -march=core-avx2 -fp-model=precise
+-O3 -march=native -fp-model=precise
+-O3 -fma -march=core-avx2 -fp-model=fast=2
+-O3 -fma -march=core-avx2 -fp-model=precise -no-vec
diff --git a/scripts/run-all.sh b/scripts/run-all.sh
index 8ffbf7a1c7d276f6c359747d75b8b2b33701fa27..36c09c4608914ec9a0520719cd7e9c0b4e97b684 100755
--- a/scripts/run-all.sh
+++ b/scripts/run-all.sh
@@ -1,7 +1,7 @@
 cd ../compiled
 
-for N in 10; do
-  for COMP in [!d]*/; do
+for N in {1..10}; do
+  for COMP in [!d]*; do
     printf "%-45s" "${COMP}" >> ../"results-${N}.txt"
     cd "${COMP}"
     for BMK in */; do
@@ -18,5 +18,3 @@ for N in 10; do
     printf "\n" >> ../"results-${N}.txt"
   done
 done
-
-cd ../compiled
diff --git a/scripts/run-nv.sh b/scripts/run-nv.sh
deleted file mode 100755
index 91d9bb7cc9fccf654a4560888cda22ae566fb663..0000000000000000000000000000000000000000
--- a/scripts/run-nv.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-cd ../compiled
-
-for N in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32; do
-  for COMP in *no-*vec*/; do
-    printf "%-45s" "${COMP}" >> ../"results-nv${N}.txt"
-    cd "${COMP}"
-    for BMK in */; do
-      cd "${BMK}"
-      usBEFORE=`date +%s%6N`
-      ./run &> /dev/null
-      usAFTER=`date +%s%6N`
-      EXECTIME=`bc <<< "scale=6; (${usAFTER} - ${usBEFORE}) / 1000000"`
-      printf ",%12f" ${EXECTIME} >> ../../../"results-nv-${N}.txt"
-      cd ..
-    done
-    cd ..
-    printf "\n" >> ../"results-nv-${N}.txt"
-    echo ${N} DONE
-  done
-done
-
-cd ../compiled