Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/23282 )
Change subject: cpu: Fix coding style (byteEnable->byte_enable)
......................................................................
cpu: Fix coding style (byteEnable->byte_enable)
Change-Id: I2206559c6c2a6e6a0452e9c7d9964792afa9f358
Signed-off-by: Giacomo Travaglini <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/23282
Maintainer: Jason Lowe-Power <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Daniel Carvalho <[email protected]>
Reviewed-by: Nikos Nikoleris <[email protected]>
---
M src/cpu/base_dyn_inst.hh
M src/cpu/checker/cpu.cc
M src/cpu/checker/cpu.hh
M src/cpu/exec_context.hh
M src/cpu/minor/exec_context.hh
M src/cpu/minor/lsq.cc
M src/cpu/minor/lsq.hh
M src/cpu/o3/cpu.hh
M src/cpu/o3/lsq.hh
M src/cpu/o3/lsq_impl.hh
M src/cpu/simple/atomic.cc
M src/cpu/simple/atomic.hh
M src/cpu/simple/base.hh
M src/cpu/simple/exec_context.hh
M src/cpu/simple/timing.cc
M src/cpu/simple/timing.hh
16 files changed, 71 insertions(+), 70 deletions(-)
Approvals:
Nikos Nikoleris: Looks good to me, approved
Daniel Carvalho: Looks good to me, approved
Jason Lowe-Power: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/base_dyn_inst.hh b/src/cpu/base_dyn_inst.hh
index c228357..85ad544 100644
--- a/src/cpu/base_dyn_inst.hh
+++ b/src/cpu/base_dyn_inst.hh
@@ -304,11 +304,11 @@
}
Fault initiateMemRead(Addr addr, unsigned size, Request::Flags flags,
- const std::vector<bool>& byteEnable = std::vector<bool>());
+ const std::vector<bool>& byte_enable = std::vector<bool>());
Fault writeMem(uint8_t *data, unsigned size, Addr addr,
Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable =
std::vector<bool>());
+ const std::vector<bool>& byte_enable =
std::vector<bool>());
Fault initiateMemAMO(Addr addr, unsigned size, Request::Flags flags,
AtomicOpFunctorPtr amo_op);
@@ -963,25 +963,26 @@
Fault
BaseDynInst<Impl>::initiateMemRead(Addr addr, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
- assert(byteEnable.empty() || byteEnable.size() == size);
+ assert(byte_enable.empty() || byte_enable.size() == size);
return cpu->pushRequest(
dynamic_cast<typename DynInstPtr::PtrType>(this),
/* ld */ true, nullptr, size, addr, flags, nullptr, nullptr,
- byteEnable);
+ byte_enable);
}
template<class Impl>
Fault
BaseDynInst<Impl>::writeMem(uint8_t *data, unsigned size, Addr addr,
Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
- assert(byteEnable.empty() || byteEnable.size() == size);
+ assert(byte_enable.empty() || byte_enable.size() == size);
return cpu->pushRequest(
dynamic_cast<typename DynInstPtr::PtrType>(this),
- /* st */ false, data, size, addr, flags, res, nullptr,
byteEnable);
+ /* st */ false, data, size, addr, flags, res, nullptr,
+ byte_enable);
}
template<class Impl>
diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc
index 48ee059..2f020c4 100644
--- a/src/cpu/checker/cpu.cc
+++ b/src/cpu/checker/cpu.cc
@@ -176,9 +176,9 @@
Fault
CheckerCPU::readMem(Addr addr, uint8_t *data, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
- assert(byteEnable.empty() || byteEnable.size() == size);
+ assert(byte_enable.empty() || byte_enable.size() == size);
Fault fault = NoFault;
bool checked_flags = false;
@@ -193,7 +193,7 @@
// Need to account for multiple accesses like the Atomic and
TimingSimple
while (1) {
RequestPtr mem_req = genMemFragmentRequest(frag_addr, size, flags,
- byteEnable, frag_size,
+ byte_enable, frag_size,
size_left);
predicate = (mem_req != nullptr);
@@ -260,9 +260,9 @@
Fault
CheckerCPU::writeMem(uint8_t *data, unsigned size,
Addr addr, Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
- assert(byteEnable.empty() || byteEnable.size() == size);
+ assert(byte_enable.empty() || byte_enable.size() == size);
Fault fault = NoFault;
bool checked_flags = false;
@@ -278,7 +278,7 @@
// Need to account for a multiple access like Atomic and Timing CPUs
while (1) {
RequestPtr mem_req = genMemFragmentRequest(frag_addr, size, flags,
- byteEnable, frag_size,
+ byte_enable, frag_size,
size_left);
predicate = (mem_req != nullptr);
diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh
index e50afeb..775381c 100644
--- a/src/cpu/checker/cpu.hh
+++ b/src/cpu/checker/cpu.hh
@@ -556,12 +556,12 @@
Fault readMem(Addr addr, uint8_t *data, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable =
std::vector<bool>())
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
override;
Fault writeMem(uint8_t *data, unsigned size, Addr addr,
Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable =
std::vector<bool>())
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
override;
Fault amoMem(Addr addr, uint8_t* data, unsigned size,
diff --git a/src/cpu/exec_context.hh b/src/cpu/exec_context.hh
index 80f3eda..a96ccfc 100644
--- a/src/cpu/exec_context.hh
+++ b/src/cpu/exec_context.hh
@@ -236,7 +236,7 @@
*/
virtual Fault readMem(Addr addr, uint8_t *data, unsigned int size,
Request::Flags flags,
- const std::vector<bool>& byteEnable = std::vector<bool>())
+ const std::vector<bool>& byte_enable = std::vector<bool>())
{
panic("ExecContext::readMem() should be overridden\n");
}
@@ -250,7 +250,7 @@
*/
virtual Fault initiateMemRead(Addr addr, unsigned int size,
Request::Flags flags,
- const std::vector<bool>& byteEnable = std::vector<bool>())
+ const std::vector<bool>& byte_enable = std::vector<bool>())
{
panic("ExecContext::initiateMemRead() should be overridden\n");
}
@@ -261,7 +261,7 @@
*/
virtual Fault writeMem(uint8_t *data, unsigned int size, Addr addr,
Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable =
+ const std::vector<bool>& byte_enable =
std::vector<bool>()) = 0;
/**
diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index 9b347b2..4cc41c6 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -113,23 +113,23 @@
Fault
initiateMemRead(Addr addr, unsigned int size,
Request::Flags flags,
- const std::vector<bool>& byteEnable =
std::vector<bool>())
- override
+ const std::vector<bool>& byte_enable =
+ std::vector<bool>()) override
{
- assert(byteEnable.empty() || byteEnable.size() == size);
+ assert(byte_enable.empty() || byte_enable.size() == size);
return execute.getLSQ().pushRequest(inst, true /* load */, nullptr,
- size, addr, flags, nullptr, nullptr, byteEnable);
+ size, addr, flags, nullptr, nullptr, byte_enable);
}
Fault
writeMem(uint8_t *data, unsigned int size, Addr addr,
Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable = std::vector<bool>())
+ const std::vector<bool>& byte_enable = std::vector<bool>())
override
{
- assert(byteEnable.empty() || byteEnable.size() == size);
+ assert(byte_enable.empty() || byte_enable.size() == size);
return execute.getLSQ().pushRequest(inst, false /* store */, data,
- size, addr, flags, res, nullptr, byteEnable);
+ size, addr, flags, res, nullptr, byte_enable);
}
Fault
diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc
index 629d89d..dea776c 100644
--- a/src/cpu/minor/lsq.cc
+++ b/src/cpu/minor/lsq.cc
@@ -295,9 +295,9 @@
ThreadContext *thread = port.cpu.getContext(
inst->id.threadId);
- const auto &byteEnable = request->getByteEnable();
- if (byteEnable.size() == 0 ||
- isAnyActiveElement(byteEnable.cbegin(), byteEnable.cend())) {
+ const auto &byte_enable = request->getByteEnable();
+ if (byte_enable.size() == 0 ||
+ isAnyActiveElement(byte_enable.cbegin(), byte_enable.cend())) {
port.numAccessesInDTLB++;
setState(LSQ::LSQRequest::InTranslation);
@@ -1574,7 +1574,7 @@
LSQ::pushRequest(MinorDynInstPtr inst, bool isLoad, uint8_t *data,
unsigned int size, Addr addr, Request::Flags flags,
uint64_t *res, AtomicOpFunctorPtr amo_op,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
assert(inst->translationFault == NoFault || inst->inLSQ);
@@ -1636,7 +1636,7 @@
addr, size, flags, cpu.dataMasterId(),
/* I've no idea why we need the PC, but give it */
inst->pc.instAddr(), std::move(amo_op));
- request->request->setByteEnable(byteEnable);
+ request->request->setByteEnable(byte_enable);
requests.push(request);
inst->inLSQ = true;
diff --git a/src/cpu/minor/lsq.hh b/src/cpu/minor/lsq.hh
index c4baad8..6b98208 100644
--- a/src/cpu/minor/lsq.hh
+++ b/src/cpu/minor/lsq.hh
@@ -709,7 +709,7 @@
Fault pushRequest(MinorDynInstPtr inst, bool isLoad, uint8_t *data,
unsigned int size, Addr addr, Request::Flags flags,
uint64_t *res, AtomicOpFunctorPtr amo_op,
- const std::vector<bool>& byteEnable =
+ const std::vector<bool>& byte_enable =
std::vector<bool>());
/** Push a predicate failed-representing request into the queues just
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 7c0ea51..a129fa1 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -714,12 +714,12 @@
Fault pushRequest(const DynInstPtr& inst, bool isLoad, uint8_t *data,
unsigned int size, Addr addr, Request::Flags flags,
uint64_t *res, AtomicOpFunctorPtr amo_op = nullptr,
- const std::vector<bool>& byteEnable =
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
{
return iew.ldstQueue.pushRequest(inst, isLoad, data, size, addr,
- flags, res, std::move(amo_op), byteEnable);
+ flags, res, std::move(amo_op), byte_enable);
}
/** CPU read function, forwards read to LSQ. */
diff --git a/src/cpu/o3/lsq.hh b/src/cpu/o3/lsq.hh
index ca92790..6db005c 100644
--- a/src/cpu/o3/lsq.hh
+++ b/src/cpu/o3/lsq.hh
@@ -406,16 +406,16 @@
*/
void
addRequest(Addr addr, unsigned size,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
- if (byteEnable.empty() ||
- isAnyActiveElement(byteEnable.begin(), byteEnable.end())) {
+ if (byte_enable.empty() ||
+ isAnyActiveElement(byte_enable.begin(),
byte_enable.end())) {
auto request = std::make_shared<Request>(_inst->getASID(),
addr, size, _flags, _inst->masterId(),
_inst->instAddr(), _inst->contextId(),
std::move(_amo_op));
- if (!byteEnable.empty()) {
- request->setByteEnable(byteEnable);
+ if (!byte_enable.empty()) {
+ request->setByteEnable(byte_enable);
}
_requests.push_back(request);
}
@@ -1040,7 +1040,7 @@
Fault pushRequest(const DynInstPtr& inst, bool isLoad, uint8_t *data,
unsigned int size, Addr addr, Request::Flags flags,
uint64_t *res, AtomicOpFunctorPtr amo_op,
- const std::vector<bool>& byteEnable);
+ const std::vector<bool>& byte_enable);
/** The CPU pointer. */
O3CPU *cpu;
diff --git a/src/cpu/o3/lsq_impl.hh b/src/cpu/o3/lsq_impl.hh
index d7dc618..e85dcb9 100644
--- a/src/cpu/o3/lsq_impl.hh
+++ b/src/cpu/o3/lsq_impl.hh
@@ -688,7 +688,7 @@
LSQ<Impl>::pushRequest(const DynInstPtr& inst, bool isLoad, uint8_t *data,
unsigned int size, Addr addr, Request::Flags flags,
uint64_t *res, AtomicOpFunctorPtr amo_op,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
// This comming request can be either load, store or atomic.
// Atomic request has a corresponding pointer to its atomic memory
@@ -720,8 +720,8 @@
size, flags, data, res, std::move(amo_op));
}
assert(req);
- if (!byteEnable.empty()) {
- req->_byteEnable = byteEnable;
+ if (!byte_enable.empty()) {
+ req->_byteEnable = byte_enable;
}
inst->setRequest();
req->taskId(cpu->taskId());
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index 9052cee..3e3ba41 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -371,7 +371,7 @@
Fault
AtomicSimpleCPU::readMem(Addr addr, uint8_t * data, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
SimpleExecContext& t_info = *threadInfo[curThread];
SimpleThread* thread = t_info.thread;
@@ -394,7 +394,7 @@
while (1) {
predicate = genMemFragmentRequest(req, frag_addr, size, flags,
- byteEnable, frag_size,
size_left);
+ byte_enable, frag_size,
size_left);
// translate to physical address
if (predicate) {
@@ -453,7 +453,7 @@
Fault
AtomicSimpleCPU::writeMem(uint8_t *data, unsigned size, Addr addr,
Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
SimpleExecContext& t_info = *threadInfo[curThread];
SimpleThread* thread = t_info.thread;
@@ -485,7 +485,7 @@
while (1) {
predicate = genMemFragmentRequest(req, frag_addr, size, flags,
- byteEnable, frag_size,
size_left);
+ byte_enable, frag_size,
size_left);
// translate to physical address
if (predicate)
@@ -541,7 +541,7 @@
if (fault != NoFault || size_left == 0)
{
if (req->isLockedRMW() && fault == NoFault) {
- assert(byteEnable.empty());
+ assert(byte_enable.empty());
locked = false;
}
diff --git a/src/cpu/simple/atomic.hh b/src/cpu/simple/atomic.hh
index 121cecd..8fd9505 100644
--- a/src/cpu/simple/atomic.hh
+++ b/src/cpu/simple/atomic.hh
@@ -218,12 +218,12 @@
Fault readMem(Addr addr, uint8_t *data, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable =
std::vector<bool>())
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
override;
Fault writeMem(uint8_t *data, unsigned size,
Addr addr, Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable =
std::vector<bool>())
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
override;
Fault amoMem(Addr addr, uint8_t* data, unsigned size,
diff --git a/src/cpu/simple/base.hh b/src/cpu/simple/base.hh
index f8e534c..32c20a1 100644
--- a/src/cpu/simple/base.hh
+++ b/src/cpu/simple/base.hh
@@ -144,19 +144,19 @@
virtual Fault readMem(Addr addr, uint8_t* data, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable =
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
{ panic("readMem() is not implemented\n"); }
virtual Fault initiateMemRead(Addr addr, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable =
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
{ panic("initiateMemRead() is not implemented\n"); }
virtual Fault writeMem(uint8_t* data, unsigned size, Addr addr,
Request::Flags flags, uint64_t* res,
- const std::vector<bool>& byteEnable =
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
{ panic("writeMem() is not implemented\n"); }
diff --git a/src/cpu/simple/exec_context.hh b/src/cpu/simple/exec_context.hh
index 8e4aa39..04be1a0 100644
--- a/src/cpu/simple/exec_context.hh
+++ b/src/cpu/simple/exec_context.hh
@@ -437,31 +437,31 @@
Fault
readMem(Addr addr, uint8_t *data, unsigned int size,
Request::Flags flags,
- const std::vector<bool>& byteEnable = std::vector<bool>())
+ const std::vector<bool>& byte_enable = std::vector<bool>())
override
{
- assert(byteEnable.empty() || byteEnable.size() == size);
- return cpu->readMem(addr, data, size, flags, byteEnable);
+ assert(byte_enable.empty() || byte_enable.size() == size);
+ return cpu->readMem(addr, data, size, flags, byte_enable);
}
Fault
initiateMemRead(Addr addr, unsigned int size,
Request::Flags flags,
- const std::vector<bool>& byteEnable =
std::vector<bool>())
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
override
{
- assert(byteEnable.empty() || byteEnable.size() == size);
- return cpu->initiateMemRead(addr, size, flags, byteEnable);
+ assert(byte_enable.empty() || byte_enable.size() == size);
+ return cpu->initiateMemRead(addr, size, flags, byte_enable);
}
Fault
writeMem(uint8_t *data, unsigned int size, Addr addr,
Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable = std::vector<bool>())
+ const std::vector<bool>& byte_enable = std::vector<bool>())
override
{
- assert(byteEnable.empty() || byteEnable.size() == size);
- return cpu->writeMem(data, size, addr, flags, res, byteEnable);
+ assert(byte_enable.empty() || byte_enable.size() == size);
+ return cpu->writeMem(data, size, addr, flags, res, byte_enable);
}
Fault amoMem(Addr addr, uint8_t *data, unsigned int size,
diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index d05eece..6487ffa 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -418,7 +418,7 @@
Fault
TimingSimpleCPU::initiateMemRead(Addr addr, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
SimpleExecContext &t_info = *threadInfo[curThread];
SimpleThread* thread = t_info.thread;
@@ -435,8 +435,8 @@
RequestPtr req = std::make_shared<Request>(
asid, addr, size, flags, dataMasterId(), pc,
thread->contextId());
- if (!byteEnable.empty()) {
- req->setByteEnable(byteEnable);
+ if (!byte_enable.empty()) {
+ req->setByteEnable(byte_enable);
}
req->taskId(taskId());
@@ -496,7 +496,7 @@
Fault
TimingSimpleCPU::writeMem(uint8_t *data, unsigned size,
Addr addr, Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable)
+ const std::vector<bool>& byte_enable)
{
SimpleExecContext &t_info = *threadInfo[curThread];
SimpleThread* thread = t_info.thread;
@@ -521,8 +521,8 @@
RequestPtr req = std::make_shared<Request>(
asid, addr, size, flags, dataMasterId(), pc,
thread->contextId());
- if (!byteEnable.empty()) {
- req->setByteEnable(byteEnable);
+ if (!byte_enable.empty()) {
+ req->setByteEnable(byte_enable);
}
req->taskId(taskId());
diff --git a/src/cpu/simple/timing.hh b/src/cpu/simple/timing.hh
index 27faa17..cab4253 100644
--- a/src/cpu/simple/timing.hh
+++ b/src/cpu/simple/timing.hh
@@ -284,12 +284,12 @@
Fault initiateMemRead(Addr addr, unsigned size,
Request::Flags flags,
- const std::vector<bool>& byteEnable =std::vector<bool>())
+ const std::vector<bool>& byte_enable =std::vector<bool>())
override;
Fault writeMem(uint8_t *data, unsigned size,
Addr addr, Request::Flags flags, uint64_t *res,
- const std::vector<bool>& byteEnable =
std::vector<bool>())
+ const std::vector<bool>& byte_enable =
std::vector<bool>())
override;
Fault initiateMemAMO(Addr addr, unsigned size, Request::Flags flags,
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/23282
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I2206559c6c2a6e6a0452e9c7d9964792afa9f358
Gerrit-Change-Number: 23282
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nikos Nikoleris <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
