From 2f8a8508fb3ad45f7945639ea220f0ca46d8e308 Mon Sep 17 00:00:00 2001 From: "Daniel R. Carvalho" Date: Fri, 4 Jun 2021 19:44:59 -0300 Subject: [PATCH] util: Rename recently renamed namespaces These namespaces were recently renamed, but the renames were not applied here. Change-Id: I3093f193e835f81e1beca538cbca6a0751f6c21b Signed-off-by: Daniel R. Carvalho Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/46541 Reviewed-by: Gabe Black Maintainer: Gabe Black Tested-by: kokoro --- util/cxx_config/main.cc | 6 +- util/cxx_config/stats.cc | 25 ++++--- util/cxx_config/stats.hh | 2 +- util/systemc/gem5_within_systemc/main.cc | 6 +- .../gem5_within_systemc/sc_gem5_control.cc | 4 +- util/systemc/gem5_within_systemc/sc_module.cc | 2 +- util/systemc/gem5_within_systemc/stats.cc | 69 +++++++++++-------- util/systemc/gem5_within_systemc/stats.hh | 2 +- .../systemc_simple_object/printer.hh | 2 +- util/tlm/src/sc_master_port.cc | 4 +- util/tlm/src/sim_control.cc | 4 +- 11 files changed, 70 insertions(+), 56 deletions(-) diff --git a/util/cxx_config/main.cc b/util/cxx_config/main.cc index 41a2af12c2..2fe407576b 100644 --- a/util/cxx_config/main.cc +++ b/util/cxx_config/main.cc @@ -113,8 +113,8 @@ main(int argc, char **argv) setClockFrequency(1000000000000); curEventQueue(getEventQueue(0)); - Stats::initSimStats(); - Stats::registerHandlers(CxxConfig::statsReset, CxxConfig::statsDump); + statistics::initSimStats(); + statistics::registerHandlers(CxxConfig::statsReset, CxxConfig::statsDump); Trace::enable(); setDebugFlag("Terminal"); @@ -291,7 +291,7 @@ main(int argc, char **argv) } while (drain_count > 0); old_cpu.switchOut(); - system.setMemoryMode(Enums::timing); + system.setMemoryMode(enums::timing); new_cpu.takeOverFrom(&old_cpu); config_manager->drainResume(); diff --git a/util/cxx_config/stats.cc b/util/cxx_config/stats.cc index 3780eacc8b..80f2479815 100644 --- a/util/cxx_config/stats.cc +++ b/util/cxx_config/stats.cc @@ -40,9 +40,12 @@ * * C++-only configuration stats handling example * - * Register with: Stats::registerHandlers(statsReset, statsDump) + * Register with: statistics::registerHandlers(statsReset, statsDump) */ +#include +#include + #include "base/statistics.hh" #include "stats.hh" @@ -51,7 +54,7 @@ namespace CxxConfig void statsPrepare() { - std::list stats = Stats::statsList(); + std::list stats = statistics::statsList(); /* gather_stats -> prepare */ for (auto i = stats.begin(); i != stats.end(); ++i) @@ -62,24 +65,26 @@ void statsDump() { std::cerr << "Stats dump\n"; - Stats::processDumpQueue(); + statistics::processDumpQueue(); - std::list stats = Stats::statsList(); + std::list stats = statistics::statsList(); statsPrepare(); /* gather_stats -> convert_value */ for (auto i = stats.begin(); i != stats.end(); ++i) { - Stats::Info *stat = *i; + statistics::Info *stat = *i; - Stats::ScalarInfo *scalar = dynamic_cast(stat); - Stats::VectorInfo *vector = dynamic_cast(stat); + statistics::ScalarInfo *scalar = + dynamic_cast(stat); + statistics::VectorInfo *vector = + dynamic_cast(stat); if (scalar) { std::cerr << "SCALAR " << stat->name << ' ' << scalar->value() << '\n'; } else if (vector) { - Stats::VResult results = vector->value(); + statistics::VResult results = vector->value(); unsigned int index = 0; for (auto e = results.begin(); e != results.end(); ++e) { @@ -99,12 +104,12 @@ void statsReset() { std::cerr << "Stats reset\n"; - Stats::processResetQueue(); + statistics::processResetQueue(); } void statsEnable() { - std::list stats = Stats::statsList(); + std::list stats = statistics::statsList(); for (auto i = stats.begin(); i != stats.end(); ++i) (*i)->enable(); diff --git a/util/cxx_config/stats.hh b/util/cxx_config/stats.hh index a2957c1107..34d03e9019 100644 --- a/util/cxx_config/stats.hh +++ b/util/cxx_config/stats.hh @@ -40,7 +40,7 @@ * * C++-only configuration stats handling example * - * Register with: Stats::registerHandlers(statsReset, statsDump) + * Register with: statistics::registerHandlers(statsReset, statsDump) */ #ifndef __UTIL_CXX_CONFIG_STATS_H__ diff --git a/util/systemc/gem5_within_systemc/main.cc b/util/systemc/gem5_within_systemc/main.cc index 6a2f706d28..6e2bd55d2c 100644 --- a/util/systemc/gem5_within_systemc/main.cc +++ b/util/systemc/gem5_within_systemc/main.cc @@ -176,8 +176,8 @@ SimControl::SimControl(sc_core::sc_module_name name, initSignals(); /* Enable stats */ - Stats::initSimStats(); - Stats::registerHandlers(CxxConfig::statsReset, CxxConfig::statsDump); + statistics::initSimStats(); + statistics::registerHandlers(CxxConfig::statsReset, CxxConfig::statsDump); Trace::enable(); setDebugFlag("Terminal"); @@ -434,7 +434,7 @@ SimControl::switchCpu(unsigned cpuNum, unsigned numTotalCpus) { // it is best to just move this call before the switchCpu loop in run() // where it previously was if (cpuNum == 0) - system.setMemoryMode(Enums::timing); + system.setMemoryMode(enums::timing); new_cpu.takeOverFrom(&old_cpu); diff --git a/util/systemc/gem5_within_systemc/sc_gem5_control.cc b/util/systemc/gem5_within_systemc/sc_gem5_control.cc index 5e99927d68..253d7f8bf8 100644 --- a/util/systemc/gem5_within_systemc/sc_gem5_control.cc +++ b/util/systemc/gem5_within_systemc/sc_gem5_control.cc @@ -236,8 +236,8 @@ Gem5TopLevelModule::Gem5TopLevelModule(sc_core::sc_module_name name, initSignals(); /* Enable stats */ - Stats::initSimStats(); - Stats::registerHandlers(CxxConfig::statsReset, CxxConfig::statsDump); + statistics::initSimStats(); + statistics::registerHandlers(CxxConfig::statsReset, CxxConfig::statsDump); Trace::enable(); diff --git a/util/systemc/gem5_within_systemc/sc_module.cc b/util/systemc/gem5_within_systemc/sc_module.cc index a0f36c74dd..86e10e7684 100644 --- a/util/systemc/gem5_within_systemc/sc_module.cc +++ b/util/systemc/gem5_within_systemc/sc_module.cc @@ -151,7 +151,7 @@ Module::serviceAsyncEvent() async_event = false; if (async_statdump || async_statreset) { - Stats::schedStatEvent(async_statdump, async_statreset); + statistics::schedStatEvent(async_statdump, async_statreset); async_statdump = false; async_statreset = false; } diff --git a/util/systemc/gem5_within_systemc/stats.cc b/util/systemc/gem5_within_systemc/stats.cc index b073afa0de..0bb3253f8f 100644 --- a/util/systemc/gem5_within_systemc/stats.cc +++ b/util/systemc/gem5_within_systemc/stats.cc @@ -40,9 +40,13 @@ * * C++-only configuration stats handling example * - * Register with: Stats::registerHandlers(statsReset, statsDump) + * Register with: statistics::registerHandlers(statsReset, statsDump) */ +#include +#include + +#include "base/logging.hh" #include "base/output.hh" #include "base/statistics.hh" #include "base/stats/text.hh" @@ -53,14 +57,15 @@ namespace CxxConfig void statsPrepare() { - std::list stats = Stats::statsList(); + std::list stats = statistics::statsList(); /* gather_stats -> prepare */ for (auto i = stats.begin(); i != stats.end(); ++i){ - Stats::Info *stat = *i; - Stats::VectorInfo *vector = dynamic_cast(stat); + statistics::Info *stat = *i; + statistics::VectorInfo *vector = + dynamic_cast(stat); if (vector){ - (dynamic_cast(*i))->prepare(); + (dynamic_cast(*i))->prepare(); } else { (*i)->prepare(); @@ -72,11 +77,11 @@ void statsPrepare() void statsDump() { bool desc = true; - Stats::Output *output = Stats::initText(filename, desc, true); + statistics::Output *output = statistics::initText(filename, desc, true); - Stats::processDumpQueue(); + statistics::processDumpQueue(); - std::list stats = Stats::statsList(); + std::list stats = statistics::statsList(); statsEnable(); statsPrepare(); @@ -84,29 +89,32 @@ void statsDump() output->begin(); /* gather_stats -> convert_value */ for (auto i = stats.begin(); i != stats.end(); ++i) { - Stats::Info *stat = *i; + statistics::Info *stat = *i; - const Stats::ScalarInfo *scalar = dynamic_cast(stat); - Stats::VectorInfo *vector = dynamic_cast(stat); - const Stats::Vector2dInfo *vector2d = dynamic_cast(vector); - const Stats::DistInfo *dist = dynamic_cast(stat); - const Stats::VectorDistInfo *vectordist = - dynamic_cast(stat); - const Stats::SparseHistInfo *sparse = - dynamic_cast(stat); - const Stats::InfoProxy *info = - dynamic_cast*>(stat); + const statistics::ScalarInfo *scalar = + dynamic_cast(stat); + statistics::VectorInfo *vector = + dynamic_cast(stat); + const statistics::Vector2dInfo *vector2d = + dynamic_cast(vector); + const statistics::DistInfo *dist = + dynamic_cast(stat); + const statistics::VectorDistInfo *vectordist = + dynamic_cast(stat); + const statistics::SparseHistInfo *sparse = + dynamic_cast(stat); + const statistics::InfoProxy *info = + dynamic_cast*>(stat); if (vector) { - const Stats::FormulaInfo *formula = dynamic_cast(vector); + const statistics::FormulaInfo *formula = + dynamic_cast(vector); if (formula){ output->visit(*formula); } else { - const Stats::VectorInfo *vector1 = vector; + const statistics::VectorInfo *vector1 = vector; output->visit(*vector1); } } else if (vector2d) { @@ -132,18 +140,19 @@ void statsReset() { std::cerr << "Stats reset\n"; - Stats::processResetQueue(); + statistics::processResetQueue(); } void statsEnable() { - std::list stats = Stats::statsList(); + std::list stats = statistics::statsList(); for (auto i = stats.begin(); i != stats.end(); ++i){ - Stats::Info *stat = *i; - Stats::VectorInfo *vector = dynamic_cast(stat); + statistics::Info *stat = *i; + statistics::VectorInfo *vector = + dynamic_cast(stat); if (vector){ - (dynamic_cast(*i))->enable(); + (dynamic_cast(*i))->enable(); } else { (*i)->enable(); diff --git a/util/systemc/gem5_within_systemc/stats.hh b/util/systemc/gem5_within_systemc/stats.hh index cbb1d92ab1..096430348c 100644 --- a/util/systemc/gem5_within_systemc/stats.hh +++ b/util/systemc/gem5_within_systemc/stats.hh @@ -40,7 +40,7 @@ * * C++-only configuration stats handling example * - * Register with: Stats::registerHandlers(statsReset, statsDump) + * Register with: statistics::registerHandlers(statsReset, statsDump) */ #ifndef __UTIL_CXX_CONFIG_STATS_H__ diff --git a/util/systemc/systemc_within_gem5/systemc_simple_object/printer.hh b/util/systemc/systemc_within_gem5/systemc_simple_object/printer.hh index 5cec142eb7..2f2c7ffb27 100644 --- a/util/systemc/systemc_within_gem5/systemc_simple_object/printer.hh +++ b/util/systemc/systemc_within_gem5/systemc_simple_object/printer.hh @@ -71,7 +71,7 @@ class Printer : public sc_core::sc_module } } - Stats::Scalar numWords; + statistics::Scalar numWords; // Gem5 statistics should be set up during the "end_of_elabortion" // callback. diff --git a/util/tlm/src/sc_master_port.cc b/util/tlm/src/sc_master_port.cc index ec17c2c652..f17fc3f54c 100644 --- a/util/tlm/src/sc_master_port.cc +++ b/util/tlm/src/sc_master_port.cc @@ -273,8 +273,8 @@ SCMasterPort::b_transport(tlm::tlm_generic_payload& trans, "Packet sending failed!\n"); // one tick is a pico second - auto delay = - sc_core::sc_time((double)(ticks / SimClock::Int::ps), sc_core::SC_PS); + auto delay = sc_core::sc_time((double)(ticks / sim_clock::as_int::ps), + sc_core::SC_PS); // update time t += delay; diff --git a/util/tlm/src/sim_control.cc b/util/tlm/src/sim_control.cc index 903c77f2fd..50a2aeabf7 100644 --- a/util/tlm/src/sim_control.cc +++ b/util/tlm/src/sim_control.cc @@ -88,8 +88,8 @@ Gem5SimControl::Gem5SimControl(sc_core::sc_module_name name, Gem5SystemC::Module::setupEventQueues(*this); initSignals(); - Stats::initSimStats(); - Stats::registerHandlers(CxxConfig::statsReset, CxxConfig::statsDump); + statistics::initSimStats(); + statistics::registerHandlers(CxxConfig::statsReset, CxxConfig::statsDump); Trace::enable();