Skip to contentSkip to conversation

stop using mmx intrinsics

PATCH New Tyler Retzlaff 3 participants 13 messages Mar 20, 2024 – May 16, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 stop using mmx intrinsics

MSVC does not support older MMX intrinsics use SSE/AVX instead.

Tyler Retzlaff (1):
net: stop using mmx intrinsics

 lib/net/net_crc_avx512.c | 28 ++++++++++------------------
 lib/net/net_crc_sse.c    | 28 ++++++++++------------------
 2 files changed, 20 insertions(+), 36 deletions(-)
Signature · 1 line
1.8.3.1
#1 lore raw

PATCH 1/1 net: stop using mmx intrinsics

Update code to use only avx/sse intrinsics as mmx is not supported on MSVC.

---
 lib/net/net_crc_avx512.c | 28 ++++++++++------------------
 lib/net/net_crc_sse.c    | 28 ++++++++++------------------
 2 files changed, 20 insertions(+), 36 deletions(-)
lib/net/net_crc_avx512.c +10 -18
index 0f0dee4..6d0c644 100644
@@ -8,7 +8,11 @@
 
 #include "net_crc.h"
 
+#ifdef RTE_TOOLCHAIN_MSVC
+#include <intrin.h>
+#else
 #include <x86intrin.h>
+#endif
 
 /* VPCLMULQDQ CRC computation context structure */
 struct crc_vpclmulqdq_ctx {
@@ -331,13 +335,10 @@ static const alignas(16) uint32_t mask2[4] = {
 			c9, c10, c11);
 	crc32_eth.fold_3x128b = _mm512_setr_epi64(c12, c13, c14, c15,
 			c16, c17, 0, 0);
-	crc32_eth.fold_1x128b = _mm_setr_epi64(_mm_cvtsi64_m64(c16),
-			_mm_cvtsi64_m64(c17));
+	crc32_eth.fold_1x128b = _mm_set_epi64x(c17, c16);
 
-	crc32_eth.rk5_rk6 = _mm_setr_epi64(_mm_cvtsi64_m64(c18),
-			_mm_cvtsi64_m64(c19));
-	crc32_eth.rk7_rk8 = _mm_setr_epi64(_mm_cvtsi64_m64(c20),
-			_mm_cvtsi64_m64(c21));
+	crc32_eth.rk5_rk6 = _mm_set_epi64x(c19, c18);
+	crc32_eth.rk7_rk8 = _mm_set_epi64x(c21, c20);
 }
 
 static void
@@ -378,13 +379,10 @@ static const alignas(16) uint32_t mask2[4] = {
 			c9, c10, c11);
 	crc16_ccitt.fold_3x128b = _mm512_setr_epi64(c12, c13, c14, c15,
 			c16, c17, 0, 0);
-	crc16_ccitt.fold_1x128b = _mm_setr_epi64(_mm_cvtsi64_m64(c16),
-			_mm_cvtsi64_m64(c17));
+	crc16_ccitt.fold_1x128b = _mm_set_epi64x(c17, c16);
 
-	crc16_ccitt.rk5_rk6 = _mm_setr_epi64(_mm_cvtsi64_m64(c18),
-			_mm_cvtsi64_m64(c19));
-	crc16_ccitt.rk7_rk8 = _mm_setr_epi64(_mm_cvtsi64_m64(c20),
-			_mm_cvtsi64_m64(c21));
+	crc16_ccitt.rk5_rk6 = _mm_set_epi64x(c19, c18);
+	crc16_ccitt.rk7_rk8 = _mm_set_epi64x(c21, c20);
 }
 
 void
