From 1fc4b238fedae232f45b0c2fa5444fb5369251f2 Mon Sep 17 00:00:00 2001
From: Iron Prando da Silva <ironprando@gmail.com>
Date: Tue, 10 May 2022 09:08:32 +0200
Subject: [PATCH] Refactored query string out of dependency tracker to
 individual device configuration objects.

---
 .../dramTimeDependencies/common/common.h      |  2 +-
 .../common/timedependency.h                   |  2 +-
 .../configurations/configurationBase.h        | 29 ++++++++++---------
 .../specialized/DDR3Configuration.cpp         | 16 ++++++++++
 .../specialized/DDR3Configuration.h           |  1 +
 .../specialized/DDR4Configuration.cpp         | 16 ++++++++++
 .../specialized/DDR4Configuration.h           |  1 +
 .../specialized/DDR5Configuration.cpp         | 16 ++++++++++
 .../specialized/DDR5Configuration.h           |  1 +
 .../specialized/HBM2Configuration.cpp         | 16 ++++++++++
 .../specialized/HBM2Configuration.h           |  1 +
 .../specialized/LPDDR4Configuration.cpp       | 16 ++++++++++
 .../specialized/LPDDR4Configuration.h         |  1 +
 .../specialized/LPDDR5Configuration.cpp       | 16 ++++++++++
 .../specialized/LPDDR5Configuration.h         |  1 +
 .../specialized/DDR3dbphaseentry.cpp          |  3 +-
 .../dbEntries/specialized/DDR3dbphaseentry.h  |  1 -
 .../specialized/LPDDR4dbphaseentry.cpp        |  3 +-
 .../specialized/LPDDR4dbphaseentry.h          |  1 -
 .../phasedependenciestracker.cpp              | 13 +--------
 20 files changed, 123 insertions(+), 33 deletions(-)

diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
index 6b673bbf..00518eb5 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/common.h
@@ -64,4 +64,4 @@ struct DBDependencyEntry {
     QString timeDependency;
     size_t dependencyPhaseID;
     QString dependencyPhaseName;
-};
\ No newline at end of file
+};
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
index 7fd828fc..171c5bc7 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/common/timedependency.h
@@ -42,7 +42,7 @@ class TimeDependency {
 public:
     TimeDependency() = default;
     TimeDependency(size_t timeValue, QString phaseDep, DependencyType depType, 
-                   QString timeDepName, bool considerIntraRank = false)
+                   QString timeDepName)
     : timeValue{timeValue}, phaseDep{phaseDep}, depType{depType}, 
       timeDepName{timeDepName} {}
 
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h
index a9eb54e7..9ac9efc7 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/configurationBase.h
@@ -41,23 +41,26 @@
 #include "businessObjects/dramTimeDependencies/dbEntries/dbphaseentryBase.h"
 
 class ConfigurationBase {
- public:
-    ConfigurationBase() {};
-    virtual ~ConfigurationBase() = default;
+public:
+   ConfigurationBase() {};
+   virtual ~ConfigurationBase() = default;
 
-    virtual std::shared_ptr<DBPhaseEntryBase> makePhaseEntry(const QSqlQuery&) const { return nullptr; }
+   virtual QString getQueryStr(const std::vector<QString>& commands) const = 0;
+   virtual std::shared_ptr<DBPhaseEntryBase> makePhaseEntry(const QSqlQuery&) const = 0;
     
-    // Delegated methods
-    const uint getClk() const;
-    DependencyMap getDependencies(std::vector<QString>& commands) const;
-    PoolControllerMap getPools() const;
+   // Delegated methods
+   const uint getClk() const;
+   DependencyMap getDependencies(std::vector<QString>& commands) const;
+   PoolControllerMap getPools() const;
 
-    static const QString getDeviceName(const TraceDB& tdb);
+   static const QString getDeviceName(const TraceDB& tdb);
 
- protected:
-    std::shared_ptr<DRAMTimeDependenciesBase> mDeviceDeps = nullptr;
+protected:
+   std::shared_ptr<DRAMTimeDependenciesBase> mDeviceDeps = nullptr;
 
-    static const uint mGetClk(const TraceDB& tdb);
-    static const QJsonObject mGetMemspec(const TraceDB& tdb);
+   static const uint mGetClk(const TraceDB& tdb);
+   static const QJsonObject mGetMemspec(const TraceDB& tdb);
+
+   QSqlQuery mExecuteQuery(const QString& queryStr);
 
 };
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp
index ce676838..8887295f 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.cpp
@@ -41,6 +41,22 @@ DDR3Configuration::DDR3Configuration(const TraceDB& tdb) {
 
 }
 
