diff mbox series

eal: fix compile failure of asm on MSVC toolchain

Message ID 1697551570-20942-1-git-send-email-roretzla@linux.microsoft.com (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series eal: fix compile failure of asm on MSVC toolchain |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/loongarch-compilation success Compilation OK
ci/loongarch-unit-testing success Unit Testing PASS
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-compile-amd64-testing success Testing PASS
ci/iol-unit-amd64-testing success Testing PASS
ci/iol-compile-arm64-testing success Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-unit-arm64-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/intel-Functional success Functional PASS

Commit Message

Tyler Retzlaff Oct. 17, 2023, 2:06 p.m. UTC 
  Most MSVC targets do not support inline asm and __MWAITX__ is a GCC
implementation detail. Use a test of defined(RTE_TOOLCHAIN_MSVC) to
avoid conditional compilation of inline asm and instead use intrinsics
instead.

Fixes: c7ed1ce04704 ("eal/x86: add power intrinsics for AMD")
Cc: sivaprasad.tummala@amd.com

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 lib/eal/x86/rte_power_intrinsics.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

David Marchand Oct. 26, 2023, 8:43 a.m. UTC | #1 
On Tue, Oct 17, 2023 at 4:06 PM Tyler Retzlaff
<roretzla@linux.microsoft.com> wrote:
>
> Most MSVC targets do not support inline asm and __MWAITX__ is a GCC
> implementation detail. Use a test of defined(RTE_TOOLCHAIN_MSVC) to
> avoid conditional compilation of inline asm and instead use intrinsics
> instead.
>
> Fixes: c7ed1ce04704 ("eal/x86: add power intrinsics for AMD")
>
> Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
Acked-by: David Marchand <david.marchand@redhat.com>

Applied, thanks.
diff mbox series

Patch

diff --git a/lib/eal/x86/rte_power_intrinsics.c b/lib/eal/x86/rte_power_intrinsics.c
index 63a1f7e..483395d 100644
--- a/lib/eal/x86/rte_power_intrinsics.c
+++ b/lib/eal/x86/rte_power_intrinsics.c
@@ -60,7 +60,7 @@  static void intel_umwait(const uint64_t timeout)
  */
 static void amd_monitorx(volatile void *addr)
 {
-#if defined(__MWAITX__)
+#if defined(RTE_TOOLCHAIN_MSVC) || defined(__MWAITX__)
 	/* cast away "volatile" when using the intrinsic */
 	_mm_monitorx((void *)(uintptr_t)addr, 0, 0);
 #else
@@ -75,7 +75,7 @@  static void amd_monitorx(volatile void *addr)
 static void amd_mwaitx(const uint64_t timeout)
 {
 	RTE_SET_USED(timeout);
-#if defined(__MWAITX__)
+#if defined(RTE_TOOLCHAIN_MSVC) || defined(__MWAITX__)
 	_mm_mwaitx(0, 0, 0);
 #else
 	asm volatile(".byte 0x0f, 0x01, 0xfb;"