diff mbox series

[ovs-dev,v5,1/5] dpif-netdev-private-extract: Fix typo VMBI -> VBMI.

Message ID 20220517100818.15639-2-cian.ferriter@intel.com
State Accepted
Commit 90cadf170fdf3110fb23705f86e810959105d9bc
Headers show
Series Build some AVX512 code on older compilers. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/intel-ovs-compilation success test: success

Commit Message

Ferriter, Cian May 17, 2022, 10:08 a.m. UTC 
Fixes: 250ceddcc2d0 ("dpif-netdev/mfex: Add AVX512 based optimized miniflow extract")
Fixes: aa85a25095ae ("dpif-netdev/mfex: Add more AVX512 traffic profiles")
Signed-off-by: Cian Ferriter <cian.ferriter@intel.com>
Acked-by: Sunil Pai G <sunil.pai.g@intel.com>

---
v4:
* Added Sunil's Fixes and Acked-by tags.
---
 lib/dpif-netdev-private-extract.c |  8 ++++----
 lib/dpif-netdev-private-extract.h | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/lib/dpif-netdev-private-extract.c b/lib/dpif-netdev-private-extract.c
index 4b2f12015..b7f094dac 100644
--- a/lib/dpif-netdev-private-extract.c
+++ b/lib/dpif-netdev-private-extract.c
@@ -55,7 +55,7 @@  static struct dpif_miniflow_extract_impl mfex_impls[] = {
 
 /* Compile in implementations only if the compiler ISA checks pass. */
 #if (__x86_64__ && HAVE_AVX512F && HAVE_LD_AVX512_GOOD && __SSE4_2__)
-    [MFEX_IMPL_VMBI_IPv4_UDP] = {
+    [MFEX_IMPL_VBMI_IPv4_UDP] = {
         .probe = mfex_avx512_vbmi_probe,
         .extract_func = mfex_avx512_vbmi_ip_udp,
         .name = "avx512_vbmi_ipv4_udp", },
@@ -65,7 +65,7 @@  static struct dpif_miniflow_extract_impl mfex_impls[] = {
         .extract_func = mfex_avx512_ip_udp,
         .name = "avx512_ipv4_udp", },
 
-    [MFEX_IMPL_VMBI_IPv4_TCP] = {
+    [MFEX_IMPL_VBMI_IPv4_TCP] = {
         .probe = mfex_avx512_vbmi_probe,
         .extract_func = mfex_avx512_vbmi_ip_tcp,
         .name = "avx512_vbmi_ipv4_tcp", },
@@ -75,7 +75,7 @@  static struct dpif_miniflow_extract_impl mfex_impls[] = {
         .extract_func = mfex_avx512_ip_tcp,
         .name = "avx512_ipv4_tcp", },
 
-    [MFEX_IMPL_VMBI_DOT1Q_IPv4_UDP] = {
+    [MFEX_IMPL_VBMI_DOT1Q_IPv4_UDP] = {
         .probe = mfex_avx512_vbmi_probe,
         .extract_func = mfex_avx512_vbmi_dot1q_ip_udp,
         .name = "avx512_vbmi_dot1q_ipv4_udp", },
@@ -85,7 +85,7 @@  static struct dpif_miniflow_extract_impl mfex_impls[] = {
         .extract_func = mfex_avx512_dot1q_ip_udp,
         .name = "avx512_dot1q_ipv4_udp", },
 
-    [MFEX_IMPL_VMBI_DOT1Q_IPv4_TCP] = {
+    [MFEX_IMPL_VBMI_DOT1Q_IPv4_TCP] = {
         .probe = mfex_avx512_vbmi_probe,
         .extract_func = mfex_avx512_vbmi_dot1q_ip_tcp,
         .name = "avx512_vbmi_dot1q_ipv4_tcp", },
diff --git a/lib/dpif-netdev-private-extract.h b/lib/dpif-netdev-private-extract.h
index f9a757ba4..ae5c161b4 100644
--- a/lib/dpif-netdev-private-extract.h
+++ b/lib/dpif-netdev-private-extract.h
@@ -82,13 +82,13 @@  enum dpif_miniflow_extract_impl_idx {
     MFEX_IMPL_SCALAR,
     MFEX_IMPL_STUDY,
 #if (__x86_64__ && HAVE_AVX512F && HAVE_LD_AVX512_GOOD && __SSE4_2__)
-    MFEX_IMPL_VMBI_IPv4_UDP,
+    MFEX_IMPL_VBMI_IPv4_UDP,
     MFEX_IMPL_IPv4_UDP,
-    MFEX_IMPL_VMBI_IPv4_TCP,
+    MFEX_IMPL_VBMI_IPv4_TCP,
     MFEX_IMPL_IPv4_TCP,
-    MFEX_IMPL_VMBI_DOT1Q_IPv4_UDP,
+    MFEX_IMPL_VBMI_DOT1Q_IPv4_UDP,
     MFEX_IMPL_DOT1Q_IPv4_UDP,
-    MFEX_IMPL_VMBI_DOT1Q_IPv4_TCP,
+    MFEX_IMPL_VBMI_DOT1Q_IPv4_TCP,
     MFEX_IMPL_DOT1Q_IPv4_TCP,
 #endif
     MFEX_IMPL_MAX
@@ -101,7 +101,7 @@  extern struct ovs_mutex dp_netdev_mutex;
  */
 #if (__x86_64__ && HAVE_AVX512F && HAVE_LD_AVX512_GOOD && __SSE4_2__)
 
-#define MFEX_IMPL_START_IDX MFEX_IMPL_VMBI_IPv4_UDP
+#define MFEX_IMPL_START_IDX MFEX_IMPL_VBMI_IPv4_UDP
 #else
 
 #define MFEX_IMPL_START_IDX MFEX_IMPL_MAX