From: Ray Kinsella <mdr@ashroe.eu>
Date: Fri, 14 Aug 2020 14:27:10 +0000 (+0100)
Subject: vpp_config: update node variants to skx and icl
X-Git-Tag: v21.01-rc0~66
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=f9c8fe41280a48f95216cab43eab8db00ee592e1;p=vpp.git

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 9a537fd1367..13d86b6c384 100644
--- 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 94b02620231..aa229e93970 100644
--- 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"