Matthew Poremba has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/28808 )
Change subject: mem: Defer deletion of respQueue.front() in DRAMCtrl
......................................................................
mem: Defer deletion of respQueue.front() in DRAMCtrl
The front() of respQueue was being deleted before the last usuage of
dram_pkt (which points to the same object) causing random crashes.
Change-Id: I89862d10599dc0d1a50717dac8ed9298b4d74a3d
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/28808
Reviewed-by: Nikos Nikoleris <nikos.nikole...@arm.com>
Maintainer: Nikos Nikoleris <nikos.nikole...@arm.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/mem/dram_ctrl.cc
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/mem/dram_ctrl.cc b/src/mem/dram_ctrl.cc
index 0a8479e..5f0fcc7 100644
--- a/src/mem/dram_ctrl.cc
+++ b/src/mem/dram_ctrl.cc
@@ -716,7 +716,7 @@
accessAndRespond(dram_pkt->pkt, frontendLatency + backendLatency);
}
- delete respQueue.front();
+ assert(respQueue.front() == dram_pkt);
respQueue.pop_front();
if (!respQueue.empty()) {
@@ -738,6 +738,8 @@
}
}
+ delete dram_pkt;
+
// We have made a location in the queue available at this point,
// so if there is a read that was forced to wait, retry now
if (retryRdReq) {
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/28808
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v20.0.0.0
Gerrit-Change-Id: I89862d10599dc0d1a50717dac8ed9298b4d74a3d
Gerrit-Change-Number: 28808
Gerrit-PatchSet: 3
Gerrit-Owner: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-Reviewer: Jason Lowe-Power <power...@gmail.com>
Gerrit-Reviewer: Matthew Poremba <matthew.pore...@amd.com>
Gerrit-Reviewer: Nikos Nikoleris <nikos.nikole...@arm.com>
Gerrit-Reviewer: Wendy Elsasser <wendy.elsas...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
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
