Skip to content

Commit 0c26988

Browse files
mr-cmr-c
committed
sse: remove unbalanced HEDLEY_DIAGNOSTIC_PUSH
Also cleanup some illegal double underscore variable names Closes: #910
1 parent 0c3dfa4 commit 0c26988

File tree

10 files changed

+59
-72
lines changed

10 files changed

+59
-72
lines changed

‎simde/simde-common.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1092,10 +1092,9 @@ SIMDE_DIAGNOSTIC_DISABLE_CPP98_COMPAT_PEDANTIC_
10921092
HEDLEY_GCC_VERSION_CHECK(4,3,0)
10931093
# define SIMDE_BUG_IGNORE_SIGN_CONVERSION(expr) (__extension__ ({ \
10941094
HEDLEY_DIAGNOSTIC_PUSH \
1095-
HEDLEY_DIAGNOSTIC_POP \
10961095
_Pragma("GCC diagnostic ignored \"-Wsign-conversion\"") \
10971096
__typeof__(expr) simde_bug_ignore_sign_conversion_v_= (expr); \
1098-
HEDLEY_DIAGNOSTIC_PUSH \
1097+
HEDLEY_DIAGNOSTIC_POP \
10991098
simde_bug_ignore_sign_conversion_v_; \
11001099
}))
11011100
#else

