From patchwork Fri Aug 11 19:20:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tyler Retzlaff X-Patchwork-Id: 130207 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 402DE43037; Fri, 11 Aug 2023 21:22:34 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 95912432A6; Fri, 11 Aug 2023 21:21:20 +0200 (CEST) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id D05E043251 for ; Fri, 11 Aug 2023 21:21:01 +0200 (CEST) Received: by linux.microsoft.com (Postfix, from userid 1086) id A2E2620FD0EC; Fri, 11 Aug 2023 12:21:00 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com A2E2620FD0EC DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1691781660; bh=TmCYUzV7g0xwHsr3PQL3t3zjEGUlB0NGtLIr9M5trHw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AAuyhXiFeIh9YqSqOOgELzvl/xfa3oZW7g6qjDd67R+8i+2wW1D2tTrV6rDrRypMN xkBtG3IBQSu3zqtho9SG4g4BV2qmwRX6KrrVjI4ibxLt5M7XvbbOUCmUt+0dHimLJS 5E/j3NSxT6nTCtYeHN5+o8Ne2yhH4ep4u4cHeSZo= From: Tyler Retzlaff To: dev@dpdk.org Cc: Bruce Richardson , Konstantin Ananyev , Ciara Power , thomas@monjalon.net, david.marchand@redhat.com, mb@smartsharesystems.com, Tyler Retzlaff Subject: [PATCH v11 10/16] eal: expand most macros to empty when using MSVC Date: Fri, 11 Aug 2023 12:20:52 -0700 Message-Id: <1691781658-32520-11-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1691781658-32520-1-git-send-email-roretzla@linux.microsoft.com> References: <1680558751-17931-1-git-send-email-roretzla@linux.microsoft.com> <1691781658-32520-1-git-send-email-roretzla@linux.microsoft.com> MIME-Version: 1.0 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 For now expand a lot of common rte macros empty. The catch here is we need to test that most of the macros do what they should but at the same time they are blocking work needed to bootstrap of the unit tests. Later we will return and provide (where possible) expansions that work correctly for msvc and where not possible provide some alternate macros to achieve the same outcome. Signed-off-by: Tyler Retzlaff Acked-by: Morten Brørup --- lib/eal/include/rte_branch_prediction.h | 8 +++++ lib/eal/include/rte_common.h | 54 +++++++++++++++++++++++++++++++++ lib/eal/include/rte_compat.h | 20 ++++++++++++ 3 files changed, 82 insertions(+) diff --git a/lib/eal/include/rte_branch_prediction.h b/lib/eal/include/rte_branch_prediction.h index 414cd92..c0356ca 100644 --- a/lib/eal/include/rte_branch_prediction.h +++ b/lib/eal/include/rte_branch_prediction.h @@ -24,7 +24,11 @@ * do_stuff(); */ #ifndef likely +#ifdef RTE_TOOLCHAIN_MSVC +#define likely(x) (!!(x)) +#else #define likely(x) __builtin_expect(!!(x), 1) +#endif #endif /* likely */ /** @@ -37,7 +41,11 @@ * do_stuff(); */ #ifndef unlikely +#ifdef RTE_TOOLCHAIN_MSVC +#define unlikely(x) (!!(x)) +#else #define unlikely(x) __builtin_expect(!!(x), 0) +#endif #endif /* unlikely */ #ifdef __cplusplus diff --git a/lib/eal/include/rte_common.h b/lib/eal/include/rte_common.h index 2f464e3..b087532 100644 --- a/lib/eal/include/rte_common.h +++ b/lib/eal/include/rte_common.h @@ -41,6 +41,10 @@ #define RTE_STD_C11 #endif +#ifdef RTE_TOOLCHAIN_MSVC +#define __extension__ +#endif + /* * RTE_TOOLCHAIN_GCC is defined if the target is built with GCC, * while a host application (like pmdinfogen) may have another compiler. @@ -65,7 +69,11 @@ /** * Force alignment */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_aligned(a) +#else #define __rte_aligned(a) __attribute__((__aligned__(a))) +#endif #ifdef RTE_ARCH_STRICT_ALIGN typedef uint64_t unaligned_uint64_t __rte_aligned(1); @@ -80,16 +88,29 @@ /** * Force a structure to be packed */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_packed +#else #define __rte_packed __attribute__((__packed__)) +#endif /** * Macro to mark a type that is not subject to type-based aliasing rules */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_may_alias +#else #define __rte_may_alias __attribute__((__may_alias__)) +#endif /******* Macro to mark functions and fields scheduled for removal *****/ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_deprecated +#define __rte_deprecated_msg(msg) +#else #define __rte_deprecated __attribute__((__deprecated__)) #define __rte_deprecated_msg(msg) __attribute__((__deprecated__(msg))) +#endif /** * Macro to mark macros and defines scheduled for removal @@ -110,14 +131,22 @@ /** * Force symbol to be generated even if it appears to be unused. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_used +#else #define __rte_used __attribute__((used)) +#endif /*********** Macros to eliminate unused variable warnings ********/ /** * short definition to mark a function parameter unused */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_unused +#else #define __rte_unused __attribute__((__unused__)) +#endif /** * Mark pointer as restricted with regard to pointer aliasing. @@ -141,6 +170,9 @@ * even if the underlying stdio implementation is ANSI-compliant, * so this must be overridden. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_format_printf(format_index, first_arg) +#else #if RTE_CC_IS_GNU #define __rte_format_printf(format_index, first_arg) \ __attribute__((format(gnu_printf, format_index, first_arg))) @@ -148,6 +180,7 @@ #define __rte_format_printf(format_index, first_arg) \ __attribute__((format(printf, format_index, first_arg))) #endif +#endif /** * Tells compiler that the function returns a value that points to @@ -222,7 +255,11 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) /** * Hint never returning function */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_noreturn +#else #define __rte_noreturn __attribute__((noreturn)) +#endif /** * Issue a warning in case the function's return value is ignored. @@ -247,12 +284,20 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) * } * @endcode */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_warn_unused_result +#else #define __rte_warn_unused_result __attribute__((warn_unused_result)) +#endif /** * Force a function to be inlined */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_always_inline +#else #define __rte_always_inline inline __attribute__((always_inline)) +#endif /** * Force a function to be noinlined @@ -437,7 +482,11 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) #define RTE_CACHE_LINE_MIN_SIZE 64 /** Force alignment to cache line. */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_cache_aligned +#else #define __rte_cache_aligned __rte_aligned(RTE_CACHE_LINE_SIZE) +#endif /** Force minimum cache line alignment. */ #define __rte_cache_min_aligned __rte_aligned(RTE_CACHE_LINE_MIN_SIZE) @@ -812,6 +861,10 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) * struct wrapper *w = container_of(x, struct wrapper, c); */ #ifndef container_of +#ifdef RTE_TOOLCHAIN_MSVC +#define container_of(ptr, type, member) \ + ((type *)((uintptr_t)(ptr) - offsetof(type, member))) +#else #define container_of(ptr, type, member) __extension__ ({ \ const typeof(((type *)0)->member) *_ptr = (ptr); \ __rte_unused type *_target_ptr = \ @@ -819,6 +872,7 @@ static void __attribute__((destructor(RTE_PRIO(prio)), used)) func(void) (type *)(((uintptr_t)_ptr) - offsetof(type, member)); \ }) #endif +#endif /** Swap two variables. */ #define RTE_SWAP(a, b) \ diff --git a/lib/eal/include/rte_compat.h b/lib/eal/include/rte_compat.h index fc9fbaa..716bc03 100644 --- a/lib/eal/include/rte_compat.h +++ b/lib/eal/include/rte_compat.h @@ -12,14 +12,22 @@ #ifndef ALLOW_EXPERIMENTAL_API +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_experimental +#else #define __rte_experimental \ __attribute__((deprecated("Symbol is not yet part of stable ABI"), \ section(".text.experimental"))) +#endif #else +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_experimental +#else #define __rte_experimental \ __attribute__((section(".text.experimental"))) +#endif #endif @@ -30,23 +38,35 @@ #if !defined ALLOW_INTERNAL_API && __has_attribute(error) /* For GCC */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_internal +#else #define __rte_internal \ __attribute__((error("Symbol is not public ABI"), \ section(".text.internal"))) +#endif #elif !defined ALLOW_INTERNAL_API && __has_attribute(diagnose_if) /* For clang */ +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_internal +#else #define __rte_internal \ _Pragma("GCC diagnostic push") \ _Pragma("GCC diagnostic ignored \"-Wgcc-compat\"") \ __attribute__((diagnose_if(1, "Symbol is not public ABI", "error"), \ section(".text.internal"))) \ _Pragma("GCC diagnostic pop") +#endif #else +#ifdef RTE_TOOLCHAIN_MSVC +#define __rte_internal +#else #define __rte_internal \ __attribute__((section(".text.internal"))) +#endif #endif