Skip to contentSkip to conversation

net/*: replace intrinsic header include with rte_vect

PATCH Applied Bruce Richardson 5 participants 5 messages Jun 20, 2024 – Jul 6, 2024 Network drivers

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/*: replace intrinsic header include with rte_vect

Rather than having the SSE code in each driver include tmmintrin.h, which often does not contain all needed intrinsics, e.g. _mm_cvtsi128_si64() for 32-bit x86 builds, we can just replace the include of ?mmintrin.h with rte_vect.h for all network drivers.

---
 drivers/net/fm10k/fm10k_rxtx_vec.c          | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c        | 2 +-
 drivers/net/iavf/iavf_rxtx_vec_sse.c        | 2 +-
 drivers/net/ice/ice_rxtx_vec_sse.c          | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c      | 2 +-
 drivers/net/mlx5/mlx5_rxtx_vec_sse.h        | 2 +-
 drivers/net/ngbe/ngbe_rxtx_vec_sse.c        | 2 +-
 drivers/net/txgbe/txgbe_rxtx_vec_sse.c      | 2 +-
 drivers/net/virtio/virtio_rxtx_simple_sse.c | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
drivers/net/fm10k/fm10k_rxtx_vec.c +1 -1
index 62119de373..9a84775cb1 100644
@@ -10,7 +10,7 @@
 #include "fm10k.h"
 #include "base/fm10k_type.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/i40e/i40e_rxtx_vec_sse.c +1 -1
index 2d4480a765..ad560d2b6b 100644
@@ -12,7 +12,7 @@
 #include "i40e_rxtx.h"
 #include "i40e_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/iavf/iavf_rxtx_vec_sse.c +1 -1
index 96f187f511..0db6fa8bd4 100644
@@ -10,7 +10,7 @@
 #include "iavf_rxtx.h"
 #include "iavf_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/ice/ice_rxtx_vec_sse.c +1 -1
index 9a1b7e3e51..c01d8ede29 100644
@@ -4,7 +4,7 @@
 
 #include "ice_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +1 -1
index f60808d576..a77370cdb7 100644
@@ -10,7 +10,7 @@
 #include "ixgbe_rxtx.h"
 #include "ixgbe_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/mlx5/mlx5_rxtx_vec_sse.h +1 -1
index 2bdd1f676d..93d6d1b5f0 100644
@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <smmintrin.h>
+#include <rte_vect.h>
 
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
drivers/net/ngbe/ngbe_rxtx_vec_sse.c +1 -1
index f703d0ea15..b128bd3a67 100644
@@ -11,7 +11,7 @@
 #include "ngbe_rxtx.h"
 #include "ngbe_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 static inline void
 ngbe_rxq_rearm(struct ngbe_rx_queue *rxq)
drivers/net/txgbe/txgbe_rxtx_vec_sse.c +1 -1
index 12eb4aeef5..1a3f2ce3cd 100644
@@ -10,7 +10,7 @@
 #include "txgbe_rxtx.h"
 #include "txgbe_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 static inline void
 txgbe_rxq_rearm(struct txgbe_rx_queue *rxq)
drivers/net/virtio/virtio_rxtx_simple_sse.c +1 -1
index 6a18741b6d..d53acc4fd6 100644
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #include <rte_byteorder.h>
 #include <rte_branch_prediction.h>
Signature · 1 line
2.43.0
Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · On Thu, 20 Jun 2024 13:32:18 +0100 Bruce Richardson…

Rather than having the SSE code in each driver include tmmintrin.h, which often does not contain all needed intrinsics, e.g. _mm_cvtsi128_si64() for 32-bit x86 builds, we can just replace the include of ?mmintrin.h with rte_vect.h for all network drivers.

---

Acked-by on v1 1/1
#2 lore raw
In reply to Bruce Richardson
Quoted 128 lines

Rather than having the SSE code in each driver include tmmintrin.h, which often does not contain all needed intrinsics, e.g. _mm_cvtsi128_si64() for 32-bit x86 builds, we can just replace the include of ?mmintrin.h with rte_vect.h for all network drivers.

---
 drivers/net/fm10k/fm10k_rxtx_vec.c          | 2 +-
 drivers/net/i40e/i40e_rxtx_vec_sse.c        | 2 +-
 drivers/net/iavf/iavf_rxtx_vec_sse.c        | 2 +-
 drivers/net/ice/ice_rxtx_vec_sse.c          | 2 +-
 drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c      | 2 +-
 drivers/net/mlx5/mlx5_rxtx_vec_sse.h        | 2 +-
 drivers/net/ngbe/ngbe_rxtx_vec_sse.c        | 2 +-
 drivers/net/txgbe/txgbe_rxtx_vec_sse.c      | 2 +-
 drivers/net/virtio/virtio_rxtx_simple_sse.c | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)
drivers/net/fm10k/fm10k_rxtx_vec.c +1 -1
index 62119de373..9a84775cb1 100644
@@ -10,7 +10,7 @@
 #include "fm10k.h"
 #include "base/fm10k_type.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/i40e/i40e_rxtx_vec_sse.c +1 -1
index 2d4480a765..ad560d2b6b 100644
@@ -12,7 +12,7 @@
 #include "i40e_rxtx.h"
 #include "i40e_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/iavf/iavf_rxtx_vec_sse.c +1 -1
index 96f187f511..0db6fa8bd4 100644
@@ -10,7 +10,7 @@
 #include "iavf_rxtx.h"
 #include "iavf_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/ice/ice_rxtx_vec_sse.c +1 -1
index 9a1b7e3e51..c01d8ede29 100644
@@ -4,7 +4,7 @@
 
 #include "ice_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c +1 -1
index f60808d576..a77370cdb7 100644
@@ -10,7 +10,7 @@
 #include "ixgbe_rxtx.h"
 #include "ixgbe_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #ifndef __INTEL_COMPILER
 #pragma GCC diagnostic ignored "-Wcast-qual"
drivers/net/mlx5/mlx5_rxtx_vec_sse.h +1 -1
index 2bdd1f676d..93d6d1b5f0 100644
@@ -9,7 +9,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <smmintrin.h>
+#include <rte_vect.h>
 
 #include <rte_mbuf.h>
 #include <rte_mempool.h>
drivers/net/ngbe/ngbe_rxtx_vec_sse.c +1 -1
index f703d0ea15..b128bd3a67 100644
@@ -11,7 +11,7 @@
 #include "ngbe_rxtx.h"
 #include "ngbe_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 static inline void
 ngbe_rxq_rearm(struct ngbe_rx_queue *rxq)
drivers/net/txgbe/txgbe_rxtx_vec_sse.c +1 -1
index 12eb4aeef5..1a3f2ce3cd 100644
@@ -10,7 +10,7 @@
 #include "txgbe_rxtx.h"
 #include "txgbe_rxtx_vec_common.h"
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 static inline void
 txgbe_rxq_rearm(struct txgbe_rx_queue *rxq)
drivers/net/virtio/virtio_rxtx_simple_sse.c +0 -0
index 6a18741b6d..d53acc4fd6 100644

drivers/net/virtio/virtio_rxtx_simple_sse.c

Quoted 9 lines
drivers/net/virtio/virtio_rxtx_simple_sse.c +1 -2
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <errno.h>
 
-#include <tmmintrin.h>
+#include <rte_vect.h>
 
 #include <rte_byteorder.h>
 #include <rte_branch_prediction.h>
--
Quoted 1 line

2.43.0

Applied
#4 lore raw
Quoted 10 lines · Tyler Retzlaff
Quoted 7 lines · Bruce Richardson

Rather than having the SSE code in each driver include tmmintrin.h, which often does not contain all needed intrinsics, e.g. _mm_cvtsi128_si64() for 32-bit x86 builds, we can just replace the include of ?mmintrin.h with rte_vect.h for all network drivers.

---

Applied to dpdk-next-net/main, thanks.