diff options
author | Polina Dudnik <pdudnik@gmail.com> | 2009-05-11 10:38:46 -0700 |
---|---|---|
committer | Polina Dudnik <pdudnik@gmail.com> | 2009-05-11 10:38:46 -0700 |
commit | b271090923aedd9a01d845023439af63cac46e55 (patch) | |
tree | da8ca79f6799d94e40dd1dc19b8d875fb9870e55 /src/mem/ruby/profiler | |
parent | 9f34659c52e0ea9095e86d82ac87a9c3d4d0f25a (diff) | |
download | gem5-b271090923aedd9a01d845023439af63cac46e55.tar.xz |
ruby: Remove transactional access types (e.g. LD_XACT) from CacheRequestType
1. Modified enumeration
2. Also modified profiler
3. Remove transactions from Tester
4. Edited XACT_MEM out of Synthetic Driver
Diffstat (limited to 'src/mem/ruby/profiler')
-rw-r--r-- | src/mem/ruby/profiler/Profiler.cc | 9 | ||||
-rw-r--r-- | src/mem/ruby/profiler/XactProfiler.cc | 263 | ||||
-rw-r--r-- | src/mem/ruby/profiler/XactProfiler.hh | 125 |
3 files changed, 0 insertions, 397 deletions
diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc index 07cbdcce7..e5579f597 100644 --- a/src/mem/ruby/profiler/Profiler.cc +++ b/src/mem/ruby/profiler/Profiler.cc @@ -1006,15 +1006,6 @@ GenericRequestType Profiler::CacheRequestType_to_GenericRequestType(const CacheR case CacheRequestType_IFETCH: return GenericRequestType_IFETCH; break; - case CacheRequestType_LD_XACT: - return GenericRequestType_LD_XACT; - break; - case CacheRequestType_LDX_XACT: - return GenericRequestType_LDX_XACT; - break; - case CacheRequestType_ST_XACT: - return GenericRequestType_ST_XACT; - break; case CacheRequestType_NULL: return GenericRequestType_NULL; break; diff --git a/src/mem/ruby/profiler/XactProfiler.cc b/src/mem/ruby/profiler/XactProfiler.cc deleted file mode 100644 index 8a3a7cd79..000000000 --- a/src/mem/ruby/profiler/XactProfiler.cc +++ /dev/null @@ -1,263 +0,0 @@ -/* - * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include "mem/ruby/profiler/XactProfiler.hh" -#include "mem/protocol/CacheMsg.hh" -#include "mem/gems_common/Map.hh" -#include "mem/ruby/common/Debug.hh" -#include "mem/protocol/MachineType.hh" -#include "TransactionInterfaceManager.hh" -#include "mem/ruby/common/Driver.hh" -#include "interface.hh" - -extern std::ostream * debug_cout_ptr; - -XactProfiler::XactProfiler() -{ - int num_processors = RubyConfig::numberOfProcessors() * RubyConfig::numberofSMTThreads(); - - m_xactTransCycles = new long long int[num_processors]; - m_xactStallTransCycles = new long long int[num_processors]; - m_xactStallNonTransCycles = new long long int[num_processors]; - m_xactAbortingCycles = new long long int[num_processors]; - m_xactCommitingCycles = new long long int[num_processors]; - m_xactBackoffCycles = new long long int[num_processors]; - m_BarrierCycles = new long long int[num_processors]; - - m_xactGoodTransCycles = new long long int[num_processors]; - m_xactNonTransCycles = new long long int[num_processors]; - - m_xactTimedCycles = new long long int[num_processors]; - m_xactBeginTimer = new long long int[num_processors]; - - clearStats(); -} - -XactProfiler::~XactProfiler() -{ - delete [] m_xactTransCycles; - delete [] m_xactStallTransCycles; - delete [] m_xactStallNonTransCycles; - delete [] m_xactAbortingCycles; - delete [] m_xactBackoffCycles; - - delete [] m_xactGoodTransCycles; - delete [] m_xactNonTransCycles; - - delete [] m_xactTimedCycles; - delete [] m_xactBeginTimer; -} - -void XactProfiler::printConfig(ostream& out) const -{ - out << endl; - out << "XactProfiler Configuration" << endl; - out << "----------------------" << endl; -} - -void XactProfiler::print(ostream& out) const -{ - out << "[XactProfiler]"; -} - -void XactProfiler::printStats(ostream& out, bool short_stats) -{ - int num_processors = RubyConfig::numberOfProcessors() * RubyConfig::numberofSMTThreads(); - out << endl; - - out << "XactProfiler Stats" << endl; - out << "--------------" << endl; - - if (max_hashFunction >= 0){ - out << "Hash values distribution" << endl; - out << "------------------------" << endl; - for(int i = 0; i <= max_hashFunction; i++){ - out << "Hash function " << i << ": " << m_hashProfile[i] << endl; - } - out << endl; - } - - out << "xact_cycle_breakdown" << endl; - out << "--------------------" << endl; - long long int total_trans_cycles = 0; - long long int total_aborting_trans_cycles = 0; - long long int total_commiting_trans_cycles = 0; - long long int total_backoff_trans_cycles = 0; - long long int total_stall_trans_cycles = 0; - long long int total_stall_nontrans_cycles = 0; - long long int total_barrier_cycles = 0; - - long long int total_good_trans_cycles = 0; - long long int total_nontrans_cycles = 0; - - long long int total_timed_cycles = 0; - - for(int i=0; i < num_processors; ++i){ - if (!short_stats){ - out << "xact_trans_cycles_processor_" << i << ": " << m_xactTransCycles[i] << endl; - out << "xact_aborting_cycles_processor_" << i << ": " << m_xactAbortingCycles[i] << endl; - out << "xact_barrier_cycles_processor_" << i << ": " << m_BarrierCycles[i] << endl; - out << "xact_backoff_cycles_processor_" << i << ": " << m_xactBackoffCycles[i] << endl; - out << "xact_stall_trans_cycles_processor_" << i << ": " << m_xactStallTransCycles[i] << endl; - out << "xact_nontrans_cycles_processor_" << i << ": " << m_xactNonTransCycles[i] << endl; - out << "xact_stall_nontrans_cycles_processor_" << i << ": " << m_xactStallNonTransCycles[i] << endl; - out << "timed_cycles_processor_" << i << ": " << m_xactTimedCycles[i] << endl; - } - - total_trans_cycles += m_xactTransCycles[i]; - total_stall_trans_cycles += m_xactStallTransCycles[i]; - total_aborting_trans_cycles += m_xactAbortingCycles[i]; - total_commiting_trans_cycles += m_xactCommitingCycles[i]; - total_backoff_trans_cycles += m_xactBackoffCycles[i]; - total_barrier_cycles += m_BarrierCycles[i]; - total_nontrans_cycles += m_xactNonTransCycles[i]; - total_good_trans_cycles += m_xactGoodTransCycles[i]; - total_stall_nontrans_cycles += m_xactStallNonTransCycles[i]; - total_timed_cycles += m_xactTimedCycles[i]; - - } - out << endl; - out << " XACT CYCLE BREAKDOWN " << endl; - out << " XACT_BREAKDOWN_NON_TRANS_CYCLES: " << total_nontrans_cycles << endl; - out << " XACT_BREAKDOWN_TRANS_CYCLES: " << total_trans_cycles << endl; - out << " XACT_BREAKDOWN_GOOD_TRANS_CYCLES: " << total_good_trans_cycles << endl; - out << " XACT_BREAKDOWN_ABORTING_CYCLES: " << total_aborting_trans_cycles << endl; - out << " XACT_BREAKDOWN_COMMITING_CYCLES: " << total_commiting_trans_cycles << endl; - out << " XACT_BREAKDOWN_BACKOFF_CYCLES: " << total_backoff_trans_cycles << endl; - out << " XACT_BREAKDOWN_BARRIER_CYCLES: " << total_barrier_cycles << endl; - out << " XACT_BREAKDOWN_STALL_CYCLES: " << total_stall_trans_cycles << endl; - out << endl; - out << " XACT_TIMED_CYCLES: " << total_timed_cycles << endl; - out << endl; - -} - -void XactProfiler::clearStats() -{ - int num_processors = RubyConfig::numberOfProcessors() * RubyConfig::numberofSMTThreads(); - for(int i=0; i < num_processors; ++i){ - m_xactTransCycles[i] = 0; - m_xactStallTransCycles[i] = 0; - m_xactGoodTransCycles[i] = 0; - m_xactBackoffCycles[i] = 0; - m_xactAbortingCycles[i] = 0; - m_xactCommitingCycles[i] = 0; - m_xactNonTransCycles[i] = 0; - m_xactStallNonTransCycles[i] = 0; - m_BarrierCycles[i] = 0; - m_xactTimedCycles[i] = 0; - } - - max_hashFunction = -1; - m_hashProfile.setSize(16); - for (int i = 0; i < 15; i++) { - m_hashProfile[i].clear(); - } -} - -void XactProfiler::profileTransCycles(int proc, int cycles){ - m_xactTransCycles[proc] += cycles; -} - -long long int XactProfiler::getTransCycles(int proc){ - return m_xactTransCycles[proc]; -} - -void XactProfiler::profileStallTransCycles(int proc, int cycles){ - m_xactStallTransCycles[proc] += cycles; -} - -long long int XactProfiler::getStallTransCycles(int proc){ - return m_xactStallTransCycles[proc]; -} - -void XactProfiler::profileGoodTransCycles(int proc, int cycles){ - m_xactGoodTransCycles[proc] += cycles; -} - -long long int XactProfiler::getGoodTransCycles(int proc){ - return m_xactGoodTransCycles[proc]; -} - -void XactProfiler::profileAbortingTransCycles(int proc, int cycles){ - m_xactAbortingCycles[proc] += cycles; -} - -long long int XactProfiler::getAbortingTransCycles(int proc){ - return m_xactAbortingCycles[proc]; -} - -void XactProfiler::profileCommitingTransCycles(int proc, int cycles){ - m_xactCommitingCycles[proc] += cycles; -} - -long long int XactProfiler::getCommitingTransCycles(int proc){ - return m_xactCommitingCycles[proc]; -} - -void XactProfiler::profileBackoffTransCycles(int proc, int cycles){ - m_xactBackoffCycles[proc] += cycles; -} - -long long int XactProfiler::getBackoffTransCycles(int proc){ - return m_xactBackoffCycles[proc]; -} - -void XactProfiler::profileStallNonTransCycles(int proc, int cycles){ - m_xactStallNonTransCycles[proc] += cycles; -} - -void XactProfiler::profileNonTransCycles(int proc, int cycles){ - m_xactNonTransCycles[proc] += cycles; -} - -long long int XactProfiler::getNonTransCycles(int proc){ - return m_xactNonTransCycles[proc]; -} - -void XactProfiler::profileBarrierCycles(int proc, int cycles){ - m_BarrierCycles[proc] += cycles; -} - -long long int XactProfiler::getBarrierCycles(int proc){ - return m_BarrierCycles[proc]; -} - -void XactProfiler::profileBeginTimer(int proc){ - m_xactBeginTimer[proc] = (long long int) g_eventQueue_ptr->getTime(); -} - -void XactProfiler::profileEndTimer(int proc){ - m_xactTimedCycles[proc] += (long long int) g_eventQueue_ptr->getTime() - m_xactBeginTimer[proc]; -} - -void XactProfiler::profileHashValue(int hashFunction, int hashValue){ - if (hashFunction > max_hashFunction) max_hashFunction = hashFunction; - - m_hashProfile[hashFunction].add(hashValue); -} diff --git a/src/mem/ruby/profiler/XactProfiler.hh b/src/mem/ruby/profiler/XactProfiler.hh deleted file mode 100644 index b90e95c01..000000000 --- a/src/mem/ruby/profiler/XactProfiler.hh +++ /dev/null @@ -1,125 +0,0 @@ - -/* - * Copyright (c) 1999-2008 Mark D. Hill and David A. Wood - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer; - * redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution; - * neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#ifndef XACTPROFILER_H -#define XACTPROFILER_H - -#include "mem/ruby/common/Global.hh" -#include "mem/protocol/GenericMachineType.hh" -#include "mem/ruby/config/RubyConfig.hh" -#include "mem/ruby/common/Histogram.hh" -#include "mem/ruby/common/Consumer.hh" -#include "mem/protocol/AccessModeType.hh" -#include "mem/protocol/AccessType.hh" -#include "mem/ruby/system/NodeID.hh" -#include "mem/ruby/system/MachineID.hh" -#include "mem/protocol/PrefetchBit.hh" -#include "mem/ruby/common/Address.hh" -#include "mem/ruby/common/Set.hh" -#include "mem/protocol/CacheRequestType.hh" -#include "mem/protocol/GenericRequestType.hh" - -template <class KEY_TYPE, class VALUE_TYPE> class Map; - -class XactProfiler { -public: - // Constructors - XactProfiler(); - - // Destructor - ~XactProfiler(); - - void printStats(ostream& out, bool short_stats=false); - void printShortStats(ostream& out) { printStats(out, true); } - void clearStats(); - void printConfig(ostream& out) const; - - void print(ostream& out) const; - - void profileTransCycles(int proc, int cycles); - void profileNonTransCycles(int proc, int cycles); - void profileStallTransCycles(int proc, int cycles); - void profileStallNonTransCycles(int proc, int cycles); - void profileAbortingTransCycles(int proc, int cycles); - void profileCommitingTransCycles(int proc, int cycles); - void profileBarrierCycles(int proc, int cycles); - void profileBackoffTransCycles(int proc, int cycles); - void profileGoodTransCycles(int proc, int cycles); - - void profileBeginTimer(int proc); - void profileEndTimer(int proc); - - long long int getTransCycles(int proc_no); - long long int getGoodTransCycles(int proc_no); - long long int getStallTransCycles(int proc_no); - long long int getAbortingTransCycles(int proc_no); - long long int getCommitingTransCycles(int proc_no); - long long int getBackoffTransCycles(int proc_no); - long long int getNonTransCycles(int proc_no); - long long int getBarrierCycles(int proc_no); - - void profileHashValue(int hashFunction, int hashValue); - -private: - - long long int * m_xactTransCycles; - long long int * m_xactStallTransCycles; - long long int * m_xactStallNonTransCycles; - long long int * m_xactAbortingCycles; - long long int * m_xactCommitingCycles; - long long int * m_xactBackoffCycles; - long long int * m_BarrierCycles; - - long long int * m_xactGoodTransCycles; - long long int * m_xactNonTransCycles; - - long long int * m_xactTimedCycles; - long long int * m_xactBeginTimer; - - int max_hashFunction; - Vector<Histogram> m_hashProfile; -}; - -// Output operator declaration -ostream& operator<<(ostream& out, const XactProfiler& obj); - -// ******************* Definitions ******************* - -// Output operator definition -extern inline -ostream& operator<<(ostream& out, const XactProfiler& obj) -{ - obj.print(out); - out << flush; - return out; -} - -#endif //XACTPROFILER_H - - |