When compiling with MSVC the error below is hit:
drivers\net\mlx5\mlx5_tx.h(1148): error C2065: 'rte_v128u32_t':
undeclared identifier
Turns out that with MSVC the data type rte_v128u32_t is not used, but
its size needs to be known. This patch defines a macro to store that
size and replaces instances of sizeof(rte_v128u32_t) with that macro.
A static assert is added to ensure the new macro never diverges from
sizeof(rte_v128u32_t).
Signed-off-by: Andre Muezerie <andre...@linux.microsoft.com>
---
drivers/net/mlx5/mlx5_defs.h | 2 ++
drivers/net/mlx5/mlx5_rxtx.c | 11 ++++++++---
drivers/net/mlx5/mlx5_tx.h | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_defs.h b/drivers/net/mlx5/mlx5_defs.h
index 9c454983be..c5e2c59309 100644
--- a/drivers/net/mlx5/mlx5_defs.h
+++ b/drivers/net/mlx5/mlx5_defs.h
@@ -196,4 +196,6 @@
#define MLX5_CNT_SVC_CYCLE_TIME_DEFAULT 500
+#define MLX5_SIZEOF_V128U32_T 16
+
#endif /* RTE_PMD_MLX5_DEFS_H_ */
diff --git a/drivers/net/mlx5/mlx5_rxtx.c b/drivers/net/mlx5/mlx5_rxtx.c
index 9c075f6a56..3f4942e225 100644
--- a/drivers/net/mlx5/mlx5_rxtx.c
+++ b/drivers/net/mlx5/mlx5_rxtx.c
@@ -28,11 +28,16 @@
#include "mlx5_tx.h"
/* static asserts */
+#ifndef RTE_TOOLCHAIN_MSVC
+static_assert(sizeof(rte_v128u32_t) == MLX5_SIZEOF_V128U32_T,
+ "MLX5_SIZEOF_V128U32_T must hold sizeof(rte_v128u32_t)");
+#endif
+
static_assert(MLX5_CQE_STATUS_HW_OWN < 0, "Must be negative value");
static_assert(MLX5_CQE_STATUS_SW_OWN < 0, "Must be negative value");
static_assert(MLX5_ESEG_MIN_INLINE_SIZE ==
(sizeof(uint16_t) +
- sizeof(rte_v128u32_t)),
+ MLX5_SIZEOF_V128U32_T),
"invalid Ethernet Segment data size");
static_assert(MLX5_ESEG_MIN_INLINE_SIZE ==
(sizeof(uint16_t) +
@@ -41,7 +46,7 @@ static_assert(MLX5_ESEG_MIN_INLINE_SIZE ==
"invalid Ethernet Segment data size");
static_assert(MLX5_ESEG_MIN_INLINE_SIZE ==
(sizeof(uint16_t) +
- sizeof(rte_v128u32_t)),
+ MLX5_SIZEOF_V128U32_T),
"invalid Ethernet Segment data size");
static_assert(MLX5_ESEG_MIN_INLINE_SIZE ==
(sizeof(uint16_t) +
@@ -50,7 +55,7 @@ static_assert(MLX5_ESEG_MIN_INLINE_SIZE ==
"invalid Ethernet Segment data size");
static_assert(MLX5_ESEG_MIN_INLINE_SIZE ==
(sizeof(uint16_t) +
- sizeof(rte_v128u32_t)),
+ MLX5_SIZEOF_V128U32_T),
"invalid Ethernet Segment data size");
static_assert(MLX5_ESEG_MIN_INLINE_SIZE ==
(sizeof(uint16_t) +
diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h
index 55568c41b1..5647f6a37d 100644
--- a/drivers/net/mlx5/mlx5_tx.h
+++ b/drivers/net/mlx5/mlx5_tx.h
@@ -1145,7 +1145,7 @@ mlx5_tx_eseg_data(struct mlx5_txq_data *__rte_restrict
txq,
} else {
/* Fill the gap in the title WQEBB with inline data. */
rte_mov16(pdst, psrc);
- psrc += sizeof(rte_v128u32_t);
+ psrc += MLX5_SIZEOF_V128U32_T;
}
pdst = (uint8_t *)(es + 2);
MLX5_ASSERT(inlen >= MLX5_ESEG_MIN_INLINE_SIZE);
--
2.49.0.vfs.0.3
