Skip to contentSkip to conversation

eal: remove unnecessary use of statement expression

PATCH Applied Tyler Retzlaff 2 participants 5 messages Jan 31, 2024 – Feb 14, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 eal: remove unnecessary use of statement expression

Remove use of statement expression syntax in expansion of MOVEUNALIGNED_LEFT47_IMM and MOVEUNALIGNED_LEFT47 macro expansions.

There appears to be no need to use the statement expression compiler extension a simple block should work.

---
 lib/eal/x86/include/rte_memcpy.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
lib/eal/x86/include/rte_memcpy.h +4 -4
index fd151be..72a9229 100644
@@ -610,7 +610,7 @@
  * - __m128i <xmm0> ~ <xmm8> must be pre-defined
  */
 #define MOVEUNALIGNED_LEFT47_IMM(dst, src, len, offset)                                                     \
-__extension__ ({                                                                                            \
+{                                                                                            \
     size_t tmp;                                                                                                \
     while (len >= 128 + 16 - offset) {                                                                      \
         xmm0 = _mm_loadu_si128((const __m128i *)(const void *)((const uint8_t *)src - offset + 0 * 16));                  \
@@ -656,7 +656,7 @@
         src = (const uint8_t *)src + tmp;                                                                   \
         dst = (uint8_t *)dst + tmp;                                                                         \
     }                                                                                                       \
-})
+}
 
 /**
  * Macro for copying unaligned block from one location to another,
@@ -671,7 +671,7 @@
  * - __m128i <xmm0> ~ <xmm8> used in MOVEUNALIGNED_LEFT47_IMM must be pre-defined
  */
 #define MOVEUNALIGNED_LEFT47(dst, src, len, offset)                   \
-__extension__ ({                                                      \
+{                                                      \
     switch (offset) {                                                 \
     case 0x01: MOVEUNALIGNED_LEFT47_IMM(dst, src, n, 0x01); break;    \
     case 0x02: MOVEUNALIGNED_LEFT47_IMM(dst, src, n, 0x02); break;    \
@@ -690,7 +690,7 @@
     case 0x0F: MOVEUNALIGNED_LEFT47_IMM(dst, src, n, 0x0F); break;    \
     default:;                                                         \
     }                                                                 \
-})
+}
 
 static __rte_always_inline void *
 rte_memcpy_generic(void *dst, const void *src, size_t n)
Signature · 1 line
1.8.3.1
#1 lore raw

ping

could relevant maintainers take a look?

thank you!

Quoted 53 lines · Tyler Retzlaff

Remove use of statement expression syntax in expansion of MOVEUNALIGNED_LEFT47_IMM and MOVEUNALIGNED_LEFT47 macro expansions.

There appears to be no need to use the statement expression compiler extension a simple block should work.

---
 lib/eal/x86/include/rte_memcpy.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
lib/eal/x86/include/rte_memcpy.h +4 -4
index fd151be..72a9229 100644
@@ -610,7 +610,7 @@
  * - __m128i <xmm0> ~ <xmm8> must be pre-defined
  */
 #define MOVEUNALIGNED_LEFT47_IMM(dst, src, len, offset)                                                     \
-__extension__ ({                                                                                            \
+{                                                                                            \
     size_t tmp;                                                                                                \
     while (len >= 128 + 16 - offset) {                                                                      \
         xmm0 = _mm_loadu_si128((const __m128i *)(const void *)((const uint8_t *)src - offset + 0 * 16));                  \
@@ -656,7 +656,7 @@
         src = (const uint8_t *)src + tmp;                                                                   \
         dst = (uint8_t *)dst + tmp;                                                                         \
     }                                                                                                       \
-})
+}
 
 /**
  * Macro for copying unaligned block from one location to another,
@@ -671,7 +671,7 @@
  * - __m128i <xmm0> ~ <xmm8> used in MOVEUNALIGNED_LEFT47_IMM must be pre-defined
  */
 #define MOVEUNALIGNED_LEFT47(dst, src, len, offset)                   \
-__extension__ ({                                                      \
+{                                                      \
     switch (offset) {                                                 \
     case 0x01: MOVEUNALIGNED_LEFT47_IMM(dst, src, n, 0x01); break;    \
     case 0x02: MOVEUNALIGNED_LEFT47_IMM(dst, src, n, 0x02); break;    \
@@ -690,7 +690,7 @@
     case 0x0F: MOVEUNALIGNED_LEFT47_IMM(dst, src, n, 0x0F); break;    \
     default:;                                                         \
     }                                                                 \
-})
+}
 
 static __rte_always_inline void *
 rte_memcpy_generic(void *dst, const void *src, size_t n)
Signature · 1 line
1.8.3.1
#2 lore raw
Quoted 4 lines · Tyler Retzlaff

ping

could relevant maintainers take a look?

This change comes from the old commit 5f2c68a710e1 ("lib: work around braced-groups within expressions").
I suspect this change breaks application compiling with pedantic, without setting a C standard >= C11.

Signature · 1 line
David Marchand
#3 lore raw
Quoted 4 lines · David Marchand
Quoted 1 line · Tyler Retzlaff
Quoted 8 lines
Quoted 3 lines

ping

could relevant maintainers take a look?

This change comes from the old commit 5f2c68a710e1 ("lib: work around braced-groups within expressions").
I suspect this change breaks application compiling with pedantic, without setting a C standard >= C11.

Oh, I get it now.
I was confused because of the other series 30308.

I'll merge this first patch.

Signature · 1 line
David Marchand
#4 lore raw
In reply to Tyler Retzlaff
Quoted 8 lines · Tyler Retzlaff

Remove use of statement expression syntax in expansion of MOVEUNALIGNED_LEFT47_IMM and MOVEUNALIGNED_LEFT47 macro expansions.

There appears to be no need to use the statement expression compiler extension a simple block should work.

Applied, thanks.

Signature · 1 line
David Marchand