+QString DDR3Configuration::getQueryStr(const std::vector<QString>& commands) const {
+    QString queryStr = "SELECT Phases.*, Transactions.TBank, Transactions.TRank "
+            " FROM Phases "
+            " INNER JOIN Transactions "
+            " ON Phases.Transact=Transactions.ID "
+            " WHERE PhaseName IN (";
+        
+    for (const auto& cmd : commands) {
+        queryStr = queryStr + '\"' + cmd + "\",";
+    }
+    queryStr.back() = ')'; 
+    queryStr += " ORDER BY PhaseBegin; ";
+
+    return queryStr;
+}
+
 std::shared_ptr<DBPhaseEntryBase> DDR3Configuration::makePhaseEntry(const QSqlQuery& query) const {
     return std::make_shared<DDR3DBPhaseEntry>(query);
 }
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h
index 0d0b74db..97fe6175 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR3Configuration.h
@@ -44,6 +44,7 @@ class DDR3Configuration : public ConfigurationBase {
  public:
     DDR3Configuration(const TraceDB& tdb);
 
+    QString getQueryStr(const std::vector<QString>& commands) const override;
     std::shared_ptr<DBPhaseEntryBase> 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 d36d11f3..88de913c 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.cpp
@@ -40,6 +40,22 @@ DDR4Configuration::DDR4Configuration(const TraceDB& tdb) {
 
 }
 
+QString DDR4Configuration::getQueryStr(const std::vector<QString>& commands) const {
+    QString queryStr = "SELECT Phases.*, Transactions.TBank, Transactions.TBankgroup, Transactions.TRank "
+            " FROM Phases "
+            " INNER JOIN Transactions "
+            " ON Phases.Transact=Transactions.ID "
+            " WHERE PhaseName IN (";
+        
+    for (const auto& cmd : commands) {
+        queryStr = queryStr + '\"' + cmd + "\",";
+    }
+    queryStr.back() = ')'; 
+    queryStr += " ORDER BY PhaseBegin; ";
+
+    return queryStr;
+}
+
 std::shared_ptr<DBPhaseEntryBase> DDR4Configuration::makePhaseEntry(const QSqlQuery& query) const {
     return std::make_shared<DDR4DBPhaseEntry>(query);
 }
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h
index f089b2e2..81d63577 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR4Configuration.h
@@ -43,6 +43,7 @@ class DDR4Configuration : public ConfigurationBase {
  public:
     DDR4Configuration(const TraceDB& tdb);
 
+    QString getQueryStr(const std::vector<QString>& commands) const override;
     std::shared_ptr<DBPhaseEntryBase> 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 e0957d53..6dc968e1 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.cpp
@@ -41,6 +41,22 @@ DDR5Configuration::DDR5Configuration(const TraceDB& tdb) {
 
 }
 
+QString DDR5Configuration::getQueryStr(const std::vector<QString>& commands) const {
+    QString queryStr = "SELECT Phases.*, Transactions.TBank, Transactions.TBankgroup, Transactions.TRank "
+            " FROM Phases "
+            " INNER JOIN Transactions "
+            " ON Phases.Transact=Transactions.ID "
+            " WHERE PhaseName IN (";
+        
+    for (const auto& cmd : commands) {
+        queryStr = queryStr + '\"' + cmd + "\",";
+    }
+    queryStr.back() = ')'; 
+    queryStr += " ORDER BY PhaseBegin; ";
+
+    return queryStr;
+}
+
 std::shared_ptr<DBPhaseEntryBase> DDR5Configuration::makePhaseEntry(const QSqlQuery& query) const {
     auto phase = std::make_shared<DDR5DBPhaseEntry>(query);
     
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h
index 700e6af9..f04b9ecb 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/DDR5Configuration.h
@@ -43,6 +43,7 @@ class DDR5Configuration : public ConfigurationBase {
  public:
     DDR5Configuration(const TraceDB& tdb);
 
+    QString getQueryStr(const std::vector<QString>& commands) const override;
     std::shared_ptr<DBPhaseEntryBase> 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 59586627..7efa3804 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.cpp
@@ -40,6 +40,22 @@ HBM2Configuration::HBM2Configuration(const TraceDB& tdb) {
 
 }
 
+QString HBM2Configuration::getQueryStr(const std::vector<QString>& commands) const {
+    QString queryStr = "SELECT Phases.*, Transactions.TBank, Transactions.TBankgroup, Transactions.TRank "
+            " FROM Phases "
+            " INNER JOIN Transactions "
+            " ON Phases.Transact=Transactions.ID "
+            " WHERE PhaseName IN (";
+        
+    for (const auto& cmd : commands) {
+        queryStr = queryStr + '\"' + cmd + "\",";
+    }
+    queryStr.back() = ')'; 
+    queryStr += " ORDER BY PhaseBegin; ";
+
+    return queryStr;
+}
+
 std::shared_ptr<DBPhaseEntryBase> HBM2Configuration::makePhaseEntry(const QSqlQuery& query) const {
     return std::make_shared<HBM2DBPhaseEntry>(query);
 }
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h
index ac6297e4..cdecc6c2 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/HBM2Configuration.h
@@ -43,6 +43,7 @@ class HBM2Configuration : public ConfigurationBase {
  public:
     HBM2Configuration(const TraceDB& tdb);
 
+    QString getQueryStr(const std::vector<QString>& commands) const override;
     std::shared_ptr<DBPhaseEntryBase> 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 b8b66f0a..1d736cfd 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.cpp
@@ -41,6 +41,22 @@ LPDDR4Configuration::LPDDR4Configuration(const TraceDB& tdb) {
 
 }
 
+QString LPDDR4Configuration::getQueryStr(const std::vector<QString>& commands) const {
+    QString queryStr = "SELECT Phases.*, Transactions.TBank, Transactions.TRank "
+            " FROM Phases "
+            " INNER JOIN Transactions "
+            " ON Phases.Transact=Transactions.ID "
+            " WHERE PhaseName IN (";
+        
+    for (const auto& cmd : commands) {
+        queryStr = queryStr + '\"' + cmd + "\",";
+    }
+    queryStr.back() = ')'; 
+    queryStr += " ORDER BY PhaseBegin; ";
+
+    return queryStr;
+}
+
 std::shared_ptr<DBPhaseEntryBase> LPDDR4Configuration::makePhaseEntry(const QSqlQuery& query) const {
     return std::make_shared<LPDDR4DBPhaseEntry>(query);
 }
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h
index 5882a0b5..ca48f51b 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR4Configuration.h
@@ -43,6 +43,7 @@ class LPDDR4Configuration : public ConfigurationBase {
  public:
     LPDDR4Configuration(const TraceDB& tdb);
 
+    QString getQueryStr(const std::vector<QString>& commands) const override;
     std::shared_ptr<DBPhaseEntryBase> makePhaseEntry(const QSqlQuery&) const override;
 
 };
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp
index 403cce5f..0eb42b91 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.cpp
@@ -41,6 +41,22 @@ LPDDR5Configuration::LPDDR5Configuration(const TraceDB& tdb) {
 
 }
 
+QString LPDDR5Configuration::getQueryStr(const std::vector<QString>& commands) const {
+    QString queryStr = "SELECT Phases.*, Transactions.TBank, Transactions.TBankgroup, Transactions.TRank "
+            " FROM Phases "
+            " INNER JOIN Transactions "
+            " ON Phases.Transact=Transactions.ID "
+            " WHERE PhaseName IN (";
+        
+    for (const auto& cmd : commands) {
+        queryStr = queryStr + '\"' + cmd + "\",";
+    }
+    queryStr.back() = ')'; 
+    queryStr += " ORDER BY PhaseBegin; ";
+
+    return queryStr;
+}
+
 std::shared_ptr<DBPhaseEntryBase> LPDDR5Configuration::makePhaseEntry(const QSqlQuery& query) const {
     auto phase = std::make_shared<LPDDR5DBPhaseEntry>(query);
     
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.h
index 1b84b4e5..8ee797e9 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/configurations/specialized/LPDDR5Configuration.h
@@ -43,6 +43,7 @@ class LPDDR5Configuration : public ConfigurationBase {
  public:
     LPDDR5Configuration(const TraceDB& tdb);
 
+    QString getQueryStr(const std::vector<QString>& commands) const override;
     std::shared_ptr<DBPhaseEntryBase> makePhaseEntry(const QSqlQuery&) const override;
 
 };
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp
index ab5019ab..7aedb3f7 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.cpp
@@ -42,8 +42,7 @@ DDR3DBPhaseEntry::DDR3DBPhaseEntry(const QSqlQuery& query) {
     phaseEnd = query.value(3).toLongLong();
     transact = query.value(4).toLongLong();
     tBank = query.value(5).toLongLong();
-    // tBankgroup = query.value(6).toLongLong();
-    tRank = query.value(7).toLongLong();
+    tRank = query.value(6).toLongLong();
 }
 
 bool DDR3DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr<DBPhaseEntryBase> otherPhase) const {
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h
index ed78fc98..44c76547 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/DDR3dbphaseentry.h
@@ -41,7 +41,6 @@ class DDR3DBPhaseEntry : public DBPhaseEntryBase {
  public:
     DDR3DBPhaseEntry(const QSqlQuery&);
 
-    // size_t tBankgroup;
     size_t tRank;
 
     bool potentialDependency(const TimeDependency& dep, const std::shared_ptr<DBPhaseEntryBase> otherPhase) const override;
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp
index 78de425b..93e46fcf 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.cpp
@@ -42,8 +42,7 @@ LPDDR4DBPhaseEntry::LPDDR4DBPhaseEntry(const QSqlQuery& query) {
     phaseEnd = query.value(3).toLongLong();
     transact = query.value(4).toLongLong();
     tBank = query.value(5).toLongLong();
-    // tBankgroup = query.value(6).toLongLong();
-    tRank = query.value(7).toLongLong();
+    tRank = query.value(6).toLongLong();
 }
 
 bool LPDDR4DBPhaseEntry::potentialDependency(const TimeDependency& dep, const std::shared_ptr<DBPhaseEntryBase> otherPhase) const {
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h
index 1017ea8f..f3faad70 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/dbEntries/specialized/LPDDR4dbphaseentry.h
@@ -42,7 +42,6 @@ class LPDDR4DBPhaseEntry : public DBPhaseEntryBase {
  public:
     LPDDR4DBPhaseEntry(const QSqlQuery&);
 
-    // size_t tBankgroup;
     size_t tRank;
 
     bool potentialDependency(const TimeDependency& dep, const std::shared_ptr<DBPhaseEntryBase> otherPhase) const override;
diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
index eb935e2d..57bbdec8 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
@@ -156,17 +156,7 @@ const std::vector<std::shared_ptr<DBPhaseEntryBase>>
 PhaseDependenciesTracker::mGetFilteredPhases(const std::shared_ptr<ConfigurationBase> deviceConfig, TraceDB& tdb, const std::vector<QString>& commands) {
     std::vector<std::shared_ptr<DBPhaseEntryBase>> phases;
 
-    QString queryStr = "SELECT Phases.*, Transactions.TBank, Transactions.TBankgroup, Transactions.TRank "
-            " FROM Phases "
-            " INNER JOIN Transactions "
-            " ON Phases.Transact=Transactions.ID "
-            " WHERE PhaseName IN (";
-        
-    for (const auto& cmd : commands) {
-        queryStr = queryStr + '\"' + cmd + "\",";
-    }
-    queryStr.back() = ')'; 
-    queryStr += " ORDER BY PhaseBegin; ";
+    QString queryStr = deviceConfig->getQueryStr(commands);
 
     auto query = mExecuteQuery(tdb, queryStr);
 
@@ -191,7 +181,6 @@ PhaseDependenciesTracker::mGetFilteredPhases(const std::shared_ptr<Configuration
 
     size_t rowIt = 0;
     do {
-        // TODO factory method
         phases[rowIt] = deviceConfig->makePhaseEntry(query);
 
         ++rowIt;