changeset e96ff45795bc in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=e96ff45795bc
description:
ruby: remove get_time()
This patch replaces get_time() in *.sm files with curCycle() which
is now possible since controllers are clocked objects.
diffstat:
src/mem/protocol/MOESI_CMP_token-L1cache.sm | 5 +++--
src/mem/protocol/MOESI_hammer-cache.sm | 11 ++++++-----
src/mem/protocol/MOESI_hammer-dir.sm | 19 ++++++++++---------
src/mem/protocol/RubySlicc_Util.sm | 1 -
src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 6 ------
5 files changed, 19 insertions(+), 23 deletions(-)
diffs (204 lines):
diff -r c2d205f278fc -r e96ff45795bc src/mem/protocol/MOESI_CMP_token-L1cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm Mon Jan 28 06:11:42
2013 -0600
+++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm Mon Jan 28 06:14:18
2013 -0600
@@ -179,6 +179,7 @@
void unset_tbe();
void wakeUpAllBuffers();
void wakeUpBuffers(Address a);
+ Time curCycle();
TBETable L1_TBEs, template="<L1Cache_TBE>", constructor="m_number_of_TBEs";
@@ -1344,7 +1345,7 @@
tbe.Prefetch := in_msg.Prefetch;
tbe.AccessMode := in_msg.AccessMode;
}
- tbe.IssueTime := get_time();
+ tbe.IssueTime := curCycle();
}
action(ta_traceStalledAddress, "ta", desc="Trace Stalled Address") {
@@ -1447,7 +1448,7 @@
// Update average latency
if (tbe.IssueCount <= 1) {
if (tbe.ExternalResponse == true) {
- updateAverageLatencyEstimate(time_to_int(get_time()) -
time_to_int(tbe.IssueTime));
+ updateAverageLatencyEstimate(time_to_int(curCycle()) -
time_to_int(tbe.IssueTime));
}
}
diff -r c2d205f278fc -r e96ff45795bc src/mem/protocol/MOESI_hammer-cache.sm
--- a/src/mem/protocol/MOESI_hammer-cache.sm Mon Jan 28 06:11:42 2013 -0600
+++ b/src/mem/protocol/MOESI_hammer-cache.sm Mon Jan 28 06:14:18 2013 -0600
@@ -181,6 +181,7 @@
void unset_tbe();
void wakeUpAllBuffers();
void wakeUpBuffers(Address a);
+ Time curCycle();
Entry getCacheEntry(Address address), return_by_pointer="yes" {
Entry L2cache_entry := static_cast(Entry, "pointer",
L2cacheMemory.lookup(address));
@@ -545,7 +546,7 @@
out_msg.Requestor := machineID;
out_msg.Destination.add(map_Address_to_Directory(address));
out_msg.MessageSize := MessageSizeType:Request_Control;
- out_msg.InitialRequestTime := get_time();
+ out_msg.InitialRequestTime := curCycle();
tbe.NumPendingMsgs := machineCount(MachineType:L1Cache); // One from
each other cache (n-1) plus the memory (+1)
}
}
@@ -558,7 +559,7 @@
out_msg.Requestor := machineID;
out_msg.Destination.add(map_Address_to_Directory(address));
out_msg.MessageSize := MessageSizeType:Request_Control;
- out_msg.InitialRequestTime := get_time();
+ out_msg.InitialRequestTime := curCycle();
tbe.NumPendingMsgs := machineCount(MachineType:L1Cache); // One from
each other cache (n-1) plus the memory (+1)
}
}
@@ -572,7 +573,7 @@
out_msg.Requestor := machineID;
out_msg.Destination.add(map_Address_to_Directory(address));
out_msg.MessageSize := MessageSizeType:Request_Control;
- out_msg.InitialRequestTime := get_time();
+ out_msg.InitialRequestTime := curCycle();
}
}
tbe.NumPendingMsgs := machineCount(MachineType:L1Cache); // One from each
other cache (n-1) plus the memory (+1)
@@ -586,7 +587,7 @@
out_msg.Requestor := machineID;
out_msg.Destination.add(map_Address_to_Directory(address));
out_msg.MessageSize := MessageSizeType:Request_Control;
- out_msg.InitialRequestTime := get_time();
+ out_msg.InitialRequestTime := curCycle();
tbe.NumPendingMsgs := machineCount(MachineType:L1Cache); // One from
each other cache (n-1) plus the memory (+1)
}
}
@@ -982,7 +983,7 @@
tbe.ForwardRequestTime := in_msg.ForwardRequestTime;
}
if (tbe.FirstResponseTime == zero_time()) {
- tbe.FirstResponseTime := get_time();
+ tbe.FirstResponseTime := curCycle();
}
}
}
diff -r c2d205f278fc -r e96ff45795bc src/mem/protocol/MOESI_hammer-dir.sm
--- a/src/mem/protocol/MOESI_hammer-dir.sm Mon Jan 28 06:11:42 2013 -0600
+++ b/src/mem/protocol/MOESI_hammer-dir.sm Mon Jan 28 06:14:18 2013 -0600
@@ -179,6 +179,7 @@
void set_tbe(TBE a);
void unset_tbe();
void wakeUpBuffers(Address a);
+ Time curCycle();
// ** OBJECTS **
@@ -877,7 +878,7 @@
out_msg.Destination.setNetDest(MachineType:L1Cache, fwd_set);
out_msg.MessageSize := MessageSizeType:Multicast_Control;
out_msg.InitialRequestTime := in_msg.InitialRequestTime;
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
assert(tbe.SilentAcks > 0);
out_msg.SilentAcks := tbe.SilentAcks;
}
@@ -893,7 +894,7 @@
out_msg.Destination.remove(in_msg.Requestor); // Don't include the
original requestor
out_msg.MessageSize := MessageSizeType:Broadcast_Control;
out_msg.InitialRequestTime := in_msg.InitialRequestTime;
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
}
}
}
@@ -953,7 +954,7 @@
out_msg.Destination.setNetDest(MachineType:L1Cache, fwd_set);
out_msg.MessageSize := MessageSizeType:Multicast_Control;
out_msg.InitialRequestTime := in_msg.InitialRequestTime;
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
out_msg.SilentAcks := machineCount(MachineType:L1Cache) -
fwd_set.count();
out_msg.SilentAcks := out_msg.SilentAcks - 1;
}
@@ -967,7 +968,7 @@
out_msg.Destination.remove(in_msg.Requestor); // Don't include
the original requestor
out_msg.MessageSize := MessageSizeType:Broadcast_Control;
out_msg.InitialRequestTime := in_msg.InitialRequestTime;
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
}
}
}
@@ -1007,7 +1008,7 @@
}
out_msg.MessageSize := MessageSizeType:Request_Control;
out_msg.InitialRequestTime := zero_time();
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
}
}
}
@@ -1025,7 +1026,7 @@
out_msg.MessageSize := MessageSizeType:Request_Control;
out_msg.DirectedProbe := true;
out_msg.InitialRequestTime := in_msg.InitialRequestTime;
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
}
}
} else {
@@ -1038,7 +1039,7 @@
out_msg.Destination.remove(in_msg.Requestor); // Don't include the
original requestor
out_msg.MessageSize := MessageSizeType:Broadcast_Control;
out_msg.InitialRequestTime := in_msg.InitialRequestTime;
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
}
}
}
@@ -1059,7 +1060,7 @@
out_msg.MessageSize := MessageSizeType:Request_Control;
out_msg.DirectedProbe := true;
out_msg.InitialRequestTime := in_msg.InitialRequestTime;
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
}
}
}
@@ -1073,7 +1074,7 @@
out_msg.Destination.remove(in_msg.Requestor); // Don't include the
original requestor
out_msg.MessageSize := MessageSizeType:Broadcast_Control;
out_msg.InitialRequestTime := in_msg.InitialRequestTime;
- out_msg.ForwardRequestTime := get_time();
+ out_msg.ForwardRequestTime := curCycle();
}
}
}
diff -r c2d205f278fc -r e96ff45795bc src/mem/protocol/RubySlicc_Util.sm
--- a/src/mem/protocol/RubySlicc_Util.sm Mon Jan 28 06:11:42 2013 -0600
+++ b/src/mem/protocol/RubySlicc_Util.sm Mon Jan 28 06:14:18 2013 -0600
@@ -32,7 +32,6 @@
void error(std::string msg);
void assert(bool condition);
int random(int number);
-Time get_time();
Time zero_time();
NodeID intToID(int nodenum);
int IDToInt(NodeID id);
diff -r c2d205f278fc -r e96ff45795bc
src/mem/ruby/slicc_interface/RubySlicc_Util.hh
--- a/src/mem/ruby/slicc_interface/RubySlicc_Util.hh Mon Jan 28 06:11:42
2013 -0600
+++ b/src/mem/ruby/slicc_interface/RubySlicc_Util.hh Mon Jan 28 06:14:18
2013 -0600
@@ -48,12 +48,6 @@
}
inline Time
-get_time()
-{
- return g_system_ptr->getTime();
-}
-
-inline Time
zero_time()
{
return 0;
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
