From d411d101fb99eed62385d390a4bc48dec3c6787f Mon Sep 17 00:00:00 2001 From: marandje Date: Mon, 3 Nov 2025 21:08:33 +0100 Subject: [PATCH] SWDEV-557363 - Fix and enable Unit_hipWallClock64_Positive_Basic (#1223) --- .../hip-tests/catch/hipTestMain/config/config_amd_windows | 1 - projects/hip-tests/catch/unit/clock/hipClockCheck.cc | 8 -------- 2 files changed, 9 deletions(-) diff --git a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows index 7aa4948676..3090d2e73c 100644 --- a/projects/hip-tests/catch/hipTestMain/config/config_amd_windows +++ b/projects/hip-tests/catch/hipTestMain/config/config_amd_windows @@ -937,7 +937,6 @@ "Unit_hipMemSetAccessHostDevice_hostalloc", "Unit_hipClock64_Positive_Basic", "Unit_hipClock_Positive_Basic", - "Unit_hipWallClock64_Positive_Basic", "====================================================", "==================SWDEV-556645==================================", "Unit_TexObjectCreate_TypePitch2D_IncompleteInit", diff --git a/projects/hip-tests/catch/unit/clock/hipClockCheck.cc b/projects/hip-tests/catch/unit/clock/hipClockCheck.cc index 0d3db9892a..a7ff919a48 100644 --- a/projects/hip-tests/catch/unit/clock/hipClockCheck.cc +++ b/projects/hip-tests/catch/unit/clock/hipClockCheck.cc @@ -57,12 +57,8 @@ bool verify_time_execution(float ratio, float time1, float time2, float expected float expected_time2) { bool test_status = false; -#if (HT_WIN == 1) - if (time1 > ratio * expected_time1 && time2 > ratio * expected_time2) { -#else if (fabs(time1 - expected_time1) < (ratio * expected_time1) && fabs(time2 - expected_time2) < (ratio * expected_time2)) { -#endif INFO("Succeeded: Expected Vs Actual: Kernel1 - " << expected_time1 << " Vs " << time1 << ", Kernel2 - " << expected_time2 << " Vs " << time2); @@ -106,11 +102,7 @@ bool kernel_time_execution(void (*kernel)(int, uint64_t), int clock_rate, uint64 HIP_CHECK(hipEventDestroy(start_event2)); HIP_CHECK(hipEventDestroy(end_event2)); -#if HT_WIN == 1 - float ratio = 1.0f; -#else float ratio = kernel == kernel_wc64 ? 0.01 : 0.5; -#endif return verify_time_execution(ratio, time1, time2, expected_time1, expected_time2); }