[Openmp-commits] [openmp] [openmp] using h/w clock tick to measure time instead of gettimeofday… (PR #85474)

[David CARLIER via Openmp-commits]

https://github.com/devnexen updated https://github.com/llvm/llvm-project/pull/85474

>From 168a469ec0e8d74a1a61a0453c3b0823a3d97661 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen at gmail.com>
Date: Fri, 15 Mar 2024 22:00:27 +0000
Subject: [PATCH 1/3] [openmp] using h/w clock tick to measure time instead of
 gettimeofday on arm64.

using counter timer frequency register for that purpose, available in user mode.
---
 openmp/runtime/src/kmp_lock.cpp  | 5 ++++-
 openmp/runtime/src/z_Linux_asm.S | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp
index 0ad14f862bcb9b..26f4dcdb4d2644 100644
--- a/openmp/runtime/src/kmp_lock.cpp
+++ b/openmp/runtime/src/kmp_lock.cpp
@@ -2644,11 +2644,14 @@ static void __kmp_set_drdpa_lock_flags(kmp_drdpa_lock_t *lck,
 #define __kmp_tsc() __kmp_hardware_timestamp()
 // Runtime's default backoff parameters
 kmp_backoff_t __kmp_spin_backoff_params = {1, 4096, 100};
+#elif KMP_ARCH_AARCH64
+#define __kmp_tsc() __kmp_hardware_timestamp()
+kmp_backoff_t __kmp_spin_backoff_params = {1, 256, 100};
 #else
 // Use nanoseconds for other platforms
 extern kmp_uint64 __kmp_now_nsec();
-kmp_backoff_t __kmp_spin_backoff_params = {1, 256, 100};
 #define __kmp_tsc() __kmp_now_nsec()
+kmp_backoff_t __kmp_spin_backoff_params = {1, 256, 100};
 #endif
 
 // A useful predicate for dealing with timestamps that may wrap.
diff --git a/openmp/runtime/src/z_Linux_asm.S b/openmp/runtime/src/z_Linux_asm.S
index 14987c298fa5f9..af147292599bab 100644
--- a/openmp/runtime/src/z_Linux_asm.S
+++ b/openmp/runtime/src/z_Linux_asm.S
@@ -1360,6 +1360,15 @@ KMP_LABEL(kmp_1):
 	DEBUG_INFO __kmp_invoke_microtask
 // -- End  __kmp_invoke_microtask
 
+// kmp_uint64
+// __kmp_hardware_timestamp(void)
+   PROC __kmp_hardware_timestamp
+   mrs x0, cntfrq_el0
+   mov x30, x0
+   ret
+   DEBUG_INFO __kmp_hardware_timestamp
+// -- End  __kmp_hardware_timestamp
+
 #endif /* (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS) && KMP_ARCH_AARCH64 */
 
 #if (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS) && KMP_ARCH_ARM

>From c08789a346049c478f0c30fa1fff0ad1daf59a16 Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen at gmail.com>
Date: Sat, 16 Mar 2024 21:16:11 +0000
Subject: [PATCH 2/3] fix __kmp_hardware_timestamp calculation.

we need both frequency and counter in fact.
---
 openmp/runtime/src/z_Linux_asm.S | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/openmp/runtime/src/z_Linux_asm.S b/openmp/runtime/src/z_Linux_asm.S
index af147292599bab..5f0d42d11736f2 100644
--- a/openmp/runtime/src/z_Linux_asm.S
+++ b/openmp/runtime/src/z_Linux_asm.S
@@ -1362,9 +1362,14 @@ KMP_LABEL(kmp_1):
 
 // kmp_uint64
 // __kmp_hardware_timestamp(void)
+// we load the current frequency of the system counter
+// then the system counter. frequency * counter gives
+// current time
    PROC __kmp_hardware_timestamp
    mrs x0, cntfrq_el0
-   mov x30, x0
+   mrs x1, cntvct_el0
+   mul x2, x1, x0
+   mov x30, x2
    ret
    DEBUG_INFO __kmp_hardware_timestamp
 // -- End  __kmp_hardware_timestamp

>From 5895bea61d3f4ec1496b6198b7208d49d46e03ae Mon Sep 17 00:00:00 2001
From: David Carlier <devnexen at gmail.com>
Date: Sat, 16 Mar 2024 23:35:05 +0000
Subject: [PATCH 3/3] disabling for macos

---
 openmp/runtime/src/kmp_lock.cpp  | 2 +-
 openmp/runtime/src/z_Linux_asm.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/openmp/runtime/src/kmp_lock.cpp b/openmp/runtime/src/kmp_lock.cpp
index 26f4dcdb4d2644..2c04a2436e139d 100644
--- a/openmp/runtime/src/kmp_lock.cpp
+++ b/openmp/runtime/src/kmp_lock.cpp
@@ -2644,7 +2644,7 @@ static void __kmp_set_drdpa_lock_flags(kmp_drdpa_lock_t *lck,
 #define __kmp_tsc() __kmp_hardware_timestamp()
 // Runtime's default backoff parameters
 kmp_backoff_t __kmp_spin_backoff_params = {1, 4096, 100};
-#elif KMP_ARCH_AARCH64
+#elif KMP_ARCH_AARCH64 && !KMP_OS_DARWIN
 #define __kmp_tsc() __kmp_hardware_timestamp()
 kmp_backoff_t __kmp_spin_backoff_params = {1, 256, 100};
 #else
diff --git a/openmp/runtime/src/z_Linux_asm.S b/openmp/runtime/src/z_Linux_asm.S
index 5f0d42d11736f2..a861b397c04a0a 100644
--- a/openmp/runtime/src/z_Linux_asm.S
+++ b/openmp/runtime/src/z_Linux_asm.S
@@ -1360,6 +1360,7 @@ KMP_LABEL(kmp_1):
 	DEBUG_INFO __kmp_invoke_microtask
 // -- End  __kmp_invoke_microtask
 
+#if !KMP_OS_DARWIN
 // kmp_uint64
 // __kmp_hardware_timestamp(void)
 // we load the current frequency of the system counter
@@ -1373,6 +1374,7 @@ KMP_LABEL(kmp_1):
    ret
    DEBUG_INFO __kmp_hardware_timestamp
 // -- End  __kmp_hardware_timestamp
+#endif
 
 #endif /* (KMP_OS_LINUX || KMP_OS_DARWIN || KMP_OS_WINDOWS) && KMP_ARCH_AARCH64 */