refs #17: Minor code clean up.

ANLAB-KAIST · Aug 8, 2015 · b76d406 · b76d406
1 parent 380e843
commit b76d406
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lib/config.hh b/lib/config.hh
@@ -45,6 +45,7 @@
 #define NBA_OQ                      (true)  // Use output-queuing semantics when possible.
 #undef NBA_CPU_MICROBENCH                  // Enable support for PAPI library for microbenchmarks.
 
+/* If you change below, update HANDLE_ALL_PORTS macro in lib/element.hh as well!! */
 #define NBA_MAX_ELEM_NEXTS (4)
 
 namespace nba {

diff --git a/lib/element.hh b/lib/element.hh
@@ -107,6 +107,14 @@ public:
     comp_thread_context *ctx;
 
 protected:
+    /* Subclasses use below to manage node-local storage. */
+    int num_nodes;
+    int node_idx;
+
+private:
+    friend class ElementGraph;
+    friend class Element::OutputPort;
+
     uint64_t branch_total = 0;
     uint64_t branch_miss = 0;
     uint64_t branch_count[NBA_MAX_ELEM_NEXTS];
@@ -115,14 +123,6 @@ protected:
     FixedArray<int, -1, NBA_MAX_ELEM_NEXTS> next_connected_inputs;
     OutputPort outputs[NBA_MAX_ELEM_NEXTS];
 
-    // used to manage per-node info
-    int num_nodes;
-    int node_idx;
-
-private:
-    friend class ElementGraph;
-    friend class Element::OutputPort;
-
     uint16_t output_counts[NBA_MAX_ELEM_NEXTS];
     Packet *output_cloned_packets[NBA_MAX_ELEM_NEXTS][NBA_MAX_COMP_BATCH_SIZE];