diff mbox series

[v8,07/14] eal: use byte swap intrinsics

Message ID	1682997341-2271-8-git-send-email-roretzla@linux.microsoft.com (mailing list archive)
State	Superseded, archived
Delegated to:	Thomas Monjalon
Headers	From: Tyler Retzlaff <roretzla@linux.microsoft.com> To: dev@dpdk.org Cc: bruce.richardson@intel.com, david.marchand@redhat.com, thomas@monjalon.net, mb@smartsharesystems.com, konstantin.ananyev@huawei.com, Tyler Retzlaff <roretzla@linux.microsoft.com> Subject: [PATCH v8 07/14] eal: use byte swap intrinsics Date: Mon, 1 May 2023 20:15:34 -0700 Message-Id: <1682997341-2271-8-git-send-email-roretzla@linux.microsoft.com> In-Reply-To: <1682997341-2271-1-git-send-email-roretzla@linux.microsoft.com> References: <1680558751-17931-1-git-send-email-roretzla@linux.microsoft.com> <1682997341-2271-1-git-send-email-roretzla@linux.microsoft.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: dev-bounces@dpdk.org
Series	msvc integration changes \| [v8,00/14] msvc integration changes [v8,01/14] eal: use rdtsc intrinsic [v8,02/14] eal: use rtm and xtest intrinsics [v8,03/14] eal: use barrier intrinsics [v8,04/14] eal: use cpuid and cpuidex intrinsics [v8,05/14] eal: use umonitor umwait and tpause intrinsics [v8,06/14] eal: use prefetch intrinsics [v8,07/14] eal: use byte swap intrinsics [v8,08/14] eal: hide GCC extension based alignment markers [v8,09/14] eal: hide typedefs based on GCC vector extensions [v8,10/14] eal: expand most macros to empty when using MSVC [v8,11/14] eal: exclude exposure of rte atomic APIs for MSVC builds [v8,12/14] telemetry: avoid expanding versioned symbol macros on MSVC [v8,13/14] eal: always define MSVC as little endian [v8,14/14] eal: do not define typeof macro when building with MSVC

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Tyler Retzlaff May 2, 2023, 3:15 a.m. UTC

  Inline assembly is not supported for MSVC x64 instead expand
use _byteswap_u{ushort,ulong,uint64} intrinsics instead.

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: Morten Brørup <mb@smartsharesystems.com>
---
 lib/eal/include/generic/rte_byteorder.h | 11 +++++++++++
 lib/eal/x86/include/rte_byteorder.h     |  4 ++++
 2 files changed, 15 insertions(+)

diff mbox series

Patch

diff --git a/lib/eal/include/generic/rte_byteorder.h b/lib/eal/include/generic/rte_byteorder.h
index a67e1d7..1e32a1b 100644
--- a/lib/eal/include/generic/rte_byteorder.h
+++ b/lib/eal/include/generic/rte_byteorder.h
@@ -234,6 +234,7 @@ 
 #endif /* __DOXYGEN__ */
 
 #ifdef RTE_FORCE_INTRINSICS
+#ifndef RTE_TOOLCHAIN_MSVC
 #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)
 #define rte_bswap16(x) __builtin_bswap16(x)
 #endif
@@ -241,6 +242,16 @@ 
 #define rte_bswap32(x) __builtin_bswap32(x)
 
 #define rte_bswap64(x) __builtin_bswap64(x)
+#else
+/*
+ * note: we may want to #pragma intrsinsic(_byteswap_u{short,long,uint64})
+ */
+#define rte_bswap16(x) _byteswap_ushort(x)
+
+#define rte_bswap32(x) _byteswap_ulong(x)
+
+#define rte_bswap64(x) _byteswap_uint64(x)
+#endif
 
 #endif
 
diff --git a/lib/eal/x86/include/rte_byteorder.h b/lib/eal/x86/include/rte_byteorder.h
index a2dfecc..3d6e58e 100644
--- a/lib/eal/x86/include/rte_byteorder.h
+++ b/lib/eal/x86/include/rte_byteorder.h
@@ -18,6 +18,7 @@ 
 #define RTE_BYTE_ORDER RTE_LITTLE_ENDIAN
 #endif
 
+#ifndef RTE_TOOLCHAIN_MSVC
 /*
  * An architecture-optimized byte swap for a 16-bit value.
  *
@@ -69,6 +70,7 @@  static inline uint32_t rte_arch_bswap32(uint32_t _x)
 				   rte_arch_bswap16(x)))
 #endif
 #endif
+#endif
 
 #define rte_cpu_to_le_16(x) (x)
 #define rte_cpu_to_le_32(x) (x)
@@ -86,11 +88,13 @@  static inline uint32_t rte_arch_bswap32(uint32_t _x)
 #define rte_be_to_cpu_32(x) rte_bswap32(x)
 #define rte_be_to_cpu_64(x) rte_bswap64(x)
 
+#ifndef RTE_TOOLCHAIN_MSVC
 #ifdef RTE_ARCH_I686
 #include "rte_byteorder_32.h"
 #else
 #include "rte_byteorder_64.h"
 #endif
+#endif
 
 #ifdef __cplusplus
 }