Skip to content

Commit dcb9af0

Browse files
gbeauchesneapinski-quic
gbeauchesne
and
apinski-quic
committed
c/c++: Handle '#pragma GCC target optimize' early [PR48026]
Handle '#pragma GCC optimize' earlier as the __OPTIMIZE__ macro may need to be defined as well for certain usages. Add additional tests for the '#pragma GCC target' case with auto-vectorization enabled and multiple combinations of namespaces and/or class member functions. This is similar to what was done for `#pramga GCC target` in r14-4967-g8697d3a1dcf327, to fix the similar issue there. Add more complete tests for PR c++/41201 after git commit r14-4967-g8697d3a1dcf327. PR c++/41201 PR c++/48026 gcc/c-family/ChangeLog: * c-pragma.cc (init_pragma): Use c_register_pragma_with_early_handler instead of c_register_pragma for `#pragma GCC optimize`. gcc/testsuite/ChangeLog: * c-c++-common/pragma-optimize-1.c: New test. * g++.target/i386/vect-pragma-target-1.C: New test. * g++.target/i386/vect-pragma-target-2.C: New test. * gcc.target/i386/vect-pragma-target-1.c: New test. * gcc.target/i386/vect-pragma-target-2.c: New test. Signed-off-by: Gwenole Beauchesne <[email protected]> Co-authored-by: Andrew Pinski <[email protected]>
1 parent 72a98dc commit dcb9af0

File tree

6 files changed

+226
-1
lines changed

6 files changed

+226
-1
lines changed

‎gcc/c-family/c-pragma.cc

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1847,7 +1847,9 @@ init_pragma (void)
18471847
c_register_pragma_with_early_handler ("GCC", "target",
18481848
handle_pragma_target,
18491849
handle_pragma_target);
1850-
c_register_pragma ("GCC", "optimize", handle_pragma_optimize);
1850+
c_register_pragma_with_early_handler ("GCC", "optimize",
1851+
handle_pragma_optimize,
1852+
handle_pragma_optimize);
18511853
c_register_pragma_with_early_handler ("GCC", "push_options",
18521854
handle_pragma_push_options,
18531855
handle_pragma_push_options);

‎gcc/testsuite/c-c++-common/pragma-optimize-1.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/* { dg-do compile } */
2+
/* { dg-options "-Ofast" } */
3+
4+
/* PR c++/48026 */
5+
/* Make sure `#pragma GCC optimize` affects the pre-defined macros too */
6+
7+
#pragma GCC optimize ("no-fast-math")
8+
#ifdef __FAST_MATH__
9+
# error Hey yo, What you doing on FAST_MATH??
10+
#endif

‎gcc/testsuite/g++.target/i386/vect-pragma-target-1.C

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */
2+
/* { dg-options "-O0" } */
3+
/* { dg-final { scan-assembler-times "paddd.+xmm\[0-9]+" 1 } } */
4+
/* { dg-final { scan-assembler-times "vfmadd132ps.+ymm\[0-9]+" 1 } } */
5+
/* { dg-final { scan-assembler-times "vpaddw.+zmm\[0-9]+" 1 } } */
6+
#include "../../gcc.target/i386/vect-pragma-target-1.c"

‎gcc/testsuite/g++.target/i386/vect-pragma-target-2.C

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */
2+
/* { dg-options "-O0" } */
3+
/* { dg-final { scan-assembler-times "paddd.+xmm\[0-9]+" 1 } } */
4+
/* { dg-final { scan-assembler-times "vfmadd132ps.+ymm\[0-9]+" 1 } } */
5+
/* { dg-final { scan-assembler-times "vpaddw.+zmm\[0-9]+" 1 } } */
6+
#include "../../gcc.target/i386/vect-pragma-target-2.c"

