This is an archive of the discontinued LLVM Phabricator instance.

Differential D106696

Suppress FP_CONTRACT due to planned command line changes (changes in the Makefile).
ClosedPublic

Authored by zahiraam on Jul 23 2021, 12:06 PM.

Details

Reviewers
mibintc
andrew.w.kaylor
Summary

In https://reviews.llvm.org/D102861 changes to the LNT suite were made to accommodate the clang patch in https://reviews.llvm.org/D74436 . These changes were made in the CMakeLists.txt. Unfortunately the buildbot seems to be running make. This patch is to add those same (FLAGS) changes in D102861 to the Makefiles.

Diff Detail

Event Timeline

zahiraam created this revision.Jul 23 2021, 12:06 PM
Herald added a subscriber: dmgreen. · View Herald TranscriptJul 23 2021, 12:06 PM
zahiraam requested review of this revision.Jul 23 2021, 12:06 PM
Harbormaster completed remote builds in B115914: Diff 361292.Jul 23 2021, 12:06 PM
mibintc accepted this revision.Jul 23 2021, 12:16 PM

LGTM - please see changes requested inline. thanks a lot

SingleSource/Benchmarks/Misc-C++/Large/Makefile
3

I think these should all say "+=" instead of merely "=" because there might be an initialization of flags from somewhere else e.g. the Make command line invocation. If you use += then it will add onto the flags, whereas straight assignment I believe would lose the other setting.

If there's no particular reason why some files use CPPFLAGS and others divide into CXXFLAGS and CFLAGS why not use the same setting in each file (i.e. choose one way or the other)

I'm going to go ahead and +1 this assuming you will make these changes

LGTM thanks so much for doing this!

This revision is now accepted and ready to land.Jul 23 2021, 12:16 PM
zahiraam added inline comments.Jul 23 2021, 12:26 PM
SingleSource/Benchmarks/Misc-C++/Large/Makefile
3

I will change all these to +=.
The reason I used 2 different ways of doing is that in SingleSource/Make.singlesrc, there is a rule at line#80 that is using the CFLAGS but not the CPPFLAGS so wanted to make sur that those flags will be used regardless of the CPPFLAGS.

zahiraam added inline comments.Jul 23 2021, 12:32 PM
SingleSource/Benchmarks/Misc-C++/Large/Makefile
3

But then I see that MultiSource/Makefile.multisrc also has a rule that doesn't use CPPFLAGS with CFLAGS (line 95).

mibintc added inline comments.Jul 23 2021, 12:38 PM
SingleSource/Benchmarks/Misc-C++/Large/Makefile
3

Probably doesn't matter, just being picky. I'm good with whatever you choose. thanks again

zahiraam updated this revision to Diff 361366.Jul 23 2021, 3:22 PM
Harbormaster completed remote builds in B115964: Diff 361366.Jul 23 2021, 3:22 PM
mibintc accepted this revision.Jul 24 2021, 5:15 AM
zahiraam set the repository for this revision to rT test-suite.Jul 26 2021, 6:34 AM
zahiraam updated this revision to Diff 361644.Jul 26 2021, 7:15 AM
Harbormaster completed remote builds in B116169: Diff 361644.Jul 26 2021, 7:16 AM
zahiraam updated this revision to Diff 361738.Jul 26 2021, 11:41 AM
zahiraam set the repository for this revision to rT test-suite.
zahiraam removed rT test-suite as the repository for this revision.Jul 26 2021, 2:11 PM
mibintc accepted this revision.Jul 26 2021, 4:18 PM
mibintc mentioned this in D106836: [LNT][FPEnv] Duplicate of D106696 to trigger pre-commit testing.Jul 26 2021, 4:31 PM
mibintc closed this revision.Jul 29 2021, 5:32 AM

commit 79f2b03c5111392d647fa542e120f70c8f39a991
Author: Zahira Ammarguellat <zahira.ammarguellat@intel.com>
Date: Mon Jul 26 11:36:23 2021 -0700

Closed by this commit (fixed) the buildbots are working well for Intel thanks Zahira

Revision Contents

PathSize
MultiSource/
Applications/
oggenc/
2 lines
Benchmarks/
DOE-ProxyApps-C++/
CLAMR/
1 line
HPCCG/
1 line
miniFE/
3 lines
SingleSource/
Benchmarks/
Linpack/
1 line
Misc-C++/
Large/
1 line
Polybench/
datamining/
correlation/
3 lines
covariance/
3 lines
linear-algebra/
kernels/
2mm/
3 lines
3mm/
3 lines
atax/
3 lines
bicg/
3 lines
gemver/
3 lines
gesummv/
3 lines
symm/
3 lines
trisolv/
3 lines
trmm/
3 lines
solvers/
gramschmidt/
3 lines
stencils/
adi/
3 lines
UnitTests/
Vector/
SSE/
2 lines

Diff 361738

MultiSource/Applications/oggenc/Makefile

LEVEL = ../../.. LEVEL = ../../..
PROG = oggenc PROG = oggenc
CPPFLAGS = -fno-strict-aliasing CPPFLAGS += -fno-strict-aliasing -ffp-contract=off -DFMA_DISABLED=1
LDFLAGS = -lm LDFLAGS = -lm
STDIN_FILENAME = $(SourceDir)/tune STDIN_FILENAME = $(SourceDir)/tune

MultiSource/Benchmarks/DOE-ProxyApps-C++/CLAMR/Makefile