@@ -392,12 +390,6 @@ static const alignas(16) uint32_t mask2[4] = {
 {
 	crc32_load_init_constants();
 	crc16_load_init_constants();
-
-	/*
-	 * Reset the register as following calculation may
-	 * use other data types such as float, double, etc.
-	 */
-	_mm_empty();
 }
 
 uint32_t
lib/net/net_crc_sse.c +10 -18
index d673ae3..9ab80a0 100644
@@ -10,7 +10,11 @@
 
 #include "net_crc.h"
 
+#ifdef RTE_TOOLCHAIN_MSVC
+#include <intrin.h>
+#else
 #include <x86intrin.h>
+#endif
 
 /** PCLMULQDQ CRC computation context structure */
 struct crc_pclmulqdq_ctx {
@@ -272,12 +276,9 @@ static const alignas(16) uint8_t crc_xmm_shift_tab[48] = {
 	p =  0x10811LLU;
 
 	/** Save the params in context structure */
-	crc16_ccitt_pclmulqdq.rk1_rk2 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(k1), _mm_cvtsi64_m64(k2));
-	crc16_ccitt_pclmulqdq.rk5_rk6 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(k5), _mm_cvtsi64_m64(k6));
-	crc16_ccitt_pclmulqdq.rk7_rk8 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(q), _mm_cvtsi64_m64(p));
+	crc16_ccitt_pclmulqdq.rk1_rk2 = _mm_set_epi64x(k2, k1);
+	crc16_ccitt_pclmulqdq.rk5_rk6 = _mm_set_epi64x(k6, k5);
+	crc16_ccitt_pclmulqdq.rk7_rk8 = _mm_set_epi64x(p, q);
 
 	/** Initialize CRC32 data */
 	k1 = 0xccaa009eLLU;
@@ -288,18 +289,9 @@ static const alignas(16) uint8_t crc_xmm_shift_tab[48] = {
 	p =  0x1db710641LLU;
 
 	/** Save the params in context structure */
-	crc32_eth_pclmulqdq.rk1_rk2 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(k1), _mm_cvtsi64_m64(k2));
-	crc32_eth_pclmulqdq.rk5_rk6 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(k5), _mm_cvtsi64_m64(k6));
-	crc32_eth_pclmulqdq.rk7_rk8 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(q), _mm_cvtsi64_m64(p));
-
-	/**
-	 * Reset the register as following calculation may
-	 * use other data types such as float, double, etc.
-	 */
-	_mm_empty();
+	crc32_eth_pclmulqdq.rk1_rk2 = _mm_set_epi64x(k2, k1);
+	crc32_eth_pclmulqdq.rk5_rk6 = _mm_set_epi64x(k6, k5);
+	crc32_eth_pclmulqdq.rk7_rk8 = _mm_set_epi64x(p, q);
 }
 
 uint32_t
Signature · 1 line
1.8.3.1
#2 lore raw

Re: [PATCH] net: stop using mmx intrinsics

20/03/2024 22:12, Tyler Retzlaff:

lib/net/net_crc_avx512.c line 15

Quoted 5 lines
lib/net/net_crc_avx512.c +4 -0
+#ifdef RTE_TOOLCHAIN_MSVC
+#include <intrin.h>
+#else
 #include <x86intrin.h>
+#endif

It is not the same include in MSVC?
Is it something we want to wrap in a DPDK header file?

#3 lore raw

Re: [PATCH] net: stop using mmx intrinsics

Quoted 8 lines · Thomas Monjalon

20/03/2024 22:12, Tyler Retzlaff:

lib/net/net_crc_avx512.c line 15

Quoted 5 lines
lib/net/net_crc_avx512.c +4 -0
+#ifdef RTE_TOOLCHAIN_MSVC
+#include <intrin.h>
+#else
 #include <x86intrin.h>
+#endif

It is not the same include in MSVC?

unfortunately intrin.h is vestigial in the monolithic approach. to use any intrinsic you're supposed to include only the one and only true header instead of vendor/arch feature specific headers.

Quoted 1 line

Is it something we want to wrap in a DPDK header file?

do you mean create a monolithic rte_intrinsic.h header that is essentially

#ifdef MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#include <immintrin.h>
#include <nmmintrin.h>
...
#endif

i assumed that doing something like this might be unpopular due to the unnecessary namespace pollution.

