commit 7cb1010bdedb613b06fcf2cb582e14c57d1d794f
author Jordi Vaquero <jordi.vaquero@metempsy.com> Fri Jul 26 16:31:39 2019 +0200
committer Jordi Vaquero <jordi.vaquero@metempsy.com> Wed Aug 07 17:19:22 2019 +0000
tree 47cd96527975bca62b3181f97943ce145dc50df3
parent 5f0ffd5d49ee5907847f398bbd976f0ebb785e36

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>

src/cpu/o3/lsq.hh

diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index 4701a8c..29c76f7 100644
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -366,7 +366,7 @@
                 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);
                 }