From 133399c91db671ba7a72b677955755a6449799f9 Mon Sep 17 00:00:00 2001 From: Tom Rollet Date: Tue, 7 Sep 2021 17:46:35 +0200 Subject: [PATCH] cpu-o3: remove useless indirection from lsq to cpu Change-Id: Idd2d4277b542da728f0740590ae7ef9ae9b76629 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50731 Maintainer: Bobby R. Bruce Tested-by: kokoro Reviewed-by: Gabe Black --- src/cpu/o3/cpu.hh | 14 -------------- src/cpu/o3/lsq.cc | 4 ++-- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh index 6a02cb8ba5..d7d660a654 100644 --- a/src/cpu/o3/cpu.hh +++ b/src/cpu/o3/cpu.hh @@ -646,20 +646,6 @@ class CPU : public BaseCPU flags, res, std::move(amo_op), byte_enable); } - /** CPU read function, forwards read to LSQ. */ - Fault - read(LSQRequest* req, int load_idx) - { - return iew.ldstQueue.read(req, load_idx); - } - - /** CPU write function, forwards write to LSQ. */ - Fault - write(LSQRequest* req, uint8_t *data, int store_idx) - { - return iew.ldstQueue.write(req, data, store_idx); - } - /** Used by the fetch unit to get a hold of the instruction port. */ Port & getInstPort() override diff --git a/src/cpu/o3/lsq.cc b/src/cpu/o3/lsq.cc index 110c58a442..babfa92ec4 100644 --- a/src/cpu/o3/lsq.cc +++ b/src/cpu/o3/lsq.cc @@ -834,9 +834,9 @@ LSQ::pushRequest(const DynInstPtr& inst, bool isLoad, uint8_t *data, } Fault fault; if (isLoad) - fault = cpu->read(req, inst->lqIdx); + fault = read(req, inst->lqIdx); else - fault = cpu->write(req, data, inst->sqIdx); + fault = write(req, data, inst->sqIdx); // inst->getFault() may have the first-fault of a // multi-access split request at this point. // Overwrite that only if we got another type of fault