From: Jordi Vaquero <jordi.vaquero@metempsy.com>
Date: Fri, 26 Jul 2019 14:31:39 +0000 (+0200)
Subject: cpu-o3: added _amo_op parameter in o3 LSQ
X-Git-Tag: v19.0.0.0~684
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7cb1010bdedb613b06fcf2cb582e14c57d1d794f;p=gem5.git

cpu-o3: added _amo_op parameter in o3 LSQ

Fix bug with AMO (or RMW) instructions where the amo_op variable
is not being propagated to the LSQ request.

Change-Id: I60c59641d9b497051376f638e27f3c4cc361f615
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19814
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Anthony Gutierrez <anthony.gutierrez@amd.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>
---

diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index 4701a8c9a..29c76f7b6 100644
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -366,7 +366,7 @@ class LSQ
                 isAnyActiveElement(byteEnable.begin(), byteEnable.end())) {
                 auto request = std::make_shared<Request>(_inst->getASID(),
                         addr, size, _flags, _inst->masterId(),
-                        _inst->instAddr(), _inst->contextId());
+                        _inst->instAddr(), _inst->contextId(), _amo_op);
                 if (!byteEnable.empty()) {
                     request->setByteEnable(byteEnable);
                 }