Merge ~kevinbecker/+git/autotest-client-tests:kevinbecker/ptsematest into ~canonical-kernel-team/+git/autotest-client-tests:master

[Kevin Becker]

UBUNTU: SAUCE: Add ptsematest from upstream

Signed-off-by: Kevin Becker <email address hidden>

Runs ptsematest and expects a max latency of 100us or less for the realtime kernel.

[Po-Hsu Lin (cypressyew)]

Hello Kevin,

For a SUT in our network (kernel team VLAN) to access repository hosted on git.kernel.org we will need to setup a proxy.

Please find inline comment.
This implies to rteval and cyclictest as well.

review: Needs Fixing

[Kevin Becker (kevinbecker)]

> Hello Kevin,
>
> For a SUT in our network (kernel team VLAN) to access repository hosted on
> git.kernel.org we will need to setup a proxy.
>
> Please find inline comment.
> This implies to rteval and cyclictest as well.

Thanks. I wasn't aware of that canonical module. I assumed the proxy was configured outside the test. I'll implement your suggestion.

0fcd730... by Kevin Becker on 2024-02-22

UBUNTU: SAUCE: Configure proxy for rt_tests_cyclictest, rt_tests_ptsematest and rteval

Signed-off-by: Kevin Becker <email address hidden>

[Kevin Becker (kevinbecker)]

I made the change to support the proxy and applied it to rt_tests_cyclictest and rteval too. I tested the changes on starlow. They all work without setting up the proxy prior to running the test.

[Po-Hsu Lin (cypressyew)]

LGTM, thanks!

The proxy was indeed configured by our infrastructure tool (the runner script in CKCT) before running the test.

However having proxy configured in the test can make things easier if we're running tests manually.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed.

diff --git a/rt_tests_cyclictest/rt_tests_cyclictest.py b/rt_tests_cyclictest/rt_tests_cyclictest.py
index 78b3854..ac8d2ac 100644
--- a/rt_tests_cyclictest/rt_tests_cyclictest.py
+++ b/rt_tests_cyclictest/rt_tests_cyclictest.py
@@ -3,7 +3,7 @@ import os
 import platform
 import re
 import shutil
-from autotest.client import test, utils
+from autotest.client import canonical, test, utils
 from autotest.client.shared import error
 
 class rt_tests_cyclictest(test.test):
@@ -40,6 +40,7 @@ class rt_tests_cyclictest(test.test):
         self.job.require_gcc()
         os.chdir(self.srcdir)
         shutil.rmtree('rt-tests', ignore_errors=True)
+        canonical.setup_proxy()
         branch = 'main'
         cmd = 'git clone -b {} https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git'.format(branch)
         utils.system_output(cmd, retain_output=True)
