From 259d504ef0325879d19d8283a4cd97a4dabd8c1d Mon Sep 17 00:00:00 2001 From: Antonin Portelli Date: Tue, 12 Dec 2017 19:32:58 +0000 Subject: [PATCH] Hadrons: first full implementation of the module memory profiler --- extras/Hadrons/Application.cc | 5 +- extras/Hadrons/Environment.cc | 13 +- extras/Hadrons/Environment.hpp | 9 +- extras/Hadrons/Global.hpp | 2 +- extras/Hadrons/Module.hpp | 6 +- extras/Hadrons/Modules/MContraction/Meson.hpp | 2 +- extras/Hadrons/VirtualMachine.cc | 120 ++++++++++++++++++ extras/Hadrons/VirtualMachine.hpp | 22 +++- 8 files changed, 166 insertions(+), 13 deletions(-) diff --git a/extras/Hadrons/Application.cc b/extras/Hadrons/Application.cc index aa66d36f..135e4df4 100644 --- a/extras/Hadrons/Application.cc +++ b/extras/Hadrons/Application.cc @@ -92,9 +92,10 @@ void Application::run(void) { parseParameterFile(parameterFileName_); } - //vm().checkGraph(); - env().printContent(); vm().printContent(); + env().printContent(); + //vm().checkGraph(); + vm().memoryProfile(); if (!scheduled_) { schedule(); diff --git a/extras/Hadrons/Environment.cc b/extras/Hadrons/Environment.cc index 403476d0..6de13e86 100644 --- a/extras/Hadrons/Environment.cc +++ b/extras/Hadrons/Environment.cc @@ -369,6 +369,16 @@ void Environment::freeAll(void) } } +void Environment::protectObjects(const bool protect) +{ + protect_ = protect; +} + +bool Environment::objectsProtected(void) const +{ + return protect_; +} + // print environment content /////////////////////////////////////////////////// void Environment::printContent(void) const { @@ -376,6 +386,7 @@ void Environment::printContent(void) const for (unsigned int i = 0; i < object_.size(); ++i) { LOG(Debug) << std::setw(4) << i << ": " - << getObjectName(i) << std::endl; + << getObjectName(i) << " (" + << sizeString(getObjectSize(i)) << ")" << std::endl; } } diff --git a/extras/Hadrons/Environment.hpp b/extras/Hadrons/Environment.hpp index 60371c20..adea13ce 100644 --- a/extras/Hadrons/Environment.hpp +++ b/extras/Hadrons/Environment.hpp @@ -142,11 +142,14 @@ public: void freeObject(const unsigned int address); void freeObject(const std::string name); void freeAll(void); + void protectObjects(const bool protect); + bool objectsProtected(void) const; // print environment content void printContent(void) const; private: // general unsigned long int locVol_; + bool protect_{true}; // grids std::vector dim_; GridPt grid4d_; @@ -195,8 +198,8 @@ void Holder::reset(T *pt) // general memory management /////////////////////////////////////////////////// template void Environment::createDerivedObject(const std::string name, - const Environment::Storage storage, - const unsigned int Ls, + const Environment::Storage storage, + const unsigned int Ls, Ts && ... args) { if (!hasObject(name)) @@ -206,7 +209,7 @@ void Environment::createDerivedObject(const std::string name, unsigned int address = getObjectAddress(name); - if (!object_[address].data) + if (!object_[address].data or !objectsProtected()) { MemoryStats memStats; diff --git a/extras/Hadrons/Global.hpp b/extras/Hadrons/Global.hpp index c3d60bf2..ebfe94dc 100644 --- a/extras/Hadrons/Global.hpp +++ b/extras/Hadrons/Global.hpp @@ -36,7 +36,7 @@ See the full license in the file "LICENSE" in the top level distribution directo #include #ifndef SITE_SIZE_TYPE -#define SITE_SIZE_TYPE unsigned int +#define SITE_SIZE_TYPE size_t #endif #define BEGIN_HADRONS_NAMESPACE \ diff --git a/extras/Hadrons/Module.hpp b/extras/Hadrons/Module.hpp index c6b58e9f..25c0ac05 100644 --- a/extras/Hadrons/Module.hpp +++ b/extras/Hadrons/Module.hpp @@ -160,12 +160,12 @@ public: // parse parameters virtual void parseParameters(XmlReader &reader, const std::string name) = 0; virtual void saveParameters(XmlWriter &writer, const std::string name) = 0; - // execution - void operator()(void); -protected: // setup virtual void setup(void) {}; virtual void execute(void) = 0; + // execution + void operator()(void); +protected: // environment shortcut DEFINE_ENV_ALIAS; // virtual machine shortcut diff --git a/extras/Hadrons/Modules/MContraction/Meson.hpp b/extras/Hadrons/Modules/MContraction/Meson.hpp index 7d19feb8..3c179d44 100644 --- a/extras/Hadrons/Modules/MContraction/Meson.hpp +++ b/extras/Hadrons/Modules/MContraction/Meson.hpp @@ -134,7 +134,7 @@ std::vector TMeson::getReference(void) template std::vector TMeson::getOutput(void) { - std::vector output = {getName()}; + std::vector output = {}; return output; } diff --git a/extras/Hadrons/VirtualMachine.cc b/extras/Hadrons/VirtualMachine.cc index 0c3eca20..15e53dbf 100644 --- a/extras/Hadrons/VirtualMachine.cc +++ b/extras/Hadrons/VirtualMachine.cc @@ -390,3 +390,123 @@ void VirtualMachine::printContent(void) const << getModuleName(i) << std::endl; } } + +// memory profile ////////////////////////////////////////////////////////////// +VirtualMachine::MemoryProfile VirtualMachine::memoryProfile(void) const +{ + bool protect = env().objectsProtected(); + bool hmsg = HadronsLogMessage.isActive(); + bool gmsg = GridLogMessage.isActive(); + bool err = HadronsLogError.isActive(); + MemoryProfile profile; + auto program = makeModuleGraph().topoSort(); + + profile.module.resize(getNModule()); + env().protectObjects(false); + GridLogMessage.Active(false); + HadronsLogMessage.Active(false); + HadronsLogError.Active(false); + for (auto it = program.rbegin(); it != program.rend(); ++it) + { + auto a = *it; + + if (profile.module[a].empty()) + { + LOG(Debug) << "Profiling memory for module '" << module_[a].name << "' (" << a << ")..." << std::endl; + memoryProfile(profile, a); + env().freeAll(); + } + } + env().protectObjects(protect); + GridLogMessage.Active(gmsg); + HadronsLogMessage.Active(hmsg); + HadronsLogError.Active(err); + LOG(Debug) << "Memory profile:" << std::endl; + LOG(Debug) << "----------------" << std::endl; + for (unsigned int a = 0; a < profile.module.size(); ++a) + { + LOG(Debug) << getModuleName(a) << " (" << a << ")" << std::endl; + for (auto &o: profile.module[a]) + { + LOG(Debug) << "|__ " << env().getObjectName(o.first) << " (" + << sizeString(o.second) << ")" << std::endl; + } + LOG(Debug) << std::endl; + } + LOG(Debug) << "----------------" << std::endl; + + return profile; +} + +void VirtualMachine::resizeProfile(MemoryProfile &profile) const +{ + if (env().getMaxAddress() > profile.object.size()) + { + MemoryPrint empty; + + empty.size = 0; + empty.module = -1; + profile.object.resize(env().getMaxAddress(), empty); + } +} + +void VirtualMachine::updateProfile(MemoryProfile &profile, + const unsigned int address) const +{ + resizeProfile(profile); + for (unsigned int a = 0; a < env().getMaxAddress(); ++a) + { + if (env().hasCreatedObject(a) and (profile.object[a].module == -1)) + { + profile.object[a].size = env().getObjectSize(a); + profile.object[a].module = address; + profile.module[address][a] = profile.object[a].size; + } + } +} + +void VirtualMachine::cleanEnvironment(MemoryProfile &profile) const +{ + resizeProfile(profile); + for (unsigned int a = 0; a < env().getMaxAddress(); ++a) + { + if (env().hasCreatedObject(a) and (profile.object[a].module == -1)) + { + env().freeObject(a); + } + } +} + +void VirtualMachine::memoryProfile(MemoryProfile &profile, + const unsigned int address) const +{ + auto m = getModule(address); + + LOG(Debug) << "Setting up module '" << m->getName() << "' (" << address << ")..." << std::endl; + + try + { + m->setup(); + updateProfile(profile, address); + } + catch (Exceptions::Definition &) + { + cleanEnvironment(profile); + for (auto &in: m->getInput()) + { + memoryProfile(profile, env().getObjectModule(in)); + } + for (auto &ref: m->getReference()) + { + memoryProfile(profile, env().getObjectModule(ref)); + } + m->setup(); + updateProfile(profile, address); + } +} + +void VirtualMachine::memoryProfile(MemoryProfile &profile, + const std::string name) const +{ + memoryProfile(profile, getModuleAddress(name)); +} diff --git a/extras/Hadrons/VirtualMachine.hpp b/extras/Hadrons/VirtualMachine.hpp index c5557add..56e5a8cf 100644 --- a/extras/Hadrons/VirtualMachine.hpp +++ b/extras/Hadrons/VirtualMachine.hpp @@ -51,8 +51,18 @@ class VirtualMachine { SINGLETON_DEFCTOR(VirtualMachine); public: - typedef SITE_SIZE_TYPE Size; - typedef std::unique_ptr ModPt; + typedef SITE_SIZE_TYPE Size; + typedef std::unique_ptr ModPt; + struct MemoryPrint + { + Size size; + unsigned int module; + }; + struct MemoryProfile + { + std::vector> module; + std::vector object; + }; private: struct ModuleInfo { @@ -100,12 +110,20 @@ public: void checkGraph(void) const; // print VM content void printContent(void) const; + // memory profile + MemoryProfile memoryProfile(void) const; // general execution Size executeProgram(const std::vector &p); Size executeProgram(const std::vector &p); private: // environment shortcut DEFINE_ENV_ALIAS; + // memory profile + void resizeProfile(MemoryProfile &profile) const; + void updateProfile(MemoryProfile &profile, const unsigned int address) const; + void cleanEnvironment(MemoryProfile &profile) const; + void memoryProfile(MemoryProfile &profile, const std::string name) const; + void memoryProfile(MemoryProfile &profile, const unsigned int address) const; private: // general bool dryRun_{false}, memoryProfile_{false};