SWDEV-465209 - Enable Not_Supported tests

This addresses
SWDEV-465209
SWDEV-465211
SWDEV-465216
SWDEV-465218
SWDEV-465210

Change-Id: I3596f058050d056608dbbe5353306ee88d277b44


[ROCm/hip-tests commit: 570c690f42]

projects/hip-tests/catch/hipTestMain/config/config_amd_linux

@@ -28,7 +28,6 @@
         "Unit_hipFuncSetCacheConfig_Positive_Basic",
         "Unit_hipFuncSetCacheConfig_Negative_Parameters",
         "Unit_hipFuncSetSharedMemConfig_Positive_Basic",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Parameters",
         "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout",
         "Unit_hipFuncSetAttribute_Positive_Parameters",
@@ -219,10 +218,6 @@
         "Unit_hipMemcpy3D_Positive_Synchronization_Behavior",
         "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior",
         "Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior",
-        "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported",
         "Unit_hipLaunchCooperativeKernel_Negative_Parameters",
         "Unit_hipDeviceGetGraphMemAttribute_Positive_ReuseMemory",
         "Unit_hipDrvGraphAddMemsetNode_Negative_Parameters",

projects/hip-tests/catch/hipTestMain/config/config_amd_windows

@@ -109,7 +109,6 @@
         "Unit_hipFuncSetCacheConfig_Positive_Basic",
         "Unit_hipFuncSetCacheConfig_Negative_Parameters",
         "Unit_hipFuncSetSharedMemConfig_Positive_Basic",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Parameters",
         "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout",
         "Unit_hipFuncSetAttribute_Positive_Parameters",
@@ -362,10 +361,6 @@
         "Unit_hipMemcpyParam2D_Positive_Synchronization_Behavior",
         "Unit_hipDrvMemcpy3D_Positive_Synchronization_Behavior",
         "Unit_Thread_Block_Tile_Dynamic_Getters_Positive_Basic",
-        "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported",
         "Performance_hipMemcpy2D_HostToHost",
         "Performance_hipMemcpy2DAsync_HostToHost",
         "Unit_hipDeviceGetGraphMemAttribute_Positive_ReuseMemory",

projects/hip-tests/catch/hipTestMain/config/config_amd_wsl.json

@@ -95,7 +95,6 @@
         "Unit_hipFuncSetCacheConfig_Positive_Basic",
         "Unit_hipFuncSetCacheConfig_Negative_Parameters",
         "Unit_hipFuncSetSharedMemConfig_Positive_Basic",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Parameters",
         "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout",
         "Unit_hipFuncSetAttribute_Positive_Parameters",
@@ -106,11 +105,6 @@
         "Unit_hipEventCreateWithFlags_DefaultFlg_NonCohHstMem",
         "Unit_hipEventCreateWithFlags_DisableSystemFence_CohHstMem",
         "Unit_hipEventCreateWithFlags_DefaultFlg_CohHstMem",
-        "NOTE: The following 4 tests are disabled due to defect - EXSWHTEC-240",
-        "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported",
         "Unit_hipOccupancyMaxActiveBlocksPerMultiprocessor_Negative_Parameters",
         "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Negative_Parameters",
         "Unit_hipModuleOccupancyMaxPotentialBlockSizeWithFlags_Negative_Parameters",
@@ -383,16 +377,10 @@
         "Unit_hipFuncSetCacheConfig_Positive_Basic",
         "Unit_hipFuncSetCacheConfig_Negative_Parameters",
         "Unit_hipFuncSetSharedMemConfig_Positive_Basic",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Parameters",
         "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize",
         "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout",
         "Unit_hipFuncSetAttribute_Positive_Parameters",
         "Unit_hipFuncSetAttribute_Negative_Parameters",
-        "NOTE: The following 4 tests are disabled due to defect - EXSWHTEC-240",
-        "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported",
         "Unit_hipOccupancyMaxActiveBlocksPerMultiprocessor_Negative_Parameters",
         "Unit_hipModuleOccupancyMaxActiveBlocksPerMultiprocessorWithFlags_Negative_Parameters",
         "Unit_hipModuleOccupancyMaxPotentialBlockSizeWithFlags_Negative_Parameters",

projects/hip-tests/catch/hipTestMain/config/config_nvidia_linux.json

