From 8ad9cb05f7f0a934345e992aa536fbf7f3d5f29d Mon Sep 17 00:00:00 2001
From: Iron Prando da Silva <ironprando@gmail.com>
Date: Tue, 15 Feb 2022 09:51:21 +0100
Subject: [PATCH] Added more DependencyType enumerators.

---
 .../phasedependenciestracker.cpp                  | 10 ++++++----
 .../businessObjects/phases/phasedependency.cpp    | 15 +++++++++++++++
 .../businessObjects/phases/phasedependency.h      |  7 ++++++-
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
index 5272d774..6f99fab5 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/dramTimeDependencies/phasedependenciestracker.cpp
@@ -216,11 +216,13 @@ PhaseDependenciesTracker::mCalculateDependencies(const std::shared_ptr<Configura
                     continue;
                 }
 
-                // Captures activate window dependencies
-                if (poolSubstrPos != -1) {       
+                if (poolSubstrPos != -1) {
+                    // Captures activate window dependencies
+                    QString poolName = dep.phaseDep.left(poolSubstrPos);
+
+                    // TODO - modify structures so the condition can be checked as below
+                    // if (poolController.isDependency(poolName, otherPhase->phaseName)) {
                     if (otherPhase->phaseName == "ACT") {
-                        QString poolName = dep.phaseDep.left(poolSubstrPos);
-                        
                         if (timeDiff == dep.timeValue) { 
                             // Captures only the first (exactly matching time) ACT in
                             // the ACT window as a dependency
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp b/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp
index de6c65ff..0cd7ec0e 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp
+++ b/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.cpp
@@ -136,12 +136,27 @@ QString PhaseDependency::dependencyTypeName(DependencyType dtype) {
         case IntraBank:
             return "IntraBank";
 
+        case IntraBankGroup:
+            return "IntraBankGroup";
+
         case IntraRank:
             return "IntraRank";
 
+        case IntraLogicalRank:
+            return "IntraLogicalRank";
+
+        case IntraPhysicalRank:
+            return "IntraPhysicalRank";
+
+        case IntraDIMMRank:
+            return "IntraDIMMRank";
+
         case InterRank:
             return "InterRank";
 
+        case InterDIMMRank:
+            return "InterDIMMRank";
+
         default:
             // TODO - maybe throw?
             return "";
diff --git a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h b/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h
index 439f973c..a29a67dd 100644
--- a/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h
+++ b/DRAMSys/traceAnalyzer/businessObjects/phases/phasedependency.h
@@ -49,8 +49,13 @@ class Phase;
 enum DependencyType
 {
     IntraBank,
+    IntraBankGroup,
     IntraRank,
-    InterRank
+    IntraLogicalRank,
+    IntraPhysicalRank,
+    IntraDIMMRank,
+    InterRank,
+    InterDIMMRank,
 };
 
 class PhaseDependency