SWDEV-516564 - SWDEV-512817 - Remove mentions of gfx940 and gfx941 (#30)

[ROCm/hip-tests commit: 902988494e]

projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withnoUnsafeflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 atomicAdd on fineGrain memory with -mno-unsafe-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include <hip_test_checkers.hh>
@@ -88,7 +88,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_Coherentwithnounsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withoutflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 atomicAdd on fineGrain memory without any unsafeatomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -85,7 +85,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_Coherentwithoutflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/AtomicAdd_Coherent_withunsafeflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 atomicAdd on fineGrain memory with -munsafe-fp-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -99,7 +99,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_CoherentwithUnsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withnoUnsafeflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 atomicAdd on CoarseGrain memory with -mno-unsafe-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -86,7 +86,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_NonCoherentwithnounsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withoutflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 atomicAdd on CoarseGrain memory without any unsafeatomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -87,7 +87,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_NonCoherentwithoutflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/AtomicAdd_NonCoherent_withunsafeflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 atomicAdd on CoarseGrain memory with -munsafe-fp-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -93,7 +93,7 @@ TEMPLATE_TEST_CASE("Unit_AtomicAdd_NonCoherentwithUnsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/BuiltIns_fadd.cc

@@ -91,7 +91,7 @@ TEST_CASE("Unit_BuiltInAtomicAdd_CoherentGlobalMem") {
       HIP_CHECK(hipFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -135,7 +135,7 @@ TEST_CASE("Unit_BuiltInAtomicAdd_NonCoherentGlobalMem") {
       free(B_h);
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950"
             "Hence skipping the testcase for GPU-0");
   }
 }
@@ -219,7 +219,7 @@ TEST_CASE("Unit_BuiltInAtomicAdd_CoherentGlobalMemWithRtc") {
       free(B_h);
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -299,7 +299,7 @@ TEST_CASE("Unit_BuiltInAtomicAdd_NonCoherentGlobalMemWithRtc") {
       free(B_h);
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/CMakeLists.txt

@@ -152,8 +152,8 @@ set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BIN
 set_property(GLOBAL APPEND PROPERTY G_INSTALL_CUSTOM_TARGETS ${CMAKE_CURRENT_BINARY_DIR}/kerDevAllocMultCO.code)
 
 # Accepted archs to compile this cmake file
-set(ACCEPTED_OFFLOAD_ARCHS gfx90a gfx940 gfx941 gfx942)
-set(ACCEPTED_GFX940_ARCH gfx940 gfx941 gfx942)
+set(ACCEPTED_OFFLOAD_ARCHS gfx90a gfx942)
+set(ACCEPTED_GFX940_ARCH gfx942)
 set(ACCEPTED_GFX1200_ARCH gfx1200 gfx1201)
 function(CheckAcceptedArchs OFFLOAD_ARCH_STR_LOCAL)
   set(ARCH_CHECK -1 PARENT_SCOPE)

projects/hip-tests/catch/unit/deviceLib/fp8_fnuz.cc

@@ -26,13 +26,13 @@ THE SOFTWARE.
 #include <type_traits>
 #include <vector>
 #include <bitset>
-#if defined(__gfx940__) || defined(__gfx941__) || defined(__gfx942__)
+#ifdef __gfx942__
 #define __gfx94plus_local__
 #endif
 
 /*
 * This catch test is meant for FP8 FNUZ conversion checking
-* tests only supported on gfx940,gfx941,gfx942 archs.
+* tests only supported on gfx942 archs.
 */
 
 static_assert(sizeof(unsigned int) == sizeof(float));
@@ -47,14 +47,12 @@ std::string get_arch_type()  {
 }
 
 #define ARCH_TYPE_GFX940(name) \
-  (name.find("gfx940") != std::string::npos) || \
-  (name.find("gfx941") != std::string::npos) || \
   (name.find("gfx942") != std::string::npos)
 
 #define FP8_FNUZ_SKIP_TEST \
   std::string gfxName = get_arch_type(); \
   if (!(ARCH_TYPE_GFX940(gfxName))) { \
-    HipTest::HIP_SKIP_TEST("This test can only be run on gfx940,gfx941,gfx42 arch"); \
+    HipTest::HIP_SKIP_TEST("This test can only be run on gfx942 arch"); \
     return; \
   }
 

projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withnounsafeflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 unsafeatomicAdd on fineGrain memory with -mno-unsafe-fp-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_common.hh>
@@ -100,7 +100,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentwithnoUnsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withoutflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on FineGrainMemory
 1. The following test scenario verifies
 unsafeatomicAdd on fineGrain memory without atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -100,7 +100,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_Coherentwithoutflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_Coherent_withunsafeflag.cc

@@ -101,7 +101,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentwithUnsafeflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, Hence"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, Hence"
              "skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withnounsafeflag.cc

@@ -22,7 +22,7 @@
 AtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 unsafeAtomicAdd on CoarseGrain memory with -mno-unsafe-fp-atomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -93,7 +93,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentnounsafeatomicsflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950, "
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950, "
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withoutflag.cc

@@ -22,7 +22,7 @@
 unsafeAtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 unsafeAtomicAdd on CoarseGrain memory without any unsafeatomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -93,7 +93,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentwithoutflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_NonCoherent_withunsafeflag.cc

@@ -22,7 +22,7 @@
 unsafeAtomicAdd on CoarseGrainMemory
 1. The following test scenario verifies
 unsafeAtomicAdd on CoarseGrain memory with unsafeatomics flag
-This testcase works only on gfx90a, gfx940, gfx941, gfx942, gfx950.
+This testcase works only on gfx90a, gfx942, gfx950.
 */
 
 #include<hip_test_checkers.hh>
@@ -93,7 +93,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentwithunsafeatomicsflag", "",
       HIP_CHECK(hipHostFree(result));
     }
   } else {
-    SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+    SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
         "Hence skipping the testcase for this GPU " << device);
   }
 }

projects/hip-tests/catch/unit/deviceLib/unsafeAtomicAdd_RTC.cc

@@ -141,7 +141,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentRTCnounsafeatomicflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -238,7 +238,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentRTCunsafeatomicflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -331,7 +331,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_CoherentRTCwithoutflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -417,7 +417,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentRTCnounsafeatomicflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -505,7 +505,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentRTCunsafeatomicflag", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }
@@ -593,7 +593,7 @@ TEMPLATE_TEST_CASE("Unit_unsafeAtomicAdd_NonCoherentRTC", "",
     }
     HIP_CHECK(hipModuleUnload(module));
   } else {
-      SUCCEED("Memory model feature is only supported for gfx90a, gfx940, gfx941, gfx942, gfx950,"
+      SUCCEED("Memory model feature is only supported for gfx90a, gfx942, gfx950,"
           "Hence skipping the testcase for this GPU " << device);
   }
 }