Skip to content

Commit f407e0c

Browse files
author
Andy Kaylor
committed
Cleanup tests and comments based on review
1 parent b74e46c commit f407e0c

File tree

2 files changed

+62
-58
lines changed

2 files changed

+62
-58
lines changed

‎clang/lib/Driver/ToolChains/Clang.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2920,7 +2920,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
29202920

29212921
auto setComplexRange = [&](LangOptions::ComplexRangeKind NewRange) {
29222922
// Warn if user expects to perform full implementation of complex
2923-
// multiplication or division in the presence of nan or ninf flags.
2923+
// multiplication or division in the presence of nnan or ninf flags.
29242924
if (Range != NewRange)
29252925
EmitComplexRangeDiag(D,
29262926
!GccRangeComplexOption.empty()
@@ -3079,7 +3079,7 @@ static void RenderFloatingPointOptions(const ToolChain &TC, const Driver &D,
30793079

30803080
StringRef Val = A->getValue();
30813081
if (OFastEnabled && Val != "aggressive") {
3082-
// Only -ffp-model=aggressive is compatible with OFast, ignore.
3082+
// Only -ffp-model=aggressive is compatible with -OFast, ignore.
30833083
D.Diag(clang::diag::warn_drv_overriding_option)
30843084
<< Args.MakeArgString("-ffp-model=" + Val) << "-Ofast";
30853085
break;

‎clang/test/Driver/fp-model.c

Lines changed: 60 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
// RUN: | FileCheck --check-prefix=WARN %s
77
// WARN: warning: overriding '-ffp-model=aggressive' option with '-ffp-contract=off' [-Woverriding-option]
88

9+
// RUN: %clang -### -ffp-model=fast -ffp-contract=off -c %s 2>&1 \
10+
// RUN: | FileCheck --check-prefix=WARN0 %s
11+
// WARN0: warning: overriding '-ffp-model=fast' option with '-ffp-contract=off' [-Woverriding-option]
12+
913
// RUN: %clang -### -ffp-model=aggressive -ffp-contract=on -c %s 2>&1 \
1014
// RUN: | FileCheck --check-prefix=WARN1 %s
1115
// WARN1: warning: overriding '-ffp-model=aggressive' option with '-ffp-contract=on' [-Woverriding-option]
@@ -100,61 +104,61 @@
100104
// RUN: %clang -### -c %s 2>&1 \
101105
// RUN: | FileCheck --check-prefix=CHECK-NOROUND %s
102106
// CHECK-NOROUND: "-cc1"
103-
// CHECK-NOROUND: "-fno-rounding-math"
107+
// CHECK-NOROUND-SAME: "-fno-rounding-math"
104108

105109
// RUN: %clang -### -frounding-math -c %s 2>&1 \
106110
// RUN: | FileCheck --check-prefix=CHECK-ROUND --implicit-check-not ffp-exception-behavior=strict %s
107111
// CHECK-ROUND: "-cc1"
108-
// CHECK-ROUND: "-frounding-math"
112+
// CHECK-ROUND-SAME: "-frounding-math"
109113

110114
// RUN: %clang -### -ftrapping-math -c %s 2>&1 \
111115
// RUN: | FileCheck --check-prefix=CHECK-TRAP %s
112116
// CHECK-TRAP: "-cc1"
113-
// CHECK-TRAP: "-ffp-exception-behavior=strict"
117+
// CHECK-TRAP-SAME: "-ffp-exception-behavior=strict"
114118

115119
// RUN: %clang -### -nostdinc -ffp-model=aggressive -c %s 2>&1 \
116120
// RUN: | FileCheck --check-prefix=CHECK-FPM-AGGR %s
117121
// CHECK-FPM-AGGR: "-cc1"
118-
// CHECK-FPM-AGGR: "-menable-no-infs"
119-
// CHECK-FPM-AGGR: "-menable-no-nans"
120-
// CHECK-FPM-AGGR: "-fapprox-func"
121-
// CHECK-FPM-AGGR: "-funsafe-math-optimizations"
122-
// CHECK-FPM-AGGR: "-fno-signed-zeros"
123-
// CHECK-FPM-AGGR: "-mreassociate"
124-
// CHECK-FPM-AGGR: "-freciprocal-math"
125-
// CHECK-FPM-AGGR: "-ffp-contract=fast"
126-
// CHECK-FPM-AGGR: "-fno-rounding-math"
127-
// CHECK-FPM-AGGR: "-ffast-math"
128-
// CHECK-FPM-AGGR: "-ffinite-math-only"
129-
// CHECK-FPM-AGGR: "-complex-range=basic"
122+
// CHECK-FPM-AGGR-SAME: "-menable-no-infs"
123+
// CHECK-FPM-AGGR-SAME: "-menable-no-nans"
124+
// CHECK-FPM-AGGR-SAME: "-fapprox-func"
125+
// CHECK-FPM-AGGR-SAME: "-funsafe-math-optimizations"
126+
// CHECK-FPM-AGGR-SAME: "-fno-signed-zeros"
127+
// CHECK-FPM-AGGR-SAME: "-mreassociate"
128+
// CHECK-FPM-AGGR-SAME: "-freciprocal-math"
129+
// CHECK-FPM-AGGR-SAME: "-ffp-contract=fast"
130+
// CHECK-FPM-AGGR-SAME: "-fno-rounding-math"
131+
// CHECK-FPM-AGGR-SAME: "-ffast-math"
132+
// CHECK-FPM-AGGR-SAME: "-ffinite-math-only"
133+
// CHECK-FPM-AGGR-SAME: "-complex-range=basic"
130134

131135
// RUN: %clang -### -nostdinc -ffp-model=fast -c %s 2>&1 \
132136
// RUN: | FileCheck --check-prefix=CHECK-FPM-FAST %s
133137
// CHECK-FPM-FAST: "-cc1"
134138
// CHECK-FPM-FAST-NOT: "-menable-no-infs"
135139
// CHECK-FPM-FAST-NOT: "-menable-no-nans"
136-
// CHECK-FPM-FAST: "-fapprox-func"
137-
// CHECK-FPM-FAST: "-funsafe-math-optimizations"
138-
// CHECK-FPM-FAST: "-fno-signed-zeros"
139-
// CHECK-FPM-FAST: "-mreassociate"
140-
// CHECK-FPM-FAST: "-freciprocal-math"
141-
// CHECK-FPM-FAST: "-ffp-contract=fast-honor-pragmas"
142-
// CHECK-FPM-FAST: "-fno-rounding-math"
140+
// CHECK-FPM-FAST-SAME: "-fapprox-func"
141+
// CHECK-FPM-FAST-SAME: "-funsafe-math-optimizations"
142+
// CHECK-FPM-FAST-SAME: "-fno-signed-zeros"
143+
// CHECK-FPM-FAST-SAME: "-mreassociate"
144+
// CHECK-FPM-FAST-SAME: "-freciprocal-math"
145+
// CHECK-FPM-FAST-SAME: "-ffp-contract=fast-honor-pragmas"
146+
// CHECK-FPM-FAST-SAME: "-fno-rounding-math"
143147
// CHECK-FPM-FAST-NOT: "-ffast-math"
144148
// CHECK-FPM-FAST-NOT: "-ffinite-math-only"
145-
// CHECK-FPM-FAST: "-complex-range=promoted"
149+
// CHECK-FPM-FAST-SAME: "-complex-range=promoted"
146150

147151
// RUN: %clang -### -nostdinc -ffp-model=precise -c %s 2>&1 \
148152
// RUN: | FileCheck --check-prefix=CHECK-FPM-PRECISE %s
149153
// CHECK-FPM-PRECISE: "-cc1"
150-
// CHECK-FPM-PRECISE: "-ffp-contract=on"
151-
// CHECK-FPM-PRECISE: "-fno-rounding-math"
154+
// CHECK-FPM-PRECISE-SAME: "-ffp-contract=on"
155+
// CHECK-FPM-PRECISE-SAME: "-fno-rounding-math"
152156

153157
// RUN: %clang -### -nostdinc -ffp-model=strict -c %s 2>&1 \
154158
// RUN: | FileCheck --check-prefix=CHECK-FPM-STRICT %s
155159
// CHECK-FPM-STRICT: "-cc1"
156-
// CHECK-FPM-STRICT: "-frounding-math"
157-
// CHECK-FPM-STRICT: "-ffp-exception-behavior=strict"
160+
// CHECK-FPM-STRICT-SAME: "-frounding-math"
161+
// CHECK-FPM-STRICT-SAME: "-ffp-exception-behavior=strict"
158162

159163
// RUN: %clang -### -nostdinc -ffp-model=strict -ffp-model=fast -c %s 2>&1 \
160164
// RUN: | FileCheck --check-prefix=CHECK-NO-EXCEPT %s
@@ -168,14 +172,14 @@
168172
// RUN: %clang -### -nostdinc -ffp-exception-behavior=strict -c %s 2>&1 \
169173
// RUN: | FileCheck --check-prefix=CHECK-FEB-STRICT %s
170174
// CHECK-FEB-STRICT: "-cc1"
171-
// CHECK-FEB-STRICT: "-fno-rounding-math"
172-
// CHECK-FEB-STRICT: "-ffp-exception-behavior=strict"
175+
// CHECK-FEB-STRICT-SAME: "-fno-rounding-math"
176+
// CHECK-FEB-STRICT-SAME: "-ffp-exception-behavior=strict"
173177

174178
// RUN: %clang -### -nostdinc -ffp-exception-behavior=maytrap -c %s 2>&1 \
175179
// RUN: | FileCheck --check-prefix=CHECK-FEB-MAYTRAP %s
176180
// CHECK-FEB-MAYTRAP: "-cc1"
177-
// CHECK-FEB-MAYTRAP: "-fno-rounding-math"
178-
// CHECK-FEB-MAYTRAP: "-ffp-exception-behavior=maytrap"
181+
// CHECK-FEB-MAYTRAP-SAME: "-fno-rounding-math"
182+
// CHECK-FEB-MAYTRAP-SAME: "-ffp-exception-behavior=maytrap"
179183

180184
// RUN: %clang -### -nostdinc -ffp-exception-behavior=ignore -c %s 2>&1 \
181185
// RUN: | FileCheck --check-prefix=CHECK-FEB-IGNORE %s
@@ -186,35 +190,35 @@
186190
// RUN: %clang -### -nostdinc -Werror -ffast-math -ffp-model=aggressive -c %s 2>&1 \
187191
// RUN: | FileCheck --check-prefix=CHECK-FASTMATH-FPM-AGGR %s
188192
// CHECK-FASTMATH-FPM-AGGR: "-cc1"
189-
// CHECK-FASTMATH-FPM-AGGR: "-menable-no-infs"
190-
// CHECK-FASTMATH-FPM-AGGR: "-menable-no-nans"
191-
// CHECK-FASTMATH-FPM-AGGR: "-fapprox-func"
192-
// CHECK-FASTMATH-FPM-AGGR: "-funsafe-math-optimizations"
193-
// CHECK-FASTMATH-FPM-AGGR: "-fno-signed-zeros"
194-
// CHECK-FASTMATH-FPM-AGGR: "-mreassociate"
195-
// CHECK-FASTMATH-FPM-AGGR: "-freciprocal-math"
196-
// CHECK-FASTMATH-FPM-AGGR: "-ffp-contract=fast"
197-
// CHECK-FASTMATH-FPM-AGGR: "-fno-rounding-math"
198-
// CHECK-FASTMATH-FPM-AGGR: "-ffast-math"
199-
// CHECK-FASTMATH-FPM-AGGR: "-ffinite-math-only"
200-
// CHECK-FASTMATH-FPM-AGGR: "-complex-range=basic"
193+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-menable-no-infs"
194+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-menable-no-nans"
195+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-fapprox-func"
196+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-funsafe-math-optimizations"
197+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-fno-signed-zeros"
198+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-mreassociate"
199+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-freciprocal-math"
200+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-ffp-contract=fast"
201+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-fno-rounding-math"
202+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-ffast-math"
203+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-ffinite-math-only"
204+
// CHECK-FASTMATH-FPM-AGGR-SAME: "-complex-range=basic"
201205

202206
// RUN: %clang -### -nostdinc -ffast-math -ffp-model=fast -c %s 2>&1 \
203207
// RUN: | FileCheck --check-prefix=CHECK-FASTMATH-FPM-FAST %s
204208
// CHECK-FASTMATH-FPM-FAST: warning: overriding '-fcomplex-arithmetic=basic' option with '-fcomplex-arithmetic=promoted'
205209
// CHECK-FASTMATH-FPM-FAST: "-cc1"
206210
// CHECK-FASTMATH-FPM-FAST-NOT: "-menable-no-infs"
207211
// CHECK-FASTMATH-FPM-FAST-NOT: "-menable-no-nans"
208-
// CHECK-FASTMATH-FPM-FAST: "-fapprox-func"
209-
// CHECK-FASTMATH-FPM-FAST: "-funsafe-math-optimizations"
210-
// CHECK-FASTMATH-FPM-FAST: "-fno-signed-zeros"
211-
// CHECK-FASTMATH-FPM-FAST: "-mreassociate"
212-
// CHECK-FASTMATH-FPM-FAST: "-freciprocal-math"
213-
// CHECK-FASTMATH-FPM-FAST: "-ffp-contract=fast-honor-pragmas"
214-
// CHECK-FASTMATH-FPM-FAST: "-fno-rounding-math"
212+
// CHECK-FASTMATH-FPM-FAST-SAME: "-fapprox-func"
213+
// CHECK-FASTMATH-FPM-FAST-SAME: "-funsafe-math-optimizations"
214+
// CHECK-FASTMATH-FPM-FAST-SAME: "-fno-signed-zeros"
215+
// CHECK-FASTMATH-FPM-FAST-SAME: "-mreassociate"
216+
// CHECK-FASTMATH-FPM-FAST-SAME: "-freciprocal-math"
217+
// CHECK-FASTMATH-FPM-FAST-SAME: "-ffp-contract=fast-honor-pragmas"
218+
// CHECK-FASTMATH-FPM-FAST-SAME: "-fno-rounding-math"
215219
// CHECK-FASTMATH-FPM-FAST-NOT: "-ffast-math"
216220
// CHECK-FASTMATH-FPM-FAST-NOT: "-ffinite-math-only"
217-
// CHECK-FASTMATH-FPM-FAST: "-complex-range=promoted"
221+
// CHECK-FASTMATH-FPM-FAST-SAME: "-complex-range=promoted"
218222

219223
// RUN: %clang -### -nostdinc -ffast-math -ffp-model=precise -c %s 2>&1 \
220224
// RUN: | FileCheck --check-prefixes=CHECK-FASTMATH-FPM-PRECISE,WARN-CX-BASIC-TO-FULL %s
@@ -226,11 +230,11 @@
226230
// CHECK-FASTMATH-FPM-PRECISE-NOT: "-fno-signed-zeros"
227231
// CHECK-FASTMATH-FPM-PRECISE-NOT: "-mreassociate"
228232
// CHECK-FASTMATH-FPM-PRECISE-NOT: "-freciprocal-math"
229-
// CHECK-FASTMATH-FPM-PRECISE: "-ffp-contract=on"
230-
// CHECK-FASTMATH-FPM-PRECISE: "-fno-rounding-math"
233+
// CHECK-FASTMATH-FPM-PRECISE-SAME: "-ffp-contract=on"
234+
// CHECK-FASTMATH-FPM-PRECISE-SAME: "-fno-rounding-math"
231235
// CHECK-FASTMATH-FPM-PRECISE-NOT: "-ffast-math"
232236
// CHECK-FASTMATH-FPM-PRECISE-NOT: "-ffinite-math-only"
233-
// CHECK-FASTMATH-FPM-PRECISE: "-complex-range=full"
237+
// CHECK-FASTMATH-FPM-PRECISE-SAME: "-complex-range=full"
234238

235239
// RUN: %clang -### -nostdinc -ffast-math -ffp-model=strict -c %s 2>&1 \
236240
// RUN: | FileCheck --check-prefixes=CHECK-FASTMATH-FPM-STRICT,WARN-CX-BASIC-TO-FULL %s
@@ -242,8 +246,8 @@
242246
// CHECK-FASTMATH-FPM-STRICT-NOT: "-fno-signed-zeros"
243247
// CHECK-FASTMATH-FPM-STRICT-NOT: "-mreassociate"
244248
// CHECK-FASTMATH-FPM-STRICT-NOT: "-freciprocal-math"
245-
// CHECK-FASTMATH-FPM-STRICT: "-ffp-contract=off"
249+
// CHECK-FASTMATH-FPM-STRICT-SAME: "-ffp-contract=off"
246250
// CHECK-FASTMATH-FPM-STRICT-NOT: "-fno-rounding-math"
247251
// CHECK-FASTMATH-FPM-STRICT-NOT: "-ffast-math"
248252
// CHECK-FASTMATH-FPM-STRICT-NOT: "-ffinite-math-only"
249-
// CHECK-FASTMATH-FPM-STRICT: "-complex-range=full"
253+
// CHECK-FASTMATH-FPM-STRICT-SAME: "-complex-range=full"

0 commit comments

Comments
 (0)