another alternative could be to find a way to limit that pollution only to msvc by stashing intrin.h in e.g. rte_common.h (or rte_os.h) under conditional compile but the problem i think we had with that approach is that some llvm headers don't define prototypes that match those from msvc see lib/eal/windows/include/rte_windows.h another issue arises where if the application includes intrin.h before dpdk headers we again have to deal with llvm vs msvc differences.

fwiw the instance highlighted llvm should have volatile qualified in their prototype but didn't.

i will commit to looking into this more after applications are working.

#4 lore raw

Re: [PATCH] net: stop using mmx intrinsics

21/03/2024 18:27, Tyler Retzlaff:

Quoted 28 lines · Thomas Monjalon
Quoted 8 lines

20/03/2024 22:12, Tyler Retzlaff:

lib/net/net_crc_avx512.c line 15

Quoted 5 lines
lib/net/net_crc_avx512.c +4 -0
+#ifdef RTE_TOOLCHAIN_MSVC
+#include <intrin.h>
+#else
 #include <x86intrin.h>
+#endif

It is not the same include in MSVC?

unfortunately intrin.h is vestigial in the monolithic approach. to use any intrinsic you're supposed to include only the one and only true header instead of vendor/arch feature specific headers.

Quoted 1 line

Is it something we want to wrap in a DPDK header file?

do you mean create a monolithic rte_intrinsic.h header that is essentially

#ifdef MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#include <immintrin.h>
#include <nmmintrin.h>
...
#endif

Quoted 2 lines

i assumed that doing something like this might be unpopular due to the unnecessary namespace pollution.

We already have such a file.
It is rte_vect.h.
I suppose we should just make sure it is included consistently instead of x86intrin.h or immintrin.h

This command will show where changes are required:
git grep intrin.h

#5 lore raw

Re: [PATCH] net: stop using mmx intrinsics

Quoted 32 lines · Thomas Monjalon

21/03/2024 18:27, Tyler Retzlaff:

Quoted 28 lines · Thomas Monjalon
Quoted 8 lines

20/03/2024 22:12, Tyler Retzlaff:

lib/net/net_crc_avx512.c line 15

Quoted 5 lines
lib/net/net_crc_avx512.c +4 -0
+#ifdef RTE_TOOLCHAIN_MSVC
+#include <intrin.h>
+#else
 #include <x86intrin.h>
+#endif

It is not the same include in MSVC?

unfortunately intrin.h is vestigial in the monolithic approach. to use any intrinsic you're supposed to include only the one and only true header instead of vendor/arch feature specific headers.

Quoted 1 line

Is it something we want to wrap in a DPDK header file?

do you mean create a monolithic rte_intrinsic.h header that is essentially

#ifdef MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#include <immintrin.h>
#include <nmmintrin.h>
...
#endif

Quoted 2 lines

i assumed that doing something like this might be unpopular due to the unnecessary namespace pollution.

Quoted 7 lines

We already have such a file.
It is rte_vect.h.
I suppose we should just make sure it is included consistently instead of x86intrin.h or immintrin.h

This command will show where changes are required:
git grep intrin.h

there were some corner cases i can't recall, but since you identified rte_vect.h is the preferred header let me do some experiments to see what i can learn. i'll either submit a series addressing it specifically or come back with details.

thanks!

Quoted 2 lines
#6 lore raw

Re: [PATCH] net: stop using mmx intrinsics

In reply to Thomas Monjalon
Quoted 32 lines · Thomas Monjalon

21/03/2024 18:27, Tyler Retzlaff:

Quoted 28 lines · Thomas Monjalon
Quoted 8 lines

20/03/2024 22:12, Tyler Retzlaff:

lib/net/net_crc_avx512.c line 15

Quoted 5 lines
lib/net/net_crc_avx512.c +4 -0
+#ifdef RTE_TOOLCHAIN_MSVC
+#include <intrin.h>
+#else
 #include <x86intrin.h>
+#endif

It is not the same include in MSVC?

unfortunately intrin.h is vestigial in the monolithic approach. to use any intrinsic you're supposed to include only the one and only true header instead of vendor/arch feature specific headers.

