From 7fb9189760b562e59a737bc7e8de360833c5921f Mon Sep 17 00:00:00 2001
From: akolliasAMD <99202231+akolliasAMD@users.noreply.github.com>
Date: Thu, 3 Oct 2024 10:41:26 -0600
Subject: [PATCH] Regression timing fix (#1361)

* Removed testbed initialization on standalone tests
* .jenkins renabled all tests
---
 .jenkins/common.groovy   | 3 ---
 test/StandaloneTests.cpp | 6 +++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.jenkins/common.groovy b/.jenkins/common.groovy
index eb797ed45d..99722aa4bd 100644
--- a/.jenkins/common.groovy
+++ b/.jenkins/common.groovy
@@ -17,9 +17,6 @@ def runCompileCommand(platform, project, jobName)
 
 def runTestCommand (platform, project, gfilter, envars)
 {
-    // Temporarily disable Standalone.RegressionTiming for RCCL CI
-    gfilter = "*:-Standalone.Regression*"
-
     String sudo = auxiliary.sudo(platform.jenkinsLabel)
 
     def command = """#!/usr/bin/env bash
diff --git a/test/StandaloneTests.cpp b/test/StandaloneTests.cpp
index cbb73efde5..97249774ee 100644
--- a/test/StandaloneTests.cpp
+++ b/test/StandaloneTests.cpp
@@ -157,7 +157,6 @@ namespace RcclUnitTesting
    * ******************************************************************************************/
   TEST(Standalone, RegressionTiming)
   {
-    TestBed testBed;
     // timing
     using namespace std::chrono;
     using Clock = std::chrono::high_resolution_clock;
@@ -169,7 +168,8 @@ namespace RcclUnitTesting
     if (numGpus < 2) {
       GTEST_SKIP() << "This test requires at least 2 devices.";
     }
-
+    hipDeviceProp_t devProp;
+    HIPCALL(hipGetDeviceProperties(&devProp, 0));
     // Initialize RCCL
     int numRanks = 2;
     std::vector<ncclComm_t> comms(numRanks);
@@ -180,7 +180,7 @@ namespace RcclUnitTesting
     for (auto p : protocolList)
     {
       usElapsed = 0;
-      if(testBed.ev.isGfx12) {
+      if(strncmp("gfx12",devProp.gcnArchName,5) == 0) {
         setenv("NCCL_PROTO", "Simple", 1);
       } else {
         setenv("NCCL_PROTO", p, 1);