From cc2cc588693bb73b1892aea82fd0ac9729196f25 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Mon, 1 Sep 2014 16:55:41 -0500
Subject: [PATCH] ruby: eliminate type Time There is another type Time in
 src/base class which results in a conflict.

---
 src/cpu/testers/rubytest/Check.cc                            | 2 +-
 src/cpu/testers/rubytest/Check.hh                            | 2 +-
 src/cpu/testers/rubytest/RubyTester.cc                       | 4 ++--
 src/cpu/testers/rubytest/RubyTester.hh                       | 2 +-
 src/mem/ruby/common/TypeDefines.hh                           | 1 -
 .../ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 4 ++--
 .../ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh | 2 +-
 src/mem/ruby/profiler/StoreTrace.cc                          | 2 +-
 src/mem/ruby/profiler/StoreTrace.hh                          | 5 +++--
 src/mem/ruby/slicc_interface/RubySlicc_Util.hh               | 1 -
 src/mem/ruby/system/CacheRecorder.cc                         | 2 +-
 src/mem/ruby/system/CacheRecorder.hh                         | 5 +++--
 12 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/cpu/testers/rubytest/Check.cc b/src/cpu/testers/rubytest/Check.cc
index ae74da67f..b2b679018 100644
--- a/src/cpu/testers/rubytest/Check.cc
+++ b/src/cpu/testers/rubytest/Check.cc
@@ -266,7 +266,7 @@ Check::initiateCheck()
 }
 
 void
-Check::performCallback(NodeID proc, SubBlock* data, Time curTime)
+Check::performCallback(NodeID proc, SubBlock* data, Cycles curTime)
 {
     Address address = data->getAddress();
 
diff --git a/src/cpu/testers/rubytest/Check.hh b/src/cpu/testers/rubytest/Check.hh
index 47d790b1e..3e8061ee7 100644
--- a/src/cpu/testers/rubytest/Check.hh
+++ b/src/cpu/testers/rubytest/Check.hh
@@ -50,7 +50,7 @@ class Check
           int _num_readers, RubyTester* _tester);
 
     void initiate(); // Does Action or Check or nether
-    void performCallback(NodeID proc, SubBlock* data, Time curTime);
+    void performCallback(NodeID proc, SubBlock* data, Cycles curTime);
     const Address& getAddress() { return m_address; }
     void changeAddress(const Address& address);
 
diff --git a/src/cpu/testers/rubytest/RubyTester.cc b/src/cpu/testers/rubytest/RubyTester.cc
index 68f76f1a6..229b3e0a9 100644
--- a/src/cpu/testers/rubytest/RubyTester.cc
+++ b/src/cpu/testers/rubytest/RubyTester.cc
@@ -102,7 +102,7 @@ RubyTester::init()
 
     m_last_progress_vector.resize(m_num_cpus);
     for (int i = 0; i < m_last_progress_vector.size(); i++) {
-        m_last_progress_vector[i] = 0;
+        m_last_progress_vector[i] = Cycles(0);
     }
 
     m_num_writers = writePorts.size();