Quoted 1 line

Is it something we want to wrap in a DPDK header file?

do you mean create a monolithic rte_intrinsic.h header that is essentially

#ifdef MSVC
#include <intrin.h>
#else
#include <x86intrin.h>
#include <immintrin.h>
#include <nmmintrin.h>
...
#endif

Quoted 2 lines

i assumed that doing something like this might be unpopular due to the unnecessary namespace pollution.

Quoted 7 lines

We already have such a file.
It is rte_vect.h.
I suppose we should just make sure it is included consistently instead of x86intrin.h or immintrin.h

This command will show where changes are required:
git grep intrin.h

thanks! i saw none of the problems i had before so this worked great.

there is only one other include of intrin.h in eal now and it is not for vector intrinsics so it should be cleaner to just include rte_vect.h whenever SIMD / vector intrinsics are required for windows and !windows.

Quoted 2 lines
#7 lore raw

v2 cover stop using mmx intrinsics

In reply to Tyler Retzlaff

MSVC does not support older MMX intrinsics use SSE/AVX instead.

v2:
* move conditional #include <intrin.h> into rte_vect.h and include rte_vect.h into net_crc_avx512.c net_crc_sse.c instead of duplicating conditional compile of include in each file.

Tyler Retzlaff (2):
eal: include header for MSVC SIMD intrinsics
net: stop using mmx intrinsics

 lib/eal/include/generic/rte_vect.h |  6 +++++-
 lib/net/net_crc_avx512.c           | 27 +++++++--------------------
 lib/net/net_crc_sse.c              | 27 +++++++--------------------
 3 files changed, 19 insertions(+), 41 deletions(-)
Signature · 1 line
1.8.3.1
#8 lore raw

PATCH v2 1/2 eal: include header for MSVC SIMD intrinsics

MSVC documents that you use the monolithic intrin.h for all intrinsics (including SIMD intrinsics) include intrin.h into rte_vec.h when building with MSVC so we don't have to duplicate conditionally compile include it across the DPDK source.

---
 lib/eal/include/generic/rte_vect.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
lib/eal/include/generic/rte_vect.h +5 -1
index 6540419..1f84292 100644
@@ -15,7 +15,11 @@
 
 #include <stdint.h>
 
-#ifndef RTE_TOOLCHAIN_MSVC
+#ifdef RTE_TOOLCHAIN_MSVC
+
+#include <intrin.h>
+
+#else
 
 /* Unsigned vector types */
 
Signature · 1 line
1.8.3.1
Acked-by on v2 1/2
#9 lore raw

Re: [PATCH v2 1/2] eal: include header for MSVC SIMD intrinsics

Quoted 7 lines · Tyler Retzlaff

MSVC documents that you use the monolithic intrin.h for all intrinsics (including SIMD intrinsics) include intrin.h into rte_vec.h when building with MSVC so we don't have to duplicate conditionally compile include it across the DPDK source.

---

#10 lore raw

PATCH v2 2/2 net: stop using mmx intrinsics

In reply to Tyler Retzlaff

Update code to use only avx/sse intrinsics as mmx is not supported on MSVC.

---
 lib/net/net_crc_avx512.c | 27 +++++++--------------------
 lib/net/net_crc_sse.c    | 27 +++++++--------------------
 2 files changed, 14 insertions(+), 40 deletions(-)
lib/net/net_crc_avx512.c +7 -20
index 0f0dee4..d18eb96 100644
@@ -5,11 +5,10 @@
 #include <stdalign.h>
 
 #include <rte_common.h>
+#include <rte_vect.h>
 
 #include "net_crc.h"
 