‎simde/x86/avx.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2127,7 +2127,7 @@ simde_mm256_round_ps (simde__m256 a, const int rounding) {
21272127
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(128) && defined(SIMDE_STATEMENT_EXPR_)
21282128
#define simde_mm256_round_ps(a, rounding) SIMDE_STATEMENT_EXPR_(({ \
21292129
simde__m256_private \
2130-
simde_mm256_round_ps_r_, \
2130+
simde_mm256_round_ps_r_ = simde__m256_to_private(simde_mm256_setzero_ps()), \
21312131
simde_mm256_round_ps_a_ = simde__m256_to_private(a); \
21322132
\
21332133
for (size_t simde_mm256_round_ps_i = 0 ; simde_mm256_round_ps_i < (sizeof(simde_mm256_round_ps_r_.m128) / sizeof(simde_mm256_round_ps_r_.m128[0])) ; simde_mm256_round_ps_i++) { \
@@ -2201,7 +2201,7 @@ simde_mm256_round_pd (simde__m256d a, const int rounding) {
22012201
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(128) && defined(SIMDE_STATEMENT_EXPR_)
22022202
#define simde_mm256_round_pd(a, rounding) SIMDE_STATEMENT_EXPR_(({ \
22032203
simde__m256d_private \
2204-
simde_mm256_round_pd_r_, \
2204+
simde_mm256_round_pd_r_ = simde__m256d_to_private(simde_mm256_setzero_pd()), \
22052205
simde_mm256_round_pd_a_ = simde__m256d_to_private(a); \
22062206
\
22072207
for (size_t simde_mm256_round_pd_i = 0 ; simde_mm256_round_pd_i < (sizeof(simde_mm256_round_pd_r_.m128d) / sizeof(simde_mm256_round_pd_r_.m128d[0])) ; simde_mm256_round_pd_i++) { \
@@ -3093,7 +3093,7 @@ simde_mm256_cmp_ps
30933093
#elif defined(SIMDE_STATEMENT_EXPR_) && SIMDE_NATURAL_VECTOR_SIZE_LE(128)
30943094
#define simde_mm256_cmp_ps(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
30953095
simde__m256_private \
3096-
simde_mm256_cmp_ps_r_, \
3096+
simde_mm256_cmp_ps_r_ = simde__m256_to_private(simde_mm256_setzero_ps()), \
30973097
simde_mm256_cmp_ps_a_ = simde__m256_to_private((a)), \
30983098
simde_mm256_cmp_ps_b_ = simde__m256_to_private((b)); \
30993099
\

‎simde/x86/avx2.h‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3989,11 +3989,11 @@ simde_mm256_shuffle_epi32 (simde__m256i a, const int imm8)
39893989
simde_mm_shuffle_epi32(simde_mm256_extracti128_si256(a, 0), (imm8)))
39903990
#elif defined(SIMDE_SHUFFLE_VECTOR_)
39913991
# define simde_mm256_shuffle_epi32(a, imm8) (__extension__ ({ \
3992-
const simde__m256i_private simde__tmp_a_ = simde__m256i_to_private(a); \
3992+
const simde__m256i_private simde_tmp_a_ = simde__m256i_to_private(a); \
39933993
simde__m256i_from_private((simde__m256i_private) { .i32 = \
39943994
SIMDE_SHUFFLE_VECTOR_(32, 32, \
3995-
(simde__tmp_a_).i32, \
3996-
(simde__tmp_a_).i32, \
3995+
(simde_tmp_a_).i32, \
3996+
(simde_tmp_a_).i32, \
39973997
((imm8) ) & 3, \
39983998
((imm8) >> 2) & 3, \
39993999
((imm8) >> 4) & 3, \
@@ -4017,11 +4017,11 @@ simde_mm256_shuffle_epi32 (simde__m256i a, const int imm8)
40174017
simde_mm_shufflehi_epi16(simde_mm256_extracti128_si256(a, 0), (imm8)))
40184018
#elif defined(SIMDE_SHUFFLE_VECTOR_)
40194019
# define simde_mm256_shufflehi_epi16(a, imm8) (__extension__ ({ \
4020-
const simde__m256i_private simde__tmp_a_ = simde__m256i_to_private(a); \
4020+
const simde__m256i_private simde_tmp_a_ = simde__m256i_to_private(a); \
40214021
simde__m256i_from_private((simde__m256i_private) { .i16 = \
40224022
SIMDE_SHUFFLE_VECTOR_(16, 32, \
4023-
(simde__tmp_a_).i16, \
4024-
(simde__tmp_a_).i16, \
4023+
(simde_tmp_a_).i16, \
4024+
(simde_tmp_a_).i16, \
40254025
0, 1, 2, 3, \
40264026
(((imm8) ) & 3) + 4, \
40274027
(((imm8) >> 2) & 3) + 4, \
@@ -4053,11 +4053,11 @@ simde_mm256_shuffle_epi32 (simde__m256i a, const int imm8)
40534053
simde_mm_shufflelo_epi16(simde_mm256_extracti128_si256(a, 0), (imm8)))
40544054
#elif defined(SIMDE_SHUFFLE_VECTOR_)
40554055
# define simde_mm256_shufflelo_epi16(a, imm8) (__extension__ ({ \
4056-
const simde__m256i_private simde__tmp_a_ = simde__m256i_to_private(a); \
4056+
const simde__m256i_private simde_tmp_a_ = simde__m256i_to_private(a); \
40574057
simde__m256i_from_private((simde__m256i_private) { .i16 = \
40584058
SIMDE_SHUFFLE_VECTOR_(16, 32, \
4059-
(simde__tmp_a_).i16, \
4060-
(simde__tmp_a_).i16, \
4059+
(simde_tmp_a_).i16, \
4060+
(simde_tmp_a_).i16, \
40614061
(((imm8) ) & 3), \
40624062
(((imm8) >> 2) & 3), \
40634063
(((imm8) >> 4) & 3), \

‎simde/x86/avx512/cmp.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ simde_mm512_cmp_ps_mask (simde__m512 a, simde__m512 b, const int imm8)
237237
#elif defined(SIMDE_STATEMENT_EXPR_) && SIMDE_NATURAL_VECTOR_SIZE_LE(128)
238238
#define simde_mm512_cmp_ps_mask(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
239239
simde__m512_private \
240-
simde_mm512_cmp_ps_mask_r_, \
240+
simde_mm512_cmp_ps_mask_r_ = simde__m512_to_private(simde_mm512_setzero_ps()), \
241241
simde_mm512_cmp_ps_mask_a_ = simde__m512_to_private((a)), \
242242
simde_mm512_cmp_ps_mask_b_ = simde__m512_to_private((b)); \
243243
\
@@ -250,7 +250,7 @@ simde_mm512_cmp_ps_mask (simde__m512 a, simde__m512 b, const int imm8)
250250
#elif defined(SIMDE_STATEMENT_EXPR_) && SIMDE_NATURAL_VECTOR_SIZE_LE(256)
251251
#define simde_mm512_cmp_ps_mask(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
252252
simde__m512_private \
253-
simde_mm512_cmp_ps_mask_r_, \
253+
simde_mm512_cmp_ps_mask_r_ = simde__m512_to_private(simde_mm512_setzero_ps()), \
254254
simde_mm512_cmp_ps_mask_a_ = simde__m512_to_private((a)), \
255255
simde_mm512_cmp_ps_mask_b_ = simde__m512_to_private((b)); \
256256
\
@@ -485,7 +485,7 @@ simde_mm512_cmp_pd_mask (simde__m512d a, simde__m512d b, const int imm8)
485485
#elif defined(SIMDE_STATEMENT_EXPR_) && SIMDE_NATURAL_VECTOR_SIZE_LE(128)
486486
#define simde_mm512_cmp_pd_mask(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
487487
simde__m512d_private \
488-
simde_mm512_cmp_pd_mask_r_, \
488+
simde_mm512_cmp_pd_mask_r_ = simde__m512d_to_private(simde_mm512_setzero_pd()), \
489489
simde_mm512_cmp_pd_mask_a_ = simde__m512d_to_private((a)), \
490490
simde_mm512_cmp_pd_mask_b_ = simde__m512d_to_private((b)); \
491491
\
@@ -498,7 +498,7 @@ simde_mm512_cmp_pd_mask (simde__m512d a, simde__m512d b, const int imm8)
498498
#elif defined(SIMDE_STATEMENT_EXPR_) && SIMDE_NATURAL_VECTOR_SIZE_LE(256)
499499
#define simde_mm512_cmp_pd_mask(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
500500
simde__m512d_private \
501-
simde_mm512_cmp_pd_mask_r_, \
501+
simde_mm512_cmp_pd_mask_r_ = simde__m512d_to_private(simde_mm512_setzero_pd()), \
502502
simde_mm512_cmp_pd_mask_a_ = simde__m512d_to_private((a)), \
503503
simde_mm512_cmp_pd_mask_b_ = simde__m512d_to_private((b)); \
504504
\

‎simde/x86/avx512/range.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ simde_mm256_range_ps (simde__m256 a, simde__m256 b, int imm8)
128128
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(128) && defined(SIMDE_STATEMENT_EXPR_)
129129
#define simde_mm256_range_ps(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
130130
simde__m256_private \
131-
simde_mm256_range_ps_r_, \
131+
simde_mm256_range_ps_r_ = simde__m256_to_private(simde_mm256_setzero_ps()), \
132132
simde_mm256_range_ps_a_ = simde__m256_to_private(a), \
133133
simde_mm256_range_ps_b_ = simde__m256_to_private(b); \
134134
\
@@ -208,7 +208,7 @@ simde_mm512_range_ps (simde__m512 a, simde__m512 b, int imm8)
208208
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(128) && defined(SIMDE_STATEMENT_EXPR_)
209209
#define simde_mm512_range_ps(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
210210
simde__m512_private \
211-
simde_mm512_range_ps_r_, \
211+
simde_mm512_range_ps_r_ = simde__m512_to_private(simde_mm512_setzero_ps()), \
212212
simde_mm512_range_ps_a_ = simde__m512_to_private(a), \
213213
simde_mm512_range_ps_b_ = simde__m512_to_private(b); \
214214
\
@@ -221,7 +221,7 @@ simde_mm512_range_ps (simde__m512 a, simde__m512 b, int imm8)
221221
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(256) && defined(SIMDE_STATEMENT_EXPR_)
222222
#define simde_mm512_range_ps(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
223223
simde__m512_private \
224-
simde_mm512_range_ps_r_, \
224+
simde_mm512_range_ps_r_ = simde__m512_to_private(simde_mm512_setzero_ps()), \
225225
simde_mm512_range_ps_a_ = simde__m512_to_private(a), \
226226
simde_mm512_range_ps_b_ = simde__m512_to_private(b); \
227227
\
@@ -368,7 +368,7 @@ simde_mm256_range_pd (simde__m256d a, simde__m256d b, int imm8)
368368
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(128) && defined(SIMDE_STATEMENT_EXPR_)
369369
#define simde_mm256_range_pd(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
370370
simde__m256d_private \
371-
simde_mm256_range_pd_r_, \
371+
simde_mm256_range_pd_r_ = simde__m256d_to_private(simde_mm256_setzero_pd()), \
372372
simde_mm256_range_pd_a_ = simde__m256d_to_private(a), \
373373
simde_mm256_range_pd_b_ = simde__m256d_to_private(b); \
374374
\
@@ -448,7 +448,7 @@ simde_mm512_range_pd (simde__m512d a, simde__m512d b, int imm8)
448448
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(128) && defined(SIMDE_STATEMENT_EXPR_)
449449
#define simde_mm512_range_pd(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
450450
simde__m512d_private \
451-
simde_mm512_range_pd_r_, \
451+
simde_mm512_range_pd_r_ = simde__m512d_to_private(simde_mm512_setzero_pd()), \
452452
simde_mm512_range_pd_a_ = simde__m512d_to_private(a), \
453453
simde_mm512_range_pd_b_ = simde__m512d_to_private(b); \
454454
\
@@ -461,7 +461,7 @@ simde_mm512_range_pd (simde__m512d a, simde__m512d b, int imm8)
461461
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(256) && defined(SIMDE_STATEMENT_EXPR_)
462462
#define simde_mm512_range_pd(a, b, imm8) SIMDE_STATEMENT_EXPR_(({ \
463463
simde__m512d_private \
464-
simde_mm512_range_pd_r_, \
464+
simde_mm512_range_pd_r_ = simde__m512d_to_private(simde_mm512_setzero_pd()), \
465465
simde_mm512_range_pd_a_ = simde__m512d_to_private(a), \
466466
simde_mm512_range_pd_b_ = simde__m512d_to_private(b); \
467467
\

‎simde/x86/avx512/round.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ SIMDE_BEGIN_DECLS_
1010
#if SIMDE_NATURAL_VECTOR_SIZE_LE(256) && defined(SIMDE_STATEMENT_EXPR_)
1111
#define simde_x_mm512_round_ps(a, rounding) SIMDE_STATEMENT_EXPR_(({ \
1212
simde__m512_private \
13-
simde_x_mm512_round_ps_r_, \
13+
simde_x_mm512_round_ps_r_ = simde__m512_to_private(simde_mm512_setzero_ps()), \
1414
simde_x_mm512_round_ps_a_ = simde__m512_to_private(a); \
1515
\
1616
for (size_t simde_x_mm512_round_ps_i = 0 ; simde_x_mm512_round_ps_i < (sizeof(simde_x_mm512_round_ps_r_.m256) / sizeof(simde_x_mm512_round_ps_r_.m256[0])) ; simde_x_mm512_round_ps_i++) { \
@@ -148,7 +148,7 @@ SIMDE_BEGIN_DECLS_
148148
#if SIMDE_NATURAL_VECTOR_SIZE_LE(256) && defined(SIMDE_STATEMENT_EXPR_)
149149
#define simde_x_mm512_round_pd(a, rounding) SIMDE_STATEMENT_EXPR_(({ \
150150
simde__m512d_private \
151-
simde_x_mm512_round_pd_r_, \
151+
simde_x_mm512_round_pd_r_ = simde__m512d_to_private(simde_mm512_setzero_pd()), \
152152
simde_x_mm512_round_pd_a_ = simde__m512d_to_private(a); \
153153
\
154154
for (size_t simde_x_mm512_round_pd_i = 0 ; simde_x_mm512_round_pd_i < (sizeof(simde_x_mm512_round_pd_r_.m256d) / sizeof(simde_x_mm512_round_pd_r_.m256d[0])) ; simde_x_mm512_round_pd_i++) { \

‎simde/x86/avx512/roundscale.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ SIMDE_BEGIN_DECLS_
7373
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(128) && defined(SIMDE_STATEMENT_EXPR_)
7474
#define simde_mm256_roundscale_ps(a, imm8) SIMDE_STATEMENT_EXPR_(({ \
7575
simde__m256_private \
76-
simde_mm256_roundscale_ps_r_, \
76+
simde_mm256_roundscale_ps_r_ = simde__m256_to_private(simde_mm256_setzero_ps()), \
7777
simde_mm256_roundscale_ps_a_ = simde__m256_to_private(a); \
7878
\
7979
for (size_t simde_mm256_roundscale_ps_i = 0 ; simde_mm256_roundscale_ps_i < (sizeof(simde_mm256_roundscale_ps_r_.m128) / sizeof(simde_mm256_roundscale_ps_r_.m128[0])) ; simde_mm256_roundscale_ps_i++) { \
@@ -141,7 +141,7 @@ SIMDE_BEGIN_DECLS_
141141
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(256) && defined(SIMDE_STATEMENT_EXPR_)
142142
#define simde_mm512_roundscale_ps(a, imm8) SIMDE_STATEMENT_EXPR_(({ \
143143
simde__m512_private \
144-
simde_mm512_roundscale_ps_r_, \
144+
simde_mm512_roundscale_ps_r_ = simde__m512_to_private(simde_mm512_setzero_ps()), \
145145
simde_mm512_roundscale_ps_a_ = simde__m512_to_private(a); \
146146
\
147147
for (size_t simde_mm512_roundscale_ps_i = 0 ; simde_mm512_roundscale_ps_i < (sizeof(simde_mm512_roundscale_ps_r_.m256) / sizeof(simde_mm512_roundscale_ps_r_.m256[0])) ; simde_mm512_roundscale_ps_i++) { \
@@ -265,7 +265,7 @@ SIMDE_BEGIN_DECLS_
265265
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(128) && defined(SIMDE_STATEMENT_EXPR_)
266266
#define simde_mm256_roundscale_pd(a, imm8) SIMDE_STATEMENT_EXPR_(({ \
267267
simde__m256d_private \
268-
simde_mm256_roundscale_pd_r_, \
268+
simde_mm256_roundscale_pd_r_ = simde__m256d_to_private(simde_mm256_setzero_pd()), \
269269
simde_mm256_roundscale_pd_a_ = simde__m256d_to_private(a); \
270270
\
271271
for (size_t simde_mm256_roundscale_pd_i = 0 ; simde_mm256_roundscale_pd_i < (sizeof(simde_mm256_roundscale_pd_r_.m128d) / sizeof(simde_mm256_roundscale_pd_r_.m128d[0])) ; simde_mm256_roundscale_pd_i++) { \
@@ -333,7 +333,7 @@ SIMDE_BEGIN_DECLS_
333333
#elif SIMDE_NATURAL_VECTOR_SIZE_LE(256) && defined(SIMDE_STATEMENT_EXPR_)
334334
#define simde_mm512_roundscale_pd(a, imm8) SIMDE_STATEMENT_EXPR_(({ \
335335
simde__m512d_private \
336-
simde_mm512_roundscale_pd_r_, \
336+
simde_mm512_roundscale_pd_r_ = simde__m512d_to_private(simde_mm512_setzero_pd()), \
337337
simde_mm512_roundscale_pd_a_ = simde__m512d_to_private(a); \
338338
\
339339
for (size_t simde_mm512_roundscale_pd_i = 0 ; simde_mm512_roundscale_pd_i < (sizeof(simde_mm512_roundscale_pd_r_.m256d) / sizeof(simde_mm512_roundscale_pd_r_.m256d[0])) ; simde_mm512_roundscale_pd_i++) { \

‎simde/x86/sse.h‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3982,11 +3982,11 @@ simde_mm_sfence (void) {
39823982
# define simde_mm_shuffle_pi16(a, imm8) _mm_shuffle_pi16(a, imm8)
39833983
#elif defined(SIMDE_SHUFFLE_VECTOR_)
39843984
# define simde_mm_shuffle_pi16(a, imm8) (__extension__ ({ \
3985-
const simde__m64_private simde__tmp_a_ = simde__m64_to_private(a); \
3985+
const simde__m64_private simde_tmp_a_ = simde__m64_to_private(a); \
39863986
simde__m64_from_private((simde__m64_private) { .i16 = \
39873987
SIMDE_SHUFFLE_VECTOR_(16, 8, \
3988-
(simde__tmp_a_).i16, \
3989-
(simde__tmp_a_).i16, \
3988+
(simde_tmp_a_).i16, \
3989+
(simde_tmp_a_).i16, \
39903990
(((imm8) ) & 3), \
39913991
(((imm8) >> 2) & 3), \
39923992
(((imm8) >> 4) & 3), \
@@ -4592,11 +4592,6 @@ simde_mm_ucomineq_ss (simde__m128 a, simde__m128 b) {
45924592
# endif
45934593
#endif
45944594

4595-
#if defined(SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_)
4596-
HEDLEY_DIAGNOSTIC_PUSH
4597-
SIMDE_DIAGNOSTIC_DISABLE_UNINITIALIZED_
4598-
#endif
4599-
46004595
SIMDE_FUNCTION_ATTRIBUTES
46014596
simde__m128
46024597
simde_mm_unpackhi_ps (simde__m128 a, simde__m128 b) {

0 commit comments

Comments
 (0)