Changeset 0092853

Timestamp:

May 26, 2020, 2:55:02 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

47a541d

Parents:

8e1b1bb

Message:

Fixed Variants

File:

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

doc/theses/thierry_delisle_PhD/code/relaxed_list.hpp

@@ -1 +1 @@
 #pragma once
 
-enum VARIANTS {
-        VANILLA,
-        SNZI,
-        BITMASK,
-        DISCOVER
-};
+#define MACRO_XSTR(s) MACRO_STR(s)
+#define MACRO_STR(s) #s
+
+#define VANILLA 0
+#define SNZI 1
+#define BITMASK 2
+#define DISCOVER 3
 
 #ifndef VARIANT
@@ -24 +25 @@
 #include "utils.hpp"
 #include "snzi.hpp"
-
-#define MACRO_XSTR(s) MACRO_STR(s)
-#define MACRO_STR(s) #s
 
 using namespace std;
@@ -69 +67 @@
 public:
         static const char * name() {
-                return MACRO_XSTR(VARIANT);
+                const char * names[] = {
+                        "VANILLA",
+                        "SNZI",
+                        "BITMASK",
+                        "DISCOVER"
+                };
+                return names[VARIANT];
         }
 
@@ -521 +525 @@
         void stats_print_local(std::ostream & os ) {
                 std::cout << "----- Relaxed List Stats -----" << std::endl;
-                {
-                        ssize_t diff = 0;
-                        size_t  num  = 0;
-                        ssize_t max  = 0;
-
-                        for(size_t i = 0; i < numLists; i++) {
-                                const auto & list = lists[i];
-                                diff+= list.s.diff;
-                                num ++;
-                                max  = std::abs(max) > std::abs(list.s.diff) ? max : list.s.diff;
-                                os << "Local Q ops   : " << (list.s.push + list.s.pop) << "(" << list.s.push << "i, " << list.s.pop << "o)\n";
-                        }
-
-                        os << "Difference   : " << ssize_t(double(diff) / num  ) << " avg\t" << max << "max" << std::endl;
-                }
+                // {
+                //      ssize_t diff = 0;
+                //      size_t  num  = 0;
+                //      ssize_t max  = 0;
+
+                //      for(size_t i = 0; i < numLists; i++) {
+                //              const auto & list = lists[i];
+                //              diff+= list.s.diff;
+                //              num ++;
+                //              max  = std::abs(max) > std::abs(list.s.diff) ? max : list.s.diff;
+                //              os << "Local Q ops   : " << (list.s.push + list.s.pop) << "(" << list.s.push << "i, " << list.s.pop << "o)\n";
+                //      }
+
+                //      os << "Difference   : " << ssize_t(double(diff) / num  ) << " avg\t" << max << "max" << std::endl;
+                // }
 
                 const auto & global = global_stats;