‎gcc/testsuite/gcc.target/i386/vect-pragma-target-1.c

Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */
2+
/* { dg-options "-O0" } */
3+
/* { dg-final { scan-assembler-times "paddd.+xmm\[0-9]+" 1 } } */
4+
/* { dg-final { scan-assembler-times "vfmadd132ps.+ymm\[0-9]+" 1 } } */
5+
/* { dg-final { scan-assembler-times "vpaddw.+zmm\[0-9]+" 1 } } */
6+
#ifndef CHECK_DEFINES
7+
#define CHECK_DEFINES 0
8+
#endif
9+
10+
#define N 1024
11+
12+
/* Optimization flags and tree vectorizer shall be disabled at this point */
13+
#if CHECK_DEFINES && defined(__OPTIMIZE__)
14+
#error "__OPTIMIZE__ is defined (not compiled with -O0?)"
15+
#endif
16+
17+
#pragma GCC push_options
18+
#pragma GCC optimize ("O2", "tree-vectorize")
19+
20+
/* Optimization flags and tree vectorizer shall be enabled at this point */
21+
#if CHECK_DEFINES && !defined(__OPTIMIZE__)
22+
#error "__OPTIMIZE__ is not defined"
23+
#endif
24+
25+
#pragma GCC push_options
26+
#pragma GCC target ("sse4.2")
27+
#ifdef __cplusplus
28+
namespace {
29+
#endif
30+
31+
/* Target flags up to including SSE4.2 shall be enabled at this point */
32+
#if CHECK_DEFINES && !defined(__SSE3__)
33+
#error "Target flag (SSE3) is not defined"
34+
#endif
35+
#if CHECK_DEFINES && !defined(__SSSE3__)
36+
#error "Target flag (SSSE3) is not defined"
37+
#endif
38+
#if CHECK_DEFINES && !defined(__SSE4_1__)
39+
#error "Target flag (SSE4.1) is not defined"
40+
#endif
41+
#if CHECK_DEFINES && !defined(__SSE4_2__)
42+
#error "Target flag (SSE4.2) is not defined"
43+
#endif
44+
45+
void
46+
__attribute__((__noinline__, __used__))
47+
vec_saxpy_i32(int y[N], const int a[N], const int x[N])
48+
{
49+
int i;
50+
for (i = 0; i < N; i++)
51+
y[i] += a[i] * x[i];
52+
}
53+
54+
#ifdef __cplusplus
55+
}
56+
#endif
57+
#pragma GCC pop_options
58+
59+
/* Target flags up to including SSE4.2 shall be disabled at this point */
60+
#if CHECK_DEFINES && defined(__SSE3__)
61+
#error "Target flag (SSE3) is still defined"
62+
#endif
63+
#if CHECK_DEFINES && defined(__SSSE3__)
64+
#error "Target flag (SSSE3) is still defined"
65+
#endif
66+
#if CHECK_DEFINES && defined(__SSE4_1__)
67+
#error "Target flag (SSE4.1) is still defined"
68+
#endif
69+
#if CHECK_DEFINES && defined(__SSE4_2__)
70+
#error "Target flag (SSE4.2) is still defined"
71+
#endif
72+
73+
#pragma GCC push_options
74+
#pragma GCC target ("avx2", "fma")
75+
#ifdef __cplusplus
76+
struct A {
77+
#endif
78+
79+
/* Target flags up to including AVX2+FMA shall be enabled at this point */
80+
#if CHECK_DEFINES && !defined(__SSE3__)
81+
#error "Target flag (SSE3) is not defined"
82+
#endif
83+
#if CHECK_DEFINES && !defined(__SSSE3__)
84+
#error "Target flag (SSSE3) is not defined"
85+
#endif
86+
#if CHECK_DEFINES && !defined(__SSE4_1__)
87+
#error "Target flag (SSE4.1) is not defined"
88+
#endif
89+
#if CHECK_DEFINES && !defined(__SSE4_2__)
90+
#error "Target flag (SSE4.2) is not defined"
91+
#endif
92+
#if CHECK_DEFINES && !defined(__AVX__)
93+
#error "Target flag (AVX) is not defined"
94+
#endif
95+
#if CHECK_DEFINES && !defined(__AVX2__)
96+
#error "Target flag (AVX2) is not defined"
97+
#endif
98+
#if CHECK_DEFINES && !defined(__FMA__)
99+
#error "Target flag (FMA) is not defined"
100+
#endif
101+
102+
void
103+
__attribute__((__noinline__, __used__))
104+
vec_saxpy_f32(float y[N], const float a[N], const float x[N])
105+
{
106+
int i;
107+
for (i = 0; i < N; i++)
108+
y[i] += a[i] * x[i];
109+
}
110+
111+
#ifdef __cplusplus
112+
};
113+
#endif
114+
#pragma GCC pop_options
115+
116+
/* Target flags up to including AVX2+FMA shall be disabled at this point */
117+
#if CHECK_DEFINES && defined(__SSE3__)
118+
#error "Target flag (SSE3) is still defined"
119+
#endif
120+
#if CHECK_DEFINES && defined(__SSSE3__)
121+
#error "Target flag (SSSE3) is still defined"
122+
#endif
123+
#if CHECK_DEFINES && defined(__SSE4_1__)
124+
#error "Target flag (SSE4.1) is still defined"
125+
#endif
126+
#if CHECK_DEFINES && defined(__SSE4_2__)
127+
#error "Target flag (SSE4.2) is still defined"
128+
#endif
129+
#if CHECK_DEFINES && defined(__AVX__)
130+
#error "Target flag (AVX) is still defined"
131+
#endif
132+
#if CHECK_DEFINES && defined(__AVX2__)
133+
#error "Target flag (AVX2) is still defined"
134+
#endif
135+
#if CHECK_DEFINES && defined(__FMA__)
136+
#error "Target flag (FMA) is still defined"
137+
#endif
138+
139+
#pragma GCC push_options
140+
#pragma GCC target ("arch=x86-64-v4")
141+
#ifdef __cplusplus
142+
namespace avx512 {
143+
struct A {
144+
#endif
145+
146+
/* Essential AVX512 target flags shall be enabled at this point */
147+
#if CHECK_DEFINES && !defined(__AVX512F__)
148+
#error "Target flag (AVX512F) is not defined"
149+
#endif
150+
#if CHECK_DEFINES && !defined(__AVX512VL__)
151+
#error "Target flag (AVX512VL) is not defined"
152+
#endif
153+
#if CHECK_DEFINES && !defined(__AVX512DQ__)
154+
#error "Target flag (AVX512DQ) is not defined"
155+
#endif
156+
#if CHECK_DEFINES && !defined(__AVX512BW__)
157+
#error "Target flag (AVX512BW) is not defined"
158+
#endif
159+
160+
void
161+
__attribute__((__noinline__, __used__))
162+
vec_saxpy_i16(short y[N], const short a[N], const short x[N])
163+
{
164+
int i;
165+
for (i = 0; i < N; i++)
166+
y[i] += a[i] * x[i];
167+
}
168+
169+
#ifdef __cplusplus
170+
};
171+
}
172+
#endif
173+
#pragma GCC pop_options
174+
175+
/* Essential AVX512 target flags shall be disabled at this point */
176+
#if CHECK_DEFINES && defined(__AVX512F__)
177+
#error "Target flag (AVX512F) is still defined"
178+
#endif
179+
#if CHECK_DEFINES && defined(__AVX512VL__)
180+
#error "Target flag (AVX512VL) is still defined"
181+
#endif
182+
#if CHECK_DEFINES && defined(__AVX512DQ__)
183+
#error "Target flag (AVX512DQ) is still defined"
184+
#endif
185+
#if CHECK_DEFINES && defined(__AVX512BW__)
186+
#error "Target flag (AVX512BW) is still defined"
187+
#endif
188+
189+
#pragma GCC pop_options
190+
191+
/* Optimization flags and tree vectorizer shall be disabled at this point */
192+
#if CHECK_DEFINES && defined(__OPTIMIZE__)
193+
#error "__OPTIMIZE__ is still defined"
194+
#endif

‎gcc/testsuite/gcc.target/i386/vect-pragma-target-2.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */
2+
/* { dg-options "-O0" } */
3+
/* { dg-final { scan-assembler-times "paddd.+xmm\[0-9]+" 1 } } */
4+
/* { dg-final { scan-assembler-times "vfmadd132ps.+ymm\[0-9]+" 1 } } */
5+
/* { dg-final { scan-assembler-times "vpaddw.+zmm\[0-9]+" 1 } } */
6+
#define CHECK_DEFINES 1
7+
#include "vect-pragma-target-1.c"

0 commit comments

Comments
 (0)