From patchwork Tue Oct 17 14:06:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 132757 X-Patchwork-Delegate: david.marchand@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F07514318D; Tue, 17 Oct 2023 16:06:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7A16940273; Tue, 17 Oct 2023 16:06:14 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 4D5FE40270 for ; Tue, 17 Oct 2023 16:06:12 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id 9826F20B74C0; Tue, 17 Oct 2023 07:06:11 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9826F20B74C0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1697551571; bh=sOhxeyES7i7fcQHillW+CTCbfl2fiaGNIR3yqIHq6/c=; h=From:To:Cc:Subject:Date:From; b=pbRm/KLLK6HwfFGx2hhQwc7frrC1YGFEEPM8IxyDvAMpncKjBcrfo9IQwL/4qbOh7 6ShZCed/tUQbBwcU4tMXtYkD8k49xPMu24LpcTrf1tYMO+mVN3BjiaR1hxANPThwtv lUxNZ158dK93sCC+hftDlCdQypeLR5RSWDVyBPbM= From: Tyler Retzlaff To: dev@dpdk.org Cc: Anatoly Burakov , Bruce Richardson , Konstantin Ananyev , Sivaprasad Tummala , Tyler Retzlaff Subject: [PATCH] eal: fix compile failure of asm on MSVC toolchain Date: Tue, 17 Oct 2023 07:06:10 -0700 Message-Id: <1697551570-20942-1-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org 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 Acked-by: David Marchand --- lib/eal/x86/rte_power_intrinsics.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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;"