Skip to content

Commit 74cfd20

Browse files
RKSimonRKSimon
committed
[clang][headers][x86] Reduce clang-format warnings when updating x86 headers
While adding constexpr support the CI code_formatting stage was being flooded with opening brace warnings.
1 parent 748f540 commit 74cfd20

File tree

3 files changed

+34
-68
lines changed

3 files changed

+34
-68
lines changed

‎clang/lib/Headers/bmiintrin.h

+13-26
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
/// bits in the operand.
3737
/// \see _tzcnt_u16
3838
static __inline__ unsigned short __RELAXED_FN_ATTRS
39-
__tzcnt_u16(unsigned short __X)
40-
{
39+
__tzcnt_u16(unsigned short __X) {
4140
return __builtin_ia32_tzcnt_u16(__X);
4241
}
4342

@@ -70,8 +69,7 @@ __tzcnt_u16(unsigned short __X)
7069
/// bits in the operand.
7170
/// \see { _mm_tzcnt_32 _tzcnt_u32 }
7271
static __inline__ unsigned int __RELAXED_FN_ATTRS
73-
__tzcnt_u32(unsigned int __X)
74-
{
72+
__tzcnt_u32(unsigned int __X) {
7573
return __builtin_ia32_tzcnt_u32(__X);
7674
}
7775

@@ -87,8 +85,7 @@ __tzcnt_u32(unsigned int __X)
8785
/// the operand.
8886
/// \see { __tzcnt_u32 _tzcnt_u32 }
8987
static __inline__ int __RELAXED_FN_ATTRS
90-
_mm_tzcnt_32(unsigned int __X)
91-
{
88+
_mm_tzcnt_32(unsigned int __X) {
9289
return (int)__builtin_ia32_tzcnt_u32(__X);
9390
}
9491

@@ -123,8 +120,7 @@ _mm_tzcnt_32(unsigned int __X)
123120
/// bits in the operand.
124121
/// \see { _mm_tzcnt_64 _tzcnt_u64 }
125122
static __inline__ unsigned long long __RELAXED_FN_ATTRS
126-
__tzcnt_u64(unsigned long long __X)
127-
{
123+
__tzcnt_u64(unsigned long long __X) {
128124
return __builtin_ia32_tzcnt_u64(__X);
129125
}
130126

@@ -140,8 +136,7 @@ __tzcnt_u64(unsigned long long __X)
140136
/// the operand.
141137
/// \see { __tzcnt_u64 _tzcnt_u64 }
142138
static __inline__ long long __RELAXED_FN_ATTRS
143-
_mm_tzcnt_64(unsigned long long __X)
144-
{
139+
_mm_tzcnt_64(unsigned long long __X) {
145140
return (long long)__builtin_ia32_tzcnt_u64(__X);
146141
}
147142

@@ -192,8 +187,7 @@ _mm_tzcnt_64(unsigned long long __X)
192187
/// operand with the one's complement of the first operand.
193188
/// \see _andn_u32
194189
static __inline__ unsigned int __DEFAULT_FN_ATTRS
195-
__andn_u32(unsigned int __X, unsigned int __Y)
196-
{
190+
__andn_u32(unsigned int __X, unsigned int __Y) {
197191
return ~__X & __Y;
198192
}
199193

@@ -298,8 +292,7 @@ _bextr2_u32(unsigned int __X, unsigned int __Y) {
298292
/// the source operand.
299293
/// \see _blsi_u32
300294
static __inline__ unsigned int __DEFAULT_FN_ATTRS
301-
__blsi_u32(unsigned int __X)
302-
{
295+
__blsi_u32(unsigned int __X) {
303296
return __X & -__X;
304297
}
305298

@@ -334,8 +327,7 @@ __blsi_u32(unsigned int __X)
334327
/// \returns An unsigned integer containing the newly created mask.
335328
/// \see _blsmsk_u32
336329
static __inline__ unsigned int __DEFAULT_FN_ATTRS
337-
__blsmsk_u32(unsigned int __X)
338-
{
330+
__blsmsk_u32(unsigned int __X) {
339331
return __X ^ (__X - 1);
340332
}
341333

@@ -370,8 +362,7 @@ __blsmsk_u32(unsigned int __X)
370362
/// operand.
371363
/// \see _blsr_u32
372364
static __inline__ unsigned int __DEFAULT_FN_ATTRS
373-
__blsr_u32(unsigned int __X)
374-
{
365+
__blsr_u32(unsigned int __X) {
375366
return __X & (__X - 1);
376367
}
377368

@@ -410,8 +401,7 @@ __blsr_u32(unsigned int __X)
410401
/// operand with the one's complement of the first operand.
411402
/// \see _andn_u64
412403
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
413-
__andn_u64 (unsigned long long __X, unsigned long long __Y)
414-
{
404+
__andn_u64 (unsigned long long __X, unsigned long long __Y) {
415405
return ~__X & __Y;
416406
}
417407

@@ -517,8 +507,7 @@ _bextr2_u64(unsigned long long __X, unsigned long long __Y) {
517507
/// bits from the source operand.
518508
/// \see _blsi_u64
519509
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
520-
__blsi_u64(unsigned long long __X)
521-
{
510+
__blsi_u64(unsigned long long __X) {
522511
return __X & -__X;
523512
}
524513

@@ -553,8 +542,7 @@ __blsi_u64(unsigned long long __X)
553542
/// \returns An unsigned 64-bit integer containing the newly created mask.
554543
/// \see _blsmsk_u64
555544
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
556-
__blsmsk_u64(unsigned long long __X)
557-
{
545+
__blsmsk_u64(unsigned long long __X) {
558546
return __X ^ (__X - 1);
559547
}
560548

@@ -589,8 +577,7 @@ __blsmsk_u64(unsigned long long __X)
589577
/// source operand.
590578
/// \see _blsr_u64
591579
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
592-
__blsr_u64(unsigned long long __X)
593-
{
580+
__blsr_u64(unsigned long long __X) {
594581
return __X & (__X - 1);
595582
}
596583

‎clang/lib/Headers/lzcntintrin.h

+3-6
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,7 @@
4949
/// bits in the operand.
5050
/// \see _lzcnt_u32
5151
static __inline__ unsigned int __DEFAULT_FN_ATTRS
52-
__lzcnt32(unsigned int __X)
53-
{
52+
__lzcnt32(unsigned int __X) {
5453
return __builtin_ia32_lzcnt_u32(__X);
5554
}
5655

@@ -66,8 +65,7 @@ __lzcnt32(unsigned int __X)
6665
/// bits in the operand.
6766
/// \see __lzcnt32
6867
static __inline__ unsigned int __DEFAULT_FN_ATTRS
69-
_lzcnt_u32(unsigned int __X)
70-
{
68+
_lzcnt_u32(unsigned int __X) {
7169
return __builtin_ia32_lzcnt_u32(__X);
7270
}
7371

@@ -99,8 +97,7 @@ _lzcnt_u32(unsigned int __X)
9997
/// bits in the operand.
10098
/// \see __lzcnt64
10199
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
102-
_lzcnt_u64(unsigned long long __X)
103-
{
100+
_lzcnt_u64(unsigned long long __X) {
104101
return __builtin_ia32_lzcnt_u64(__X);
105102
}
106103
#endif

‎clang/lib/Headers/tbmintrin.h

+18-36
Original file line numberDiff line numberDiff line change
@@ -28,56 +28,47 @@
2828
(unsigned int)(b)))
2929

3030
static __inline__ unsigned int __DEFAULT_FN_ATTRS
31-
__blcfill_u32(unsigned int __a)
32-
{
31+
__blcfill_u32(unsigned int __a) {
3332
return __a & (__a + 1);
3433
}
3534

3635
static __inline__ unsigned int __DEFAULT_FN_ATTRS
37-
__blci_u32(unsigned int __a)
38-
{
36+
__blci_u32(unsigned int __a) {
3937
return __a | ~(__a + 1);
4038
}
4139

4240
static __inline__ unsigned int __DEFAULT_FN_ATTRS
43-
__blcic_u32(unsigned int __a)
44-
{
41+
__blcic_u32(unsigned int __a) {
4542
return ~__a & (__a + 1);
4643
}
4744

4845
static __inline__ unsigned int __DEFAULT_FN_ATTRS
49-
__blcmsk_u32(unsigned int __a)
50-
{
46+
__blcmsk_u32(unsigned int __a) {
5147
return __a ^ (__a + 1);
5248
}
5349

5450
static __inline__ unsigned int __DEFAULT_FN_ATTRS
55-
__blcs_u32(unsigned int __a)
56-
{
51+
__blcs_u32(unsigned int __a) {
5752
return __a | (__a + 1);
5853
}
5954

6055
static __inline__ unsigned int __DEFAULT_FN_ATTRS
61-
__blsfill_u32(unsigned int __a)
62-
{
56+
__blsfill_u32(unsigned int __a) {
6357
return __a | (__a - 1);
6458
}
6559

6660
static __inline__ unsigned int __DEFAULT_FN_ATTRS
67-
__blsic_u32(unsigned int __a)
68-
{
61+
__blsic_u32(unsigned int __a) {
6962
return ~__a | (__a - 1);
7063
}
7164

7265
static __inline__ unsigned int __DEFAULT_FN_ATTRS
73-
__t1mskc_u32(unsigned int __a)
74-
{
66+
__t1mskc_u32(unsigned int __a) {
7567
return ~__a | (__a + 1);
7668
}
7769

7870
static __inline__ unsigned int __DEFAULT_FN_ATTRS
79-
__tzmsk_u32(unsigned int __a)
80-
{
71+
__tzmsk_u32(unsigned int __a) {
8172
return ~__a & (__a - 1);
8273
}
8374

@@ -87,56 +78,47 @@ __tzmsk_u32(unsigned int __a)
8778
(unsigned long long)(b)))
8879

8980
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
90-
__blcfill_u64(unsigned long long __a)
91-
{
81+
__blcfill_u64(unsigned long long __a) {
9282
return __a & (__a + 1);
9383
}
9484

9585
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
96-
__blci_u64(unsigned long long __a)
97-
{
86+
__blci_u64(unsigned long long __a) {
9887
return __a | ~(__a + 1);
9988
}
10089

10190
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
102-
__blcic_u64(unsigned long long __a)
103-
{
91+
__blcic_u64(unsigned long long __a) {
10492
return ~__a & (__a + 1);
10593
}
10694

10795
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
108-
__blcmsk_u64(unsigned long long __a)
109-
{
96+
__blcmsk_u64(unsigned long long __a) {
11097
return __a ^ (__a + 1);
11198
}
11299

113100
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
114-
__blcs_u64(unsigned long long __a)
115-
{
101+
__blcs_u64(unsigned long long __a) {
116102
return __a | (__a + 1);
117103
}
118104

119105
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
120-
__blsfill_u64(unsigned long long __a)
121-
{
106+
__blsfill_u64(unsigned long long __a) {
122107
return __a | (__a - 1);
123108
}
124109

125110
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
126-
__blsic_u64(unsigned long long __a)
127-
{
111+
__blsic_u64(unsigned long long __a) {
128112
return ~__a | (__a - 1);
129113
}
130114

131115
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
132-
__t1mskc_u64(unsigned long long __a)
133-
{
116+
__t1mskc_u64(unsigned long long __a) {
134117
return ~__a | (__a + 1);
135118
}
136119

137120
static __inline__ unsigned long long __DEFAULT_FN_ATTRS
138-
__tzmsk_u64(unsigned long long __a)
139-
{
121+
__tzmsk_u64(unsigned long long __a) {
140122
return ~__a & (__a - 1);
141123
}
142124
#endif

0 commit comments

Comments
 (0)