@@ -225,7 +225,7 @@ void
 RubyTester::checkForDeadlock()
 {
     int size = m_last_progress_vector.size();
-    Time current_time = curCycle();
+    Cycles current_time = curCycle();
     for (int processor = 0; processor < size; processor++) {
         if ((current_time - m_last_progress_vector[processor]) >
                 m_deadlock_threshold) {
diff --git a/src/cpu/testers/rubytest/RubyTester.hh b/src/cpu/testers/rubytest/RubyTester.hh
index df1bc1fbb..e1b829a7d 100644
--- a/src/cpu/testers/rubytest/RubyTester.hh
+++ b/src/cpu/testers/rubytest/RubyTester.hh
@@ -141,7 +141,7 @@ class RubyTester : public MemObject
     RubyTester& operator=(const RubyTester& obj);
 
     CheckTable* m_checkTable_ptr;
-    std::vector<Time> m_last_progress_vector;
+    std::vector<Cycles> m_last_progress_vector;
 
     int m_num_cpus;
     uint64 m_checks_completed;
diff --git a/src/mem/ruby/common/TypeDefines.hh b/src/mem/ruby/common/TypeDefines.hh
index 391c9365a..9996fb0f4 100644
--- a/src/mem/ruby/common/TypeDefines.hh
+++ b/src/mem/ruby/common/TypeDefines.hh
@@ -33,7 +33,6 @@
 typedef unsigned long long uint64;
 typedef long long int64;
 
-typedef int64 Time;
 typedef uint64 physical_address_t;
 
 typedef int64 Index;            // what the address bit ripper returns
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
index 5f9493806..db71c9974 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
@@ -60,7 +60,7 @@ NetworkInterface_d::NetworkInterface_d(const Params *p)
     // instantiating the NI flit buffers
     for (int i = 0; i < m_num_vcs; i++) {
         m_ni_buffers[i] = new flitBuffer_d();
-        m_ni_enqueue_time[i] = INFINITE_;
+        m_ni_enqueue_time[i] = Cycles(INFINITE_);
     }
 
     m_vc_allocator.resize(m_virtual_networks); // 1 allocator per vnet
@@ -330,7 +330,7 @@ NetworkInterface_d::scheduleOutputLink()
 
             if (t_flit->get_type() == TAIL_ ||
                t_flit->get_type() == HEAD_TAIL_) {
-                m_ni_enqueue_time[vc] = INFINITE_;
+                m_ni_enqueue_time[vc] = Cycles(INFINITE_);
             }
             return;
         }
diff --git a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
index 0b8b9f12f..05142cd28 100644
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
@@ -86,7 +86,7 @@ class NetworkInterface_d : public ClockedObject, public Consumer
     // Input Flit Buffers
     // The flit buffers which will serve the Consumer
     std::vector<flitBuffer_d *>   m_ni_buffers;
-    std::vector<Time> m_ni_enqueue_time;
+    std::vector<Cycles> m_ni_enqueue_time;
 
     // The Message buffers that takes messages from the protocol
     std::vector<MessageBuffer *> inNode_ptr;
diff --git a/src/mem/ruby/profiler/StoreTrace.cc b/src/mem/ruby/profiler/StoreTrace.cc
index 84b05ea86..1c462dd25 100644
--- a/src/mem/ruby/profiler/StoreTrace.cc
+++ b/src/mem/ruby/profiler/StoreTrace.cc
@@ -127,7 +127,7 @@ void
 StoreTrace::downgrade(NodeID node)
 {
     if (node == m_last_writer) {
-        Time current = curTick();
+        Tick current = curTick();
         assert(m_stores_this_interval != 0);
         assert(m_last_store != 0);
         assert(m_first_store != 0);
diff --git a/src/mem/ruby/profiler/StoreTrace.hh b/src/mem/ruby/profiler/StoreTrace.hh
index 293871723..ac38a420b 100644
--- a/src/mem/ruby/profiler/StoreTrace.hh
+++ b/src/mem/ruby/profiler/StoreTrace.hh
@@ -31,6 +31,7 @@
 
 #include <iostream>
 
+#include "base/types.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/Histogram.hh"
 
@@ -61,8 +62,8 @@ class StoreTrace
 
     Address m_addr;
     NodeID m_last_writer;
-    Time m_first_store;
-    Time m_last_store;
+    Tick m_first_store;
+    Tick m_last_store;
     int m_stores_this_interval;
 
     int64 m_total_samples; // Total number of store lifetimes of this line
diff --git a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
index 52a47518f..4398a4a00 100644
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh
@@ -47,7 +47,6 @@ random(int n)
 }
 
 inline Cycles zero_time() { return Cycles(0); }
-inline Cycles TimeToCycles(Time t) { return Cycles(t); }
 
 inline NodeID
 intToID(int nodenum)
diff --git a/src/mem/ruby/system/CacheRecorder.cc b/src/mem/ruby/system/CacheRecorder.cc
index 3a76a64f7..542d91aef 100644
--- a/src/mem/ruby/system/CacheRecorder.cc
+++ b/src/mem/ruby/system/CacheRecorder.cc
@@ -143,7 +143,7 @@ CacheRecorder::enqueueNextFetchRequest()
 void
 CacheRecorder::addRecord(int cntrl, const physical_address_t data_addr,
                          const physical_address_t pc_addr,
-                         RubyRequestType type, Time time, DataBlock& data)
+                         RubyRequestType type, Tick time, DataBlock& data)
 {
     TraceRecord* rec = (TraceRecord*)malloc(sizeof(TraceRecord) +
                                             m_block_size_bytes);
diff --git a/src/mem/ruby/system/CacheRecorder.hh b/src/mem/ruby/system/CacheRecorder.hh
index 2156b0689..ad1223dce 100644
--- a/src/mem/ruby/system/CacheRecorder.hh
+++ b/src/mem/ruby/system/CacheRecorder.hh
@@ -38,6 +38,7 @@
 #include <vector>
 
 #include "base/hashmap.hh"
+#include "base/types.hh"
 #include "mem/protocol/RubyRequestType.hh"
 #include "mem/ruby/common/Address.hh"
 #include "mem/ruby/common/DataBlock.hh"
@@ -54,7 +55,7 @@ class Sequencer;
 class TraceRecord {
   public:
     int m_cntrl_id;
-    Time m_time;
+    Tick m_time;
     physical_address_t m_data_address;
     physical_address_t m_pc_address;
     RubyRequestType m_type;
@@ -75,7 +76,7 @@ class CacheRecorder
                   uint64_t block_size_bytes);
     void addRecord(int cntrl, const physical_address_t data_addr,
                    const physical_address_t pc_addr,  RubyRequestType type,
-                   Time time, DataBlock& data);
+                   Tick time, DataBlock& data);
 
     uint64 aggregateRecords(uint8_t** data, uint64 size);