From: Gabe Black Date: Thu, 20 Aug 2020 03:14:49 +0000 (-0700) Subject: misc: Delete the critical path annotation code. X-Git-Tag: v20.1.0.0~261 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9d1278d5515482d925f055d66d45328693d562b4;p=gem5.git misc: Delete the critical path annotation code. This code was at least a little Alpha specific, and now that Alpha is gone it can no longer be compiled. We could either fix it up to work with other/all ISAs or delete it, and the consensus was to delete it. It could potentially be revived in the future by retrieving it from version control. Change-Id: Ied073f2b9b166951ecba3442cd762eb19bc690b3 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/32954 Reviewed-by: Steve Reinhardt Maintainer: Gabe Black Tested-by: kokoro --- diff --git a/SConstruct b/SConstruct index 4dc48ae78..e37a858bf 100755 --- a/SConstruct +++ b/SConstruct @@ -1000,8 +1000,6 @@ sticky_vars.AddVariables( BoolVariable('USE_POSIX_CLOCK', 'Use POSIX Clocks', have_posix_clock), BoolVariable('USE_FENV', 'Use IEEE mode control', have_fenv), BoolVariable('USE_PNG', 'Enable support for PNG images', have_png), - BoolVariable('CP_ANNOTATE', 'Enable critical path annotation capability', - False), BoolVariable('USE_KVM', 'Enable hardware virtualized (KVM) CPU models', have_kvm), BoolVariable('USE_TUNTAP', @@ -1018,7 +1016,7 @@ sticky_vars.AddVariables( ) # These variables get exported to #defines in config/*.hh (see src/SConscript). -export_vars += ['USE_FENV', 'TARGET_ISA', 'TARGET_GPU_ISA', 'CP_ANNOTATE', +export_vars += ['USE_FENV', 'TARGET_ISA', 'TARGET_GPU_ISA', 'USE_POSIX_CLOCK', 'USE_KVM', 'USE_TUNTAP', 'PROTOCOL', 'HAVE_PROTOBUF', 'HAVE_VALGRIND', 'HAVE_PERF_ATTR_EXCLUDE_HOST', 'USE_PNG', diff --git a/src/arch/arm/isa/includes.isa b/src/arch/arm/isa/includes.isa index 14d1c5572..89c7200e5 100644 --- a/src/arch/arm/isa/includes.isa +++ b/src/arch/arm/isa/includes.isa @@ -111,7 +111,6 @@ output exec {{ #endif -#include "base/cp_annotate.hh" #include "debug/Arm.hh" #include "mem/packet.hh" #include "mem/packet_access.hh" diff --git a/src/base/CPA.py b/src/base/CPA.py deleted file mode 100644 index cbed29a37..000000000 --- a/src/base/CPA.py +++ /dev/null @@ -1,9 +0,0 @@ -from m5.SimObject import SimObject -from m5.params import * - -class CPA(SimObject): - type = 'CPA' - cxx_header = "base/cp_annotate.hh" - - enabled = Param.Bool(False, "Is Annotation enabled?") - user_apps = VectorParam.String([], "List of apps to get symbols for") diff --git a/src/base/SConscript b/src/base/SConscript index 2b2ad7c57..bd1842906 100644 --- a/src/base/SConscript +++ b/src/base/SConscript @@ -28,9 +28,6 @@ Import('*') -if env['CP_ANNOTATE']: - SimObject('CPA.py') - Source('cp_annotate.cc') SimObject('Graphics.py') Source('atomicio.cc') GTest('atomicio.test', 'atomicio.test.cc', 'atomicio.cc') diff --git a/src/base/cp_annotate.cc b/src/base/cp_annotate.cc deleted file mode 100644 index c66b8438b..000000000 --- a/src/base/cp_annotate.cc +++ /dev/null @@ -1,1359 +0,0 @@ -/* - * Copyright (c) 2006-2009 The Regents of The University of Michigan - * 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 "base/cp_annotate.hh" - -#include "arch/generic/linux/threadinfo.hh" -#include "arch/utility.hh" -#include "base/callback.hh" -#include "base/loader/object_file.hh" -#include "base/output.hh" -#include "base/trace.hh" -#include "config/the_isa.hh" -#include "cpu/thread_context.hh" -#include "debug/Annotate.hh" -#include "debug/AnnotateVerbose.hh" -#include "sim/core.hh" -#include "sim/sim_exit.hh" -#include "sim/system.hh" - -struct CPAIgnoreSymbol -{ - const char *symbol; - size_t len; -}; -#define CPA_IGNORE_SYMBOL(sym) { #sym, sizeof(#sym) } - -CPAIgnoreSymbol ignoreSymbols[] = { - CPA_IGNORE_SYMBOL("m5a_"), - CPA_IGNORE_SYMBOL("ret_from_sys_call"), - CPA_IGNORE_SYMBOL("ret_from_reschedule"), - CPA_IGNORE_SYMBOL("_spin_"), - CPA_IGNORE_SYMBOL("local_bh_"), - CPA_IGNORE_SYMBOL("restore_all"), - CPA_IGNORE_SYMBOL("Call_Pal_"), - CPA_IGNORE_SYMBOL("pal_post_interrupt"), - CPA_IGNORE_SYMBOL("rti_to_"), - CPA_IGNORE_SYMBOL("sys_int_2"), - CPA_IGNORE_SYMBOL("sys_interrupt"), - CPA_IGNORE_SYMBOL("normal_int"), - CPA_IGNORE_SYMBOL("TRAP_INTERRUPT_10_"), - CPA_IGNORE_SYMBOL("Trap_Interrupt"), - CPA_IGNORE_SYMBOL("do_entInt"), - CPA_IGNORE_SYMBOL("__do_softirq"), - CPA_IGNORE_SYMBOL("_end"), - CPA_IGNORE_SYMBOL("entInt"), - CPA_IGNORE_SYMBOL("entSys"), - {0,0} -}; -#undef CPA_IGNORE_SYMBOL - -using namespace std; -using namespace TheISA; - -bool CPA::exists; -CPA *CPA::_cpa; - -CPA::CPA(Params *p) - : SimObject(p), numSm(0), numSmt(0), numSys(0), numQs(0), conId(0) -{ - if (exists) - fatal("Multiple annotation objects found in system"); - exists = true; - - _enabled = p->enabled; - _cpa = this; - - vector::iterator i; - i = p->user_apps.begin(); - - while (i != p->user_apps.end()) { - auto *of = createObjectFile(*i); - string sf; - if (!of) - fatal("Couldn't load symbols from file: %s\n", *i); - sf = *i; - sf.erase(0, sf.rfind('/') + 1);; - DPRINTFN("file %s short: %s\n", *i, sf); - userApp[sf] = new Loader::SymbolTable; - bool result1 = of->loadGlobalSymbols(userApp[sf]); - bool result2 = of->loadLocalSymbols(userApp[sf]); - if (!result1 || !result2) - panic("blah"); - assert(result1 && result2); - i++; - } -} - -void -CPA::startup() -{ - osbin = simout.create("annotate.bin", true); - // MAGIC version number 'M''5''A'N' + version/capabilities - ah.version = 0x4D35414E00000101ULL; - ah.num_recs = 0; - ah.key_off = 0; - osbin->write((char*)&ah, sizeof(AnnotateHeader)); - - registerExitCallback([this]() { dump(true); dumpKey(); }); -} - -uint64_t -CPA::getFrame(ThreadContext *tc) -{ - // This code is ISA specific and will need to be changed - // if the annotation code is used for something other than Alpha - return (tc->readMiscRegNoEffect(TheISA::IPR_PALtemp23) & - ~ULL(0x3FFF)); - -} - -void -CPA::swSmBegin(ThreadContext *tc, Addr sm_string, int32_t sm_id, int32_t flags) -{ - if (!enabled()) - return; - - std::string st; - Addr junk; - char sm[50]; - if (!TheISA::inUserMode(tc)) - Loader::debugSymbolTable.findNearestSymbol( - tc->readIntReg(ReturnAddressReg), st, junk); - - tc->getVirtProxy().readString(sm, sm_string, 50); - System *sys = tc->getSystemPtr(); - StringWrap name(sys->name()); - - if (!sm[0]) - warn("Got null SM at tick %d\n", curTick()); - - int sysi = getSys(sys); - int smi = getSm(sysi, sm, sm_id); - DPRINTF(Annotate, "Starting machine: %s(%d) sysi: %d id: %#x\n", sm, - smi, sysi, sm_id); - DPRINTF(Annotate, "smMap[%d] = %d, %s, %#x\n", smi, - smMap[smi-1].first, smMap[smi-1].second.first, - smMap[smi-1].second.second); - - uint64_t frame = getFrame(tc); - StackId sid = StackId(sysi, frame); - - // check if we need to link to the previous state machine - if (flags & FL_LINK) { - if (smStack[sid].size()) { - int prev_smi = smStack[sid].back(); - DPRINTF(Annotate, "Linking from %d to state machine %s(%d) [%#x]\n", - prev_smi, sm, smi, sm_id); - - if (lnMap[smi]) - DPRINTF(Annotate, "LnMap already contains entry for %d of %d\n", - smi, lnMap[smi]); - assert(lnMap[smi] == 0); - lnMap[smi] = prev_smi; - - add(OP_LINK, FL_NONE, tc->contextId(), prev_smi, smi); - } else { - DPRINTF(Annotate, "Not Linking to state machine %s(%d) [%#x]\n", - sm, smi, sm_id); - } - } - - - smStack[sid].push_back(smi); - - DPRINTF(Annotate, "Stack Now (%#X):\n", frame); - for (int x = smStack[sid].size()-1; x >= 0; x--) - DPRINTF(Annotate, "-- %d\n", smStack[sid][x]); - - // reset the sw state exculsion to false - if (swExpl[sid]) - swExpl[sid] = false; - - - Id id = Id(sm, frame); - if (scLinks[sysi-1][id]) { - AnnDataPtr an = scLinks[sysi-1][id]; - scLinks[sysi-1].erase(id); - an->stq = smi; - an->dump = true; - DPRINTF(Annotate, - "Found prev unknown linking from %d to state machine %s(%d)\n", - an->sm, sm, smi); - - if (lnMap[smi]) - DPRINTF(Annotate, "LnMap already contains entry for %d of %d\n", - smi, lnMap[smi]); - assert(lnMap[smi] == 0); - lnMap[smi] = an->sm; - } - - // add a new begin ifwe have that info - if (st != "") { - DPRINTF(Annotate, "st: %s smi: %d stCache.size %d\n", st, - smi, stCache.size()); - int sti = getSt(sm, st); - lastState[smi] = sti; - add(OP_BEGIN, FL_NONE, tc->contextId(), smi, sti); - } -} - -void -CPA::swSmEnd(ThreadContext *tc, Addr sm_string) -{ - if (!enabled()) - return; - - char sm[50]; - tc->getVirtProxy().readString(sm, sm_string, 50); - System *sys = tc->getSystemPtr(); - doSwSmEnd(sys, tc->contextId(), sm, getFrame(tc)); -} - -void -CPA::doSwSmEnd(System *sys, int cpuid, string sm, uint64_t frame) -{ - int sysi = getSys(sys); - StackId sid = StackId(sysi, frame); - - - // reset the sw state exculsion to false - if (swExpl[sid]) - swExpl[sid] = false; - - - int smib = smStack[sid].back(); - StringWrap name(sys->name()); - DPRINTF(Annotate, "Ending machine: %s[%d, %#x] (%d?)\n", sm, sysi, - frame, smib); - - if (!smStack[sid].size() || smMap[smib-1].second.first != sm) { - DPRINTF(Annotate, "State Machine not unwinding correctly. sid: %d, %#x" - " top of stack: %s Current Stack:\n", - sysi, frame, smMap[smib-1].second.first); - for (int x = smStack[sid].size()-1; x >= 0; x--) - DPRINTF(Annotate, "-- %d\n", smStack[sid][x]); - DPRINTF(Annotate, "Ending machine: %s; end stack: %s\n", sm, - smMap[smib-1].second.first); - - warn("State machine stack not unwinding correctly at %d\n", curTick()); - } else { - DPRINTF(Annotate, - "State machine ending:%s sysi:%d id:%#x back:%d getSm:%d\n", - sm, sysi, smMap[smib-1].second.second, smStack[sid].back(), - getSm(sysi, sm, smMap[smib-1].second.second)); - assert(getSm(sysi, sm, smMap[smib-1].second.second) == - smStack[sid].back()); - - int smi = smStack[sid].back(); - smStack[sid].pop_back(); - - if (lnMap[smi]) { - DPRINTF(Annotate, "Linking %d back to %d\n", smi, lnMap[smi]); - add(OP_LINK, FL_NONE, cpuid, smi, lnMap[smi]); - lnMap.erase(smi); - } - - if (smStack[sid].size()) { - add(OP_BEGIN, FL_NONE, cpuid, smi, lastState[smi]); - } - - DPRINTF(Annotate, "Stack Now:\n"); - for (int x = smStack[sid].size()-1; x >= 0; x--) - DPRINTF(Annotate, "-- %d\n", smStack[sid][x]); - } -} - - -void -CPA::swExplictBegin(ThreadContext *tc, int32_t flags, Addr st_string) -{ - if (!enabled()) - return; - - char st[50]; - tc->getVirtProxy().readString(st, st_string, 50); - - StringWrap name(tc->getSystemPtr()->name()); - DPRINTF(Annotate, "Explict begin of state %s\n", st); - if (flags & FL_BAD) - warn("BAD state encountered: at cycle %d: %s\n", curTick(), st); - swBegin(tc->getSystemPtr(), tc->contextId(), - st, getFrame(tc), true, flags); -} - -void -CPA::swAutoBegin(ThreadContext *tc, Addr next_pc) -{ - if (!enabled()) - return; - - string sym; - Addr sym_addr = 0; - - if (!TheISA::inUserMode(tc)) { - Loader::debugSymbolTable.findNearestSymbol(next_pc, sym, sym_addr); - } else { - Linux::ThreadInfo ti(tc); - string app = ti.curTaskName(); - if (userApp.count(app)) - userApp[app]->findNearestSymbol(next_pc, sym, sym_addr); - } - - if (sym_addr) - swBegin(tc->getSystemPtr(), tc->contextId(), sym, getFrame(tc)); -} - -void -CPA::swBegin(System *sys, int cpuid, std::string st, uint64_t frame, bool expl, - int flags) -{ - int x = 0; - int len; - while (ignoreSymbols[x].len) - { - len = ignoreSymbols[x].len; - if (!st.compare(0,len, ignoreSymbols[x].symbol, len)) - return; - x++; - } - - int sysi = getSys(sys); - StackId sid = StackId(sysi, frame); - // if expl is true suspend symbol table based states - if (!smStack[sid].size()) - return; - if (!expl && swExpl[sid]) - return; - if (expl) - swExpl[sid] = true; - DPRINTFS(AnnotateVerbose, sys, "SwBegin: %s sysi: %d\n", st, sysi); - int smi = smStack[sid].back(); - int sti = getSt(smMap[smi-1].second.first, st); - if (lastState[smi] != sti) { - lastState[smi] = sti; - add(OP_BEGIN, flags, cpuid, smi, sti); - } -} - -void -CPA::swEnd(ThreadContext *tc) -{ - if (!enabled()) - return; - - std::string st; - Addr junk; - if (!TheISA::inUserMode(tc)) - Loader::debugSymbolTable.findNearestSymbol( - tc->readIntReg(ReturnAddressReg), st, junk); - System *sys = tc->getSystemPtr(); - StringWrap name(sys->name()); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) { - DPRINTF(Annotate, "Explict end of State: %s IGNORED\n", st); - return; - } - DPRINTF(Annotate, "Explict end of State: %s\n", st); - // return back to symbol table based states - swExpl[sid] = false; - int smi = smStack[sid].back(); - if (st != "") { - int sti = getSt(smMap[smi-1].second.first, st); - lastState[smi] = sti; - add(OP_BEGIN, FL_NONE, tc->contextId(), smi, sti); - } -} - -void -CPA::swQ(ThreadContext *tc, Addr id, Addr q_string, int32_t count) -{ - if (!enabled()) - return; - - char q[50]; - tc->getVirtProxy().readString(q, q_string, 50); - System *sys = tc->getSystemPtr(); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - if (swExpl[sid]) - swExpl[sid] = false; - int qi = getQ(sysi, q, id); - if (count == 0) { - //warn("Tried to queue 0 bytes in %s, ignoring\n", q); - return; - } - DPRINTFS(AnnotateQ, sys, - "swQ: %s[%#x] cur size %d %d bytes: %d adding: %d\n", - q, id, qSize[qi-1], qData[qi-1].size(), qBytes[qi-1], count); - doQ(sys, FL_NONE, tc->contextId(), smi, q, qi, count); -} - -void -CPA::swDq(ThreadContext *tc, Addr id, Addr q_string, int32_t count) -{ - if (!enabled()) - return; - - char q[50]; - tc->getVirtProxy().readString(q, q_string, 50); - System *sys = tc->getSystemPtr(); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - int qi = getQ(sysi, q, id); - if (swExpl[sid]) - swExpl[sid] = false; - DPRINTFS(AnnotateQ, sys, - "swDq: %s[%#x] cur size %d %d bytes: %d removing: %d\n", - q, id, qSize[qi-1], qData[qi-1].size(), qBytes[qi-1], count); - assert(count != 0); - - doDq(sys, FL_NONE, tc->contextId(), smi, q, qi, count); -} - -void -CPA::swPq(ThreadContext *tc, Addr id, Addr q_string, int32_t count) -{ - if (!enabled()) - return; - - char q[50]; - tc->getVirtProxy().readString(q, q_string, 50); - System *sys = tc->getSystemPtr(); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - int qi = getQ(sysi, q, id); - if (swExpl[sid]) - swExpl[sid] = false; - DPRINTFS(AnnotateQ, sys, - "swPq: %s [%#x] cur size %d %d bytes: %d peeking: %d\n", - q, id, qSize[qi-1], qData[qi-1].size(), qBytes[qi-1], count); - - assert(count != 0); - if (qBytes[qi-1] < count) { - dump(true); - dumpKey(); - fatal("Queue %s peeking with not enough bytes available in queue!\n", q); - } - - add(OP_PEEK, FL_NONE, tc->contextId(), smi, qi, count); -} - -void -CPA::swRq(ThreadContext *tc, Addr id, Addr q_string, int32_t count) -{ - if (!enabled()) - return; - - char q[50]; - tc->getVirtProxy().readString(q, q_string, 50); - System *sys = tc->getSystemPtr(); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - int qi = getQ(sysi, q, id); - if (swExpl[sid]) - swExpl[sid] = false; - DPRINTFS(AnnotateQ, sys, - "swRq: %s [%#x] cur size %d %d bytes: %d reserve: %d\n", - q, id, qSize[qi-1], qData[qi-1].size(), qBytes[qi-1], count); - - assert(count != 0); - - add(OP_RESERVE, FL_NONE, tc->contextId(), smi, qi, count); -} - - -void -CPA::swWf(ThreadContext *tc, Addr id, Addr q_string, Addr sm_string, - int32_t count) -{ - if (!enabled()) - return; - - char q[50]; - tc->getVirtProxy().readString(q, q_string, 50); - System *sys = tc->getSystemPtr(); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - int qi = getQ(sysi, q, id); - add(OP_WAIT_FULL, FL_NONE, tc->contextId(), smi, qi, count); - - if (!!sm_string) { - char sm[50]; - tc->getVirtProxy().readString(sm, sm_string, 50); - doSwSmEnd(tc->getSystemPtr(), tc->contextId(), sm, getFrame(tc)); - } -} - -void -CPA::swWe(ThreadContext *tc, Addr id, Addr q_string, Addr sm_string, - int32_t count) -{ - if (!enabled()) - return; - - char q[50]; - tc->getVirtProxy().readString(q, q_string, 50); - System *sys = tc->getSystemPtr(); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - int qi = getQ(sysi, q, id); - add(OP_WAIT_EMPTY, FL_NONE, tc->contextId(), smi, qi, count); - - if (!!sm_string) { - char sm[50]; - tc->getVirtProxy().readString(sm, sm_string, 50); - doSwSmEnd(tc->getSystemPtr(), tc->contextId(), sm, getFrame(tc)); - } -} - -void -CPA::swSq(ThreadContext *tc, Addr id, Addr q_string, int32_t size, - int32_t flags) -{ - if (!enabled()) - return; - - char q[50]; - tc->getVirtProxy().readString(q, q_string, 50); - System *sys = tc->getSystemPtr(); - StringWrap name(sys->name()); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - int qi = getQ(sysi, q, id); - DPRINTF(AnnotateQ, "swSq: %s [%#x] cur size: %d bytes: %d, new size: %d\n", - q, id, qSize[qi-1], qBytes[qi-1], size); - - if (FL_RESET & flags) { - DPRINTF(AnnotateQ, "Resetting Queue %s\n", q); - add(OP_SIZE_QUEUE, FL_NONE, tc->contextId(), smi, qi, 0); - qData[qi-1].clear(); - qSize[qi-1] = 0; - qBytes[qi-1] = 0; - } - - if (qBytes[qi-1] < size) - doQ(sys, FL_NONE, tc->contextId(), smi, q, qi, size - qBytes[qi-1]); - else if (qBytes[qi-1] > size) { - DPRINTF(AnnotateQ, "removing for resize of queue %s\n", q); - add(OP_SIZE_QUEUE, FL_NONE, tc->contextId(), smi, qi, size); - if (size <= 0) { - qData[qi-1].clear(); - qSize[qi-1] = 0; - qBytes[qi-1] = 0; - return; - } - int need = qBytes[qi-1] - size; - qBytes[qi-1] = size; - while (need > 0) { - int32_t tail_bytes = qData[qi-1].back()->data; - if (qSize[qi-1] <= 0 || qBytes[qi-1] < 0) { - dump(true); - dumpKey(); - fatal("Queue %s had inconsistancy when doing size queue!\n", q); - } - if (tail_bytes > need) { - qData[qi-1].back()->data -= need; - need = 0; - } else if (tail_bytes == need) { - qData[qi-1].pop_back(); - qSize[qi-1]--; - need = 0; - } else { - qData[qi-1].pop_back(); - qSize[qi-1]--; - need -= tail_bytes; - } - } - } -} - -void -CPA::swAq(ThreadContext *tc, Addr id, Addr q_string, int32_t size) -{ - if (!enabled()) - return; - - char q[50]; - tc->getVirtProxy().readString(q, q_string, 50); - System *sys = tc->getSystemPtr(); - StringWrap name(sys->name()); - - int sysi = getSys(sys); - int qi = getQ(sysi, q, id); - if (qBytes[qi-1] != size) { - DPRINTF(AnnotateQ, "Queue %s [%#x] has inconsintant size\n", q, id); - //dump(true); - //dumpKey(); - std::list::iterator ai = qData[qi-1].begin(); - int x = 0; - while (ai != qData[qi-1].end()) { - DPRINTF(AnnotateQ, "--Element %d size %d\n", x, (*ai)->data); - ai++; - x++; - } - - warn("%d: Queue Assert: SW said there should be %d byte(s) in %s," - "however there are %d byte(s)\n", - curTick(), size, q, qBytes[qi-1]); - DPRINTF(AnnotateQ, "%d: Queue Assert: SW said there should be %d" - " byte(s) in %s, however there are %d byte(s)\n", - curTick(), size, q, qBytes[qi-1]); - } -} - -void -CPA::swLink(ThreadContext *tc, Addr lsm_string, Addr lsm_id, Addr sm_string) -{ - if (!enabled()) - return; - - char lsm[50]; - tc->getVirtProxy().readString(lsm, lsm_string, 50); - System *sys = tc->getSystemPtr(); - StringWrap name(sys->name()); - - int sysi = getSys(sys); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - int lsmi = getSm(sysi, lsm, lsm_id); - - DPRINTF(Annotate, "Linking from %d to state machine %s(%d) [%#x]\n", - smi, lsm, lsmi, lsm_id); - - if (lnMap[lsmi]) - DPRINTF(Annotate, "LnMap already contains entry for %d of %d\n", - lsmi, lnMap[lsmi]); - assert(lnMap[lsmi] == 0); - lnMap[lsmi] = smi; - - add(OP_LINK, FL_NONE, tc->contextId(), smi, lsmi); - - if (!!sm_string) { - char sm[50]; - tc->getVirtProxy().readString(sm, sm_string, 50); - doSwSmEnd(tc->getSystemPtr(), tc->contextId(), sm, getFrame(tc)); - } -} - -void -CPA::swIdentify(ThreadContext *tc, Addr smi_string) -{ - if (!enabled()) - return; - - int sysi = getSys(tc->getSystemPtr()); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - return; - int smi = smStack[sid].back(); - - DPRINTFS(Annotate, tc->getSystemPtr(), "swIdentify: id %#X\n", smi_string); - - add(OP_IDENT, FL_NONE, tc->contextId(), smi, 0, smi_string); -} - -uint64_t -CPA::swGetId(ThreadContext *tc) -{ - if (!enabled()) - return 0; - - uint64_t id = ++conId; - int sysi = getSys(tc->getSystemPtr()); - StackId sid = StackId(sysi, getFrame(tc)); - if (!smStack[sid].size()) - panic("swGetId called without a state machine stack!"); - int smi = smStack[sid].back(); - - DPRINTFS(Annotate, tc->getSystemPtr(), "swGetId: id %#X\n", id); - - add(OP_IDENT, FL_NONE, tc->contextId(), smi, 0, id); - return id; -} - - -void -CPA::swSyscallLink(ThreadContext *tc, Addr lsm_string, Addr sm_string) -{ - if (!enabled()) - return; - - char lsm[50]; - tc->getVirtProxy().readString(lsm, lsm_string, 50); - System *sys = tc->getSystemPtr(); - StringWrap name(sys->name()); - int sysi = getSys(sys); - - Id id = Id(lsm, getFrame(tc)); - StackId sid = StackId(sysi, getFrame(tc)); - - if (!smStack[sid].size()) - return; - - int smi = smStack[sid].back(); - - DPRINTF(Annotate, "Linking from %d to state machine %s(UNKNOWN)\n", - smi, lsm); - - if (scLinks[sysi-1][id]) - DPRINTF(Annotate, - "scLinks already contains entry for system %d %s[%x] of %d\n", - sysi, lsm, getFrame(tc), scLinks[sysi-1][id]); - assert(scLinks[sysi-1][id] == 0); - scLinks[sysi-1][id] = add(OP_LINK, FL_NONE, tc->contextId(), smi, 0xFFFF); - scLinks[sysi-1][id]->dump = false; - - if (!!sm_string) { - char sm[50]; - tc->getVirtProxy().readString(sm, sm_string, 50); - doSwSmEnd(tc->getSystemPtr(), tc->contextId(), sm, getFrame(tc)); - } -} - -CPA::AnnDataPtr -CPA::add(int t, int f, int c, int sm, int stq, int32_t d) -{ - AnnDataPtr an = std::make_shared(); - an->time = curTick(); - an->data = d; - an->orig_data = d; - an->op = t; - an->flag = f; - an->sm = sm; - an->stq = stq; - an->cpu = c; - an->dump = true; - - data.push_back(an); - - DPRINTF(AnnotateVerbose, "Annotate: op: %d flags: 0x%x sm: %d state: %d time: %d, data: %d\n", - an->op, an->flag, an->sm, an->stq, an->time, an->data); - - // Don't dump Links because we might be setting no-dump on it - if (an->op != OP_LINK) - dump(false); - - return an; -} - -void -CPA::dumpKey() -{ - std::streampos curpos = osbin->tellp(); - ah.key_off = curpos; - - // Output the various state machines and their corresponding states - *osbin << "# Automatically generated state machine descriptor file" << endl; - - *osbin << "sms = {}" << endl << endl; - vector state_machines; - state_machines.resize(numSmt+1); - - // State machines, id -> states - SCache::iterator i = smtCache.begin(); - while (i != smtCache.end()) { - state_machines[i->second] = i->first; - i++; - } - - for (int x = 1; x < state_machines.size(); x++) { - vector states; - states.resize(numSt[x-1]+1); - assert(x-1 < stCache.size()); - SCache::iterator i = stCache[x-1].begin(); - while (i != stCache[x-1].end()) { - states[i->second] = i->first; - i++; - } - *osbin << "sms[\"" << state_machines[x] << "\"] = [\"NULL\""; - for (int y = 1; y < states.size(); y++) - *osbin << ", \"" << states[y] << "\""; - *osbin << "]" << endl; - } - - *osbin << endl << endl << endl; - - // state machine number -> system, name, id - *osbin << "smNum = [\"NULL\""; - for (int x = 0; x < smMap.size(); x++) - *osbin << ", (" << smMap[x].first << ", \"" << smMap[x].second.first << - "\", " << smMap[x].second.second << ")"; - *osbin << "]" << endl; - - *osbin << endl << endl << endl; - - // Output the systems - vector systems; - systems.resize(numSys+1); - NameCache::iterator i2 = nameCache.begin(); - while (i2 != nameCache.end()) { - systems[i2->second.second] = i2->second.first; - i2++; - } - - *osbin << "sysNum = [\"NULL\""; - for (int x = 1; x < systems.size(); x++) { - *osbin << ", \"" << systems[x] << "\""; - } - *osbin << "]" << endl; - - // queue number -> system, qname, qid - *osbin << "queues = [\"NULL\""; - for (int x = 0; x < qMap.size(); x++) - *osbin << ", (" << qMap[x].first << ", \"" << qMap[x].second.first << - "\", " << qMap[x].second.second << ")"; - *osbin << "]" << endl; - - *osbin << "smComb = [s for s in [(i,r) for i in xrange(1,len(sysNum)) " - << "for r in xrange (1,len(smNum))]]" << endl; - ah.key_len = osbin->tellp() - curpos; - - // output index - curpos = osbin->tellp(); - ah.idx_off = curpos; - - for (int x = 0; x < annotateIdx.size(); x++) - osbin->write((char*)&annotateIdx[x], sizeof(uint64_t)); - ah.idx_len = osbin->tellp() - curpos; - - osbin->seekp(0); - osbin->write((char*)&ah, sizeof(AnnotateHeader)); - osbin->flush(); - -} - -void -CPA::dump(bool all) -{ - - list::iterator i; - - i = data.begin(); - - if (i == data.end()) - return; - - // Dump the data every - if (!all && data.size() < 10000) - return; - - DPRINTF(Annotate, "Writing %d\n", data.size()); - while (i != data.end()) { - AnnDataPtr an = *i; - - // If we can't dump this record, hold here - if (!an->dump && !all) - break; - - ah.num_recs++; - if (ah.num_recs % 100000 == 0) - annotateIdx.push_back(osbin->tellp()); - - - osbin->write((char*)&(an->time), sizeof(an->time)); - osbin->write((char*)&(an->orig_data), sizeof(an->orig_data)); - osbin->write((char*)&(an->sm), sizeof(an->sm)); - osbin->write((char*)&(an->stq), sizeof(an->stq)); - osbin->write((char*)&(an->op), sizeof(an->op)); - osbin->write((char*)&(an->flag), sizeof(an->flag)); - osbin->write((char*)&(an->cpu), sizeof(an->cpu)); - i++; - } - if (data.begin() != i) - data.erase(data.begin(), i); - - if (all) - osbin->flush(); -} - -void -CPA::doQ(System *sys, int flags, int cpuid, int sm, - string q, int qi, int count) -{ - qSize[qi-1]++; - qBytes[qi-1] += count; - if (qSize[qi-1] > 2501 || qBytes[qi-1] > 2000000000) - warn("Queue %s is %d elements/%d bytes, " - "maybe things aren't being removed?\n", - q, qSize[qi-1], qBytes[qi-1]); - if (flags & FL_QOPP) - qData[qi-1].push_front(add(OP_QUEUE, flags, cpuid, sm, qi, count)); - else - qData[qi-1].push_back(add(OP_QUEUE, flags, cpuid, sm, qi, count)); - DPRINTFS(AnnotateQ, sys, "Queing in queue %s size now %d/%d\n", - q, qSize[qi-1], qBytes[qi-1]); - assert(qSize[qi-1] >= 0); - assert(qBytes[qi-1] >= 0); -} - - -void -CPA::doDq(System *sys, int flags, int cpuid, int sm, - string q, int qi, int count) -{ - - StringWrap name(sys->name()); - if (count == -1) { - add(OP_DEQUEUE, flags, cpuid, sm, qi, count); - qData[qi-1].clear(); - qSize[qi-1] = 0; - qBytes[qi-1] = 0; - DPRINTF(AnnotateQ, "Dequeing all data in queue %s size now %d/%d\n", - q, qSize[qi-1], qBytes[qi-1]); - return; - } - - assert(count > 0); - if (qSize[qi-1] <= 0 || qBytes[qi-1] <= 0 || !qData[qi-1].size()) { - dump(true); - dumpKey(); - fatal("Queue %s dequing with no data available in queue!\n", - q); - } - assert(qSize[qi-1] >= 0); - assert(qBytes[qi-1] >= 0); - assert(qData[qi-1].size()); - - int32_t need = count; - qBytes[qi-1] -= count; - if (qBytes[qi-1] < 0) { - dump(true); - dumpKey(); - fatal("Queue %s dequing with no bytes available in queue!\n", - q); - } - - while (need > 0) { - int32_t head_bytes = qData[qi-1].front()->data; - if (qSize[qi-1] <= 0 || qBytes[qi-1] < 0) { - dump(true); - dumpKey(); - fatal("Queue %s dequing with nothing in queue!\n", - q); - } - - if (head_bytes > need) { - qData[qi-1].front()->data -= need; - need = 0; - } else if (head_bytes == need) { - qData[qi-1].pop_front(); - qSize[qi-1]--; - need = 0; - } else { - qData[qi-1].pop_front(); - qSize[qi-1]--; - need -= head_bytes; - } - } - - add(OP_DEQUEUE, flags, cpuid, sm, qi, count); - DPRINTF(AnnotateQ, "Dequeing in queue %s size now %d/%d\n", - q, qSize[qi-1], qBytes[qi-1]); -} - - - -void -CPA::serialize(CheckpointOut &cp) const -{ - - SERIALIZE_SCALAR(numSm); - SERIALIZE_SCALAR(numSmt); - arrayParamOut(os, "numSt", numSt); - arrayParamOut(os, "numQ", numQ); - SERIALIZE_SCALAR(numSys); - SERIALIZE_SCALAR(numQs); - SERIALIZE_SCALAR(conId); - arrayParamOut(os, "qSize", qSize); - arrayParamOut(os, "qSize", qSize); - arrayParamOut(os, "qBytes", qBytes); - - SCache::iterator i; - int x = 0, y = 0; - - // smtCache (SCache) - x = 0; - y = 0; - i = smtCache.begin(); - while (i != smtCache.end()) { - paramOut(os, csprintf("smtCache%d.str", x), i->first); - paramOut(os, csprintf("smtCache%d.int", x), i->second); - x++; i++; - } - - // stCache (StCache) - for (x = 0; x < stCache.size(); x++) { - i = stCache[x].begin(); - y = 0; - while (i != stCache[x].end()) { - paramOut(os, csprintf("stCache%d_%d.str", x, y), i->first); - paramOut(os, csprintf("stCache%d_%d.int", x, y), i->second); - y++; i++; - } - } - - // qCache (IdCache) - IdHCache::iterator idi; - for (x = 0; x < qCache.size(); x++) { - idi = qCache[x].begin(); - y = 0; - while (idi != qCache[x].end()) { - paramOut(os, csprintf("qCache%d_%d.str", x, y), idi->first.first); - paramOut(os, csprintf("qCache%d_%d.id", x, y), idi->first.second); - paramOut(os, csprintf("qCache%d_%d.int", x, y), idi->second); - y++; idi++; - } - } - - // smCache (IdCache) - for (x = 0; x < smCache.size(); x++) { - idi = smCache[x].begin(); - y = 0; - paramOut(os, csprintf("smCache%d", x), smCache[x].size()); - while (idi != smCache[x].end()) { - paramOut(os, csprintf("smCache%d_%d.str", x, y), idi->first.first); - paramOut(os, csprintf("smCache%d_%d.id", x, y), idi->first.second); - paramOut(os, csprintf("smCache%d_%d.int", x, y), idi->second); - y++; idi++; - } - } - - // scLinks (ScCache) -- data not serialize - - - // namecache (NameCache) - NameCache::iterator ni; - - ni = nameCache.begin(); - x = 0; - while (ni != nameCache.end()) { - paramOut(os, csprintf("nameCache%d.name", x), ni->first->name()); - paramOut(os, csprintf("nameCache%d.str", x), ni->second.first); - paramOut(os, csprintf("nameCache%d.int", x), ni->second.second); - x++; ni++; - } - - // smStack (SmStack) - SmStack::iterator si; - si = smStack.begin(); - x = 0; - paramOut(os, "smStackIdCount", smStack.size()); - while (si != smStack.end()) { - paramOut(os, csprintf("smStackId%d.sys", x), si->first.first); - paramOut(os, csprintf("smStackId%d.frame", x), si->first.second); - paramOut(os, csprintf("smStackId%d.count", x), si->second.size()); - for (y = 0; y < si->second.size(); y++) - paramOut(os, csprintf("smStackId%d_%d", x, y), si->second[y]); - x++; si++; - } - - // lnMap (LinkMap) - x = 0; - LinkMap::iterator li; - li = lnMap.begin(); - paramOut(os, "lnMapSize", lnMap.size()); - while (li != lnMap.end()) { - paramOut(os, csprintf("lnMap%d.smi", x), li->first); - paramOut(os, csprintf("lnMap%d.lsmi", x), li->second); - x++; li++; - } - - // swExpl (vector) - SwExpl::iterator swexpli; - swexpli = swExpl.begin(); - x = 0; - paramOut(os, "swExplCount", swExpl.size()); - while (swexpli != swExpl.end()) { - paramOut(os, csprintf("swExpl%d.sys", x), swexpli->first.first); - paramOut(os, csprintf("swExpl%d.frame", x), swexpli->first.second); - paramOut(os, csprintf("swExpl%d.swexpl", x), swexpli->second); - x++; swexpli++; - } - - // lastState (IMap) - x = 0; - IMap::iterator ii; - ii = lastState.begin(); - paramOut(os, "lastStateSize", lastState.size()); - while (ii != lastState.end()) { - paramOut(os, csprintf("lastState%d.smi", x), ii->first); - paramOut(os, csprintf("lastState%d.sti", x), ii->second); - x++; ii++; - } - - // smMap (IdMap) - for (x = 0; x < smMap.size(); x++) { - paramOut(os, csprintf("smMap%d.sys", x), smMap[x].first); - paramOut(os, csprintf("smMap%d.smname", x), smMap[x].second.first); - paramOut(os, csprintf("smMap%d.id", x), smMap[x].second.second); - } - - // qMap (IdMap) - for (x = 0; x < qMap.size(); x++) { - paramOut(os, csprintf("qMap%d.sys", x), qMap[x].first); - paramOut(os, csprintf("qMap%d.qname", x), qMap[x].second.first); - paramOut(os, csprintf("qMap%d.id", x), qMap[x].second.second); - } - - // qData (vector) - for (x = 0; x < qData.size(); x++) { - if (!qData[x].size()) - continue; - y = 0; - for (auto &ann : qData[x]) { - ann->serializeSection(os, csprintf("Q%d_%d", x, y)); - y++; - } - } -} - -void -CPA::unserialize(CheckpointIn &cp) -{ - UNSERIALIZE_SCALAR(numSm); - UNSERIALIZE_SCALAR(numSmt); - UNSERIALIZE_CONTAINER(numSt); - UNSERIALIZE_CONTAINER(numQ); - UNSERIALIZE_SCALAR(numSys); - UNSERIALIZE_SCALAR(numQs); - UNSERIALIZE_SCALAR(conId); - UNSERIALIZE_CONTAINER(qSize); - UNSERIALIZE_CONTAINER(qBytes); - - - // smtCache (SCache - string str; - int smi; - for (int x = 0; x < numSmt; x++) { - paramIn(cp, csprintf("smtCache%d.str", x), str); - paramIn(cp, csprintf("smtCache%d.int", x), smi); - smtCache[str] = smi; - } - - // stCache (StCache) - stCache.resize(numSmt); - for (int x = 0; x < numSmt; x++) { - for (int y = 0; y < numSt[x]; y++) { - paramIn(cp, csprintf("stCache%d_%d.str", x,y), str); - paramIn(cp, csprintf("stCache%d_%d.int", x,y), smi); - stCache[x][str] = smi; - } - } - - // qCache (IdCache) - uint64_t id; - qCache.resize(numSys); - for (int x = 0; x < numSys; x++) { - for (int y = 0; y < numQ[x]; y++) { - paramIn(cp, csprintf("qCache%d_%d.str", x,y), str); - paramIn(cp, csprintf("qCache%d_%d.id", x,y), id); - paramIn(cp, csprintf("qCache%d_%d.int", x,y), smi); - qCache[x][Id(str,id)] = smi; - } - } - - // smCache (IdCache) - smCache.resize(numSys); - for (int x = 0; x < numSys; x++) { - int size; - paramIn(cp, csprintf("smCache%d", x), size); - for (int y = 0; y < size; y++) { - paramIn(cp, csprintf("smCache%d_%d.str", x,y), str); - paramIn(cp, csprintf("smCache%d_%d.id", x,y), id); - paramIn(cp, csprintf("smCache%d_%d.int", x,y), smi); - smCache[x][Id(str,id)] = smi; - } - } - - // scLinks (ScCache) -- data not serialized, just creating one per sys - for (int x = 0; x < numSys; x++) - scLinks.push_back(ScHCache()); - - // nameCache (NameCache) - for (int x = 0; x < numSys; x++) { - System *sys; - SimObject *sptr; - string str; - int sysi; - - objParamIn(cp, csprintf("nameCache%d.name", x), sptr); - sys = dynamic_cast(sptr); - - paramIn(cp, csprintf("nameCache%d.str", x), str); - paramIn(cp, csprintf("nameCache%d.int", x), sysi); - nameCache[sys] = std::make_pair(str, sysi); - } - - //smStack (SmStack) - int smStack_size; - paramIn(cp, "smStackIdCount", smStack_size); - for (int x = 0; x < smStack_size; x++) { - int sysi; - uint64_t frame; - int count; - paramIn(cp, csprintf("smStackId%d.sys", x), sysi); - paramIn(cp, csprintf("smStackId%d.frame", x), frame); - paramIn(cp, csprintf("smStackId%d.count", x), count); - StackId sid = StackId(sysi, frame); - for (int y = 0; y < count; y++) { - paramIn(cp, csprintf("smStackId%d_%d", x, y), smi); - smStack[sid].push_back(smi); - } - } - - // lnMap (LinkMap) - int lsmi; - int lnMap_size; - paramIn(cp, "lnMapSize", lnMap_size); - for (int x = 0; x < lnMap_size; x++) { - paramIn(cp, csprintf("lnMap%d.smi", x), smi); - paramIn(cp, csprintf("lnMap%d.lsmi", x), lsmi); - lnMap[smi] = lsmi; - } - - // swExpl (vector) - int swExpl_size; - paramIn(cp, "swExplCount", swExpl_size); - for (int x = 0; x < swExpl_size; x++) { - int sysi; - uint64_t frame; - bool b; - paramIn(cp, csprintf("swExpl%d.sys", x), sysi); - paramIn(cp, csprintf("swExpl%d.frame", x), frame); - paramIn(cp, csprintf("swExpl%d.swexpl", x), b); - StackId sid = StackId(sysi, frame); - swExpl[sid] = b; - } - - // lastState (IMap) - int sti; - int lastState_size; - paramIn(cp, "lastStateSize", lastState_size); - for (int x = 0; x < lastState_size; x++) { - paramIn(cp, csprintf("lastState%d.smi", x), smi); - paramIn(cp, csprintf("lastState%d.sti", x), sti); - lastState[smi] = sti; - } - - - //smMap (IdMap) - smMap.resize(numSm); - for (int x = 0; x < smMap.size(); x++) { - paramIn(cp, csprintf("smMap%d.sys", x), smMap[x].first); - paramIn(cp, csprintf("smMap%d.smname", x), smMap[x].second.first); - paramIn(cp, csprintf("smMap%d.id", x), smMap[x].second.second); - } - - //qMap (IdMap) - qMap.resize(numQs); - for (int x = 0; x < qMap.size(); x++) { - paramIn(cp, csprintf("qMap%d.sys", x), qMap[x].first); - paramIn(cp, csprintf("qMap%d.qname", x), qMap[x].second.first); - paramIn(cp, csprintf("qMap%d.id", x), qMap[x].second.second); - } - - - // qData (vector) - qData.resize(qSize.size()); - for (int x = 0; x < qSize.size(); x++) { - if (!qSize[x]) - continue; - for (int y = 0; y < qSize[x]; y++) { - AnnDataPtr a = std::make_shared(); - a->unserializeSection(cp, csprintf("Q%d_%d", x, y)); - data.push_back(a); - qData[x].push_back(a); - } - } -} - -void -CPA::AnnotateData::serialize(CheckpointOut &cp) const -{ - SERIALIZE_SCALAR(time); - SERIALIZE_SCALAR(data); - SERIALIZE_SCALAR(sm); - SERIALIZE_SCALAR(stq); - SERIALIZE_SCALAR(op); - SERIALIZE_SCALAR(flag); - SERIALIZE_SCALAR(cpu); -} - -void -CPA::AnnotateData::unserialize(CheckpointIn &cp) -{ - UNSERIALIZE_SCALAR(time); - UNSERIALIZE_SCALAR(data); - orig_data = data; - UNSERIALIZE_SCALAR(sm); - UNSERIALIZE_SCALAR(stq); - UNSERIALIZE_SCALAR(op); - UNSERIALIZE_SCALAR(flag); - UNSERIALIZE_SCALAR(cpu); - dump = true; -} - -CPA* -CPAParams::create() -{ - return new CPA(this); -} - diff --git a/src/base/cp_annotate.hh b/src/base/cp_annotate.hh deleted file mode 100644 index a33780320..000000000 --- a/src/base/cp_annotate.hh +++ /dev/null @@ -1,559 +0,0 @@ -/* - * Copyright (c) 2014 ARM Limited - * All rights reserved. - * - * The license below extends only to copyright in the software and shall - * not be construed as granting a license to any other intellectual - * property including but not limited to intellectual property relating - * to a hardware implementation of the functionality of the software - * licensed hereunder. You may use the software subject to the license - * terms below provided that you ensure that this notice is replicated - * unmodified and in its entirety in all distributions of the software, - * modified or unmodified, in source code or in binary form. - * - * Copyright (c) 2006-2009 The Regents of The University of Michigan - * 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 __BASE__CP_ANNOTATE_HH__ -#define __BASE__CP_ANNOTATE_HH__ - -#include -#include -#include -#include -#include -#include - -#include "base/loader/symtab.hh" -#include "base/trace.hh" -#include "base/types.hh" -#include "debug/AnnotateQ.hh" -#include "config/cp_annotate.hh" -#include "config/the_isa.hh" -#include "sim/serialize.hh" -#include "sim/system.hh" - -#if CP_ANNOTATE -#include "params/CPA.hh" -#endif - -class System; -class ThreadContext; - - -#if !CP_ANNOTATE -class CPA -{ - public: - enum flags { - FL_NONE = 0x00, - FL_HW = 0x01, - FL_BAD = 0x02, - FL_QOPP = 0x04, - FL_WAIT = 0x08, - FL_LINK = 0x10, - FL_RESET = 0x20 - }; - - static CPA *cpa() { return NULL; } - static bool available() { return false; } - bool enabled() { return false; } - void swSmBegin(ThreadContext *tc, Addr sm_string, - int32_t sm_id, int32_t flags) { return; } - void swSmEnd(ThreadContext *tc, Addr sm_string) { return; } - void swExplictBegin(ThreadContext *tc, int32_t flags, - Addr st_string) { return; } - void swAutoBegin(ThreadContext *tc, Addr next_pc) { return; } - void swEnd(ThreadContext *tc) { return; } - void swQ(ThreadContext *tc, Addr id, Addr q_string, - int32_t count) { return; } - void swDq(ThreadContext *tc, Addr id, Addr q_string, - int32_t count) { return; } - void swPq(ThreadContext *tc, Addr id, Addr q_string, - int32_t count) { return; } - void swRq(ThreadContext *tc, Addr id, Addr q_string, - int32_t count) { return; } - void swWf(ThreadContext *tc, Addr id, Addr q_string, - Addr sm_string, int32_t count) { return; } - void swWe(ThreadContext *tc, Addr id, Addr q_string, - Addr sm_string, int32_t count) { return; } - void swSq(ThreadContext *tc, Addr id, Addr q_string, - int32_t size, int32_t flags) { return; } - void swAq(ThreadContext *tc, Addr id, Addr q_string, - int32_t size) { return; } - void swLink(ThreadContext *tc, Addr lsm_string, - Addr lsm_id, Addr sm_string) { return; } - void swIdentify(ThreadContext *tc, Addr smi_string) { return; } - uint64_t swGetId(ThreadContext *tc) { return 0; } - void swSyscallLink(ThreadContext *tc, Addr lsm_string, - Addr sm_string) { return; } - void hwBegin(flags f, System *sys, uint64_t frame, std::string sm, - std::string st) { return; } - void hwQ(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, - int32_t count = 1) { return; } - void hwDq(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, - int32_t count = 1) { return; } - void hwPq(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, - int32_t count = 1) { return; } - void hwRq(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, - int32_t count = 1) { return; } - void hwWf(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, - int32_t count = 1) { return; } - void hwWe(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, - int32_t count = 1) { return; } -}; -#else - -/** - * Provide a hash function for the CPI Id type - */ -namespace std { -template <> -struct hash > -{ - - size_t - operator()(const std::pair& x) const - { - return hash()(x.first); - } - -}; -} - -class CPA : SimObject -{ - public: - typedef CPAParams Params; - - /** The known operations that are written to the annotation output file. */ - enum ops { - OP_BEGIN = 0x01, - OP_WAIT_EMPTY = 0x02, - OP_WAIT_FULL = 0x03, - OP_QUEUE = 0x04, - OP_DEQUEUE = 0x05, - OP_SIZE_QUEUE = 0x08, - OP_PEEK = 0x09, - OP_LINK = 0x0A, - OP_IDENT = 0x0B, - OP_RESERVE = 0x0C - }; - - /** Flags for the various options.*/ - enum flags { - /* no flags */ - FL_NONE = 0x00, - /* operation was done on hardware */ - FL_HW = 0x01, - /* operation should cause a warning when encountered */ - FL_BAD = 0x02, - /* Queue like a stack, not a queue */ - FL_QOPP = 0x04, - /* Mark HW state as waiting for some non-resource constraint - * (e.g. wait because SM only starts after 10 items are queued) */ - FL_WAIT = 0x08, - /* operation is linking to another state machine */ - FL_LINK = 0x10, - /* queue should be completely cleared/reset before executing this - * operation */ - FL_RESET = 0x20 - }; - - - - protected: - const Params * - params() const - { - return dynamic_cast(_params); - } - - /* struct that is written to the annotation output file */ - struct AnnotateData : public Serializable { - - Tick time; - uint32_t data; - uint32_t orig_data; - uint16_t sm; - uint16_t stq; - uint8_t op; - uint8_t flag; - uint8_t cpu; - bool dump; - - void serialize(CheckpointOut &cp) const override; - void unserialize(CheckpointIn &cp) override; - }; - - typedef std::shared_ptr AnnDataPtr; - - /* header for the annotation file */ - struct AnnotateHeader { - uint64_t version; - uint64_t num_recs; - uint64_t key_off; - uint64_t idx_off; - uint32_t key_len; - uint32_t idx_len; - }; - - AnnotateHeader ah; - - std::vector annotateIdx; - - // number of state machines encountered in the simulation - int numSm; - // number of states encountered in the simulation - int numSmt; - // number of states/queues for a given state machine/system respectively - std::vector numSt, numQ; - // number of systems in the simulation - int numSys; - // number of queues in the state machine - int numQs; - // maximum connection id assigned so far - uint64_t conId; - - // Convert state strings into state ids - typedef std::unordered_map SCache; - typedef std::vector StCache; - - // Convert sm and queue name,id into queue id - typedef std::pair Id; - typedef std::unordered_map IdHCache; - typedef std::vector IdCache; - - // Hold mapping of sm and queues to output python - typedef std::vector > IdMap; - - // System pointer to name,id - typedef std::map > NameCache; - - // array of systems each of which is a stack of running sm - typedef std::pair StackId; - typedef std::map > SmStack; - - // map of each context and if it's currently in explict state mode - // states are not automatically updated until it leaves - typedef std::map SwExpl; - - typedef std::map IMap; - // List of annotate records have not been written/completed yet - typedef std::list AnnotateList; - - // Maintain link state information - typedef std::map LinkMap; - - // SC Links - typedef std::unordered_map ScHCache; - typedef std::vector ScCache; - - - AnnotateList data; - - // vector indexed by queueid to find current number of elements and bytes - std::vector qSize; - std::vector qBytes; - - - // Turn state machine string into state machine id (small int) - // Used for outputting key to convert id back into string - SCache smtCache; - // Turn state machine id, state name into state id (small int) - StCache stCache; - // turn system, queue, and queue identify into qid (small int) - // turn system, state, and context into state machine id (small int) - IdCache qCache, smCache; - //Link state machines accross system calls - ScCache scLinks; - // System pointer to name,id - NameCache nameCache; - // Stack of state machines currently nested (should unwind correctly) - SmStack smStack; - // Map of currently outstanding links - LinkMap lnMap; - // If the state machine is currently exculding automatic changes - SwExpl swExpl; - // Last state that a given state machine was in - IMap lastState; - // Hold mapping of sm and queues to output python - IdMap smMap, qMap; - // Items still in queue, used for sanity checking - std::vector qData; - - void doDq(System *sys, int flags, int cpu, int sm, std::string q, int qi, - int count); - void doQ(System *sys, int flags, int cpu, int sm, std::string q, int qi, - int count); - - void doSwSmEnd(System *sys, int cpuid, std::string sm, uint64_t frame); - - // Turn a system id, state machine string, state machine id into a small int - // for annotation output - int - getSm(int sysi, std::string si, uint64_t id) - { - int smi; - Id smid = Id(si, id); - - smi = smCache[sysi-1][smid]; - if (smi == 0) { - smCache[sysi-1][smid] = smi = ++numSm; - assert(smi < 65535); - smMap.push_back(std::make_pair(sysi, smid)); - } - return smi; - } - - // Turn a state machine string, state string into a small int - // for annotation output - int - getSt(std::string sm, std::string s) - { - int sti, smi; - - smi = smtCache[sm]; - if (smi == 0) - smi = smtCache[sm] = ++numSmt; - - while (stCache.size() < smi) { - //stCache.resize(sm); - stCache.push_back(SCache()); - numSt.push_back(0); - } - //assert(stCache.size() == sm); - //assert(numSt.size() == sm); - sti = stCache[smi-1][s]; - if (sti == 0) - stCache[smi-1][s] = sti = ++numSt[smi-1]; - return sti; - } - - // Turn state machine pointer into a smal int for annotation output - int - getSys(System *s) - { - NameCache::iterator i = nameCache.find(s); - if (i == nameCache.end()) { - nameCache[s] = std::make_pair(s->name(), ++numSys); - i = nameCache.find(s); - // might need to put smstackid into map here, but perhaps not - //smStack.push_back(std::vector()); - //swExpl.push_back(false); - numQ.push_back(0); - qCache.push_back(IdHCache()); - smCache.push_back(IdHCache()); - scLinks.push_back(ScHCache()); - } - return i->second.second; - } - - // Turn queue name, and queue context into small int for - // annotation output - int - getQ(int sys, std::string q, uint64_t id) - { - int qi; - Id qid = Id(q, id); - - qi = qCache[sys-1][qid]; - if (qi == 0) { - qi = qCache[sys-1][qid] = ++numQs; - assert(qi < 65535); - qSize.push_back(0); - qBytes.push_back(0); - qData.push_back(AnnotateList()); - numQ[sys-1]++; - qMap.push_back(std::make_pair(sys, qid)); - } - return qi; - } - - void swBegin(System *sys, int cpuid, std::string st, uint64_t frame, - bool expl = false, int flags = FL_NONE); - - AnnDataPtr add(int t, int f, int c, int sm, int stq, int32_t data=0); - - std::ostream *osbin; - - bool _enabled; - - /** Only allow one CPA object in a system. It doesn't make sense to have - * more that one per simulation because if a part of the system was - * important it would have annotations and queues, and with more than one - * object none of the sanity checking for queues will work. */ - static bool exists; - static CPA *_cpa; - - - std::map userApp; - - public: - static CPA *cpa() { return _cpa; } - void swSmBegin(ThreadContext *tc); - void swSmEnd(ThreadContext *tc); - void swExplictBegin(ThreadContext *tc); - void swAutoBegin(ThreadContext *tc, Addr next_pc); - void swEnd(ThreadContext *tc); - void swQ(ThreadContext *tc); - void swDq(ThreadContext *tc); - void swPq(ThreadContext *tc); - void swRq(ThreadContext *tc); - void swWf(ThreadContext *tc); - void swWe(ThreadContext *tc); - void swSq(ThreadContext *tc); - void swAq(ThreadContext *tc); - void swLink(ThreadContext *tc); - void swIdentify(ThreadContext *tc); - uint64_t swGetId(ThreadContext *tc); - void swSyscallLink(ThreadContext *tc); - - inline void hwBegin(flags f, System *sys, uint64_t frame, std::string sm, - std::string st) - { - if (!enabled()) - return; - - int sysi = getSys(sys); - int smi = getSm(sysi, sm, frame); - add(OP_BEGIN, FL_HW | f, 0, smi, getSt(sm, st)); - if (f & FL_BAD) - warn("BAD state encountered: at cycle %d: %s\n", curTick(), st); - } - - inline void hwQ(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, int32_t count = 1) - { - if (!enabled()) - return; - - int sysi = getSys(sys); - int qi = getQ(q_sys ? getSys(q_sys) : sysi, q, qid); - DPRINTFS(AnnotateQ, sys, - "hwQ: %s[%#x] cur size %d %d bytes: %d adding: %d\n", - q, qid, qSize[qi-1], qData[qi-1].size(), qBytes[qi-1], count); - doQ(sys, FL_HW | f, 0, getSm(sysi, sm, frame), q, qi, count); - - } - - inline void hwDq(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, int32_t count = 1) - { - if (!enabled()) - return; - - int sysi = getSys(sys); - int qi = getQ(q_sys ? getSys(q_sys) : sysi, q, qid); - DPRINTFS(AnnotateQ, sys, - "hwDQ: %s[%#x] cur size %d %d bytes: %d removing: %d\n", - q, qid, qSize[qi-1], qData[qi-1].size(), qBytes[qi-1], count); - doDq(sys, FL_HW | f, 0, getSm(sysi,sm, frame), q, qi, count); - } - - inline void hwPq(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, int32_t count = 1) - { - if (!enabled()) - return; - - int sysi = getSys(sys); - int qi = getQ(q_sys ? getSys(q_sys) : sysi, q, qid); - DPRINTFS(AnnotateQ, sys, - "hwPQ: %s[%#x] cur size %d %d bytes: %d peeking: %d\n", - q, qid, qSize[qi-1], qData[qi-1].size(), qBytes[qi-1], count); - add(OP_PEEK, FL_HW | f, 0, getSm(sysi, sm, frame), qi, count); - } - - inline void hwRq(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, int32_t count = 1) - { - if (!enabled()) - return; - - int sysi = getSys(sys); - int qi = getQ(q_sys ? getSys(q_sys) : sysi, q, qid); - DPRINTFS(AnnotateQ, sys, - "hwRQ: %s[%#x] cur size %d %d bytes: %d reserving: %d\n", - q, qid, qSize[qi-1], qData[qi-1].size(), qBytes[qi-1], count); - add(OP_RESERVE, FL_HW | f, 0, getSm(sysi, sm, frame), qi, count); - } - - inline void hwWf(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, int32_t count = 1) - { - if (!enabled()) - return; - - int sysi = getSys(sys); - int qi = getQ(q_sys ? getSys(q_sys) : sysi, q, qid); - add(OP_WAIT_FULL, FL_HW | f, 0, getSm(sysi, sm, frame), qi, count); - } - - inline void hwWe(flags f, System *sys, uint64_t frame, std::string sm, - std::string q, uint64_t qid, System *q_sys = NULL, int32_t count = 1) - { - if (!enabled()) - return; - - int sysi = getSys(sys); - int qi = getQ(q_sys ? getSys(q_sys) : sysi, q, qid); - add(OP_WAIT_EMPTY, FL_HW | f, 0, getSm(sysi, sm, frame), qi, count); - } - - public: - CPA(Params *p); - void startup(); - - uint64_t getFrame(ThreadContext *tc); - - static bool available() { return true; } - - bool - enabled() - { - if (!this) - return false; - return _enabled; - } - - void dump(bool all); - void dumpKey(); - - void serialize(CheckpointOut &cp) const override; - void unserialize(CheckpointIn &cp) override; -}; -#endif // !CP_ANNOTATE - -#endif //__BASE__CP_ANNOTATE_HH__ - diff --git a/src/cpu/o3/commit_impl.hh b/src/cpu/o3/commit_impl.hh index c1704841f..de792060d 100644 --- a/src/cpu/o3/commit_impl.hh +++ b/src/cpu/o3/commit_impl.hh @@ -46,7 +46,6 @@ #include #include "arch/utility.hh" -#include "base/cp_annotate.hh" #include "base/loader/symtab.hh" #include "base/logging.hh" #include "config/the_isa.hh" @@ -1280,14 +1279,6 @@ DefaultCommit::commitHead(const DynInstPtr &head_inst, unsigned inst_num) updateComInstStats(head_inst); - if (FullSystem) { - if (CPA::available()) { - if (head_inst->isControl()) { - ThreadContext *tc = thread[tid]->getTC(); - CPA::cpa()->swAutoBegin(tc, head_inst->nextInstAddr()); - } - } - } DPRINTF(Commit, "[tid:%i] [sn:%llu] Committing instruction with PC %s\n", tid, head_inst->seqNum, head_inst->pcState()); diff --git a/src/cpu/o3/dyn_inst_impl.hh b/src/cpu/o3/dyn_inst_impl.hh index 764b5d2fd..597bd1d55 100644 --- a/src/cpu/o3/dyn_inst_impl.hh +++ b/src/cpu/o3/dyn_inst_impl.hh @@ -41,7 +41,6 @@ #ifndef __CPU_O3_DYN_INST_IMPL_HH__ #define __CPU_O3_DYN_INST_IMPL_HH__ -#include "base/cp_annotate.hh" #include "cpu/o3/dyn_inst.hh" #include "debug/O3PipeView.hh" diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc index 23b99715b..e63ad4eda 100644 --- a/src/cpu/simple/base.cc +++ b/src/cpu/simple/base.cc @@ -42,7 +42,6 @@ #include "cpu/simple/base.hh" #include "arch/utility.hh" -#include "base/cp_annotate.hh" #include "base/cprintf.hh" #include "base/inifile.hh" #include "base/loader/symtab.hh" @@ -586,10 +585,6 @@ BaseSimpleCPU::postExecute() ++t_info.numLoad; } - if (CPA::available()) { - CPA::cpa()->swAutoBegin(threadContexts[curThread], pc.nextInstAddr()); - } - if (curStaticInst->isControl()) { ++t_info.numBranches; } diff --git a/src/dev/net/i8254xGBe.cc b/src/dev/net/i8254xGBe.cc index 55e8c51c2..950a9b7a3 100644 --- a/src/dev/net/i8254xGBe.cc +++ b/src/dev/net/i8254xGBe.cc @@ -56,7 +56,7 @@ using namespace iGbReg; using namespace Net; IGbE::IGbE(const Params *p) - : EtherDevice(p), etherInt(NULL), cpa(NULL), + : EtherDevice(p), etherInt(NULL), rxFifo(p->rx_fifo_size), txFifo(p->tx_fifo_size), inTick(false), rxTick(false), txTick(false), txFifoTick(false), rxDmaPacket(false), pktOffset(0), fetchDelay(p->fetch_delay), wbDelay(p->wb_delay), @@ -133,7 +133,6 @@ IGbE::~IGbE() void IGbE::init() { - cpa = CPA::cpa(); PciDevice::init(); } @@ -889,19 +888,13 @@ IGbE::DescCache::writeback(Addr aMask) DPRINTF(EthernetDesc, "Writing back %d descriptors\n", max_to_wb); - if (max_to_wb <= 0) { - if (usedCache.size()) - igbe->anBegin(annSmWb, "Wait Alignment", CPA::FL_WAIT); - else - igbe->anWe(annSmWb, annUsedCacheQ); + if (max_to_wb <= 0) return; - } wbOut = max_to_wb; assert(!wbDelayEvent.scheduled()); igbe->schedule(wbDelayEvent, curTick() + igbe->wbDelay); - igbe->anBegin(annSmWb, "Prepare Writeback Desc"); } template @@ -919,14 +912,9 @@ IGbE::DescCache::writeback1() for (int x = 0; x < wbOut; x++) { assert(usedCache.size()); memcpy(&wbBuf[x], usedCache[x], sizeof(T)); - igbe->anPq(annSmWb, annUsedCacheQ); - igbe->anPq(annSmWb, annDescQ); - igbe->anQ(annSmWb, annUsedDescQ); } - igbe->anBegin(annSmWb, "Writeback Desc DMA"); - assert(wbOut); igbe->dmaWrite(pciToDma(descBase() + descHead() * sizeof(T)), wbOut * sizeof(T), &wbEvent, (uint8_t*)wbBuf, @@ -953,18 +941,6 @@ IGbE::DescCache::fetchDescriptors() size_t free_cache = size - usedCache.size() - unusedCache.size(); - if (!max_to_fetch) - igbe->anWe(annSmFetch, annUnusedDescQ); - else - igbe->anPq(annSmFetch, annUnusedDescQ, max_to_fetch); - - if (max_to_fetch) { - if (!free_cache) - igbe->anWf(annSmFetch, annDescQ); - else - igbe->anRq(annSmFetch, annDescQ, free_cache); - } - max_to_fetch = std::min(max_to_fetch, free_cache); @@ -982,7 +958,6 @@ IGbE::DescCache::fetchDescriptors() assert(!fetchDelayEvent.scheduled()); igbe->schedule(fetchDelayEvent, curTick() + igbe->fetchDelay); - igbe->anBegin(annSmFetch, "Prepare Fetch Desc"); } template @@ -995,8 +970,6 @@ IGbE::DescCache::fetchDescriptors1() return; } - igbe->anBegin(annSmFetch, "Fetch Desc"); - DPRINTF(EthernetDesc, "Fetching descriptors at %#x (%#x), size: %#x\n", descBase() + cachePnt * sizeof(T), pciToDma(descBase() + cachePnt * sizeof(T)), @@ -1012,14 +985,10 @@ void IGbE::DescCache::fetchComplete() { T *newDesc; - igbe->anBegin(annSmFetch, "Fetch Complete"); for (int x = 0; x < curFetching; x++) { newDesc = new T; memcpy(newDesc, &fetchBuf[x], sizeof(T)); unusedCache.push_back(newDesc); - igbe->anDq(annSmFetch, annUnusedDescQ); - igbe->anQ(annSmFetch, annUnusedCacheQ); - igbe->anQ(annSmFetch, annDescQ); } @@ -1037,16 +1006,6 @@ IGbE::DescCache::fetchComplete() DPRINTF(EthernetDesc, "Fetching complete cachePnt %d -> %d\n", oldCp, cachePnt); - if ((descTail() >= cachePnt ? (descTail() - cachePnt) : (descLen() - - cachePnt)) == 0) - { - igbe->anWe(annSmFetch, annUnusedDescQ); - } else if (!(size - usedCache.size() - unusedCache.size())) { - igbe->anWf(annSmFetch, annDescQ); - } else { - igbe->anBegin(annSmFetch, "Wait", CPA::FL_WAIT); - } - enableSm(); igbe->checkDrain(); } @@ -1056,8 +1015,6 @@ void IGbE::DescCache::wbComplete() { - igbe->anBegin(annSmWb, "Finish Writeback"); - long curHead = descHead(); #ifndef NDEBUG long oldHead = curHead; @@ -1067,9 +1024,6 @@ IGbE::DescCache::wbComplete() assert(usedCache.size()); delete usedCache[0]; usedCache.pop_front(); - - igbe->anDq(annSmWb, annUsedCacheQ); - igbe->anDq(annSmWb, annDescQ); } curHead += wbOut; @@ -1092,13 +1046,8 @@ IGbE::DescCache::wbComplete() writeback(wbAlignment); } - if (!wbOut) { + if (!wbOut) igbe->checkDrain(); - if (usedCache.size()) - igbe->anBegin(annSmWb, "Wait", CPA::FL_WAIT); - else - igbe->anWe(annSmWb, annUsedCacheQ); - } fetchAfterWb(); } @@ -1341,8 +1290,6 @@ IGbE::RxDescCache::pktComplete() RxDesc *desc; desc = unusedCache.front(); - igbe->anBegin("RXS", "Update Desc"); - uint16_t crcfixup = igbe->regs.rctl.secrc() ? 0 : 4 ; DPRINTF(EthernetDesc, "pktPtr->length: %d bytesCopied: %d " "stripcrc offset: %d value written: %d %d\n", @@ -1493,11 +1440,8 @@ IGbE::RxDescCache::pktComplete() enableSm(); pktDone = true; - igbe->anBegin("RXS", "Done Updating Desc"); DPRINTF(EthernetDesc, "Processing of this descriptor complete\n"); - igbe->anDq("RXS", annUnusedCacheQ); unusedCache.pop_front(); - igbe->anQ("RXS", annUsedCacheQ); usedCache.push_back(desc); } @@ -1612,9 +1556,7 @@ IGbE::TxDescCache::processContextDesc() TxdOp::setDd(desc); unusedCache.pop_front(); - igbe->anDq("TXS", annUnusedCacheQ); usedCache.push_back(desc); - igbe->anQ("TXS", annUsedCacheQ); } if (!unusedCache.size()) @@ -1768,8 +1710,6 @@ IGbE::TxDescCache::pktComplete() assert(unusedCache.size()); assert(pktPtr); - igbe->anBegin("TXS", "Update Desc"); - DPRINTF(EthernetDesc, "DMA of packet complete\n"); @@ -1801,9 +1741,7 @@ IGbE::TxDescCache::pktComplete() (pktPtr->length < ( tsoMss + tsoHeaderLen) && tsoTotalLen != tsoUsedLen && useTso)) { assert(!useTso || (tsoDescBytesUsed == TxdOp::getLen(desc))); - igbe->anDq("TXS", annUnusedCacheQ); unusedCache.pop_front(); - igbe->anQ("TXS", annUsedCacheQ); usedCache.push_back(desc); tsoDescBytesUsed = 0; @@ -1926,9 +1864,7 @@ IGbE::TxDescCache::pktComplete() if (!useTso || TxdOp::getLen(desc) == tsoDescBytesUsed) { DPRINTF(EthernetDesc, "Descriptor Done\n"); - igbe->anDq("TXS", annUnusedCacheQ); unusedCache.pop_front(); - igbe->anQ("TXS", annUsedCacheQ); usedCache.push_back(desc); tsoDescBytesUsed = 0; } @@ -1946,17 +1882,14 @@ IGbE::TxDescCache::pktComplete() tsoPktHasHeader = false; if (igbe->regs.txdctl.wthresh() == 0) { - igbe->anBegin("TXS", "Desc Writeback"); DPRINTF(EthernetDesc, "WTHRESH == 0, writing back descriptor\n"); writeback(0); } else if (!igbe->regs.txdctl.gran() && igbe->regs.txdctl.wthresh() <= descInBlock(usedCache.size())) { DPRINTF(EthernetDesc, "used > WTHRESH, writing back descriptor\n"); - igbe->anBegin("TXS", "Desc Writeback"); writeback((igbe->cacheBlockSize()-1)>>4); } else if (igbe->regs.txdctl.wthresh() <= usedCache.size()) { DPRINTF(EthernetDesc, "used > WTHRESH, writing back descriptor\n"); - igbe->anBegin("TXS", "Desc Writeback"); writeback((igbe->cacheBlockSize()-1)>>4); } @@ -2141,7 +2074,6 @@ IGbE::txStateMachine() // iteration we'll get the rest of the data if (txPacket && txDescCache.packetAvailable() && !txDescCache.packetMultiDesc() && txPacket->length) { - anQ("TXS", "TX FIFO Q"); DPRINTF(EthernetSM, "TXS: packet placed in TX FIFO\n"); #ifndef NDEBUG bool success = @@ -2150,7 +2082,6 @@ IGbE::txStateMachine() txFifoTick = true && drainState() != DrainState::Draining; assert(success); txPacket = NULL; - anBegin("TXS", "Desc Writeback"); txDescCache.writeback((cacheBlockSize()-1)>>4); return; } @@ -2169,10 +2100,7 @@ IGbE::txStateMachine() if (!txDescCache.packetWaiting()) { if (txDescCache.descLeft() == 0) { postInterrupt(IT_TXQE); - anBegin("TXS", "Desc Writeback"); txDescCache.writeback(0); - anBegin("TXS", "Desc Fetch"); - anWe("TXS", txDescCache.annUnusedCacheQ); txDescCache.fetchDescriptors(); DPRINTF(EthernetSM, "TXS: No descriptors left in ring, forcing " "writeback stopping ticking and posting TXQE\n"); @@ -2182,15 +2110,12 @@ IGbE::txStateMachine() if (!(txDescCache.descUnused())) { - anBegin("TXS", "Desc Fetch"); txDescCache.fetchDescriptors(); - anWe("TXS", txDescCache.annUnusedCacheQ); DPRINTF(EthernetSM, "TXS: No descriptors available in cache, " "fetching and stopping ticking\n"); txTick = false; return; } - anPq("TXS", txDescCache.annUnusedCacheQ); txDescCache.processContextDesc(); @@ -2203,8 +2128,6 @@ IGbE::txStateMachine() unsigned size = txDescCache.getPacketSize(txPacket); if (size > 0 && txFifo.avail() > size) { - anRq("TXS", "TX FIFO Q"); - anBegin("TXS", "DMA Packet"); DPRINTF(EthernetSM, "TXS: Reserving %d bytes in FIFO and " "beginning DMA of next packet\n", size); txFifo.reserve(size); @@ -2213,10 +2136,8 @@ IGbE::txStateMachine() DPRINTF(EthernetSM, "TXS: getPacketSize returned: %d\n", size); DPRINTF(EthernetSM, "TXS: No packets to get, writing back used descriptors\n"); - anBegin("TXS", "Desc Writeback"); txDescCache.writeback(0); } else { - anWf("TXS", "TX FIFO Q"); DPRINTF(EthernetSM, "TXS: FIFO full, stopping ticking until space " "available in FIFO\n"); txTick = false; @@ -2236,12 +2157,10 @@ IGbE::ethRxPkt(EthPacketPtr pkt) rxPackets++; DPRINTF(Ethernet, "RxFIFO: Receiving pcakte from wire\n"); - anBegin("RXQ", "Wire Recv"); if (!regs.rctl.en()) { DPRINTF(Ethernet, "RxFIFO: RX not enabled, dropping\n"); - anBegin("RXQ", "FIFO Drop", CPA::FL_BAD); return true; } @@ -2256,23 +2175,9 @@ IGbE::ethRxPkt(EthPacketPtr pkt) if (!rxFifo.push(pkt)) { DPRINTF(Ethernet, "RxFIFO: Packet won't fit in fifo... dropped\n"); postInterrupt(IT_RXO, true); - anBegin("RXQ", "FIFO Drop", CPA::FL_BAD); return false; } - if (CPA::available() && cpa->enabled()) { - assert(sys->numSystemsRunning <= 2); - System *other_sys; - if (sys->systemList[0] == sys) - other_sys = sys->systemList[1]; - else - other_sys = sys->systemList[0]; - - cpa->hwDq(CPA::FL_NONE, sys, macAddr, "RXQ", "WireQ", 0, other_sys); - anQ("RXQ", "RX FIFO Q"); - cpa->hwWe(CPA::FL_NONE, sys, macAddr, "RXQ", "WireQ", 0, other_sys); - } - return true; } @@ -2306,7 +2211,6 @@ IGbE::rxStateMachine() rxDescCache.writeback(0); if (descLeft == 0) { - anBegin("RXS", "Writeback Descriptors"); rxDescCache.writeback(0); DPRINTF(EthernetSM, "RXS: No descriptors left in ring, forcing" " writeback and stopping ticking\n"); @@ -2319,7 +2223,6 @@ IGbE::rxStateMachine() if (regs.rxdctl.wthresh() >= rxDescCache.descUsed()) { DPRINTF(EthernetSM, "RXS: Writing back because WTHRESH >= descUsed\n"); - anBegin("RXS", "Writeback Descriptors"); if (regs.rxdctl.wthresh() < (cacheBlockSize()>>4)) rxDescCache.writeback(regs.rxdctl.wthresh()-1); else @@ -2331,14 +2234,11 @@ IGbE::rxStateMachine() regs.rxdctl.hthresh())) { DPRINTF(EthernetSM, "RXS: Fetching descriptors because " "descUnused < PTHRESH\n"); - anBegin("RXS", "Fetch Descriptors"); rxDescCache.fetchDescriptors(); } if (rxDescCache.descUnused() == 0) { - anBegin("RXS", "Fetch Descriptors"); rxDescCache.fetchDescriptors(); - anWe("RXS", rxDescCache.annUnusedCacheQ); DPRINTF(EthernetSM, "RXS: No descriptors available in cache, " "fetching descriptors and stopping ticking\n"); rxTick = false; @@ -2354,25 +2254,19 @@ IGbE::rxStateMachine() } if (!rxDescCache.descUnused()) { - anBegin("RXS", "Fetch Descriptors"); rxDescCache.fetchDescriptors(); - anWe("RXS", rxDescCache.annUnusedCacheQ); DPRINTF(EthernetSM, "RXS: No descriptors available in cache, " "stopping ticking\n"); rxTick = false; DPRINTF(EthernetSM, "RXS: No descriptors available, fetching\n"); return; } - anPq("RXS", rxDescCache.annUnusedCacheQ); if (rxFifo.empty()) { - anWe("RXS", "RX FIFO Q"); DPRINTF(EthernetSM, "RXS: RxFIFO empty, stopping ticking\n"); rxTick = false; return; } - anPq("RXS", "RX FIFO Q"); - anBegin("RXS", "Get Desc"); EthPacketPtr pkt; pkt = rxFifo.front(); @@ -2381,17 +2275,14 @@ IGbE::rxStateMachine() pktOffset = rxDescCache.writePacket(pkt, pktOffset); DPRINTF(EthernetSM, "RXS: Writing packet into memory\n"); if (pktOffset == pkt->length) { - anBegin( "RXS", "FIFO Dequeue"); DPRINTF(EthernetSM, "RXS: Removing packet from FIFO\n"); pktOffset = 0; - anDq("RXS", "RX FIFO Q"); rxFifo.pop(); } DPRINTF(EthernetSM, "RXS: stopping ticking until packet DMA completes\n"); rxTick = false; rxDmaPacket = true; - anBegin("RXS", "DMA Packet"); } void @@ -2399,15 +2290,11 @@ IGbE::txWire() { txFifoTick = false; - if (txFifo.empty()) { - anWe("TXQ", "TX FIFO Q"); + if (txFifo.empty()) return; - } - anPq("TXQ", "TX FIFO Q"); if (etherInt->sendPacket(txFifo.front())) { - anQ("TXQ", "WireQ"); if (DTRACE(EthernetSM)) { IpPtr ip(txFifo.front()); if (ip) @@ -2416,8 +2303,6 @@ IGbE::txWire() else DPRINTF(EthernetSM, "Transmitting Non-Ip packet\n"); } - anDq("TXQ", "TX FIFO Q"); - anBegin("TXQ", "Wire Send"); DPRINTF(EthernetSM, "TxFIFO: Successful transmit, bytes available in fifo: %d\n", txFifo.avail()); @@ -2460,7 +2345,6 @@ IGbE::tick() void IGbE::ethTxDone() { - anBegin("TXQ", "Send Done"); // restart the tx state machines if they are stopped // fifo to send another packet // tx sm to put more data into the fifo diff --git a/src/dev/net/i8254xGBe.hh b/src/dev/net/i8254xGBe.hh index a899826c9..5d9761bed 100644 --- a/src/dev/net/i8254xGBe.hh +++ b/src/dev/net/i8254xGBe.hh @@ -36,7 +36,6 @@ #include #include -#include "base/cp_annotate.hh" #include "base/inet.hh" #include "debug/EthernetDesc.hh" #include "debug/EthernetIntr.hh" @@ -55,7 +54,6 @@ class IGbE : public EtherDevice { private: IGbEInt *etherInt; - CPA *cpa; // device registers iGbReg::Regs regs; @@ -172,42 +170,6 @@ class IGbE : public EtherDevice */ void checkDrain(); - void anBegin(std::string sm, std::string st, int flags = CPA::FL_NONE) { - if (cpa) - cpa->hwBegin((CPA::flags)flags, sys, macAddr, sm, st); - } - - void anQ(std::string sm, std::string q) { - if (cpa) - cpa->hwQ(CPA::FL_NONE, sys, macAddr, sm, q, macAddr); - } - - void anDq(std::string sm, std::string q) { - if (cpa) - cpa->hwDq(CPA::FL_NONE, sys, macAddr, sm, q, macAddr); - } - - void anPq(std::string sm, std::string q, int num = 1) { - if (cpa) - cpa->hwPq(CPA::FL_NONE, sys, macAddr, sm, q, macAddr, NULL, num); - } - - void anRq(std::string sm, std::string q, int num = 1) { - if (cpa) - cpa->hwRq(CPA::FL_NONE, sys, macAddr, sm, q, macAddr, NULL, num); - } - - void anWe(std::string sm, std::string q) { - if (cpa) - cpa->hwWe(CPA::FL_NONE, sys, macAddr, sm, q, macAddr); - } - - void anWf(std::string sm, std::string q) { - if (cpa) - cpa->hwWf(CPA::FL_NONE, sys, macAddr, sm, q, macAddr); - } - - template class DescCache : public Serializable { diff --git a/src/dev/pci/copy_engine.cc b/src/dev/pci/copy_engine.cc index 9cb3dc993..4c66eb0c5 100644 --- a/src/dev/pci/copy_engine.cc +++ b/src/dev/pci/copy_engine.cc @@ -46,7 +46,6 @@ #include -#include "base/cp_annotate.hh" #include "base/trace.hh" #include "debug/DMACopyEngine.hh" #include "debug/Drain.hh" @@ -449,8 +448,6 @@ CopyEngine::regStats() void CopyEngine::CopyEngineChannel::fetchDescriptor(Addr address) { - anDq(); - anBegin("FetchDescriptor"); DPRINTF(DMACopyEngine, "Reading descriptor from at memory location %#x(%#x)\n", address, ce->pciToDma(address)); assert(address); @@ -479,8 +476,6 @@ CopyEngine::CopyEngineChannel::fetchDescComplete() if (inDrain()) return; writeCompletionStatus(); } else { - anBegin("Idle"); - anWait(); busy = false; nextState = Idle; inDrain(); @@ -499,7 +494,6 @@ CopyEngine::CopyEngineChannel::fetchDescComplete() void CopyEngine::CopyEngineChannel::readCopyBytes() { - anBegin("ReadCopyBytes"); DPRINTF(DMACopyEngine, "Reading %d bytes from buffer to memory location %#x(%#x)\n", curDmaDesc->len, curDmaDesc->dest, ce->pciToDma(curDmaDesc->src)); @@ -520,7 +514,6 @@ CopyEngine::CopyEngineChannel::readCopyBytesComplete() void CopyEngine::CopyEngineChannel::writeCopyBytes() { - anBegin("WriteCopyBytes"); DPRINTF(DMACopyEngine, "Writing %d bytes from buffer to memory location %#x(%#x)\n", curDmaDesc->len, curDmaDesc->dest, ce->pciToDma(curDmaDesc->dest)); @@ -541,8 +534,6 @@ CopyEngine::CopyEngineChannel::writeCopyBytesComplete() cr.status.compl_desc_addr(lastDescriptorAddr >> 6); completionDataReg = cr.status() | 1; - anQ("DMAUsedDescQ", channelId, 1); - anQ("AppRecvQ", curDmaDesc->user1, curDmaDesc->len); if (curDmaDesc->command & DESC_CTRL_CP_STS) { nextState = CompletionWrite; if (inDrain()) return; @@ -559,8 +550,6 @@ CopyEngine::CopyEngineChannel::continueProcessing() busy = false; if (underReset) { - anBegin("Reset"); - anWait(); underReset = false; refreshNext = false; busy = false; @@ -581,15 +570,12 @@ CopyEngine::CopyEngineChannel::continueProcessing() } else { inDrain(); nextState = Idle; - anWait(); - anBegin("Idle"); } } void CopyEngine::CopyEngineChannel::writeCompletionStatus() { - anBegin("WriteCompletionStatus"); DPRINTF(DMACopyEngine, "Writing completion status %#x to address %#x(%#x)\n", completionDataReg, cr.completionAddr, ce->pciToDma(cr.completionAddr)); @@ -610,7 +596,6 @@ CopyEngine::CopyEngineChannel::writeStatusComplete() void CopyEngine::CopyEngineChannel::fetchNextAddr(Addr address) { - anBegin("FetchNextAddr"); DPRINTF(DMACopyEngine, "Fetching next address...\n"); busy = true; cePort.dmaAction(MemCmd::ReadReq, @@ -628,8 +613,6 @@ CopyEngine::CopyEngineChannel::fetchAddrComplete() DPRINTF(DMACopyEngine, "Got NULL descriptor, nothing more to do\n"); busy = false; nextState = Idle; - anWait(); - anBegin("Idle"); inDrain(); return; } diff --git a/src/dev/pci/copy_engine.hh b/src/dev/pci/copy_engine.hh index cc5d18e36..eba8a9bb8 100644 --- a/src/dev/pci/copy_engine.hh +++ b/src/dev/pci/copy_engine.hh @@ -48,7 +48,6 @@ #include -#include "base/cp_annotate.hh" #include "base/statistics.hh" #include "dev/pci/copy_engine_defs.hh" #include "dev/pci/device.hh" @@ -136,36 +135,6 @@ class CopyEngine : public PciDevice void recvCommand(); bool inDrain(); void restartStateMachine(); - inline void anBegin(const char *s) - { - CPA::cpa()->hwBegin(CPA::FL_NONE, ce->sys, - channelId, "CopyEngine", s); - } - - inline void anWait() - { - CPA::cpa()->hwWe(CPA::FL_NONE, ce->sys, - channelId, "CopyEngine", "DMAUnusedDescQ", channelId); - } - - inline void anDq() - { - CPA::cpa()->hwDq(CPA::FL_NONE, ce->sys, - channelId, "CopyEngine", "DMAUnusedDescQ", channelId); - } - - inline void anPq() - { - CPA::cpa()->hwDq(CPA::FL_NONE, ce->sys, - channelId, "CopyEngine", "DMAUnusedDescQ", channelId); - } - - inline void anQ(const char * s, uint64_t id, int size = 1) - { - CPA::cpa()->hwQ(CPA::FL_NONE, ce->sys, channelId, - "CopyEngine", s, id, NULL, size); - } - }; private: