commit 93f7848f9e307c9ef6c9fbffe9cd69d4b9e9a95d
author Pratik Vishwakarma <Pratik.Vishwakarma@amd.com> Thu Dec 07 16:39:15 2017 +0530
committer chrome-bot <chrome-bot@chromium.org> Wed Dec 13 00:32:23 2017 -0800
tree 6fc33a1058673c0fc3d6bebe4df19d6acb921c9b
parent 67d431ca745e8ae9a949d229b1350d79f8363a72

graphics_GpuReset: Update for stoney gpu family

Updated test to use libdrm tests for "stoney" gpu family
Specifically, it will call amdgpu_test with Suite id = 7
i.e. Deadlock Tests with Test id = 1 i.e. gfx ring block test

BUG=b:65368363
TEST=test_that <ip> --board=kahlee graphics_GpuReset

Change-Id: I7181b64cdbafd3b99f9b0df8a3f8a81946dec4b5
Signed-off-by: Pratik Vishwakarma <Pratik.Vishwakarma@amd.com>
Reviewed-on: https://chromium-review.googlesource.com/749614
Reviewed-by: Drew Davenport <ddavenport@chromium.org>

client/site_tests/graphics_GpuReset/graphics_GpuReset.py

diff --git a/client/site_tests/graphics_GpuReset/graphics_GpuReset.py b/client/site_tests/graphics_GpuReset/graphics_GpuReset.py
index 7e76b06..c913d0d 100644
--- a/client/site_tests/graphics_GpuReset/graphics_GpuReset.py
+++ b/client/site_tests/graphics_GpuReset/graphics_GpuReset.py
@@ -7,6 +7,7 @@
 import time
 
 from autotest_lib.client.bin import test
+from autotest_lib.client.bin import utils as bin_utils
 from autotest_lib.client.common_lib import error, utils
 from autotest_lib.client.cros.graphics import graphics_utils
 
@@ -41,12 +42,17 @@
 
   @graphics_utils.GraphicsTest.failure_report_decorator('graphics_GpuReset')
   def run_once(self, options=''):
-    exefile = os.path.join(self.srcdir, 'gpureset')
-    if not os.path.isfile(exefile):
-      raise error.TestFail('Failed: could not locate gpureset executable (' +
-                           exefile + ').')
+    gpu_family = bin_utils.get_gpu_family()
+    if gpu_family == 'stoney':
+        options = '-s 7 -t 1'
+        exefile = 'amdgpu_test'
+    else:
+        options = ''
+        exefile = os.path.join(self.srcdir, 'gpureset')
+        if not os.path.isfile(exefile):
+          raise error.TestFail('Failed: could not locate gpureset executable (' +
+                               exefile + ').')
 
-    options = ''
     cmd = '%s %s' % (exefile, options)
 
     # If UI is running, we must stop it and restore later.
@@ -98,12 +104,18 @@
     # Analyze summary and count number of passes.
     pass_count = 0
     for line in results:
-      if line.strip().startswith('[       OK ] graphics_GpuReset'):
-        pass_count += 1
-      if line.strip().startswith('[  FAILED  ] graphics_GpuReset'):
-        msg = line.strip()[30:]
-        failed_msg = 'Test failed with %s' % msg
-        raise error.TestFail('Failed: %s' % failed_msg)
+      if gpu_family == 'stoney':
+        if "passed" in line:
+          pass_count += 1
+        if "failed" in line:
+          raise error.TestFail('Failed: %s' % line)
+      else:
+        if line.strip().startswith('[       OK ] graphics_GpuReset'):
+          pass_count += 1
+        if line.strip().startswith('[  FAILED  ] graphics_GpuReset'):
+          msg = line.strip()[30:]
+          failed_msg = 'Test failed with %s' % msg
+          raise error.TestFail('Failed: %s' % failed_msg)
     f.close()
 
     # Final chance to fail.