LEVEL = ../../../.. LEVEL = ../../../..
PROG = CLAMR PROG = CLAMR
CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1
RUN_OPTIONS = -n 64 -t 1000 RUN_OPTIONS = -n 64 -t 1000
include $(LEVEL)/MultiSource/Makefile.multisrc include $(LEVEL)/MultiSource/Makefile.multisrc

MultiSource/Benchmarks/DOE-ProxyApps-C++/HPCCG/Makefile

LEVEL = ../../../.. LEVEL = ../../../..
PROG = HPCCG PROG = HPCCG
CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1
LDFLAGS = -lm LDFLAGS = -lm
RUN_OPTIONS = 50 50 50 RUN_OPTIONS = 50 50 50
include $(LEVEL)/MultiSource/Makefile.multisrc include $(LEVEL)/MultiSource/Makefile.multisrc

MultiSource/Benchmarks/DOE-ProxyApps-C++/miniFE/Makefile

LEVEL = ../../../.. LEVEL = ../../../..
PROG = miniFE 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 LDFLAGS = -lm
RUN_OPTIONS = -nx 64 -ny 64 -nz 64 RUN_OPTIONS = -nx 64 -ny 64 -nz 64
include $(LEVEL)/MultiSource/Makefile.multisrc include $(LEVEL)/MultiSource/Makefile.multisrc

SingleSource/Benchmarks/Linpack/Makefile

LEVEL = ../../.. LEVEL = ../../..
CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1
LDFLAGS += -lm LDFLAGS += -lm
FP_TOLERANCE := 0.0001 FP_TOLERANCE := 0.0001

SingleSource/Benchmarks/Misc-C++/Large/Makefile

LEVEL = ../../../.. LEVEL = ../../../..
CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1
LDFLAGS += -lm -lstdc++ LDFLAGS += -lm -lstdc++
mibintcUnsubmitted
Not Done
ReplyInline Actions

I think these should all say "+=" instead of merely "=" because there might be an initialization of flags from somewhere else e.g. the Make command line invocation. If you use += then it will add onto the flags, whereas straight assignment I believe would lose the other setting.

If there's no particular reason why some files use CPPFLAGS and others divide into CXXFLAGS and CFLAGS why not use the same setting in each file (i.e. choose one way or the other)

I'm going to go ahead and +1 this assuming you will make these changes

LGTM thanks so much for doing this!

mibintc: I think these should all say "+=" instead of merely "=" because there might be an…
zahiraamAuthorUnsubmitted
Done
ReplyInline Actions

I will change all these to +=.
The reason I used 2 different ways of doing is that in SingleSource/Make.singlesrc, there is a rule at line#80 that is using the CFLAGS but not the CPPFLAGS so wanted to make sur that those flags will be used regardless of the CPPFLAGS.

zahiraam: I will change all these to +=. The reason I used 2 different ways of doing is that in…
zahiraamAuthorUnsubmitted
Done
ReplyInline Actions

But then I see that MultiSource/Makefile.multisrc also has a rule that doesn't use CPPFLAGS with CFLAGS (line 95).

zahiraam: But then I see that MultiSource/Makefile.multisrc also has a rule that doesn't use CPPFLAGS…
mibintcUnsubmitted
Not Done
ReplyInline Actions

Probably doesn't matter, just being picky. I'm good with whatever you choose. thanks again

mibintc: Probably doesn't matter, just being picky. I'm good with whatever you choose. thanks again
LIBS = -lstdc++ LIBS = -lstdc++
FP_ABSTOLERANCE := 0.01 FP_ABSTOLERANCE := 0.01

SingleSource/Benchmarks/Polybench/datamining/correlation/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = correlation 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 ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET CFLAGS += -DSMALL_DATASET
Context not available.

SingleSource/Benchmarks/Polybench/datamining/covariance/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = covariance 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 ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET CFLAGS += -DSMALL_DATASET
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/2mm/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = 2mm 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 ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET CFLAGS += -DSMALL_DATASET
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/3mm/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = 3mm 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 ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET CFLAGS += -DSMALL_DATASET
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/atax/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = atax 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 HASH_PROGRAM_OUTPUT = 1
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/bicg/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = bicg 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 HASH_PROGRAM_OUTPUT = 1
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gemver/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = gemver 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 HASH_PROGRAM_OUTPUT = 1
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/gesummv/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = gesummv 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 ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET CFLAGS += -DSMALL_DATASET
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/symm/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = symm 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) ifeq ($(ARCH),Mips)
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trisolv/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = trisolv 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 HASH_PROGRAM_OUTPUT = 1
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/kernels/trmm/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = trmm 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 ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET CFLAGS += -DSMALL_DATASET
Context not available.

SingleSource/Benchmarks/Polybench/linear-algebra/solvers/gramschmidt/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = gramschmidt 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 ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET CFLAGS += -DSMALL_DATASET
Context not available.

SingleSource/Benchmarks/Polybench/stencils/adi/Makefile

Context not available.
POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities POLYBENCH_UTILS = SingleSource/Benchmarks/Polybench/utilities
PROG = adi 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 ifdef SMALL_PROBLEM_SIZE
CFLAGS += -DSMALL_DATASET CFLAGS += -DSMALL_DATASET
Context not available.

SingleSource/UnitTests/Vector/SSE/Makefile

Context not available.
DIRS = DIRS =
LEVEL = ../../../.. LEVEL = ../../../..
FP_TOLERANCE := 0.016 FP_TOLERANCE := 0.016
CPPFLAGS += -ffp-contract=off -DFMA_DISABLED=1
LDFLAGS += -lm LDFLAGS += -lm
include $(LEVEL)/SingleSource/Makefile.singlesrc include $(LEVEL)/SingleSource/Makefile.singlesrc
Context not available.