vpp_config: update node variants to skx and icl

Node variant names have changed to skx and icl.

Type: fix

Signed-off-by: Ray Kinsella <mdr@ashroe.eu>
Change-Id: I5be832aa59e4e440df53869077d801c011e3defa

diff --git a/extras/vpp_config/data/startup.conf.template b/extras/vpp_config/data/startup.conf.template
index 9a537fd..13d86b6 100644 (file)
--- a/extras/vpp_config/data/startup.conf.template
+++ b/extras/vpp_config/data/startup.conf.template
@@ -156,10 +156,10 @@ dpdk {{
 #node {{
 
 ## specify the preferred default variant
-#      default {{ variant avx512 }}
+#      default {{ variant icl }}
 
 ## specify the preferred variant, for a given node
-#      ip4-rewrite {{ variant avx2 }}
+#      ip4-rewrite {{ variant skx }}
 
 #}}
 

diff --git a/test/Makefile b/test/Makefile
index 94b0262..aa229e9 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -380,8 +380,8 @@ help:
        @echo "                               TEST='*.*.test_add_bfd' selects all test functions named test_add_bfd from all files/classes"
        @echo ""
        @echo " VARIANT=<variant>      - specify which march node variant to unit test"
-       @echo "                          e.g. VARIANT=avx2 test the avx2 march variants"
-       @echo "                          e.g. VARIANT=avx512 test the avx512 march variants"
+       @echo "                          e.g. VARIANT=skx test the skx march variants"
+       @echo "                          e.g. VARIANT=icl test the icl march variants"
        @echo ""
        @echo " VPP_ZOMBIE_NOCHECK=1   - skip checking for vpp (zombie) processes (CAUTION)"
        @echo " COREDUMP_SIZE=<size>   - pass <size> as unix { coredump-size <size> } argument to vpp"