changeset 736909f5c13b in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=736909f5c13b
description:
ruby: remove calls to g_system_ptr->getTime()
This patch further removes calls to g_system_ptr->getTime() where ever
other
clocked objects are available for providing current time.
diffstat:
src/cpu/testers/rubytest/Check.cc | 8 +++-----
src/cpu/testers/rubytest/Check.hh | 2 +-
src/cpu/testers/rubytest/RubyTester.cc | 6 +++---
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc | 2 +-
src/mem/ruby/structures/Prefetcher.cc | 4 ++--
5 files changed, 10 insertions(+), 12 deletions(-)
diffs (107 lines):
diff -r 23c3e1c0e9e4 -r 736909f5c13b src/cpu/testers/rubytest/Check.cc
--- a/src/cpu/testers/rubytest/Check.cc Tue Jan 15 07:43:23 2013 -0600
+++ b/src/cpu/testers/rubytest/Check.cc Thu Jan 17 13:10:12 2013 -0600
@@ -276,7 +276,7 @@
}
void
-Check::performCallback(NodeID proc, SubBlock* data)
+Check::performCallback(NodeID proc, SubBlock* data, Time curTime)
{
Address address = data->getAddress();
@@ -312,8 +312,7 @@
"Time: %d\n",
proc, address, data, byte_number,
(int)m_value + byte_number,
- (int)data->getByte(byte_number), *this,
- g_system_ptr->getTime());
+ (int)data->getByte(byte_number), *this, curTime);
}
}
DPRINTF(RubyTest, "Action/check success\n");
@@ -327,8 +326,7 @@
} else {
panic("Unexpected TesterStatus: %s proc: %d data: %s m_status: %s "
- "time: %d\n",
- *this, proc, data, m_status, g_system_ptr->getTime());
+ "time: %d\n", *this, proc, data, m_status, curTime);
}
DPRINTF(RubyTest, "proc: %d, Address: 0x%x\n", proc,
diff -r 23c3e1c0e9e4 -r 736909f5c13b src/cpu/testers/rubytest/Check.hh
--- a/src/cpu/testers/rubytest/Check.hh Tue Jan 15 07:43:23 2013 -0600
+++ b/src/cpu/testers/rubytest/Check.hh Thu Jan 17 13:10:12 2013 -0600
@@ -50,7 +50,7 @@
int _num_readers, RubyTester* _tester);
void initiate(); // Does Action or Check or nether
- void performCallback(NodeID proc, SubBlock* data);
+ void performCallback(NodeID proc, SubBlock* data, Time curTime);
const Address& getAddress() { return m_address; }
void changeAddress(const Address& address);
diff -r 23c3e1c0e9e4 -r 736909f5c13b src/cpu/testers/rubytest/RubyTester.cc
--- a/src/cpu/testers/rubytest/RubyTester.cc Tue Jan 15 07:43:23 2013 -0600
+++ b/src/cpu/testers/rubytest/RubyTester.cc Thu Jan 17 13:10:12 2013 -0600
@@ -191,7 +191,7 @@
RubyTester::hitCallback(NodeID proc, SubBlock* data)
{
// Mark that we made progress
- m_last_progress_vector[proc] = g_system_ptr->getTime();
+ m_last_progress_vector[proc] = curCycle();
DPRINTF(RubyTest, "completed request for proc: %d\n", proc);
DPRINTF(RubyTest, "addr: 0x%x, size: %d, data: ",
@@ -205,7 +205,7 @@
// back the data to make the check
Check* check_ptr = m_checkTable_ptr->getCheck(data->getAddress());
assert(check_ptr != NULL);
- check_ptr->performCallback(proc, data);
+ check_ptr->performCallback(proc, data, curCycle());
}
void
@@ -229,7 +229,7 @@
RubyTester::checkForDeadlock()
{
int size = m_last_progress_vector.size();
- Time current_time = g_system_ptr->getTime();
+ Time current_time = curCycle();
for (int processor = 0; processor < size; processor++) {
if ((current_time - m_last_progress_vector[processor]) >
m_deadlock_threshold) {
diff -r 23c3e1c0e9e4 -r 736909f5c13b
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc Tue Jan
15 07:43:23 2013 -0600
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc Thu Jan
17 13:10:12 2013 -0600
@@ -37,7 +37,7 @@
m_network_ptr = network_ptr;
m_id = id;
m_vc_state = IDLE_;
- m_time = g_system_ptr->getTime();
+ m_time = m_network_ptr->curCycle();
if (m_network_ptr->get_vnet_type(id) == DATA_VNET_)
m_credit_count = m_network_ptr->getBuffersPerDataVC();
diff -r 23c3e1c0e9e4 -r 736909f5c13b src/mem/ruby/structures/Prefetcher.cc
--- a/src/mem/ruby/structures/Prefetcher.cc Tue Jan 15 07:43:23 2013 -0600
+++ b/src/mem/ruby/structures/Prefetcher.cc Thu Jan 17 13:10:12 2013 -0600
@@ -248,7 +248,7 @@
// launch next prefetch
stream->m_address = line_addr;
- stream->m_use_time = g_system_ptr->getTime();
+ stream->m_use_time = m_controller->curCycle();
DPRINTF(RubyPrefetcher, "Requesting prefetch for %s\n", line_addr);
m_controller->enqueuePrefetch(line_addr, stream->m_type);
}
@@ -290,7 +290,7 @@
PrefetchEntry *mystream = &(m_array[index]);
mystream->m_address = line_address(address);
mystream->m_stride = stride;
- mystream->m_use_time = g_system_ptr->getTime();
+ mystream->m_use_time = m_controller->curCycle();
mystream->m_is_valid = true;
mystream->m_type = type;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
