Sequencer.cc (10917:c38f28fad4c3) | Sequencer.cc (10919:80069a602c83) |
---|---|
1/* 2 * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 146 unchanged lines hidden (view full) --- 155} 156 157void 158Sequencer::printProgress(ostream& out) const 159{ 160#if 0 161 int total_demand = 0; 162 out << "Sequencer Stats Version " << m_version << endl; | 1/* 2 * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood 3 * All rights reserved. 4 * 5 * Redistribution and use in source and binary forms, with or without 6 * modification, are permitted provided that the following conditions are 7 * met: redistributions of source code must retain the above copyright 8 * notice, this list of conditions and the following disclaimer; --- 146 unchanged lines hidden (view full) --- 155} 156 157void 158Sequencer::printProgress(ostream& out) const 159{ 160#if 0 161 int total_demand = 0; 162 out << "Sequencer Stats Version " << m_version << endl; |
163 out << "Current time = " << g_system_ptr->getTime() << endl; | 163 out << "Current time = " << m_ruby_system->getTime() << endl; |
164 out << "---------------" << endl; 165 out << "outstanding requests" << endl; 166 167 out << "proc " << m_Read 168 << " version Requests = " << m_readRequestTable.size() << endl; 169 170 // print the request table 171 RequestTable::iterator read = m_readRequestTable.begin(); --- 380 unchanged lines hidden (view full) --- 552 RubyTester::SenderState* testerSenderState = 553 pkt->findNextSenderState<RubyTester::SenderState>(); 554 assert(testerSenderState); 555 testerSenderState->subBlock.mergeFrom(data); 556 } 557 558 delete srequest; 559 | 164 out << "---------------" << endl; 165 out << "outstanding requests" << endl; 166 167 out << "proc " << m_Read 168 << " version Requests = " << m_readRequestTable.size() << endl; 169 170 // print the request table 171 RequestTable::iterator read = m_readRequestTable.begin(); --- 380 unchanged lines hidden (view full) --- 552 RubyTester::SenderState* testerSenderState = 553 pkt->findNextSenderState<RubyTester::SenderState>(); 554 assert(testerSenderState); 555 testerSenderState->subBlock.mergeFrom(data); 556 } 557 558 delete srequest; 559 |
560 RubySystem *rs = m_ruby_system; |
|
560 if (RubySystem::getWarmupEnabled()) { 561 assert(pkt->req); 562 delete pkt->req; 563 delete pkt; | 561 if (RubySystem::getWarmupEnabled()) { 562 assert(pkt->req); 563 delete pkt->req; 564 delete pkt; |
564 g_system_ptr->m_cache_recorder->enqueueNextFetchRequest(); | 565 rs->m_cache_recorder->enqueueNextFetchRequest(); |
565 } else if (RubySystem::getCooldownEnabled()) { 566 delete pkt; | 566 } else if (RubySystem::getCooldownEnabled()) { 567 delete pkt; |
567 g_system_ptr->m_cache_recorder->enqueueNextFlushRequest(); | 568 rs->m_cache_recorder->enqueueNextFlushRequest(); |
568 } else { 569 ruby_hit_callback(pkt); 570 } 571} 572 573bool 574Sequencer::empty() const 575{ --- 156 unchanged lines hidden (view full) --- 732 733// this can be called from setState whenever coherence permissions are 734// upgraded when invoked, coherence violations will be checked for the 735// given block 736void 737Sequencer::checkCoherence(const Address& addr) 738{ 739#ifdef CHECK_COHERENCE | 569 } else { 570 ruby_hit_callback(pkt); 571 } 572} 573 574bool 575Sequencer::empty() const 576{ --- 156 unchanged lines hidden (view full) --- 733 734// this can be called from setState whenever coherence permissions are 735// upgraded when invoked, coherence violations will be checked for the 736// given block 737void 738Sequencer::checkCoherence(const Address& addr) 739{ 740#ifdef CHECK_COHERENCE |
740 g_system_ptr->checkGlobalCoherenceInvariant(addr); | 741 m_ruby_system->checkGlobalCoherenceInvariant(addr); |
741#endif 742} 743 744void 745Sequencer::recordRequestType(SequencerRequestType requestType) { 746 DPRINTF(RubyStats, "Recorded statistic: %s\n", 747 SequencerRequestType_to_string(requestType)); 748} --- 80 unchanged lines hidden --- | 742#endif 743} 744 745void 746Sequencer::recordRequestType(SequencerRequestType requestType) { 747 DPRINTF(RubyStats, "Recorded statistic: %s\n", 748 SequencerRequestType_to_string(requestType)); 749} --- 80 unchanged lines hidden --- |