diff mbox series

[v3,14/39] acl: use C11 alignas

Message ID	1707894382-307-15-git-send-email-roretzla@linux.microsoft.com (mailing list archive)
State	Superseded, archived
Delegated to:	David Marchand
Headers	From: Tyler Retzlaff <roretzla@linux.microsoft.com> To: dev@dpdk.org Cc: Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>, Bruce Richardson <bruce.richardson@intel.com>, Chengwen Feng <fengchengwen@huawei.com>, Cristian Dumitrescu <cristian.dumitrescu@intel.com>, David Christensen <drc@linux.vnet.ibm.com>, David Hunt <david.hunt@intel.com>, Ferruh Yigit <ferruh.yigit@amd.com>, Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>, Jasvinder Singh <jasvinder.singh@intel.com>, Jerin Jacob <jerinj@marvell.com>, Kevin Laatz <kevin.laatz@intel.com>, Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>, Min Zhou <zhoumin@loongson.cn>, Ruifeng Wang <ruifeng.wang@arm.com>, Sameh Gobriel <sameh.gobriel@intel.com>, Stanislaw Kardach <kda@semihalf.com>, Thomas Monjalon <thomas@monjalon.net>, Vladimir Medvedkin <vladimir.medvedkin@intel.com>, Yipeng Wang <yipeng1.wang@intel.com>, Tyler Retzlaff <roretzla@linux.microsoft.com> Subject: [PATCH v3 14/39] acl: use C11 alignas Date: Tue, 13 Feb 2024 23:05:57 -0800 Message-Id: <1707894382-307-15-git-send-email-roretzla@linux.microsoft.com> In-Reply-To: <1707894382-307-1-git-send-email-roretzla@linux.microsoft.com> References: <1707873986-29352-1-git-send-email-roretzla@linux.microsoft.com> <1707894382-307-1-git-send-email-roretzla@linux.microsoft.com> Precedence: list Errors-To: dev-bounces@dpdk.org
Series	use C11 alignas and normalize type alignment \| [v3,00/39] use C11 alignas and normalize type alignment [v3,01/39] eal: use C11 alignas [v3,02/39] eal: redefine macro to be integer literal for MSVC [v3,03/39] stack: use C11 alignas [v3,04/39] sched: use C11 alignas [v3,05/39] ring: use C11 alignas [v3,06/39] pipeline: use C11 alignas [v3,07/39] net: use C11 alignas [v3,08/39] mbuf: remove unnecessary explicit alignment [v3,09/39] hash: use C11 alignas [v3,10/39] eventdev: use C11 alignas [v3,11/39] ethdev: use C11 alignas [v3,12/39] dmadev: use C11 alignas [v3,13/39] distributor: use C11 alignas [v3,14/39] acl: use C11 alignas [v3,15/39] vhost: use C11 alignas [v3,16/39] timer: use C11 alignas [v3,17/39] table: use C11 alignas [v3,18/39] reorder: use C11 alignas [v3,19/39] regexdev: use C11 alignas [v3,20/39] rcu: use C11 alignas [v3,21/39] power: use C11 alignas [v3,22/39] rawdev: use C11 alignas [v3,23/39] port: use C11 alignas [v3,24/39] pdcp: use C11 alignas [v3,25/39] node: use C11 alignas [v3,26/39] mldev: use C11 alignas [v3,27/39] mempool: use C11 alignas [v3,28/39] member: use C11 alignas [v3,29/39] lpm: use C11 alignas [v3,30/39] ipsec: use C11 alignas [v3,31/39] jobstats: use C11 alignas [v3,32/39] bpf: use C11 alignas [v3,33/39] compressdev: use C11 alignas [v3,34/39] cryptodev: use C11 alignas [v3,35/39] dispatcher: use C11 alignas [v3,36/39] fib: use C11 alignas [v3,37/39] gpudev: use C11 alignas [v3,38/39] graph: use C11 alignas [v3,39/39] ip_frag: use C11 alignas

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Tyler Retzlaff Feb. 14, 2024, 7:05 a.m. UTC

  * Move __rte_aligned from the end of {struct,union} definitions to
  be between {struct,union} and tag.

  The placement between {struct,union} and the tag allows the desired
  alignment to be imparted on the type regardless of the toolchain being
  used for all of GCC, LLVM, MSVC compilers building both C and C++.

* Replace use of __rte_aligned(a) on variables/fields with alignas(a).

Signed-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>
---
 lib/acl/acl_run.h         | 4 ++--
 lib/acl/acl_run_altivec.h | 6 ++++--
 lib/acl/acl_run_neon.h    | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff mbox series

Patch

diff --git a/lib/acl/acl_run.h b/lib/acl/acl_run.h
index 7d215de..7f09241 100644
--- a/lib/acl/acl_run.h
+++ b/lib/acl/acl_run.h
@@ -55,12 +55,12 @@  struct acl_flow_data {
  * Structure to maintain running results for
  * a single packet (up to 4 tries).
  */
-struct completion {
+struct __rte_aligned(XMM_SIZE) completion {
 	uint32_t *results;                          /* running results. */
 	int32_t   priority[RTE_ACL_MAX_CATEGORIES]; /* running priorities. */
 	uint32_t  count;                            /* num of remaining tries */
 	/* true for allocated struct */
-} __rte_aligned(XMM_SIZE);
+};
 
 /*
  * One parms structure for each slot in the search engine.
diff --git a/lib/acl/acl_run_altivec.h b/lib/acl/acl_run_altivec.h
index 3c30466..2d398ff 100644
--- a/lib/acl/acl_run_altivec.h
+++ b/lib/acl/acl_run_altivec.h
@@ -3,15 +3,17 @@ 
  * Copyright (C) IBM Corporation 2016.
  */
 
+#include <stdalign.h>
+
 #include "acl_run.h"
 #include "acl_vect.h"
 
-struct _altivec_acl_const {
+alignas(RTE_CACHE_LINE_SIZE) struct _altivec_acl_const {
 	rte_xmm_t xmm_shuffle_input;
 	rte_xmm_t xmm_index_mask;
 	rte_xmm_t xmm_ones_16;
 	rte_xmm_t range_base;
-} altivec_acl_const __rte_cache_aligned = {
+} altivec_acl_const = {
 	{
 		.u32 = {0x00000000, 0x04040404, 0x08080808, 0x0c0c0c0c}
 	},
diff --git a/lib/acl/acl_run_neon.h b/lib/acl/acl_run_neon.h
index 69d1b6d..63074f8 100644
--- a/lib/acl/acl_run_neon.h
+++ b/lib/acl/acl_run_neon.h
@@ -2,14 +2,16 @@ 
  * Copyright(c) 2015 Cavium, Inc
  */
 
+#include <stdalign.h>
+
 #include "acl_run.h"
 #include "acl_vect.h"
 
-struct _neon_acl_const {
+alignas(RTE_CACHE_LINE_SIZE) struct _neon_acl_const {
 	rte_xmm_t xmm_shuffle_input;
 	rte_xmm_t xmm_index_mask;
 	rte_xmm_t range_base;
-} neon_acl_const __rte_cache_aligned = {
+} neon_acl_const = {
 	{
 		.u32 = {0x00000000, 0x04040404, 0x08080808, 0x0c0c0c0c}
 	},