diff --git a/MultiSource/Applications/oggenc/Makefile b/MultiSource/Applications/oggenc/Makefile --- a/MultiSource/Applications/oggenc/Makefile +++ b/MultiSource/Applications/oggenc/Makefile @@ -1,7 +1,7 @@ LEVEL = ../../.. PROG = oggenc -CPPFLAGS = -fno-strict-aliasing +CPPFLAGS += -fno-strict-aliasing -ffp-contract=off -DFMA_DISABLED=1 LDFLAGS = -lm STDIN_FILENAME = $(SourceDir)/tune diff --git a/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/Makefile b/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/Makefile --- a/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/Makefile +++ b/MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/Makefile @@ -1,5 +1,6 @@ LEVEL = ../../../.. PROG = CLAMR +CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1 RUN_OPTIONS = -n 64 -t 1000 include $(LEVEL)/MultiSource/Makefile.multisrc diff --git a/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/Makefile b/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/Makefile --- a/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/Makefile +++ b/MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/Makefile @@ -1,6 +1,7 @@ LEVEL = ../../../.. PROG = HPCCG +CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1 LDFLAGS = -lm RUN_OPTIONS = 50 50 50 include $(LEVEL)/MultiSource/Makefile.multisrc diff --git a/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/Makefile b/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/Makefile --- a/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/Makefile +++ b/MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/Makefile @@ -1,7 +1,8 @@ LEVEL = ../../../.. PROG = miniFE -CXXFLAGS = -I. -DMINIFE_SCALAR=double -DMINIFE_LOCAL_ORDINAL=int -DMINIFE_GLOBAL_ORDINAL=int -DMINIFE_CSR_MATRIX +CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -I. -DMINIFE_SCALAR=double -DMINIFE_LOCAL_ORDINAL=int -DMINIFE_GLOBAL_ORDINAL=int -DMINIFE_CSR_MATRIX LDFLAGS = -lm RUN_OPTIONS = -nx 64 -ny 64 -nz 64 include $(LEVEL)/MultiSource/Makefile.multisrc diff --git a/SingleSource/Benchmarks/Linpack/Makefile b/SingleSource/Benchmarks/Linpack/Makefile --- a/SingleSource/Benchmarks/Linpack/Makefile +++ b/SingleSource/Benchmarks/Linpack/Makefile @@ -1,4 +1,5 @@ LEVEL = ../../.. +CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1 LDFLAGS += -lm FP_TOLERANCE := 0.0001 diff --git a/SingleSource/Benchmarks/Misc-C++/Large/Makefile b/SingleSource/Benchmarks/Misc-C++/Large/Makefile --- a/SingleSource/Benchmarks/Misc-C++/Large/Makefile +++ b/SingleSource/Benchmarks/Misc-C++/Large/Makefile @@ -1,4 +1,5 @@ LEVEL = ../../../.. +CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1 LDFLAGS += -lm -lstdc++ LIBS = -lstdc++ FP_ABSTOLERANCE := 0.01 diff --git a/SingleSource/Benchmarks/Polybench/datamining/correlation/Makefile b/SingleSource/Benchmarks/Polybench/datamining/correlation/Makefile --- a/SingleSource/Benchmarks/Polybench/datamining/correlation/Makefile +++ b/SingleSource/Benchmarks/Polybench/datamining/correlation/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = correlation -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifdef SMALL_PROBLEM_SIZE CFLAGS += -DSMALL_DATASET diff --git a/SingleSource/Benchmarks/Polybench/datamining/covariance/Makefile b/SingleSource/Benchmarks/Polybench/datamining/covariance/Makefile --- a/SingleSource/Benchmarks/Polybench/datamining/covariance/Makefile +++ b/SingleSource/Benchmarks/Polybench/datamining/covariance/Makefile @@ -3,7 +3,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = covariance -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifdef SMALL_PROBLEM_SIZE CFLAGS += -DSMALL_DATASET diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = 2mm -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifdef SMALL_PROBLEM_SIZE CFLAGS += -DSMALL_DATASET diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = 3mm -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifdef SMALL_PROBLEM_SIZE CFLAGS += -DSMALL_DATASET diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = atax -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 HASH_PROGRAM_OUTPUT = 1 diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = bicg -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 HASH_PROGRAM_OUTPUT = 1 diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = gemver -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 HASH_PROGRAM_OUTPUT = 1 diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = gesummv -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifdef SMALL_PROBLEM_SIZE CFLAGS += -DSMALL_DATASET diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = symm -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifeq ($(ARCH),Mips) diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = trisolv -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 HASH_PROGRAM_OUTPUT = 1 diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = trmm -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifdef SMALL_PROBLEM_SIZE CFLAGS += -DSMALL_DATASET diff --git a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/Makefile b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/Makefile --- a/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/Makefile +++ b/SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = gramschmidt -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifdef SMALL_PROBLEM_SIZE CFLAGS += -DSMALL_DATASET diff --git a/SingleSource/Benchmarks/Polybench/stencils/adi/Makefile b/SingleSource/Benchmarks/Polybench/stencils/adi/Makefile --- a/SingleSource/Benchmarks/Polybench/stencils/adi/Makefile +++ b/SingleSource/Benchmarks/Polybench/stencils/adi/Makefile @@ -2,7 +2,8 @@ POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities PROG = adi -CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 +CFLAGS += -I $(PROJ_SRC_ROOT)/$(POLYBENCH_UTILS) -DPOLYBENCH_DUMP_ARRAYS -DFP_ABSTOLERANCE=1e-5 -ffp-contract=off -DFMA_DISABLED=1 +CXXFLAGS += -ffp-contract=off -DFMA_DISABLED=1 ifdef SMALL_PROBLEM_SIZE CFLAGS += -DSMALL_DATASET diff --git a/SingleSource/UnitTests/Vector/SSE/Makefile b/SingleSource/UnitTests/Vector/SSE/Makefile --- a/SingleSource/UnitTests/Vector/SSE/Makefile +++ b/SingleSource/UnitTests/Vector/SSE/Makefile @@ -3,6 +3,8 @@ DIRS = LEVEL = ../../../.. FP_TOLERANCE := 0.016 +CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1 + LDFLAGS += -lm include $(LEVEL)/SingleSource/Makefile.singlesrc