more portable cycles.h

3 files changed, 31 insertions, 11 deletions

diff --git a/test/monniaux/clock.c b/test/monniaux/clock.c
index fb636667..4ec679f6 100644
--- a/test/monniaux/clock.c
+++ b/test/monniaux/clock.c
@@ -24,9 +24,9 @@ cycle_t get_current_cycle(void) {
 }
 
 void print_total_clock(void) {
-  printf("time cycles: %lu\n", total_clock);
+  printf("time cycles: %" PRcycle "\n", total_clock);
 }
 
 void printerr_total_clock(void) {
-  fprintf(stderr, "time cycles: %lu\n", total_clock);
+  fprintf(stderr, "time cycles: %" PRcycle "\n", total_clock);
 }
diff --git a/test/monniaux/cycles.h b/test/monniaux/cycles.h
index aed9941a..c7dc582b 100644
--- a/test/monniaux/cycles.h
+++ b/test/monniaux/cycles.h
@@ -1,14 +1,11 @@
+#include <stdint.h>
 #include <inttypes.h>
 #include <stdio.h>
 
-typedef unsigned long cycle_t;
-
-#ifdef MAX_MEASURES
-  static cycle_t _last_stop[MAX_MEASURES] = {0};
-  static cycle_t _total_cycles[MAX_MEASURES] = {0};
-#endif
-
 #ifdef __K1C__
+typedef uint64_t cycle_t;
+#define PRcycle PRId64
+
 #include <../../k1-cos/include/hal/cos_registers.h>
 
 static inline void cycle_count_config(void)
@@ -28,11 +25,20 @@ static inline cycle_t get_cycle(void)
 #else // not K1C
 static inline void cycle_count_config(void) { }
 
-#ifdef  __x86_64__
+#if defined(__i386__) || defined( __x86_64__)
+#define PRcycle PRId64
+typedef uint64_t cycle_t;
 #include <x86intrin.h>
 static inline cycle_t get_cycle(void) { return __rdtsc(); }
 
 #elif __riscv
+#ifdef __riscv32
+#define PRcycle PRId32
+typedef uint32_t cycle_t;
+#else
+#define PRcycle PRId64
+typedef uint64_t cycle_t;
+#endif
 static inline cycle_t get_cycle(void) {
   cycle_t cycles;
   asm volatile ("rdcycle %0" : "=r" (cycles));
@@ -41,6 +47,9 @@ static inline cycle_t get_cycle(void) {
 
 #elif defined (__ARM_ARCH) && (__ARM_ARCH >= 6)
 #if (__ARM_ARCH < 8)
+typedef uint32_t cycle_t;
+#define PRcycle PRId32
+
 /* need this kernel module
 https://github.com/zertyz/MTL/tree/master/cpp/time/kernel/arm */
 static inline cycle_t get_cycle(void) {
@@ -49,6 +58,8 @@ static inline cycle_t get_cycle(void) {
   return cycles;
 }
 #else
+#define PRcycle PRId64
+typedef uint64_t cycle_t;
 /* need this kernel module:
 https://github.com/jerinjacobk/armv8_pmu_cycle_counter_el0
 
@@ -61,7 +72,10 @@ static inline cycle_t get_cycle(void)
   return val;
 }
 #endif
+
 #else
+#define PRcycle PRId32
+typedef uint32_t cycle_t;
 static inline cycle_t get_cycle(void) { return 0; }
 #endif
 #endif
@@ -71,3 +85,9 @@ static inline cycle_t get_cycle(void) { return 0; }
   #define TIMESTOP(i) {cycle_t cur = get_cycle(); _total_cycles[i] += cur - _last_stop[i]; _last_stop[i] = cur;}
   #define TIMEPRINT(n) { for (int i = 0; i <= n; i++) printf("%d cycles: %" PRIu64 "\n", i, _total_cycles[i]); }
 #endif
+
+
+#ifdef MAX_MEASURES
+  static cycle_t _last_stop[MAX_MEASURES] = {0};
+  static cycle_t _total_cycles[MAX_MEASURES] = {0};
+#endif
diff --git a/test/monniaux/quicksort/quicksort_run.c b/test/monniaux/quicksort/quicksort_run.c
index c35d0752..3c640b24 100644
--- a/test/monniaux/quicksort/quicksort_run.c
+++ b/test/monniaux/quicksort/quicksort_run.c
@@ -13,7 +13,7 @@ int main (void) {
   quicksort(vec, len);
   quicksort_time = get_cycle() - quicksort_time;
   printf("sorted=%s\n"
-	 "time cycles:%" PRIu64 "\n",
+	 "time cycles:%" PRcycle "\n",
 	 data_vec_is_sorted(vec, len)?"true":"false",
 	 quicksort_time);
   free(vec);