X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=lib%2Facl%2Facl_run_avx512x16.h;h=f87293eeb7c5375f5d48217c68c7e179676300c2;hb=6e858b4d9244cf53505589673755ab18ac2a4a83;hp=da244bc257ab82c7236d068ecbd3855e3feb1b89;hpb=99a2dd955fba6e4cc23b77d590a033650ced9c45;p=dpdk.git

diff --git a/lib/acl/acl_run_avx512x16.h b/lib/acl/acl_run_avx512x16.h
index da244bc257..f87293eeb7 100644
--- a/lib/acl/acl_run_avx512x16.h
+++ b/lib/acl/acl_run_avx512x16.h
@@ -10,7 +10,7 @@
  */
 
 /*
- * This implementation uses 512-bit registers(zmm) and instrincts.
+ * This implementation uses 512-bit registers(zmm) and intrinsics.
  * So our main SIMD type is 512-bit width and each such variable can
  * process sizeof(__m512i) / sizeof(uint32_t) == 16 entries in parallel.
  */
@@ -25,20 +25,20 @@
 #define _F_(x)		x##_avx512x16
 
 /*
- * Same instrincts have different syntaxis (depending on the bit-width),
+ * Same intrinsics have different syntaxes (depending on the bit-width),
  * so to overcome that few macros need to be defined.
  */
 
-/* Naming convention for generic epi(packed integers) type instrincts. */
+/* Naming convention for generic epi(packed integers) type intrinsics. */
 #define _M_I_(x)	_mm512_##x
 
-/* Naming convention for si(whole simd integer) type instrincts. */
+/* Naming convention for si(whole simd integer) type intrinsics. */
 #define _M_SI_(x)	_mm512_##x##_si512
 
-/* Naming convention for masked gather type instrincts. */
+/* Naming convention for masked gather type intrinsics. */
 #define _M_MGI_(x)	_mm512_##x
 
-/* Naming convention for gather type instrincts. */
+/* Naming convention for gather type intrinsics. */
 #define _M_GI_(name, idx, base, scale)	_mm512_##name(idx, base, scale)
 
 /* num/mask of transitions per SIMD regs */
@@ -239,7 +239,7 @@ _F_(gather_bytes)(__m512i zero, const __m512i p[2], const uint32_t m[2],
 }
 
 /*
- * Resolve matches for multiple categories (GT 8, use 512b instuctions/regs)
+ * Resolve matches for multiple categories (GT 8, use 512b instructions/regs)
  */
 static inline void
 resolve_mcgt8_avx512x1(uint32_t result[],
@@ -252,8 +252,6 @@ resolve_mcgt8_avx512x1(uint32_t result[],
 	__mmask16 cm, sm;
 	__m512i cp, cr, np, nr;
 
-	const uint32_t match_log = 5;
-
 	res = pr->results;
 	pri = pr->priority;
 
@@ -261,7 +259,7 @@ resolve_mcgt8_avx512x1(uint32_t result[],
 
 	for (k = 0; k != nb_pkt; k++, result += nb_cat) {
 
-		mi = match[k] << match_log;
+		mi = match[k] << ACL_MATCH_LOG;
 
 		cr = _mm512_maskz_loadu_epi32(cm, res + mi);
 		cp = _mm512_maskz_loadu_epi32(cm, pri + mi);
@@ -269,7 +267,7 @@ resolve_mcgt8_avx512x1(uint32_t result[],
 		for (i = 1, pm = match + nb_pkt; i != nb_trie;
 				i++, pm += nb_pkt) {
 
-			mi = pm[k] << match_log;
+			mi = pm[k] << ACL_MATCH_LOG;
 
 			nr = _mm512_maskz_loadu_epi32(cm, res + mi);
 			np = _mm512_maskz_loadu_epi32(cm, pri + mi);