-#include <x86intrin.h>
-
 /* VPCLMULQDQ CRC computation context structure */
 struct crc_vpclmulqdq_ctx {
 	__m512i rk1_rk2;
@@ -331,13 +330,10 @@ static const alignas(16) uint32_t mask2[4] = {
 			c9, c10, c11);
 	crc32_eth.fold_3x128b = _mm512_setr_epi64(c12, c13, c14, c15,
 			c16, c17, 0, 0);
-	crc32_eth.fold_1x128b = _mm_setr_epi64(_mm_cvtsi64_m64(c16),
-			_mm_cvtsi64_m64(c17));
+	crc32_eth.fold_1x128b = _mm_set_epi64x(c17, c16);
 
-	crc32_eth.rk5_rk6 = _mm_setr_epi64(_mm_cvtsi64_m64(c18),
-			_mm_cvtsi64_m64(c19));
-	crc32_eth.rk7_rk8 = _mm_setr_epi64(_mm_cvtsi64_m64(c20),
-			_mm_cvtsi64_m64(c21));
+	crc32_eth.rk5_rk6 = _mm_set_epi64x(c19, c18);
+	crc32_eth.rk7_rk8 = _mm_set_epi64x(c21, c20);
 }
 
 static void
@@ -378,13 +374,10 @@ static const alignas(16) uint32_t mask2[4] = {
 			c9, c10, c11);
 	crc16_ccitt.fold_3x128b = _mm512_setr_epi64(c12, c13, c14, c15,
 			c16, c17, 0, 0);
-	crc16_ccitt.fold_1x128b = _mm_setr_epi64(_mm_cvtsi64_m64(c16),
-			_mm_cvtsi64_m64(c17));
+	crc16_ccitt.fold_1x128b = _mm_set_epi64x(c17, c16);
 
-	crc16_ccitt.rk5_rk6 = _mm_setr_epi64(_mm_cvtsi64_m64(c18),
-			_mm_cvtsi64_m64(c19));
-	crc16_ccitt.rk7_rk8 = _mm_setr_epi64(_mm_cvtsi64_m64(c20),
-			_mm_cvtsi64_m64(c21));
+	crc16_ccitt.rk5_rk6 = _mm_set_epi64x(c19, c18);
+	crc16_ccitt.rk7_rk8 = _mm_set_epi64x(c21, c20);
 }
 
 void
@@ -392,12 +385,6 @@ static const alignas(16) uint32_t mask2[4] = {
 {
 	crc32_load_init_constants();
 	crc16_load_init_constants();
-
-	/*
-	 * Reset the register as following calculation may
-	 * use other data types such as float, double, etc.
-	 */
-	_mm_empty();
 }
 
 uint32_t
lib/net/net_crc_sse.c +7 -20
index d673ae3..112dc94 100644
@@ -6,12 +6,11 @@
 #include <string.h>
 
 #include <rte_common.h>
+#include <rte_vect.h>
 #include <rte_branch_prediction.h>
 
 #include "net_crc.h"
 
-#include <x86intrin.h>
-
 /** PCLMULQDQ CRC computation context structure */
 struct crc_pclmulqdq_ctx {
 	__m128i rk1_rk2;
@@ -272,12 +271,9 @@ static const alignas(16) uint8_t crc_xmm_shift_tab[48] = {
 	p =  0x10811LLU;
 
 	/** Save the params in context structure */
-	crc16_ccitt_pclmulqdq.rk1_rk2 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(k1), _mm_cvtsi64_m64(k2));
-	crc16_ccitt_pclmulqdq.rk5_rk6 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(k5), _mm_cvtsi64_m64(k6));
-	crc16_ccitt_pclmulqdq.rk7_rk8 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(q), _mm_cvtsi64_m64(p));
+	crc16_ccitt_pclmulqdq.rk1_rk2 = _mm_set_epi64x(k2, k1);
+	crc16_ccitt_pclmulqdq.rk5_rk6 = _mm_set_epi64x(k6, k5);
+	crc16_ccitt_pclmulqdq.rk7_rk8 = _mm_set_epi64x(p, q);
 
 	/** Initialize CRC32 data */
 	k1 = 0xccaa009eLLU;
