From cc2cc588693bb73b1892aea82fd0ac9729196f25 Mon Sep 17 00:00:00 2001 From: Nilay Vaish 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