Attachment 850719 Details for Bug 984605 – Optimization flags patch

Optimization flags patch

nwchem-makefile_flags.patch (text/plain), 6.79 KB, created by Antonio T. (sagitter) on 2014-01-15 21:53:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Antonio T. (sagitter)

Created: 2014-01-15 21:53:48 UTC

Size: 6.79 KB

patch

obsolete

>--- a/src/config/makefile.orig.h	2013-10-16 01:36:46.000000000 +0200
>+++ b/src/config/makefile.h	2014-01-15 18:51:58.658817154 +0100
>@@ -1368,15 +1368,15 @@
> 
>   DEFINES = -DLINUX
> 
>-      FOPTIMIZE  = -O2 
>+      FOPTIMIZE  = @@OPTFLAGS@@ 
>       ifeq ($(FC),gfortran)
>         FOPTIONS   = -Wextra -ffast-math #-Wunused  
>         FOPTIMIZE  += -ffast-math -Wuninitialized
>         _FC=gfortran
>         DEFINES  += -DGFORTRAN
>       endif
>-      COPTIONS   = -Wall
>-      COPTIMIZE  = -g -O2
>+      COPTIONS   = @@OPTFLAGS@@
>+      COPTIMIZE  = @@OPTFLAGS@@
> 
> ifeq ($(LINUXCPU),x86) 
>   ifeq ($(TARGET),CYGNUS)
>@@ -1392,9 +1392,9 @@
>       ifeq ($(FC),g77)
>   FOPTIONS   += -fno-second-underscore   
>   FOPTIONS   += -fno-f90  -ffixed-line-length-72 -ffixed-form
>-  FOPTIMIZE  +=  -O2  -malign-double -finline-functions 
>+  FOPTIMIZE  +=  @@OPTFLAGS@@  -malign-double -finline-functions 
>   COPTIONS   += -Wall  -malign-double 
>-  COPTIMIZE  += -g -O2
>+  COPTIMIZE  += @@OPTFLAGS@@
>     FOPTIONS  +=  -malign-double -fno-globals -Wno-globals  -fno-silent #-Wunused  
>     FOPTIMIZE += -Wuninitialized -ffast-math -funroll-loops -fstrength-reduce 
>     FOPTIMIZE += -fno-move-all-movables -fno-reduce-all-givs 
>@@ -1427,7 +1427,7 @@
> #        FOPTIMIZE +=-fprefetch-loop-arrays -minline-all-stringops -fexpensive-optimizations
>       else
>         FOPTIMIZE  += -march=i686
>-        COPTIONS   = -Wall -march=i686 -malign-double 
>+        COPTIONS   = @@OPTFLAGS@@ -march=i686 -malign-double 
>       endif
>     else
>     ifneq ($(_CPU),x86)
>@@ -1490,7 +1490,7 @@
>       FOPTIONS += -fpe-all=0 -traceback #-fp-model  precise
>     endif
> 
>-    FOPTIMIZE = -O3 -prefetch  -unroll 
>+    FOPTIMIZE = @@OPTFLAGS@@ -prefetch  -unroll 
>     ifeq ($(_CPU),i586)
>       FOPTIMIZE +=  -tpp5 -xi # this are for PentiumII
>     endif
>@@ -1511,8 +1511,8 @@
>       ifeq ($(_FC),gfortran)
> #gcc version 4.1.0 20050525 (experimental)
>         LINK.f = gfortran  $(LDFLAGS) 
>-        FOPTIONS   = -Wextra -ffast-math #-Wunused  
>-        FOPTIMIZE  = -O2 -ffast-math -Wuninitialized
>+        FOPTIONS   = @@OPTFLAGS@@ -ffast-math #-Wunused  
>+        FOPTIMIZE  = @@OPTFLAGS@@ -ffast-math -Wuninitialized
>         ifeq ($(_CPU),i786)
>           FOPTIONS += -march=pentium4 -mtune=pentium4
>           FVECTORIZE = $(FOPTIMIZE) -O3 -ftree-vectorize 
>@@ -1541,7 +1541,7 @@
> 
>   ifeq ($(CC),icc)
>     COPTIONS   =   -mp1 -w -g -vec-report1
>-    COPTIMIZE = -O3   -unroll 
>+    COPTIMIZE = @@OPTFLAGS@@   -unroll 
>     ifeq ($(_CPU),i586)
>       COPTIMIZE +=  -tpp5 -xi # this are for PentiumII
>     endif
>@@ -1568,9 +1568,9 @@
>       _FC=xlf
>     endif
>     ifeq ($(_FC),xlf)
>-      FOPTIONS  = -q32  -qextname -qfixed 
>+      FOPTIONS  = @@OPTFLAGS@@ -q32  -qextname -qfixed 
>       FOPTIONS +=  -NQ40000 -NT80000 -NS2048 -qmaxmem=8192 -qxlf77=leadzero
>-      FOPTIMIZE= -O3 -qstrict -qfloat=fltint
>+      FOPTIMIZE= @@OPTFLAGS@@  -qstrict -qfloat=fltint
>       ifeq ($(FC),blrts_xlf)
>         FOPTIMIZE+= -qarch=440 -qtune=440
>       else
>@@ -1583,8 +1583,8 @@
>       FCONVERT = $(CPP) $(CPPFLAGS) $< > $*.f
>     endif
>     ifeq ($(FC),g77)
>-      FOPTIONS   = -fno-second-underscore -fno-globals -Wno-globals
>-      FOPTIMIZE  = -g -O2
>+      FOPTIONS   = @@OPTFLAGS@@ -fno-second-underscore -fno-globals -Wno-globals
>+      FOPTIMIZE  = @@OPTFLAGS@@
>     endif
>     ifeq ($(CC),xlc)
>       _CC=xlc
>@@ -1595,8 +1595,8 @@
>     ifeq ($(_CC),xlc)
>       COPTIONS  +=  -q32 -qlanglvl=extended
>     else
>-      COPTIONS   = -Wall
>-      COPTIMIZE  = -g -O2
>+      COPTIONS   = @@OPTFLAGS@@
>+      COPTIMIZE  = @@OPTFLAGS@@
>     endif
>     LDOPTIONS += -Wl,--relax #-v
>   endif
>@@ -1687,8 +1687,8 @@
>       endif
>       FOPTIMIZE  = -O2 
>       ifeq ($(FC),gfortran)
>-        FOPTIONS   = -m64
>-        COPTIONS   = -m64
>+        FOPTIONS   = @@OPTFLAGS@@
>+        COPTIONS   = @@OPTFLAGS@@
>         FOPTIONS   += -ffast-math #-Wunused  
>         FOPTIMIZE  += -ffast-math -Wuninitialized
>        _FC=gfortran
>@@ -1754,7 +1754,7 @@
>       FC=ifort
>       CC=gcc
>       DEFINES   +=   -DLINUXIA64 
>-      COPTIMIZE = -O1
>+      COPTIMIZE = @@OPTFLAGS@@
>       ifdef USE_SHARED
>         FOPTIONS+= -fPIC
>       endif
>
>--- a/src/tools/ga-5-2/armci/configure.orig	2013-05-18 02:43:08.000000000 +0200
>+++ b/src/tools/ga-5-2/armci/configure	2014-01-15 21:22:35.247233227 +0100
>@@ -14871,7 +14871,7 @@
>   LINUX64:gnu:ia64:*) :
>     armci_cv_c_opt="-O0 -g" ;; #(
>   LINUX64:gnu:x86_64:*) :
>-    armci_cv_c_opt="-O3 -funroll-loops" ;; #(
>+    armci_cv_c_opt="@@OPTFLAGS@@ -funroll-loops" ;; #(
>   LINUX64:ibm:powerpc64:*) :
>     armci_cv_c_opt="-O3 -qinline=100 -qstrict -qarch=auto -qtune=auto" ;; #(
>   LINUX64:ibm:ppc64:*) :
>@@ -14884,8 +14884,10 @@
>     armci_cv_c_opt="-assume no2underscore -fpe3 -check nooverflow -assume accuracy_sensitive -check nopower -check nounderflow" ;; #(
>   LINUX:fujitsu:*:*) :
>     armci_cv_c_opt="-Kfast" ;; #(
>+  LINUX:*:*:*) :
>+    armci_cv_c_opt="@@OPTFLAGS@@ -finline-functions -funroll-loops -malign-double" ;; #(
>   LINUX:gnu:686:*) :
>-    armci_cv_c_opt="-O2 -finline-functions -funroll-loops -march=pentiumpro -malign-double" ;; #(
>+    armci_cv_c_opt="@@OPTFLAGS@@ -finline-functions -funroll-loops -malign-double" ;; #(
>   LINUX:gnu:686:MELLANOX) :
>     armci_cv_c_opt="-O2 -finline-functions -funroll-loops -march=pentiumpro" ;; #(
>   LINUX:gnu:686:OPENIB) :
>@@ -14897,7 +14899,7 @@
>   LINUX:gnu:786:OPENIB) :
>     armci_cv_c_opt="-O2 -finline-functions -funroll-loops -march=pentiumpro" ;; #(
>   LINUX:gnu:x86:*) :
>-    armci_cv_c_opt="-O2 -finline-functions -funroll-loops -malign-double" ;; #(
>+    armci_cv_c_opt="@@OPTFLAGS@@ -finline-functions -funroll-loops -malign-double" ;; #(
>   LINUX:gnu:x86:MELLANOX) :
>     armci_cv_c_opt="-O2 -finline-functions -funroll-loops " ;; #(
>   LINUX:gnu:x86:OPENIB) :
>@@ -14905,7 +14907,7 @@
>   LINUX:ibm:*:*) :
>     armci_cv_c_opt="-q32" ;; #(
>   LINUX:intel:*:*) :
>-    armci_cv_c_opt="-O3 -prefetch" ;; #(
>+    armci_cv_c_opt="@@OPTFLAGS@@ -prefetch" ;; #(
>   MACX64:*:*:*) :
>     armci_cv_c_opt= ;; #(
>   MACX:*:*:*) :
>
>--- a/src/tools/ga-5-2/comex/configure.orig	2013-05-18 02:43:19.000000000 +0200
>+++ b/src/tools/ga-5-2/comex/configure	2014-01-15 22:36:18.398972717 +0100
>@@ -3901,13 +3901,13 @@
>   CFLAGS=$ac_save_CFLAGS
> elif test $ac_cv_prog_cc_g = yes; then
>   if test "$GCC" = yes; then
>-    CFLAGS="-g -O2"
>+    CFLAGS="@@OPTFLAGS@@"
>   else
>     CFLAGS="-g"
>   fi
> else
>   if test "$GCC" = yes; then
>-    CFLAGS="-O2"
>+    CFLAGS="@@OPTFLAGS@@"
>   else
>     CFLAGS=
>   fi
>
>
>
>--- a/src/util/GNUmakefile.orig	2013-05-18 02:39:05.000000000 +0200
>+++ b/src/util/GNUmakefile	2014-01-15 18:57:47.971885111 +0100
>@@ -97,6 +97,7 @@
>   EXTRA_OBJ = dec_fpe.o
> endif
> ifeq ($(NWCHEM_TARGET),$(findstring $(NWCHEM_TARGET),LINUX64 CATAMOUNT))
>+ EXTRA_OBJ = linux_cpu.o linux_shift.o linux_random.o   erfc.o  linux_setfpucw.o
> ifeq ($(_CPU),alpha)
> ifeq ($(FC),fort)
>   EXTRA_OBJ += dec_fpe.o

Actions: View

Attachments on bug 984605: 850719