From 7e8decb48daf96a7cda1bfefb8b5b0c1c55afa79 Mon Sep 17 00:00:00 2001
From: Eiden Yoshida <eiden.yoshida@amd.com>
Date: Thu, 24 Jun 2021 15:08:47 -0600
Subject: [PATCH 1/2] Add hmm tests to gfx90a CI

---
 .jenkins/common.groovy | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/.jenkins/common.groovy b/.jenkins/common.groovy
index 028e204a..6bf24c5b 100644
--- a/.jenkins/common.groovy
+++ b/.jenkins/common.groovy
@@ -33,12 +33,25 @@ def runTestCommand (platform, project)
     String centos = platform.jenkinsLabel.contains('centos') ? '3' : ''
 
     def testCommand = "ctest${centos} --output-on-failure"
-    def command = """#!/usr/bin/env bash
-                set -x
-                cd ${project.paths.project_build_prefix}
-                cd ${project.testDirectory}
-                ${sudo} LD_LIBRARY_PATH=/opt/rocm/lib ${testCommand}
-            """
+    def hmmTestCommand = ''
+
+    if (platform.jenkinsLabel.contains('gfx90a'))
+    {
+        hmmTestCommand = """
+                            export HSA_XNACK=1
+                            export ROCRAND_USE_HMM=1
+                            ${testCommand}
+                         """
+    }
+
+    def command = """
+                    #!/usr/bin/env bash
+                    set -x
+                    cd ${project.paths.project_build_prefix}
+                    cd ${project.testDirectory}
+                    ${testCommand}
+                    ${hmmTestCommand}
+                  """
 
     platform.runCommand(this, command)
 }

From 4935579305198df4ed6d9925b186e027a34c471b Mon Sep 17 00:00:00 2001
From: Eiden Yoshida <eiden.yoshida@amd.com>
Date: Fri, 25 Jun 2021 12:39:41 -0600
Subject: [PATCH 2/2] Use proper environment variable

---
 .jenkins/common.groovy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.jenkins/common.groovy b/.jenkins/common.groovy
index 6bf24c5b..f09cbbce 100644
--- a/.jenkins/common.groovy
+++ b/.jenkins/common.groovy
@@ -39,7 +39,7 @@ def runTestCommand (platform, project)
     {
         hmmTestCommand = """
                             export HSA_XNACK=1
-                            export ROCRAND_USE_HMM=1
+                            export HIPCUB_USE_HMM=1
                             ${testCommand}
                          """
     }