@@ -288,18 +284,9 @@ static const alignas(16) uint8_t crc_xmm_shift_tab[48] = {
 	p =  0x1db710641LLU;
 
 	/** Save the params in context structure */
-	crc32_eth_pclmulqdq.rk1_rk2 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(k1), _mm_cvtsi64_m64(k2));
-	crc32_eth_pclmulqdq.rk5_rk6 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(k5), _mm_cvtsi64_m64(k6));
-	crc32_eth_pclmulqdq.rk7_rk8 =
-		_mm_setr_epi64(_mm_cvtsi64_m64(q), _mm_cvtsi64_m64(p));
-
-	/**
-	 * Reset the register as following calculation may
-	 * use other data types such as float, double, etc.
-	 */
-	_mm_empty();
+	crc32_eth_pclmulqdq.rk1_rk2 = _mm_set_epi64x(k2, k1);
+	crc32_eth_pclmulqdq.rk5_rk6 = _mm_set_epi64x(k6, k5);
+	crc32_eth_pclmulqdq.rk7_rk8 = _mm_set_epi64x(p, q);
 }
 
 uint32_t
Signature · 1 line
1.8.3.1
Acked-by on v2 2/2
#11 lore raw

Re: [PATCH v2 2/2] net: stop using mmx intrinsics

Quoted 5 lines · Tyler Retzlaff

Update code to use only avx/sse intrinsics as mmx is not supported on MSVC.

---

One comment inline below. With or without that suggestion:

Quoted 22 lines
 lib/net/net_crc_avx512.c | 27 +++++++--------------------
 lib/net/net_crc_sse.c    | 27 +++++++--------------------
 2 files changed, 14 insertions(+), 40 deletions(-)
lib/net/net_crc_avx512.c +1 -2
index 0f0dee4..d18eb96 100644
@@ -5,11 +5,10 @@
 #include <stdalign.h>
 
 #include <rte_common.h>
+#include <rte_vect.h>
 
 #include "net_crc.h"
 
-#include <x86intrin.h>
-
 /* VPCLMULQDQ CRC computation context structure */
 struct crc_vpclmulqdq_ctx {
 	__m512i rk1_rk2;

lib/net/net_crc_avx512.c static const alignas(16) uint32_t mask2[4] = { · line 332

Quoted 3 lines
lib/net/net_crc_avx512.c +0 -0
@@ -331,13 +330,10 @@ static const alignas(16) uint32_t mask2[4] = {
 			c9, c10, c11);
 	crc32_eth.fold_3x128b = _mm512_setr_epi64(c12, c13, c14, c15,
 			c16, c17, 0, 0);

Since the setr's below are being replaced, it would be nice to change these ones above too. Long term I think it's going to be confusing having some assignments set up as L->R, while others are R->L.

Quoted 11 lines
lib/net/net_crc_avx512.c +3 -6
-	crc32_eth.fold_1x128b = _mm_setr_epi64(_mm_cvtsi64_m64(c16),
-			_mm_cvtsi64_m64(c17));
+	crc32_eth.fold_1x128b = _mm_set_epi64x(c17, c16);
 
-	crc32_eth.rk5_rk6 = _mm_setr_epi64(_mm_cvtsi64_m64(c18),
-			_mm_cvtsi64_m64(c19));
-	crc32_eth.rk7_rk8 = _mm_setr_epi64(_mm_cvtsi64_m64(c20),
-			_mm_cvtsi64_m64(c21));
+	crc32_eth.rk5_rk6 = _mm_set_epi64x(c19, c18);
+	crc32_eth.rk7_rk8 = _mm_set_epi64x(c21, c20);
 }

<snip>

#12 lore raw
In reply to Tyler Retzlaff

28/03/2024 17:14, Tyler Retzlaff:

Quoted 10 lines

MSVC does not support older MMX intrinsics use SSE/AVX instead.

v2:
* move conditional #include <intrin.h> into rte_vect.h and include rte_vect.h into net_crc_avx512.c net_crc_sse.c instead of duplicating conditional compile of include in each file.

Tyler Retzlaff (2):
eal: include header for MSVC SIMD intrinsics
net: stop using mmx intrinsics

Applied, thanks.