From 7d106463c5d8e9bb7c2ed43d8816ddb314b4d9e3 Mon Sep 17 00:00:00 2001
From: namrata-ibm <namrata.bhave@ibm.com>
Date: Thu, 10 Feb 2022 10:47:18 +0000
Subject: [PATCH] Adding CYCLE timer for s390x

---
 include/my_rdtsc.h | 1 +
 mysys/my_rdtsc.cc  | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/include/my_rdtsc.h b/include/my_rdtsc.h
index 6e378e94e5bb..4669b6a8ce05 100644
--- a/include/my_rdtsc.h
+++ b/include/my_rdtsc.h
@@ -137,5 +137,6 @@ void my_timer_init(MY_TIMER_INFO *mti);
 /* #define MY_TIMER_ROUTINE_ASM_SUNPRO_X86_64       27  - No longer used */
 #define MY_TIMER_ROUTINE_ASM_AARCH64 28
 #define MY_TIMER_ROUTINE_GET_THREAD_TIMES 29
+#define MY_TIMER_ROUTINE_ASM_S390X 30
 
 #endif
diff --git a/mysys/my_rdtsc.cc b/mysys/my_rdtsc.cc
index 3869db572e65..a9b6533b730d 100644
--- a/mysys/my_rdtsc.cc
+++ b/mysys/my_rdtsc.cc
@@ -169,6 +169,12 @@ ulonglong my_timer_cycles(void) {
     __asm __volatile__("mrs %[rt],cntvct_el0" : [ rt ] "=r"(result));
     return result;
   }
+#elif defined(__GNUC__) && defined(__s390x__)
+  {
+    uint64_t result;
+    __asm __volatile__("stck %0" : "=Q" (result) : : "cc");
+    return result;
+  }
 #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
   /* gethrtime may appear as either cycle or nanosecond counter */
   return (ulonglong)gethrtime();
@@ -491,6 +497,8 @@ void my_timer_init(MY_TIMER_INFO *mti) {
   mti->cycles.routine = MY_TIMER_ROUTINE_ASM_GCC_SPARC64;
 #elif defined(__GNUC__) && defined(__aarch64__)
   mti->cycles.routine = MY_TIMER_ROUTINE_ASM_AARCH64;
+#elif defined(__GNUC__) && defined(__s390x__)
+  mti->cycles.routine = MY_TIMER_ROUTINE_ASM_S390X;
 #elif defined(HAVE_SYS_TIMES_H) && defined(HAVE_GETHRTIME)
   mti->cycles.routine = MY_TIMER_ROUTINE_GETHRTIME;
 #else