From dbb69deea72e18a5f77521734ad8b6fb36ef8faa Mon Sep 17 00:00:00 2001 From: Huo Yaoyuan Date: Thu, 22 May 2025 14:01:09 +0800 Subject: [PATCH 1/2] Use minipal_lowres_ticks for paltests --- .../tests/palsuite/threading/Sleep/test1/Sleep.cpp | 14 ++++---------- .../tests/palsuite/threading/Sleep/test2/sleep.cpp | 14 ++++---------- .../palsuite/threading/SleepEx/test1/test1.cpp | 14 ++++---------- .../palsuite/threading/SleepEx/test2/test2.cpp | 14 ++++---------- .../WaitForMultipleObjectsEx/test2/test2.cpp | 14 ++++---------- .../WFSOExMutexTest/WFSOExMutexTest.cpp | 14 ++++---------- .../WFSOExSemaphoreTest/WFSOExSemaphoreTest.cpp | 14 ++++---------- .../WFSOExThreadTest/WFSOExThreadTest.cpp | 14 ++++---------- 8 files changed, 32 insertions(+), 80 deletions(-) diff --git a/src/coreclr/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp b/src/coreclr/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp index 3cc3d92448282d..765c1bd6dd0a37 100644 --- a/src/coreclr/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp +++ b/src/coreclr/pal/tests/palsuite/threading/Sleep/test1/Sleep.cpp @@ -32,8 +32,8 @@ PALTEST(threading_Sleep_test1_paltest_sleep_test1, "threading/Sleep/test1/paltes /* Milliseconds of error which are acceptable Function execution time, etc. */ DWORD AcceptableTimeError = 150; - UINT64 OldTimeStamp; - UINT64 NewTimeStamp; + int64_t OldTimeStamp; + int64_t NewTimeStamp; DWORD MaxDelta; DWORD TimeDelta; DWORD i; @@ -43,17 +43,11 @@ PALTEST(threading_Sleep_test1_paltest_sleep_test1, "threading/Sleep/test1/paltes return ( FAIL ); } - LARGE_INTEGER performanceFrequency; - if (!QueryPerformanceFrequency(&performanceFrequency)) - { - return FAIL; - } - for( i = 0; i < sizeof(SleepTimes) / sizeof(DWORD); i++) { - OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency); + OldTimeStamp = minipal_lowres_ticks(); Sleep(SleepTimes[i]); - NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency); + NewTimeStamp = minipal_lowres_ticks(); TimeDelta = NewTimeStamp - OldTimeStamp; diff --git a/src/coreclr/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp b/src/coreclr/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp index 6fb148b681f2fd..838f8ab5c96dd1 100644 --- a/src/coreclr/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp +++ b/src/coreclr/pal/tests/palsuite/threading/Sleep/test2/sleep.cpp @@ -31,8 +31,8 @@ PALTEST(threading_Sleep_test2_paltest_sleep_test2, "threading/Sleep/test2/paltes /* Milliseconds of error which are acceptable Function execution time, etc. */ DWORD AcceptableTimeError = 150; - UINT64 OldTimeStamp; - UINT64 NewTimeStamp; + int64_t OldTimeStamp; + int64_t NewTimeStamp; DWORD MaxDelta; DWORD TimeDelta; DWORD i; @@ -42,17 +42,11 @@ PALTEST(threading_Sleep_test2_paltest_sleep_test2, "threading/Sleep/test2/paltes return ( FAIL ); } - LARGE_INTEGER performanceFrequency; - if (!QueryPerformanceFrequency(&performanceFrequency)) - { - return FAIL; - } - for( i = 0; i < sizeof(SleepTimes) / sizeof(DWORD); i++) { - OldTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency); + OldTimeStamp = minipal_lowres_ticks(); Sleep(SleepTimes[i]); - NewTimeStamp = GetHighPrecisionTimeStamp(performanceFrequency); + NewTimeStamp = minipal_lowres_ticks(); TimeDelta = NewTimeStamp - OldTimeStamp; diff --git a/src/coreclr/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp b/src/coreclr/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp index 61bdf136b8f8a3..94abcf5b0b38de 100644 --- a/src/coreclr/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp +++ b/src/coreclr/pal/tests/palsuite/threading/SleepEx/test1/test1.cpp @@ -39,8 +39,8 @@ PALTEST(threading_SleepEx_test1_paltest_sleepex_test1, "threading/SleepEx/test1/ {2000, TRUE}, }; - UINT64 OldTimeStamp; - UINT64 NewTimeStamp; + int64_t OldTimeStamp; + int64_t NewTimeStamp; DWORD MaxDelta; DWORD TimeDelta; DWORD i; @@ -50,19 +50,13 @@ PALTEST(threading_SleepEx_test1_paltest_sleepex_test1, "threading/SleepEx/test1/ return FAIL; } - LARGE_INTEGER performanceFrequency; - if (!QueryPerformanceFrequency(&performanceFrequency)) - { - return FAIL; - } - for (i = 0; i Date: Thu, 22 May 2025 14:01:28 +0800 Subject: [PATCH 2/2] Delete unused GetHighPrecisionTimeStamp --- src/coreclr/pal/tests/palsuite/common/palsuite.cpp | 5 ----- src/coreclr/pal/tests/palsuite/common/palsuite.h | 1 - 2 files changed, 6 deletions(-) diff --git a/src/coreclr/pal/tests/palsuite/common/palsuite.cpp b/src/coreclr/pal/tests/palsuite/common/palsuite.cpp index 030d8cc13cd6d6..914aa6b9cacb34 100644 --- a/src/coreclr/pal/tests/palsuite/common/palsuite.cpp +++ b/src/coreclr/pal/tests/palsuite/common/palsuite.cpp @@ -52,11 +52,6 @@ char* convertC(const WCHAR * wString) return MultiBuffer; } -UINT64 GetHighPrecisionTimeStamp(LARGE_INTEGER performanceFrequency) -{ - return (UINT64)minipal_hires_ticks(); -} - static const char* rgchPathDelim = "/"; diff --git a/src/coreclr/pal/tests/palsuite/common/palsuite.h b/src/coreclr/pal/tests/palsuite/common/palsuite.h index ed5766963533e8..f80107e33ee545 100644 --- a/src/coreclr/pal/tests/palsuite/common/palsuite.h +++ b/src/coreclr/pal/tests/palsuite/common/palsuite.h @@ -163,7 +163,6 @@ inline ULONG VAL32(ULONG x) WCHAR* convert(const char * aString); char* convertC(const WCHAR * wString); -UINT64 GetHighPrecisionTimeStamp(LARGE_INTEGER performanceFrequency); extern const char* szTextFile;