diff --git a/DRAMSys/traceAnalyzer/CMakeLists.txt b/DRAMSys/traceAnalyzer/CMakeLists.txt index 6db1bec5..ea1123f7 100644 --- a/DRAMSys/traceAnalyzer/CMakeLists.txt +++ b/DRAMSys/traceAnalyzer/CMakeLists.txt @@ -107,8 +107,8 @@ add_executable(TraceAnalyzer businessObjects/dramTimeDependencies/common/StringMapper.cpp businessObjects/dramTimeDependencies/deviceDependencies/poolcontroller.cpp businessObjects/dramTimeDependencies/deviceDependencies/poolcontrollermap.cpp - businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.cpp - businessObjects/dramTimeDependencies/configurations/configurationIF.cpp + businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp + businessObjects/dramTimeDependencies/configurations/configurationBase.cpp businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp # businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/README.md b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/README.md new file mode 100644 index 00000000..43efabe9 --- /dev/null +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/README.md @@ -0,0 +1,53 @@ + +## Relevant classes +``` +PhaseDependenciesTracker +├── ConfigurationFactory +│   └── ConfigurationBase +│   ├── DBPhaseEntryBase +│   └── DRAMTimeDependenciesBase +│   ├── DependencyMap +│   │   └── PhaseTimeDependencies +│   └── PoolControllerMap +└── DBDependencyEntry +``` + +#### PhaseDependenciesTracker +Responsible for the whole execution. Instantiates a configuration class through the ConfigurationFactory, loads the selected phases into memory, calculates the time dependencies between phases and saves into the database file. + +#### ConfigurationFactory +Creates a configuration object given its name. + +#### ConfigurationBase +Interface and common functionality of configuration classes. These include creating DBPhaseEntryBase objects from the database for the given device and delegate methods. + +#### DBPhaseEntryBase +Interfaces to device specific phase entries. Specificities include object data, construction and dependency logic. + +#### DRAMTimeDependenciesBase +Interfaces to device's time dependencies descriptor class. + +#### DependencyMap +A STL map using auxiliar objects. Maps phases to their PhaseTimeDependencies. + +#### PhaseTimeDependencies +An auxiliar class with initializer list constructor. Contains a vector of TimeDependency objects and its maximum time value. + +#### PoolControllerMap +Maps pool names to PoolController objects. Pools keep track of all potential dependencies of a given phase. + +#### DBDependencyEntry +Contains the data to be written to the database. + + +## Suggested steps for creating a device: +1. Create a time dependencies class inheriting from the DRAMTimeDependenciesBase object. +2. Create the phase entry object inheriting from DBPhaseEntryBase. The object must determine the relevant data to be used and how phases may be correlated. +3. Create a configuration class for your object inheriting from ConfigurationBase. This will contain the dependencies maps and instantiate the specialized DBPhaseEntryBase object. +4. Add the newly created device to the functions of the ConfigurationFactory class. The device name is taken from the database. + +#### Example +For instance, we have the necessary objects for calculating DDR3 device dependencies implemented in the following files: +1. deviceDependencies/specialized/TimeDependenciesInfoDDR3.(h/cpp) +2. dbEntries/specialized/DDR3dbphaseentry.(h/cpp) +3. configurations/specialized/DDR3Configuration.(h/cpp) diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationIF.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.cpp similarity index 82% rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationIF.cpp rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.cpp index d41e5cad..1f4e62d0 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationIF.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.cpp @@ -33,34 +33,34 @@ * Iron Prando da Silva */ -#include "configurationIF.h" +#include "configurationBase.h" -const uint ConfigurationIF::getClk() const { +const uint ConfigurationBase::getClk() const { if (!mDeviceDeps) - throw std::invalid_argument("Invalid DRAMTimeDependenciesIF object in 'ConfigurationIF::getClk'."); + throw std::invalid_argument("Invalid DRAMTimeDependenciesBase object in 'ConfigurationBase::getClk'."); return mDeviceDeps->getClk(); } -DependencyMap ConfigurationIF::getDependencies(std::vector& commands) const { +DependencyMap ConfigurationBase::getDependencies(std::vector& commands) const { if (!mDeviceDeps) - throw std::invalid_argument("Invalid DRAMTimeDependenciesIF object in 'ConfigurationIF::getDependencies'."); + throw std::invalid_argument("Invalid DRAMTimeDependenciesBase object in 'ConfigurationBase::getDependencies'."); return mDeviceDeps->getDependencies(commands); } -PoolControllerMap ConfigurationIF::getPools() const { +PoolControllerMap ConfigurationBase::getPools() const { if (!mDeviceDeps) - throw std::invalid_argument("Invalid DRAMTimeDependenciesIF object in 'ConfigurationIF::getAWPools'."); + throw std::invalid_argument("Invalid DRAMTimeDependenciesBase object in 'ConfigurationBase::getAWPools'."); return mDeviceDeps->getPools(); } -const QString ConfigurationIF::getDeviceName(const TraceDB& tdb) { +const QString ConfigurationBase::getDeviceName(const TraceDB& tdb) { return mGetMemspec(tdb)["memoryType"].toString(); } -const uint ConfigurationIF::mGetClk(const TraceDB& tdb) { +const uint ConfigurationBase::mGetClk(const TraceDB& tdb) { QSqlDatabase db = tdb.getDatabase(); QString query = "SELECT clk FROM GeneralInfo"; QSqlQuery sqlQuery = db.exec(query); @@ -72,7 +72,7 @@ const uint ConfigurationIF::mGetClk(const TraceDB& tdb) { return clock; } -const QJsonObject ConfigurationIF::mGetMemspec(const TraceDB& tdb) { +const QJsonObject ConfigurationBase::mGetMemspec(const TraceDB& tdb) { QSqlDatabase db = tdb.getDatabase(); QString query = "SELECT Memspec FROM GeneralInfo"; QSqlQuery sqlQuery = db.exec(query); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationIF.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h similarity index 87% rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationIF.h rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h index 440e0dc8..a9eb54e7 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationIF.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h @@ -37,15 +37,15 @@ #include -#include "businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.h" -#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h" +#include "businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h" +#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h" -class ConfigurationIF { +class ConfigurationBase { public: - ConfigurationIF() {}; - virtual ~ConfigurationIF() = default; + ConfigurationBase() {}; + virtual ~ConfigurationBase() = default; - virtual std::shared_ptr makePhaseEntry(const QSqlQuery&) const { return nullptr; } + virtual std::shared_ptr makePhaseEntry(const QSqlQuery&) const { return nullptr; } // Delegated methods const uint getClk() const; @@ -55,7 +55,7 @@ class ConfigurationIF { static const QString getDeviceName(const TraceDB& tdb); protected: - std::shared_ptr mDeviceDeps = nullptr; + std::shared_ptr mDeviceDeps = nullptr; static const uint mGetClk(const TraceDB& tdb); static const QJsonObject mGetMemspec(const TraceDB& tdb); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp index 9d731976..48d4d553 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.cpp @@ -35,8 +35,8 @@ #include "configurationfactory.h" -std::shared_ptr ConfigurationFactory::make(const TraceDB& tdb) { - const QString deviceName = ConfigurationIF::getDeviceName(tdb); +std::shared_ptr ConfigurationFactory::make(const TraceDB& tdb) { + const QString deviceName = ConfigurationBase::getDeviceName(tdb); if (deviceName == "DDR3") { return std::make_shared(tdb); @@ -62,7 +62,7 @@ std::shared_ptr ConfigurationFactory::make(const TraceDB& tdb) } const std::vector ConfigurationFactory::possiblePhases(const TraceDB& tdb) { - const QString deviceName = ConfigurationIF::getDeviceName(tdb); + const QString deviceName = ConfigurationBase::getDeviceName(tdb); if (deviceName == "DDR3") { // return DDR3TimeDependencies::getPossiblePhases(); @@ -90,7 +90,7 @@ const std::vector ConfigurationFactory::possiblePhases(const TraceDB& t bool ConfigurationFactory::deviceSupported(const TraceDB& tdb) { uint clk; // Not used - const QString deviceName = ConfigurationIF::getDeviceName(tdb); + const QString deviceName = ConfigurationBase::getDeviceName(tdb); if (deviceName == "DDR3") { return true; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.h index 7b252277..d1c3eaa6 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationfactory.h @@ -37,7 +37,7 @@ #include -#include "configurationIF.h" +#include "configurationBase.h" #include "specialized/DDR3Configuration.h" #include "specialized/DDR4Configuration.h" @@ -49,7 +49,7 @@ class ConfigurationFactory { public: - static std::shared_ptr make(const TraceDB& tdb); + static std::shared_ptr make(const TraceDB& tdb); static const std::vector possiblePhases(const TraceDB& tdb); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp index 934ab61a..ce676838 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp @@ -41,6 +41,6 @@ DDR3Configuration::DDR3Configuration(const TraceDB& tdb) { } -std::shared_ptr DDR3Configuration::makePhaseEntry(const QSqlQuery& query) const { +std::shared_ptr DDR3Configuration::makePhaseEntry(const QSqlQuery& query) const { return std::make_shared(query); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h index ebd8d195..0d0b74db 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h @@ -35,15 +35,15 @@ #pragma once -#include "businessObjects/dramTimeDependencies/configurations/configurationIF.h" +#include "businessObjects/dramTimeDependencies/configurations/configurationBase.h" // #include "businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h" #include "businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h" #include "businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h" -class DDR3Configuration : public ConfigurationIF { +class DDR3Configuration : public ConfigurationBase { public: DDR3Configuration(const TraceDB& tdb); - std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; + std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp index 2cef13f2..d36d11f3 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp @@ -40,6 +40,6 @@ DDR4Configuration::DDR4Configuration(const TraceDB& tdb) { } -std::shared_ptr DDR4Configuration::makePhaseEntry(const QSqlQuery& query) const { +std::shared_ptr DDR4Configuration::makePhaseEntry(const QSqlQuery& query) const { return std::make_shared(query); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h index 7534bcb6..f089b2e2 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h @@ -35,14 +35,14 @@ #pragma once -#include "businessObjects/dramTimeDependencies/configurations/configurationIF.h" +#include "businessObjects/dramTimeDependencies/configurations/configurationBase.h" #include "businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h" #include "businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h" -class DDR4Configuration : public ConfigurationIF { +class DDR4Configuration : public ConfigurationBase { public: DDR4Configuration(const TraceDB& tdb); - std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; + std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp index 5f0022e6..d43b27b5 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp @@ -41,7 +41,7 @@ DDR5Configuration::DDR5Configuration(const TraceDB& tdb) { } -std::shared_ptr DDR5Configuration::makePhaseEntry(const QSqlQuery& query) const { +std::shared_ptr DDR5Configuration::makePhaseEntry(const QSqlQuery& query) const { auto phase = std::make_shared(query); std::dynamic_pointer_cast(mDeviceDeps)->rankIDToRankIDs(phase->tRank, phase->tLogicalRank, phase->tPhysicalRank, phase->tDIMMRank); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h index 6025f15c..700e6af9 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h @@ -35,14 +35,14 @@ #pragma once -#include "businessObjects/dramTimeDependencies/configurations/configurationIF.h" +#include "businessObjects/dramTimeDependencies/configurations/configurationBase.h" #include "businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h" #include "businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h" -class DDR5Configuration : public ConfigurationIF { +class DDR5Configuration : public ConfigurationBase { public: DDR5Configuration(const TraceDB& tdb); - std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; + std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp index d746eadd..59586627 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp @@ -40,6 +40,6 @@ HBM2Configuration::HBM2Configuration(const TraceDB& tdb) { } -std::shared_ptr HBM2Configuration::makePhaseEntry(const QSqlQuery& query) const { +std::shared_ptr HBM2Configuration::makePhaseEntry(const QSqlQuery& query) const { return std::make_shared(query); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h index 3cf77a1f..ac6297e4 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h @@ -35,14 +35,14 @@ #pragma once -#include "businessObjects/dramTimeDependencies/configurations/configurationIF.h" +#include "businessObjects/dramTimeDependencies/configurations/configurationBase.h" #include "businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h" #include "businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h" -class HBM2Configuration : public ConfigurationIF { +class HBM2Configuration : public ConfigurationBase { public: HBM2Configuration(const TraceDB& tdb); - std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; + std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp index bc328d81..b8b66f0a 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp @@ -41,6 +41,6 @@ LPDDR4Configuration::LPDDR4Configuration(const TraceDB& tdb) { } -std::shared_ptr LPDDR4Configuration::makePhaseEntry(const QSqlQuery& query) const { +std::shared_ptr LPDDR4Configuration::makePhaseEntry(const QSqlQuery& query) const { return std::make_shared(query); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h index f7587a93..5882a0b5 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h @@ -35,14 +35,14 @@ #pragma once -#include "businessObjects/dramTimeDependencies/configurations/configurationIF.h" +#include "businessObjects/dramTimeDependencies/configurations/configurationBase.h" #include "businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h" #include "businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h" -class LPDDR4Configuration : public ConfigurationIF { +class LPDDR4Configuration : public ConfigurationBase { public: LPDDR4Configuration(const TraceDB& tdb); - std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; + std::shared_ptr makePhaseEntry(const QSqlQuery&) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h similarity index 91% rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h index fd62a755..81f82a22 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h @@ -40,12 +40,12 @@ #include "businessObjects/phases/phasedependency.h" #include "businessObjects/dramTimeDependencies/common/common.h" -class DBPhaseEntryIF { +class DBPhaseEntryBase { public: - DBPhaseEntryIF() = default; - virtual ~DBPhaseEntryIF() = default; + DBPhaseEntryBase() = default; + virtual ~DBPhaseEntryBase() = default; - virtual bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { return false; } + virtual bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { return false; } size_t id; StringMapper phaseName; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp index add142ae..ab5019ab 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp @@ -46,7 +46,7 @@ DDR3DBPhaseEntry::DDR3DBPhaseEntry(const QSqlQuery& query) { tRank = query.value(7).toLongLong(); } -bool DDR3DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { +bool DDR3DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { auto other = std::dynamic_pointer_cast(otherPhase); if (!other) return false; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h index 904ee54f..ed78fc98 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h @@ -35,14 +35,14 @@ #pragma once -#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h" +#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h" -class DDR3DBPhaseEntry : public DBPhaseEntryIF { +class DDR3DBPhaseEntry : public DBPhaseEntryBase { public: DDR3DBPhaseEntry(const QSqlQuery&); // size_t tBankgroup; size_t tRank; - bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; + bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp index 2dc988a2..ce79d097 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.cpp @@ -46,7 +46,7 @@ DDR4DBPhaseEntry::DDR4DBPhaseEntry(const QSqlQuery& query) { tRank = query.value(7).toLongLong(); } -bool DDR4DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { +bool DDR4DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { auto other = std::dynamic_pointer_cast(otherPhase); if (!other) return false; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h index 94e65857..ddf19e90 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR4dbphaseentry.h @@ -35,14 +35,14 @@ #pragma once -#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h" +#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h" -class DDR4DBPhaseEntry : public DBPhaseEntryIF { +class DDR4DBPhaseEntry : public DBPhaseEntryBase { public: DDR4DBPhaseEntry(const QSqlQuery&); size_t tBankgroup; size_t tRank; - bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; + bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp index b1d2f3e3..d2e95f6c 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.cpp @@ -46,7 +46,7 @@ DDR5DBPhaseEntry::DDR5DBPhaseEntry(const QSqlQuery& query) { tRank = query.value(7).toLongLong(); } -bool DDR5DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { +bool DDR5DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { auto other = std::dynamic_pointer_cast(otherPhase); if (!other) return false; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h index 651b8fb3..6b118760 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR5dbphaseentry.h @@ -35,9 +35,9 @@ #pragma once -#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h" +#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h" -class DDR5DBPhaseEntry : public DBPhaseEntryIF { +class DDR5DBPhaseEntry : public DBPhaseEntryBase { public: DDR5DBPhaseEntry(const QSqlQuery&); @@ -48,5 +48,5 @@ class DDR5DBPhaseEntry : public DBPhaseEntryIF { size_t tPhysicalRank; size_t tDIMMRank; - bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; + bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp index 1c0b039e..6403f9bf 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.cpp @@ -46,7 +46,7 @@ HBM2DBPhaseEntry::HBM2DBPhaseEntry(const QSqlQuery& query) { tRank = query.value(7).toLongLong(); } -bool HBM2DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { +bool HBM2DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { auto other = std::dynamic_pointer_cast(otherPhase); if (!other) return false; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h index d3b6c24a..476f9e99 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/HBM2dbphaseentry.h @@ -35,14 +35,14 @@ #pragma once -#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h" +#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h" -class HBM2DBPhaseEntry : public DBPhaseEntryIF { +class HBM2DBPhaseEntry : public DBPhaseEntryBase { public: HBM2DBPhaseEntry(const QSqlQuery&); size_t tBankgroup; size_t tRank; - bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; + bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp index d16e296b..78de425b 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp @@ -46,7 +46,7 @@ LPDDR4DBPhaseEntry::LPDDR4DBPhaseEntry(const QSqlQuery& query) { tRank = query.value(7).toLongLong(); } -bool LPDDR4DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { +bool LPDDR4DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const { auto other = std::dynamic_pointer_cast(otherPhase); if (!other) return false; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h index e2612bce..1017ea8f 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h @@ -36,14 +36,14 @@ #pragma once -#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryIF.h" +#include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h" -class LPDDR4DBPhaseEntry : public DBPhaseEntryIF { +class LPDDR4DBPhaseEntry : public DBPhaseEntryBase { public: LPDDR4DBPhaseEntry(const QSqlQuery&); // size_t tBankgroup; size_t tRank; - bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; + bool potentialDependency(const TimeDependency& dep, const std::shared_ptr otherPhase) const override; }; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp similarity index 88% rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.cpp rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp index df67097c..00ee6b85 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.cpp @@ -33,18 +33,18 @@ * Iron Prando da Silva */ -#include "dramtimedependenciesIF.h" +#include "dramtimedependenciesbase.h" #include -DRAMTimeDependenciesIF::DRAMTimeDependenciesIF(const QJsonObject& memspec, const uint inTCK) { +DRAMTimeDependenciesBase::DRAMTimeDependenciesBase(const QJsonObject& memspec, const uint inTCK) { mMemspecJson = memspec; tCK = inTCK; } DependencyMap -DRAMTimeDependenciesIF::getDependencies(std::vector& dependencyFilter) const { +DRAMTimeDependenciesBase::getDependencies(std::vector& dependencyFilter) const { DependencyMap dependenciesMap; std::vector dependencyFilterStrMapper(dependencyFilter.begin(), dependencyFilter.end()); @@ -68,11 +68,11 @@ DRAMTimeDependenciesIF::getDependencies(std::vector& dependencyFilter) return dependenciesMap; } -PoolControllerMap DRAMTimeDependenciesIF::getPools() const { +PoolControllerMap DRAMTimeDependenciesBase::getPools() const { return PoolControllerMap(mPools); } -void DRAMTimeDependenciesIF::mFilterDependencyList(std::vector& dependencyList, const std::vector& dependencyFilter) const { +void DRAMTimeDependenciesBase::mFilterDependencyList(std::vector& dependencyList, const std::vector& dependencyFilter) const { std::vector newDepList(dependencyList.size()); // TODO - probably there is a smarter way to filter these values, @@ -113,7 +113,7 @@ void DRAMTimeDependenciesIF::mFilterDependencyList(std::vector& } -void DRAMTimeDependenciesIF::mFilterDependencyMap(DependencyMap& dependencyMap, const std::vector& dependencyFilter) const { +void DRAMTimeDependenciesBase::mFilterDependencyMap(DependencyMap& dependencyMap, const std::vector& dependencyFilter) const { if (!dependencyMap.empty()) { auto itFilter = dependencyFilter.begin(); @@ -159,7 +159,7 @@ void DRAMTimeDependenciesIF::mFilterDependencyMap(DependencyMap& dependencyMap, } -uint DRAMTimeDependenciesIF::mFindVectorMaximum(const std::vector& dependencyList) const { +uint DRAMTimeDependenciesBase::mFindVectorMaximum(const std::vector& dependencyList) const { auto maxElement = std::max_element( dependencyList.begin(), dependencyList.end(), diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h similarity index 94% rename from DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.h rename to DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h index bfdeb033..04f524fb 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h @@ -39,10 +39,10 @@ #include "businessObjects/dramTimeDependencies/common/common.h" #include "poolcontrollermap.h" -class DRAMTimeDependenciesIF { +class DRAMTimeDependenciesBase { public: - DRAMTimeDependenciesIF(const QJsonObject& memspec, const uint tCK); - virtual ~DRAMTimeDependenciesIF() = default; + DRAMTimeDependenciesBase(const QJsonObject& memspec, const uint tCK); + virtual ~DRAMTimeDependenciesBase() = default; DependencyMap getDependencies(std::vector& dependencyFilter) const; diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp index 4cdf2562..9382eadf 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.cpp @@ -37,7 +37,7 @@ using namespace std; -DDR3TimeDependencies::DDR3TimeDependencies(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesIF(memspec, tCK) { +DDR3TimeDependencies::DDR3TimeDependencies(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesBase(memspec, tCK) { mInitializeValues(); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h index 1d7f777e..ae73e23c 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/DDR3TimeDependencies.h @@ -35,9 +35,9 @@ #pragma once -#include "businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesIF.h" +#include "businessObjects/dramTimeDependencies/deviceDependencies/dramtimedependenciesbase.h" -class DDR3TimeDependencies final : public DRAMTimeDependenciesIF { +class DDR3TimeDependencies final : public DRAMTimeDependenciesBase { public: DDR3TimeDependencies(const QJsonObject& memspec, const uint tCK); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp index 5b68f4fd..d3cc0756 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.cpp @@ -37,7 +37,7 @@ using namespace std; -TimeDependenciesInfoDDR3::TimeDependenciesInfoDDR3(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesIF(memspec, tCK) { +TimeDependenciesInfoDDR3::TimeDependenciesInfoDDR3(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesBase(memspec, tCK) { mInitializeValues(); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h index b1b5bd73..89183f1b 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR3.h @@ -35,9 +35,9 @@ #pragma once -#include "../dramtimedependenciesIF.h" +#include "../dramtimedependenciesbase.h" -class TimeDependenciesInfoDDR3 final : public DRAMTimeDependenciesIF { +class TimeDependenciesInfoDDR3 final : public DRAMTimeDependenciesBase { public: TimeDependenciesInfoDDR3(const QJsonObject& memspec, const uint clk); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp index 9a6a89c5..afcd0b62 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.cpp @@ -37,7 +37,7 @@ using namespace std; -TimeDependenciesInfoDDR4::TimeDependenciesInfoDDR4(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesIF(memspec, tCK) { +TimeDependenciesInfoDDR4::TimeDependenciesInfoDDR4(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesBase(memspec, tCK) { mInitializeValues(); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h index f6366603..ac974ec7 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR4.h @@ -35,9 +35,9 @@ #pragma once -#include "../dramtimedependenciesIF.h" +#include "../dramtimedependenciesbase.h" -class TimeDependenciesInfoDDR4 final : public DRAMTimeDependenciesIF { +class TimeDependenciesInfoDDR4 final : public DRAMTimeDependenciesBase { public: TimeDependenciesInfoDDR4(const QJsonObject& memspec, const uint clk); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp index 58020485..60083362 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.cpp @@ -38,7 +38,7 @@ using namespace std; -TimeDependenciesInfoDDR5::TimeDependenciesInfoDDR5(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesIF(memspec, tCK) { +TimeDependenciesInfoDDR5::TimeDependenciesInfoDDR5(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesBase(memspec, tCK) { mInitializeValues(); mBitsDIMMRanks = ceil(log2(mNumOfDIMMRanks)); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h index a3b587b5..e07bb7ad 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoDDR5.h @@ -35,9 +35,9 @@ #pragma once -#include "../dramtimedependenciesIF.h" +#include "../dramtimedependenciesbase.h" -class TimeDependenciesInfoDDR5 final : public DRAMTimeDependenciesIF { +class TimeDependenciesInfoDDR5 final : public DRAMTimeDependenciesBase { public: TimeDependenciesInfoDDR5(const QJsonObject& memspec, const uint clk); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp index 790a4ed7..6f8c849a 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.cpp @@ -37,7 +37,7 @@ using namespace std; -TimeDependenciesInfoHBM2::TimeDependenciesInfoHBM2(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesIF(memspec, tCK) { +TimeDependenciesInfoHBM2::TimeDependenciesInfoHBM2(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesBase(memspec, tCK) { mInitializeValues(); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h index 8ec86bb8..06a55775 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoHBM2.h @@ -35,9 +35,9 @@ #pragma once -#include "../dramtimedependenciesIF.h" +#include "../dramtimedependenciesbase.h" -class TimeDependenciesInfoHBM2 final : public DRAMTimeDependenciesIF { +class TimeDependenciesInfoHBM2 final : public DRAMTimeDependenciesBase { public: TimeDependenciesInfoHBM2(const QJsonObject& memspec, const uint clk); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp index 8f988584..3b8fc142 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.cpp @@ -37,7 +37,7 @@ using namespace std; -TimeDependenciesInfoLPDDR4::TimeDependenciesInfoLPDDR4(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesIF(memspec, tCK) { +TimeDependenciesInfoLPDDR4::TimeDependenciesInfoLPDDR4(const QJsonObject& memspec, const uint tCK) : DRAMTimeDependenciesBase(memspec, tCK) { mInitializeValues(); } diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h index 20613bb1..03f49166 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/deviceDependencies/specialized/TimeDependenciesInfoLPDDR4.h @@ -35,9 +35,9 @@ #pragma once -#include "../dramtimedependenciesIF.h" +#include "../dramtimedependenciesbase.h" -class TimeDependenciesInfoLPDDR4 final : public DRAMTimeDependenciesIF { +class TimeDependenciesInfoLPDDR4 final : public DRAMTimeDependenciesBase { public: TimeDependenciesInfoLPDDR4(const QJsonObject& memspec, const uint clk); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp index a5334f19..e2ba2d9b 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp @@ -152,9 +152,9 @@ void PhaseDependenciesTracker::mInsertIntoTable(TraceDB& tdb, const std::vector< } -const std::vector> -PhaseDependenciesTracker::mGetFilteredPhases(const std::shared_ptr deviceConfig, TraceDB& tdb, const std::vector& commands) { - std::vector> phases; +const std::vector> +PhaseDependenciesTracker::mGetFilteredPhases(const std::shared_ptr deviceConfig, TraceDB& tdb, const std::vector& commands) { + std::vector> phases; QString queryStr = "SELECT Phases.*, Transactions.TBank, Transactions.TBankgroup, Transactions.TRank " " FROM Phases " @@ -207,7 +207,7 @@ PhaseDependenciesTracker::mGetFilteredPhases(const std::shared_ptr -PhaseDependenciesTracker::mCalculateDependencies(const std::shared_ptr deviceConfig, const std::vector>& phases, std::vector& commands) { +PhaseDependenciesTracker::mCalculateDependencies(const std::shared_ptr deviceConfig, const std::vector>& phases, std::vector& commands) { std::vector entries; entries.reserve((size_t) (0.4 * phases.size())); diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h index ebd7e16a..de20b25f 100644 --- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h +++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.h @@ -52,8 +52,8 @@ private: static void mCreateTable(TraceDB& tdb); static void mInsertIntoTable(TraceDB& tdb, const std::vector& entries); - static const std::vector> mGetFilteredPhases(const std::shared_ptr, TraceDB& tdb, const std::vector& commands); - static const std::vector mCalculateDependencies(const std::shared_ptr, const std::vector>& phases, std::vector& commands); + static const std::vector> mGetFilteredPhases(const std::shared_ptr, TraceDB& tdb, const std::vector& commands); + static const std::vector mCalculateDependencies(const std::shared_ptr, const std::vector>& phases, std::vector& commands); static QSqlQuery mExecuteQuery(TraceDB& tdb, const QString queryStr);