Changeset 47e000c for doc/theses/thierry_delisle_PhD/code/readyQ_proto/utils.hpp

Timestamp:

Apr 13, 2021, 8:02:56 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

e56cfb41

Parents:

0effb6a (diff), 7f5683e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• doc/theses/thierry_delisle_PhD/code/readyQ_proto/utils.hpp (modified) (4 diffs)

doc/theses/thierry_delisle_PhD/code/readyQ_proto/utils.hpp

@@ -12 +12 @@
 
 #include <x86intrin.h>
-
-// Barrier from
-class barrier_t {
-public:
-        barrier_t(size_t total)
-                : waiting(0)
-                , total(total)
-        {}
-
-        void wait(unsigned) {
-                size_t target = waiting++;
-                target = (target - (target % total)) + total;
-                while(waiting < target)
-                        asm volatile("pause");
-
-                assert(waiting < (1ul << 60));
-        }
-
-private:
-        std::atomic<size_t> waiting;
-        size_t total;
-};
 
 // class Random {
@@ -102 +80 @@
 };
 
-static inline long long rdtscl(void) {
-    unsigned int lo, hi;
-    __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
-    return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
-}
+static inline long long int rdtscl(void) {
+        #if defined( __i386 ) || defined( __x86_64 )
+                unsigned int lo, hi;
+                __asm__ __volatile__ ("rdtsc" : "=a"(lo), "=d"(hi));
+                return ( (unsigned long long)lo)|( ((unsigned long long)hi)<<32 );
+        #elif defined( __aarch64__ ) || defined( __arm__ )
+                // https://github.com/google/benchmark/blob/v1.1.0/src/cycleclock.h#L116
+                long long int virtual_timer_value;
+                asm volatile("mrs %0, cntvct_el0" : "=r"(virtual_timer_value));
+                return virtual_timer_value;
+        #else
+                #error unsupported hardware architecture
+        #endif
+}
+
+#if defined( __i386 ) || defined( __x86_64 )
+        #define Pause() __asm__ __volatile__ ( "pause" : : : )
+#elif defined( __ARM_ARCH )
+        #define Pause() __asm__ __volatile__ ( "YIELD" : : : )
+#else
+        #error unsupported architecture
+#endif
 
 static inline void affinity(int tid) {
@@ -195 +190 @@
 }
 
+// Barrier from
+class barrier_t {
+public:
+        barrier_t(size_t total)
+                : waiting(0)
+                , total(total)
+        {}
+
+        void wait(unsigned) {
+                size_t target = waiting++;
+                target = (target - (target % total)) + total;
+                while(waiting < target)
+                        Pause();
+
+                assert(waiting < (1ul << 60));
+        }
+
+private:
+        std::atomic<size_t> waiting;
+        size_t total;
+};
+
 struct spinlock_t {
         std::atomic_bool ll = { false };
@@ -201 +218 @@
                 while( __builtin_expect(ll.exchange(true),false) ) {
                         while(ll.load(std::memory_order_relaxed))
-                                asm volatile("pause");
+                                Pause();
                 }
         }