EXSWHTEC-253 - Implement tests for coalesced_group basic APIs

catch/hipTestMain/config/config_amd_linux

@@ -134,6 +134,37 @@
         "Unit_hipEventIpc",
         "=== SWDEV-427101:Below test fails randomly in PSDB ===",
         "Unit_deviceAllocation_InOneThread_AccessInAllThreads",
+        "=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/154 ===",
+        "Unit_Coalesced_Group_Getters_Positive_Basic",
+        "Unit_Coalesced_Group_Getters_Via_Base_Type_Positive_Basic",
+        "Unit_Coalesced_Group_Getters_Via_Non_Member_Functions_Positive_Basic",
+        "Unit_Coalesced_Group_Shfl_Up_Positive_Basic - int",
+        "Unit_Coalesced_Group_Shfl_Up_Positive_Basic - unsigned int",
+        "Unit_Coalesced_Group_Shfl_Up_Positive_Basic - long",
+        "Unit_Coalesced_Group_Shfl_Up_Positive_Basic - unsigned long",
+        "Unit_Coalesced_Group_Shfl_Up_Positive_Basic - long long",
+        "Unit_Coalesced_Group_Shfl_Up_Positive_Basic - unsigned long long",
+        "Unit_Coalesced_Group_Shfl_Up_Positive_Basic - float",
+        "Unit_Coalesced_Group_Shfl_Up_Positive_Basic - double",
+        "Unit_Coalesced_Group_Shfl_Down_Positive_Basic - int",
+        "Unit_Coalesced_Group_Shfl_Down_Positive_Basic - unsigned int",
+        "Unit_Coalesced_Group_Shfl_Down_Positive_Basic - long",
+        "Unit_Coalesced_Group_Shfl_Down_Positive_Basic - unsigned long",
+        "Unit_Coalesced_Group_Shfl_Down_Positive_Basic - long long",
+        "Unit_Coalesced_Group_Shfl_Down_Positive_Basic - unsigned long long",
+        "Unit_Coalesced_Group_Shfl_Down_Positive_Basic - float",
+        "Unit_Coalesced_Group_Shfl_Down_Positive_Basic - double",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - int",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - unsigned int",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - long",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - unsigned long",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - long long",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - unsigned long long",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - float",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - double",
+        "Unit_Coalesced_Group_Sync_Positive_Basic - uint8_t",
+        "Unit_Coalesced_Group_Sync_Positive_Basic - uint16_t",
+        "Unit_Coalesced_Group_Sync_Positive_Basic - uint32_t",
         "=== Patch which removes the typetraits implementation from std namespace in hiprtc is reverted ===",
         "Unit_hiprtc_stdheaders",
         "Unit_hipMemAddressFree_negative",

catch/hipTestMain/config/config_amd_windows

@@ -219,6 +219,15 @@
         "Unit_hipFreeAsync_negative",
         "Unit_hipLaunchHostFunc_multistreams",
         "Unit_hipGraphMem_Alloc_Free_NodeGetParams_Negative",
+        "=== Below tests fail in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/154 ===",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - int",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - unsigned int",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - long",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - unsigned long",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - long long",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - unsigned long long",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - float",
+        "Unit_Coalesced_Group_Shfl_Positive_Basic - double",
         "=== SWDEV-431191:Below tests failed in stress test on 03/11/23 ===",
         "Unit_hipHostMalloc_AllocateMoreThanAvailGPUMemory",
         "Unit_hipHostMalloc_AllocateUseMoreThanAvailGPUMemory",

catch/hipTestMain/main.cc

@@ -30,6 +30,8 @@ int main(int argc, char** argv) {
     | Opt(cmd_options.progress)
         ["-P"]["--progress"]
         ("Show progress bar when running performance tests")
+    | Opt(cmd_options.cg_iterations, "cg_iterations")
+        ["-E"]["--cg-iterations"]
     | Opt(cmd_options.cg_extended_run, "cg_extened_run")
         ["-E"]["--cg-extended-run"]
         ("Number of iterations used for cooperative groups sync tests (default: 5)")

catch/include/cmd_options.hh

@@ -25,9 +25,10 @@ THE SOFTWARE.
 struct CmdOptions {
   int iterations = 10;
   int warmups = 100;
+  int cg_iterations = 5;
   int cg_extended_run = 5;
   bool no_display = false;
   bool progress = false;
 };
 
-extern CmdOptions cmd_options;
+extern CmdOptions cmd_options;

catch/unit/cooperativeGrps/CMakeLists.txt

@@ -9,8 +9,9 @@ set(TEST_SRC
   hipLaunchCooperativeKernel_old.cc
   hipLaunchCooperativeKernelMultiDevice_old.cc
   grid_group.cc
-  coalesced_groups_shfl_down.cc
-  coalesced_groups_shfl_up.cc
+  coalesced_group.cc
+  coalesced_groups_shfl_down_old.cc
+  coalesced_groups_shfl_up_old.cc
   coalesced_tiled_groups_metagrp.cc
 )
 if(HIP_PLATFORM STREQUAL "nvidia")