[gem5-dev] Change in gem5/gem5[develop]: mem: Update instances of masterId

[Shivani Parekh (Gerrit) via gem5-dev]

Shivani Parekh has uploaded this change for review. (  
https://gem5-review.googlesource.com/c/public/gem5/+/33534 )

Change subject: mem: Update instances of masterId
......................................................................

mem: Update instances of masterId

Change-Id: If2b70dd98a57cf879349df467fd65c64dcec55b9
---
M src/mem/dram_ctrl.hh
M src/mem/external_master.cc
M src/mem/external_master.hh
M src/mem/qos/q_policy.cc
4 files changed, 9 insertions(+), 9 deletions(-)



diff --git a/src/mem/dram_ctrl.hh b/src/mem/dram_ctrl.hh
index 78a50fd..778d9fa 100644
--- a/src/mem/dram_ctrl.hh
+++ b/src/mem/dram_ctrl.hh
@@ -618,7 +618,7 @@
         const PacketPtr pkt;

         /** MasterID associated with the packet */
-        const MasterID _masterId;
+        const MasterID _requestorId;

         const bool read;

@@ -677,7 +677,7 @@
          * Get the packet MasterID
          * (interface compatibility with Packet)
          */
-        inline MasterID masterId() const { return _masterId; }
+        inline MasterID masterId() const { return _requestorId; }

         /**
          * Get the packet size
@@ -708,7 +708,7 @@
                    uint32_t _row, uint16_t bank_id, Addr _addr,
                    unsigned int _size, Bank& bank_ref, Rank& rank_ref)
             : entryTime(curTick()), readyTime(curTick()), pkt(_pkt),
-              _masterId(pkt->masterId()),
+              _requestorId(pkt->masterId()),
               read(is_read), rank(_rank), bank(_bank), row(_row),
               bankId(bank_id), addr(_addr), size(_size), burstHelper(NULL),
               bankRef(bank_ref), rankRef(rank_ref),  
_qosValue(_pkt->qosValue())
diff --git a/src/mem/external_master.cc b/src/mem/external_master.cc
index 1a1ec40..9cee9e7 100644
--- a/src/mem/external_master.cc
+++ b/src/mem/external_master.cc
@@ -53,7 +53,7 @@
     portName(params->name + ".port"),
     portType(params->port_type),
     portData(params->port_data),
-    masterId(params->system->getMasterId(this))
+    _id(params->system->getMasterId(this))
 {}

 Port &
diff --git a/src/mem/external_master.hh b/src/mem/external_master.hh
index fb289a6..1099489 100644
--- a/src/mem/external_master.hh
+++ b/src/mem/external_master.hh
@@ -128,7 +128,7 @@

     void init() override;

-    const MasterID masterId;
+    const MasterID _id;
 };


diff --git a/src/mem/qos/q_policy.cc b/src/mem/qos/q_policy.cc
index e8235dc..21fe88f 100644
--- a/src/mem/qos/q_policy.cc
+++ b/src/mem/qos/q_policy.cc
@@ -119,10 +119,10 @@
         DPRINTF(QOS, "QoSQPolicy::lrg evaluating alternative "
                      "unique id %d\n", uniqueId);

-        if (track.find(masterId) != track.end()) {
-            ret = track[masterId];
-            DPRINTF(QOS, "QoSQPolicy::lrg master id "
-                         "%d selected for service\n", masterId);
+        if (track.find(uniqueId) != track.end()) {
+            ret = track[uniqueId];
+            DPRINTF(QOS, "QoSQPolicy::lrg unique id "
+                         "%d selected for service\n", uniqueId);

             return ret;
         }

--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/33534
To unsubscribe, or for help writing mail filters, visit  
https://gem5-review.googlesource.com/settings

Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If2b70dd98a57cf879349df467fd65c64dcec55b9
Gerrit-Change-Number: 33534
Gerrit-PatchSet: 1
Gerrit-Owner: Shivani Parekh <shpar...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s