@@ -1,9 +1,5 @@
 {
     "DisabledTests": [
-        "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported",
         "=== Below test fails in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/85 ===",
         "Unit_hipFuncSetAttribute_Negative_Parameters",
         "=== Below test fails in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/215 ===",

projects/hip-tests/catch/hipTestMain/config/config_nvidia_windows.json

@@ -1,9 +1,5 @@
 {
     "DisabledTests": [
-        "Unit_hipFuncSetCacheConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported",
-        "Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported",
         "=== Below test fails in external CI for PR https://github.com/ROCm-Developer-Tools/hip-tests/pull/215 ===",
         "Unit_ChannelDescriptor_Positive_Basic_1D - long",
         "Unit_ChannelDescriptor_Positive_Basic_1D - unsigned long",

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

@@ -1,8 +1,5 @@
 set(TEST_SRC
     execution_control_common.cc
-    hipFuncSetCacheConfig.cc
-    hipFuncSetSharedMemConfig.cc
-    hipFuncSetAttribute.cc
     hipFuncGetAttributes.cc
     hipLaunchKernel.cc
     hipLaunchCooperativeKernel.cc
@@ -15,6 +12,13 @@ if(HIP_PLATFORM MATCHES "amd")
         hipExtLaunchMultiKernelMultiDevice.cc
         launch_api.cc
     )
+else()
+    # These functions are currently unimplemented on AMD
+    set(TEST_SRC ${TEST_SRC}
+        hipFuncSetCacheConfig.cc
+        hipFuncSetSharedMemConfig.cc
+        hipFuncSetAttribute.cc
+    )
 endif()
 
 hip_add_exe_to_target(NAME ExecutionControlTest

projects/hip-tests/catch/unit/executionControl/hipFuncSetAttribute.cc

@@ -219,6 +219,11 @@ TEST_CASE("Unit_hipFuncSetAttribute_Negative_Parameters") {
  *  - HIP_VERSION >= 5.2
  */
 TEST_CASE("Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supported") {
+#if HT_NVIDIA
+  HipTest::HIP_SKIP_TEST("This is an AMD specific test");
+  return;
+#endif
+
   hipFuncAttributes old_attributes;
   HIP_CHECK(hipFuncGetAttributes(&old_attributes, reinterpret_cast<void*>(kernel)));
 
@@ -246,6 +251,11 @@ TEST_CASE("Unit_hipFuncSetAttribute_Positive_MaxDynamicSharedMemorySize_Not_Supp
  *  - HIP_VERSION >= 5.2
  */
 TEST_CASE("Unit_hipFuncSetAttribute_Positive_PreferredSharedMemoryCarveout_Not_Supported") {
+#if HT_NVIDIA
+  HipTest::HIP_SKIP_TEST("This is an AMD specific test");
+  return;
+#endif
+
   hipFuncAttributes old_attributes;
   HIP_CHECK(hipFuncGetAttributes(&old_attributes, reinterpret_cast<void*>(kernel)));
 

projects/hip-tests/catch/unit/executionControl/hipFuncSetCacheConfig.cc

@@ -100,6 +100,11 @@ TEST_CASE("Unit_hipFuncSetCacheConfig_Negative_Parameters") {
  *  - HIP_VERSION >= 5.2
  */
 TEST_CASE("Unit_hipFuncSetCacheConfig_Negative_Not_Supported") {
+#if HT_NVIDIA
+  HipTest::HIP_SKIP_TEST("This is an AMD specific test");
+  return;
+#endif
+
   HIP_CHECK_ERROR(hipFuncSetCacheConfig(reinterpret_cast<void*>(kernel), hipFuncCachePreferNone),
                   hipErrorNotSupported);
 }

projects/hip-tests/catch/unit/executionControl/hipFuncSetSharedMemConfig.cc

@@ -100,6 +100,11 @@ TEST_CASE("Unit_hipFuncSetSharedMemConfig_Negative_Parameters") {
  *  - HIP_VERSION >= 5.2
  */
 TEST_CASE("Unit_hipFuncSetSharedMemConfig_Negative_Not_Supported") {
+#if HT_NVIDIA
+  HipTest::HIP_SKIP_TEST("This is an AMD specific test");
+  return;
+#endif
+
   HIP_CHECK_ERROR(
       hipFuncSetSharedMemConfig(reinterpret_cast<void*>(kernel), hipSharedMemBankSizeDefault),
       hipErrorNotSupported);