Commit 2b5ecc15 by Anirudh Mohan Kaushik

network

parent 799a131f
...@@ -149,7 +149,7 @@ Throttle::operateVnet(int vnet, int &bw_remaining, bool &schedule_wakeup, ...@@ -149,7 +149,7 @@ Throttle::operateVnet(int vnet, int &bw_remaining, bool &schedule_wakeup,
MessageBuffer *demandQueue = m_in[2]; MessageBuffer *demandQueue = m_in[2];
if (!BASELINE) { if (!BASELINE) {
if (slotStart && (vnet == 6) && returnSID() <7) { if (slotStart && (vnet == 6) && returnSID() <4) {
setSlotType(); setSlotType();
bool isWBSlot = getVnetToken(); bool isWBSlot = getVnetToken();
DPRINTF(RubyNetwork, "m_SID: %s, SlotOwner: %s, slotStart: %s, isWBSlot: %s, smBlock: %s vnet: %s\n", returnSID(), slotOwner, slotStart, isWBSlot, getSharedMemStatus(), vnet); DPRINTF(RubyNetwork, "m_SID: %s, SlotOwner: %s, slotStart: %s, isWBSlot: %s, smBlock: %s vnet: %s\n", returnSID(), slotOwner, slotStart, isWBSlot, getSharedMemStatus(), vnet);
...@@ -179,7 +179,7 @@ if (slotStart && (vnet == 6) && returnSID() <7) { ...@@ -179,7 +179,7 @@ if (slotStart && (vnet == 6) && returnSID() <7) {
} }
} }
else { else {
if (slotStart && returnSID() <7) { if (slotStart && returnSID() <4) {
setSlotType(); setSlotType();
} }
} }
...@@ -224,7 +224,7 @@ if (slotStart && returnSID() <7) { ...@@ -224,7 +224,7 @@ if (slotStart && returnSID() <7) {
if (vnet == 6 || vnet == 2) vnetMatch = true; if (vnet == 6 || vnet == 2) vnetMatch = true;
} }
if (switchID == 8 && SID < 7 && vnetMatch) { if (switchID == 5 && SID < 4 && vnetMatch) {
// This is for cases when the core sends a request (demand or WB) to the arbiter // This is for cases when the core sends a request (demand or WB) to the arbiter
if (slotOwner == SID && slotStart) { if (slotOwner == SID && slotStart) {
// This is the start of the slot of the core under analysis // This is the start of the slot of the core under analysis
...@@ -312,7 +312,7 @@ if (slotStart && returnSID() <7) { ...@@ -312,7 +312,7 @@ if (slotStart && returnSID() <7) {
} }
break; break;
} }
else if (switchID == 8 && SID == 7) { else if (switchID == 5 && SID == 4) {
// This case is for shared memory requests/responses to the arbiter // This case is for shared memory requests/responses to the arbiter
bool isSlotOwner = false; bool isSlotOwner = false;
...@@ -371,6 +371,8 @@ if (slotStart && returnSID() <7) { ...@@ -371,6 +371,8 @@ if (slotStart && returnSID() <7) {
int diff = m_units_remaining[vnet] - bw_remaining; int diff = m_units_remaining[vnet] - bw_remaining;
m_units_remaining[vnet] = max(0, diff); m_units_remaining[vnet] = max(0, diff);
bw_remaining = max(0, -diff); bw_remaining = max(0, -diff);
if (in->isReady()) schedule_wakeup = true;
} }
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment