From 695870d846fd9b087c8172c0efed0dd74eb311ee Mon Sep 17 00:00:00 2001 From: Maneesh Gupta Date: Wed, 21 Jun 2023 16:00:42 +0530 Subject: [PATCH] SWDEV-397358 - Fix hipDeviceSetCacheConfig & hipDeviceSetSharedMemConfig tests (#312) [ROCm/hip-tests commit: efc742a90007e3b13b400e1af702b166670d7128] --- .../catch/hipTestMain/config/config_amd_linux_common.json | 7 +------ .../hipTestMain/config/config_amd_windows_common.json | 7 +------ .../catch/unit/device/hipDeviceSetGetCacheConfig.cc | 8 ++------ .../catch/unit/device/hipDeviceSetGetSharedMemConfig.cc | 6 +----- 4 files changed, 5 insertions(+), 23 deletions(-) diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux_common.json b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux_common.json index da0979f4f7..ceaabe158f 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_linux_common.json +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_linux_common.json @@ -67,11 +67,6 @@ "SWDEV-398980 fails in Stress test", "Unit_hipMemcpyPeer_Positive_Synchronization_Behavior", "SWDEV-398981 fails in stress test", - "Unit_hipStreamCreateWithPriority_MulthreadDefaultflag", - "Disabling below 4 tests temporarily due to change in API behavior", - "Unit_hipDeviceSetCacheConfig_Positive_Basic", - "Unit_hipDeviceSetCacheConfig_Negative_Parameters", - "Unit_hipDeviceSetSharedMemConfig_Positive_Basic", - "Unit_hipDeviceSetSharedMemConfig_Negative_Parameters" + "Unit_hipStreamCreateWithPriority_MulthreadDefaultflag" ] } diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows_common.json b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows_common.json index 05a22159d9..c6dcda0c92 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows_common.json +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows_common.json @@ -166,11 +166,6 @@ "SWDEV-402082 - PAL Backend fails to reserve address on GPU except first one", "Unit_hipGraphInstantiateWithFlags_FlagAutoFreeOnLaunch_check", "SWDEV-398981 fails in stress test", - "Unit_hipStreamCreateWithPriority_MulthreadDefaultflag", - "Disabling below 4 tests temporarily due to change in API behavior", - "Unit_hipDeviceSetCacheConfig_Positive_Basic", - "Unit_hipDeviceSetCacheConfig_Negative_Parameters", - "Unit_hipDeviceSetSharedMemConfig_Positive_Basic", - "Unit_hipDeviceSetSharedMemConfig_Negative_Parameters" + "Unit_hipStreamCreateWithPriority_MulthreadDefaultflag" ] } diff --git a/projects/hip-tests/catch/unit/device/hipDeviceSetGetCacheConfig.cc b/projects/hip-tests/catch/unit/device/hipDeviceSetGetCacheConfig.cc index b093336d6a..dc82a85fc3 100644 --- a/projects/hip-tests/catch/unit/device/hipDeviceSetGetCacheConfig.cc +++ b/projects/hip-tests/catch/unit/device/hipDeviceSetGetCacheConfig.cc @@ -38,16 +38,12 @@ TEST_CASE("Unit_hipDeviceSetCacheConfig_Positive_Basic") { const auto cache_config = GENERATE(from_range(std::begin(kCacheConfigs), std::end(kCacheConfigs))); -#if HT_AMD - HIP_CHECK_ERROR(hipDeviceSetCacheConfig(cache_config), hipErrorNotSupported); -#elif HT_NVIDIA HIP_CHECK(hipDeviceSetCacheConfig(cache_config)); -#endif } TEST_CASE("Unit_hipDeviceSetCacheConfig_Negative_Parameters") { #if HT_AMD - HIP_CHECK_ERROR(hipDeviceSetCacheConfig(static_cast(-1)), hipErrorNotSupported); + HIP_CHECK_ERROR(hipDeviceSetCacheConfig(static_cast(-1)), hipSuccess); #elif HT_NVIDIA HIP_CHECK_ERROR(hipDeviceSetCacheConfig(static_cast(-1)), hipErrorInvalidValue); #endif @@ -105,4 +101,4 @@ TEST_CASE("Unit_hipDeviceGetCacheConfig_Positive_Threaded") { TEST_CASE("Unit_HipDeviceGetCacheConfig_Negative_Parameters") { HIP_CHECK_ERROR(hipDeviceGetCacheConfig(nullptr), hipErrorInvalidValue); -} \ No newline at end of file +} diff --git a/projects/hip-tests/catch/unit/device/hipDeviceSetGetSharedMemConfig.cc b/projects/hip-tests/catch/unit/device/hipDeviceSetGetSharedMemConfig.cc index 83251172dc..9a1230a7c8 100644 --- a/projects/hip-tests/catch/unit/device/hipDeviceSetGetSharedMemConfig.cc +++ b/projects/hip-tests/catch/unit/device/hipDeviceSetGetSharedMemConfig.cc @@ -35,11 +35,7 @@ TEST_CASE("Unit_hipDeviceSetSharedMemConfig_Positive_Basic") { HIP_CHECK(hipSetDevice(device)); INFO("Current device is " << device); -#if HT_AMD - HIP_CHECK_ERROR(hipDeviceSetSharedMemConfig(mem_config), hipErrorNotSupported); -#elif HT_NVIDIA HIP_CHECK(hipDeviceSetSharedMemConfig(mem_config)); -#endif } TEST_CASE("Unit_hipDeviceSetSharedMemConfig_Negative_Parameters") { @@ -113,4 +109,4 @@ TEST_CASE("Unit_hipDeviceGetSharedMemConfig_Positive_Threaded") { TEST_CASE("Unit_hipDeviceGetSharedMemConfig_Negative_Parameters") { HIP_CHECK_ERROR(hipDeviceGetSharedMemConfig(nullptr), hipErrorInvalidValue); -} \ No newline at end of file +}