Merge ~ian-may/+git/autotest-client-tests:dgx-pts-updates into ~canonical-kernel-team/+git/autotest-client-tests:master

[Ian May]

[Francis Ginther (fginther)]

Looks good.

review: Approve

[Francis Ginther (fginther)]

Applied and pushed.

diff --git a/ubuntu_performance_pts/ubuntu_performance_pts.py b/ubuntu_performance_pts/ubuntu_performance_pts.py
index 5130438..5f23b5d 100644
--- a/ubuntu_performance_pts/ubuntu_performance_pts.py
+++ b/ubuntu_performance_pts/ubuntu_performance_pts.py
@@ -109,7 +109,8 @@ class ubuntu_performance_pts(test.test):
             'libpng-dev',
             'autoconf',
             'linux-tools-generic',
-            'linux-tools-' + release
+            'linux-tools-' + release,
+            'numactl'
         ]
         if series in ['bionic']:
             pkgs.append('libssl1.0-dev')
@@ -172,10 +173,13 @@ class ubuntu_performance_pts(test.test):
                         #  add pretty colors. Skip over all these and
                         #  grab the last number in the field
                         #
+                        if field not in values:
+                            values[field] = []
+
                         if n > 0:
-                            values[field] = numbers[n - 1]
+                            values[field].append(numbers[n - 1])
                         else:
-                            values[field] = 0
+                            values[field].append(0)
 
         return values
 
@@ -198,7 +202,8 @@ class ubuntu_performance_pts(test.test):
                 print("Test %d of %d:" % (i + 1, test_iterations))
                 for field in fields:
                     if field in values[i]:
-                        print(benchmark + "_" + field.lower() + "[%d] %s" % (i, values[i][field]))
+                        for j, value in enumerate(values[i][field]):
+                            print(benchmark + "_" + field.lower() + "[%d][%d] %s" % (i, j, value))
 
         #
         #  Compute min/max/average:
@@ -206,30 +211,37 @@ class ubuntu_performance_pts(test.test):
         field = 'Average'
         if values[i] != {}:
             test_run = True
-            v = [ float(values[i][field]) for i in values ]
-            test_run = True
-            maximum = max(v)
-            minimum = min(v)
-            average = sum(v) / float(len(v))
-            max_err = (maximum - minimum) / average * 100.0
+            for test_num in range(len(values[i][field])):
+                v = [ float(values[i][field][test_num]) for i in values ]
+                maximum = max(v)
+                minimum = min(v)
+                average = sum(v) / float(len(v))
+                max_err = (maximum - minimum) / average * 100.0
 
-            print("")
-            print(benchmark + "_" + field.lower() + "_minimum %.2f" % (minimum))
-            print(benchmark + "_" + field.lower() + "_maximum %.2f" % (maximum))
-            print(benchmark + "_" + field.lower() + "_average %.2f" % (average))
-            print(benchmark + "_" + field.lower() + "_maximum_error %.2f%%" % (max_err))
-            print("")
+                print("")
+                print(benchmark + "_" + field.lower() + "_minimum %.2f" % (minimum))
+                print(benchmark + "_" + field.lower() + "_maximum %.2f" % (maximum))
+                print(benchmark + "_" + field.lower() + "_average %.2f" % (average))
+                print(benchmark + "_" + field.lower() + "_maximum_error %.2f%%" % (max_err))
+                print("")
 
-            if max_err > 5.0:
-                print("FAIL: maximum error is greater than 5%")
-                test_pass = False
+                if max_err > 5.0:
+                    print("FAIL: maximum error is greater than 5%")
+                    test_pass = False
 
-            if test_pass:
-                print("PASS: test passes specified performance thresholds")
+                if test_pass:
+                    print("PASS: test passes specified performance thresholds")
 
         if not test_run:
             print("NOTRUN: test not run, no data")
 
+    def get_platform(self):
+        bpn = utils.system_output('dmidecode -s baseboard-product-name | head -1', retain_output=True)
+        if bpn == 'DGXA100':
+            return 'DGXA100'
+        else:
+            return 'Default'
+
     def run_john_the_ripper_blowfish(self, test_name, tag):
         if self.get_platform_distro()[1].split('.')[0] > "20":
             cmd = 'export PRESET_OPTIONS="john-the-ripper.run-test=Blowfish"; %s phoronix-test-suite batch-benchmark john-the-ripper-1.8.0' % force_times_to_run
@@ -250,7 +262,11 @@ class ubuntu_performance_pts(test.test):
         self.print_stats(test_name, cmd)
 
     def run_ttsiod_renderer(self, test_name, tag):
-        cmd = '%s phoronix-test-suite batch-benchmark ttsiod-renderer-1.7.0' % force_times_to_run
+        #if on DGXA100 bind cpu and mem to stable numa range
+        if self.get_platform() == 'DGXA100':
+            cmd = 'numactl -N 0-3 -m 0-3 %s phoronix-test-suite batch-benchmark ttsiod-renderer-1.7.0' % force_times_to_run
+        else:
+            cmd = '%s phoronix-test-suite batch-benchmark ttsiod-renderer-1.7.0' % force_times_to_run
         self.print_stats(test_name, cmd)
 
     def run_generic(self, test_name, subtest):