changeset 0e9e99e6369a in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=0e9e99e6369a
description:
ruby: eliminate type Time
There is another type Time in src/base class which results in a
conflict.
diffstat:
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 -
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc | 4 ++--
src/mem/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(-)
diffs (187 lines):
diff -r 44839e8febbd -r 0e9e99e6369a src/cpu/testers/rubytest/Check.cc
--- a/src/cpu/testers/rubytest/Check.cc Mon Sep 01 16:55:40 2014 -0500
+++ b/src/cpu/testers/rubytest/Check.cc Mon Sep 01 16:55:41 2014 -0500
@@ -266,7 +266,7 @@
}
void
-Check::performCallback(NodeID proc, SubBlock* data, Time curTime)
+Check::performCallback(NodeID proc, SubBlock* data, Cycles curTime)
{
Address address = data->getAddress();
diff -r 44839e8febbd -r 0e9e99e6369a src/cpu/testers/rubytest/Check.hh
--- a/src/cpu/testers/rubytest/Check.hh Mon Sep 01 16:55:40 2014 -0500
+++ b/src/cpu/testers/rubytest/Check.hh Mon Sep 01 16:55:41 2014 -0500
@@ -50,7 +50,7 @@
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 -r 44839e8febbd -r 0e9e99e6369a src/cpu/testers/rubytest/RubyTester.cc
--- a/src/cpu/testers/rubytest/RubyTester.cc Mon Sep 01 16:55:40 2014 -0500
+++ b/src/cpu/testers/rubytest/RubyTester.cc Mon Sep 01 16:55:41 2014 -0500
@@ -102,7 +102,7 @@
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 @@
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 -r 44839e8febbd -r 0e9e99e6369a src/cpu/testers/rubytest/RubyTester.hh
--- a/src/cpu/testers/rubytest/RubyTester.hh Mon Sep 01 16:55:40 2014 -0500
+++ b/src/cpu/testers/rubytest/RubyTester.hh Mon Sep 01 16:55:41 2014 -0500
@@ -141,7 +141,7 @@
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 -r 44839e8febbd -r 0e9e99e6369a src/mem/ruby/common/TypeDefines.hh
--- a/src/mem/ruby/common/TypeDefines.hh Mon Sep 01 16:55:40 2014 -0500
+++ b/src/mem/ruby/common/TypeDefines.hh Mon Sep 01 16:55:41 2014 -0500
@@ -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 -r 44839e8febbd -r 0e9e99e6369a
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Mon Sep
01 16:55:40 2014 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.cc Mon Sep
01 16:55:41 2014 -0500
@@ -60,7 +60,7 @@
// 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 @@
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 -r 44839e8febbd -r 0e9e99e6369a
src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh
--- a/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh Mon Sep
01 16:55:40 2014 -0500
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh Mon Sep
01 16:55:41 2014 -0500
@@ -86,7 +86,7 @@
// 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 -r 44839e8febbd -r 0e9e99e6369a src/mem/ruby/profiler/StoreTrace.cc
--- a/src/mem/ruby/profiler/StoreTrace.cc Mon Sep 01 16:55:40 2014 -0500
+++ b/src/mem/ruby/profiler/StoreTrace.cc Mon Sep 01 16:55:41 2014 -0500
@@ -127,7 +127,7 @@
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 -r 44839e8febbd -r 0e9e99e6369a src/mem/ruby/profiler/StoreTrace.hh
--- a/src/mem/ruby/profiler/StoreTrace.hh Mon Sep 01 16:55:40 2014 -0500
+++ b/src/mem/ruby/profiler/StoreTrace.hh Mon Sep 01 16:55:41 2014 -0500
@@ -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 @@
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 -r 44839e8febbd -r 0e9e99e6369a
src/mem/ruby/slicc_interface/RubySlicc_Util.hh
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh Mon Sep 01 16:55:40
2014 -0500
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh Mon Sep 01 16:55:41
2014 -0500
@@ -47,7 +47,6 @@
}
inline Cycles zero_time() { return Cycles(0); }
-inline Cycles TimeToCycles(Time t) { return Cycles(t); }
inline NodeID
intToID(int nodenum)
diff -r 44839e8febbd -r 0e9e99e6369a src/mem/ruby/system/CacheRecorder.cc
--- a/src/mem/ruby/system/CacheRecorder.cc Mon Sep 01 16:55:40 2014 -0500
+++ b/src/mem/ruby/system/CacheRecorder.cc Mon Sep 01 16:55:41 2014 -0500
@@ -143,7 +143,7 @@
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 -r 44839e8febbd -r 0e9e99e6369a src/mem/ruby/system/CacheRecorder.hh
--- a/src/mem/ruby/system/CacheRecorder.hh Mon Sep 01 16:55:40 2014 -0500
+++ b/src/mem/ruby/system/CacheRecorder.hh Mon Sep 01 16:55:41 2014 -0500
@@ -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 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 @@
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);
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