diff --git a/rt_tests_ptsematest/control b/rt_tests_ptsematest/control
new file mode 100644
index 0000000..dd6bbec
--- /dev/null
+++ b/rt_tests_ptsematest/control
@@ -0,0 +1,19 @@
+AUTHOR = '''
+Carsten Emde <[e-mail]>
+ '''
+NAME = "rt_tests_ptsematest"
+DOC = '''
+description rt test utils
+URL https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
+'''
+SUITE = "None"
+TIME = "MEDIUM"
+TEST_CLASS = 'kernel'
+TEST_CATEGORY = 'Functional'
+TEST_TYPE = 'client'
+
+result = job.run_test_detail('rt_tests_ptsematest', test_name='setup', tag='setup', timeout=60*5)
+if result == 'GOOD':
+    job.run_test('rt_tests_ptsematest', test_name='rt_tests_ptsematest', tag='rt_tests_ptsematest')
+else:
+    print("ERROR: test failed to build")
diff --git a/rt_tests_ptsematest/rt_tests_ptsematest.py b/rt_tests_ptsematest/rt_tests_ptsematest.py
new file mode 100644
index 0000000..4bd6456
--- /dev/null
+++ b/rt_tests_ptsematest/rt_tests_ptsematest.py
@@ -0,0 +1,94 @@
+import multiprocessing
+import os
+import platform
+import re
+import shutil
+from autotest.client import canonical, test, utils
+from autotest.client.shared import error
+
+class rt_tests_ptsematest(test.test):
+    version = 1
+
+    def initialize(self):
+        self.flavour = re.split('-\d*-', platform.uname()[2])[-1]
+        self.arch = platform.processor()
+
+    def install_required_pkgs(self):
+        try:
+            series = platform.dist()[2]
+        except AttributeError:
+            import distro
+            series = distro.codename()
+
+        pkgs = [
+            'build-essential',
+            'git',
+            'libnuma-dev',
+        ]
+        gcc = 'gcc' if self.arch in ['ppc64le', 'aarch64', 's390x', 'riscv64'] else 'gcc-multilib'
+        pkgs.append(gcc)
+
+        cmd = 'yes "" | DEBIAN_FRONTEND=noninteractive apt-get install --yes --force-yes ' + ' '.join(pkgs)
+        self.results = utils.system_output(cmd, retain_output=True)
+
+    # setup
+    #
+    #    Automatically run when there is no autotest/client/tmp/<test-suite> directory
+    #
+    def setup(self):
+        self.install_required_pkgs()
+        self.job.require_gcc()
+        os.chdir(self.srcdir)
+        shutil.rmtree('rt-tests', ignore_errors=True)
+        canonical.setup_proxy()
+        branch = 'main'
+        cmd = 'git clone -b {} https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git'.format(branch)
+        utils.system_output(cmd, retain_output=True)
+
+        # Print test suite HEAD SHA1 commit id for future reference
+        os.chdir(os.path.join(self.srcdir, 'rt-tests'))
+        title_local = utils.system_output("git log --oneline -1 | sed 's/(.*)//'", retain_output=False, verbose=False)
+        title_upstream = utils.system_output("git log --oneline | grep -v SAUCE | head -1", retain_output=False, verbose=False)
+        print("Latest commit in '{}' branch: {}".format(branch, title_local))
+        print("Latest upstream commit: {}".format(title_upstream))
+
+        try:
+            nprocs = '-j' + str(multiprocessing.cpu_count())
+        except:
+            nprocs = ''
+        utils.make(nprocs)
+
+
+    # run_once
+    #
+    #    Driven by the control file for each individual test.
+    #
+    #    Runs ptsematest with one thread per processor, for 100000 loops, and 
+    #    priority set to 80. It will fail if the max latency goes over 100us.
+    #
+    def run_once(self, test_name, args='-l 100000 -p 80 -S -q', exit_on_error=True):
+        if test_name == 'setup':
+            return
+
+        self.results = utils.system_output(self.srcdir + '/rt-tests/ptsematest ' + args, retain_output=True)
+
+        # Parse results
+        max_values = []
+        lines = self.results.split('\n')
+
+        for line in lines:
+            components = line.split(',')
+            for component in components:
+                if 'Max' in component:
+                    # Extract the max latency for each thread
+                    max_value = int(component.strip().split()[-1])
+                    max_values.append(max_value)
+
+        # Find the highest "Max" latency
+        highest_max = max(max_values)
+        print("Highest Max Latency:", highest_max)
+
+        if highest_max > 100:
+            raise error.TestError('FAIL: Max latency over 100us.')
+
+        return
diff --git a/rteval/rteval.py b/rteval/rteval.py
index 2105747..0508567 100644
--- a/rteval/rteval.py
+++ b/rteval/rteval.py
@@ -5,7 +5,7 @@ import re
 import shutil
 import xml.etree.ElementTree as ET
 from datetime import datetime
-from autotest.client import test, utils
+from autotest.client import canonical, test, utils
 from autotest.client.shared import error
 
 class rteval(test.test):
@@ -61,6 +61,7 @@ class rteval(test.test):
         self.job.require_gcc()
         os.chdir(self.srcdir)
         shutil.rmtree('rteval', ignore_errors=True)
+        canonical.setup_proxy()
         branch = 'main'
         cmd = 'git clone -b {} https://git.kernel.org/pub/scm/utils/rteval/rteval.git'.format(branch)
         utils.system_output(cmd, retain_output=True)