diff -r f47462dc8063 -r 8bfda516e3e8 src/mem/simple_dram.hh --- a/src/mem/simple_dram.hh Fri Mar 07 23:12:27 2014 +0000 +++ b/src/mem/simple_dram.hh Fri Mar 07 23:12:52 2014 +0000 @@ -430,6 +430,10 @@ void recordActivate(Tick act_tick, uint8_t rank, uint8_t bank); void printParams() const; + + /** + * Used for debugging to observe the contents of the queues. + */ void printQs() const; /** diff -r f47462dc8063 -r 8bfda516e3e8 src/mem/simple_dram.cc --- a/src/mem/simple_dram.cc Fri Mar 07 23:12:27 2014 +0000 +++ b/src/mem/simple_dram.cc Fri Mar 07 23:12:52 2014 +0000 @@ -190,7 +190,8 @@ } SimpleDRAM::DRAMPacket* -SimpleDRAM::decodeAddr(PacketPtr pkt, Addr dramPktAddr, unsigned size, bool isRead) +SimpleDRAM::decodeAddr(PacketPtr pkt, Addr dramPktAddr, unsigned size, + bool isRead) { // decode the address based on the address mapping scheme, with // Ra, Co, Ba and Ch denoting rank, column, bank and channel, @@ -573,13 +574,13 @@ "Memory controller %s physical organization\n" \ "Number of devices per rank %d\n" \ "Device bus width (in bits) %d\n" \ - "DRAM data bus burst %d\n" \ - "Row buffer size %d\n" \ + "DRAM data bus burst (bytes) %d\n" \ + "Row buffer size (bytes) %d\n" \ "Columns per row buffer %d\n" \ "Rows per bank %d\n" \ "Banks per rank %d\n" \ "Ranks per channel %d\n" \ - "Total mem capacity %u\n", + "Total mem capacity (bytes) %u\n", name(), devicesPerRank, deviceBusWidth, burstSize, rowBufferSize, columnsPerRowBuffer, rowsPerBank, banksPerRank, ranksPerChannel, rowBufferSize * rowsPerBank * banksPerRank * ranksPerChannel); @@ -646,15 +647,11 @@ // simply drop inhibited packets for now if (pkt->memInhibitAsserted()) { - DPRINTF(DRAM,"Inhibited packet -- Dropping it now\n"); + DPRINTF(DRAM, "Inhibited packet -- Dropping it now\n"); pendingDelete.push_back(pkt); return true; } - // Every million accesses, print the state of the queues - if (numReqs % 1000000 == 0) - printQs(); - // Calc avg gap between requests if (prevArrival != 0) { totGap += curTick() - prevArrival; @@ -705,8 +702,6 @@ accessAndRespond(pkt, 1); } - retryRdReq = false; - retryWrReq = false; return true; } @@ -722,7 +717,7 @@ // it is a split packet dram_pkt->burstHelper->burstsServiced++; if (dram_pkt->burstHelper->burstsServiced == - dram_pkt->burstHelper->burstCount) { + dram_pkt->burstHelper->burstCount) { // we have now serviced all children packets of a system packet // so we can now respond to the requester // @todo we probably want to have a different front end and back