changeset 764a7401e217 in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=764a7401e217
description:
ruby: Added bcast msg profiling to hammer and token
diffstat:
src/mem/protocol/MOESI_CMP_token-L1cache.sm | 8 ++++----
src/mem/protocol/MOESI_CMP_token-L2cache.sm | 2 +-
src/mem/protocol/MOESI_CMP_token-dir.sm | 4 ++--
src/mem/protocol/MOESI_hammer-dir.sm | 6 +++---
src/mem/protocol/RubySlicc_Exports.sm | 1 +
src/mem/ruby/network/Network.cc | 1 +
6 files changed, 12 insertions(+), 10 deletions(-)
diffs (112 lines):
diff -r a5ddcb2abfa1 -r 764a7401e217 src/mem/protocol/MOESI_CMP_token-L1cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L1cache.sm Fri Aug 20 11:46:12
2010 -0700
+++ b/src/mem/protocol/MOESI_CMP_token-L1cache.sm Fri Aug 20 11:46:12
2010 -0700
@@ -730,9 +730,9 @@
out_msg.RetryNum := L1_TBEs[address].IssueCount;
out_msg.isLocal := true;
if (L1_TBEs[address].IssueCount == 0) {
- out_msg.MessageSize := MessageSizeType:Request_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
} else {
- out_msg.MessageSize := MessageSizeType:Reissue_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
}
out_msg.Prefetch := L1_TBEs[address].Prefetch;
out_msg.AccessMode := L1_TBEs[address].AccessMode;
@@ -854,9 +854,9 @@
out_msg.RetryNum := L1_TBEs[address].IssueCount;
if (L1_TBEs[address].IssueCount == 0) {
- out_msg.MessageSize := MessageSizeType:Request_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
} else {
- out_msg.MessageSize := MessageSizeType:Reissue_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
}
out_msg.Prefetch := L1_TBEs[address].Prefetch;
out_msg.AccessMode := L1_TBEs[address].AccessMode;
diff -r a5ddcb2abfa1 -r 764a7401e217 src/mem/protocol/MOESI_CMP_token-L2cache.sm
--- a/src/mem/protocol/MOESI_CMP_token-L2cache.sm Fri Aug 20 11:46:12
2010 -0700
+++ b/src/mem/protocol/MOESI_CMP_token-L2cache.sm Fri Aug 20 11:46:12
2010 -0700
@@ -748,7 +748,7 @@
out_msg.Type := in_msg.Type;
out_msg.isLocal := false;
- out_msg.MessageSize := MessageSizeType:Request_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
out_msg.AccessMode := in_msg.AccessMode;
out_msg.Prefetch := in_msg.Prefetch;
}
diff -r a5ddcb2abfa1 -r 764a7401e217 src/mem/protocol/MOESI_CMP_token-dir.sm
--- a/src/mem/protocol/MOESI_CMP_token-dir.sm Fri Aug 20 11:46:12 2010 -0700
+++ b/src/mem/protocol/MOESI_CMP_token-dir.sm Fri Aug 20 11:46:12 2010 -0700
@@ -434,7 +434,7 @@
l2_select_num_bits));
out_msg.RetryNum := 0;
- out_msg.MessageSize := MessageSizeType:Request_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
out_msg.Prefetch := PrefetchBit:No;
out_msg.AccessMode := AccessModeType:SupervisorMode;
}
@@ -500,7 +500,7 @@
l2_select_num_bits));
out_msg.RetryNum := 0;
- out_msg.MessageSize := MessageSizeType:Request_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
out_msg.Prefetch := PrefetchBit:No;
out_msg.AccessMode := AccessModeType:SupervisorMode;
}
diff -r a5ddcb2abfa1 -r 764a7401e217 src/mem/protocol/MOESI_hammer-dir.sm
--- a/src/mem/protocol/MOESI_hammer-dir.sm Fri Aug 20 11:46:12 2010 -0700
+++ b/src/mem/protocol/MOESI_hammer-dir.sm Fri Aug 20 11:46:12 2010 -0700
@@ -477,7 +477,7 @@
out_msg.Requestor := in_msg.Requestor;
out_msg.Destination.broadcast(MachineType:L1Cache); // Send to all
L1 caches
out_msg.Destination.remove(in_msg.Requestor); // Don't include the
original requestor
- out_msg.MessageSize := MessageSizeType:Forwarded_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
}
}
}
@@ -494,7 +494,7 @@
//
out_msg.Requestor := machineID;
out_msg.Destination.broadcast(MachineType:L1Cache);
- out_msg.MessageSize := MessageSizeType:Forwarded_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
}
}
}
@@ -510,7 +510,7 @@
//
out_msg.Requestor := machineID;
out_msg.Destination.broadcast(MachineType:L1Cache);
- out_msg.MessageSize := MessageSizeType:Forwarded_Control;
+ out_msg.MessageSize := MessageSizeType:Broadcast_Control;
}
}
}
diff -r a5ddcb2abfa1 -r 764a7401e217 src/mem/protocol/RubySlicc_Exports.sm
--- a/src/mem/protocol/RubySlicc_Exports.sm Fri Aug 20 11:46:12 2010 -0700
+++ b/src/mem/protocol/RubySlicc_Exports.sm Fri Aug 20 11:46:12 2010 -0700
@@ -200,6 +200,7 @@
Response_Control, desc="non-data response";
Writeback_Data, desc="Writeback data";
Writeback_Control, desc="Writeback control";
+ Broadcast_Control, desc="Broadcast control";
Forwarded_Control, desc="Forwarded control";
Invalidate_Control, desc="Invalidate control";
Unblock_Control, desc="Unblock control";
diff -r a5ddcb2abfa1 -r 764a7401e217 src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc Fri Aug 20 11:46:12 2010 -0700
+++ b/src/mem/ruby/network/Network.cc Fri Aug 20 11:46:12 2010 -0700
@@ -71,6 +71,7 @@
case MessageSizeType_Reissue_Control:
case MessageSizeType_Response_Control:
case MessageSizeType_Writeback_Control:
+ case MessageSizeType_Broadcast_Control:
case MessageSizeType_Forwarded_Control:
case MessageSizeType_Invalidate_Control:
case MessageSizeType_Unblock_Control:
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
