d9b0c6fbf7
Drop pycodestyle for code style checking in favor of black. Black is much faster, stable PEP8 compliant code style checker offering also automatic formatting. It aims to be very stable and produce smallest diffs. It's used by many small and big projects. Running checkstyle with black takes a few seconds with a terse output. Thus, test-checkstyle-diff is no longer necessary. Expand scope of checkstyle to all python files in the repo, replacing test-checkstyle with checkstyle-python. Also, fixstyle-python is now available for automatic style formatting. Note: python virtualenv has been consolidated in test/Makefile, test/requirements*.txt which will eventually be moved to a central location. This is required to simply the automated generation of docker executor images in the CI. Type: improvement Change-Id: I022a326603485f58585e879ac0f697fceefbc9c8 Signed-off-by: Klement Sekera <klement.sekera@gmail.com> Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
144 lines
3.6 KiB
Python
144 lines
3.6 KiB
Python
#!/usr/bin/env python3
|
|
import re
|
|
import unittest
|
|
import platform
|
|
from framework import VppTestCase
|
|
|
|
|
|
def checkX86():
|
|
return platform.machine() in ["x86_64", "AMD64"]
|
|
|
|
|
|
def skipVariant(variant):
|
|
with open("/proc/cpuinfo") as f:
|
|
cpuinfo = f.read()
|
|
|
|
exp = re.compile(r"(?:flags\s+:)(?:\s\w+)+(?:\s(" + variant + r"))(?:\s\w+)+")
|
|
match = exp.search(cpuinfo, re.DOTALL | re.MULTILINE)
|
|
|
|
return checkX86() and match is not None
|
|
|
|
|
|
class TestNodeVariant(VppTestCase):
|
|
"""Test Node Variants"""
|
|
|
|
@classmethod
|
|
def setUpConstants(cls, variant):
|
|
super(TestNodeVariant, cls).setUpConstants()
|
|
# find the position of node_variants in the cmdline args.
|
|
|
|
if checkX86():
|
|
node_variants = cls.vpp_cmdline.index("node { ") + 1
|
|
cls.vpp_cmdline[node_variants] = (
|
|
"default { variant default } "
|
|
"ip4-rewrite { variant " + variant + " } "
|
|
)
|
|
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super(TestNodeVariant, cls).setUpClass()
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
super(TestNodeVariant, cls).tearDownClass()
|
|
|
|
def setUp(self):
|
|
super(TestNodeVariant, self).setUp()
|
|
|
|
def tearDown(self):
|
|
super(TestNodeVariant, self).tearDown()
|
|
|
|
def getActiveVariant(self, node):
|
|
node_desc = self.vapi.cli("show node " + node)
|
|
self.logger.info(node_desc)
|
|
|
|
match = re.search(
|
|
r"\s+(\S+)\s+(\d+)\s+(:?yes)", node_desc, re.DOTALL | re.MULTILINE
|
|
)
|
|
|
|
return match.groups(0)
|
|
|
|
def checkVariant(self, variant):
|
|
"""Test node variants defaults"""
|
|
|
|
variant_info = self.getActiveVariant("ip4-lookup")
|
|
self.assertEqual(variant_info[0], "default")
|
|
|
|
variant_info = self.getActiveVariant("ip4-rewrite")
|
|
self.assertEqual(variant_info[0], variant)
|
|
|
|
|
|
class TestICLVariant(TestNodeVariant):
|
|
"""Test icl Node Variants"""
|
|
|
|
VARIANT = "icl"
|
|
LINUX_VARIANT = "avx512_bitalg"
|
|
|
|
@classmethod
|
|
def setUpConstants(cls):
|
|
super(TestICLVariant, cls).setUpConstants(cls.VARIANT)
|
|
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super(TestICLVariant, cls).setUpClass()
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
super(TestICLVariant, cls).tearDownClass()
|
|
|
|
@unittest.skipUnless(
|
|
skipVariant(LINUX_VARIANT), VARIANT + " not a supported variant, skip."
|
|
)
|
|
def test_icl(self):
|
|
self.checkVariant(self.VARIANT)
|
|
|
|
|
|
class TestSKXVariant(TestNodeVariant):
|
|
"""Test skx Node Variants"""
|
|
|
|
VARIANT = "skx"
|
|
LINUX_VARIANT = "avx512f"
|
|
|
|
@classmethod
|
|
def setUpConstants(cls):
|
|
super(TestSKXVariant, cls).setUpConstants(cls.VARIANT)
|
|
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super(TestSKXVariant, cls).setUpClass()
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
super(TestSKXVariant, cls).tearDownClass()
|
|
|
|
@unittest.skipUnless(
|
|
skipVariant(LINUX_VARIANT), VARIANT + " not a supported variant, skip."
|
|
)
|
|
def test_skx(self):
|
|
self.checkVariant(self.VARIANT)
|
|
|
|
|
|
class TestHSWVariant(TestNodeVariant):
|
|
"""Test avx2 Node Variants"""
|
|
|
|
VARIANT = "hsw"
|
|
LINUX_VARIANT = "avx2"
|
|
|
|
@classmethod
|
|
def setUpConstants(cls):
|
|
super(TestHSWVariant, cls).setUpConstants(cls.VARIANT)
|
|
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super(TestHSWVariant, cls).setUpClass()
|
|
|
|
@classmethod
|
|
def tearDownClass(cls):
|
|
super(TestHSWVariant, cls).tearDownClass()
|
|
|
|
@unittest.skipUnless(
|
|
skipVariant(LINUX_VARIANT), VARIANT + " not a supported variant, skip."
|
|
)
|
|
def test_hsw(self):
|
|
self.checkVariant(self.VARIANT)
|