Daniel Carvalho has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/45411 )
Change subject: cpu,mem: Rename ContextSwitchTaskId namespace
......................................................................
cpu,mem: Rename ContextSwitchTaskId namespace
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::ContextSwitchTaskId becomes ::context_switch_task_id.
Change-Id: If3884a5da7afe6144954d556b3b54f659bb7afb5
Signed-off-by: Daniel R. Carvalho <[email protected]>
---
M src/arch/arm/linux/fs_workload.cc
M src/arch/arm/table_walker.cc
M src/cpu/base.cc
M src/dev/arm/gic_v3_its.cc
M src/dev/arm/smmu_v3_proc.cc
M src/dev/dma_device.cc
M src/mem/cache/cache_blk.hh
M src/mem/cache/prefetch/queued.cc
M src/mem/cache/tags/base.cc
M src/mem/request.hh
10 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/arch/arm/linux/fs_workload.cc
b/src/arch/arm/linux/fs_workload.cc
index dc70765..e392a86 100644
--- a/src/arch/arm/linux/fs_workload.cc
+++ b/src/arch/arm/linux/fs_workload.cc
@@ -255,9 +255,9 @@
std::map<uint32_t, uint32_t>::iterator itr = taskMap.find(pid);
if (itr == taskMap.end()) {
uint32_t map_size = taskMap.size();
- if (map_size > ContextSwitchTaskId::MaxNormalTaskId + 1) {
+ if (map_size > context_switch_task_id::MaxNormalTaskId + 1) {
warn_once("Error out of identifiers for cache occupancy
stats");
- taskMap[pid] = ContextSwitchTaskId::Unknown;
+ taskMap[pid] = context_switch_task_id::Unknown;
} else {
taskMap[pid] = map_size;
}
diff --git a/src/arch/arm/table_walker.cc b/src/arch/arm/table_walker.cc
index 9fa4315..d5cf0a9 100644
--- a/src/arch/arm/table_walker.cc
+++ b/src/arch/arm/table_walker.cc
@@ -2174,7 +2174,7 @@
RequestPtr req = std::make_shared<Request>(
descAddr, numBytes, flags, requestorId);
- req->taskId(ContextSwitchTaskId::DMA);
+ req->taskId(context_switch_task_id::DMA);
PacketPtr pkt = new Packet(req, MemCmd::ReadReq);
pkt->dataStatic(data);
port->sendFunctional(pkt);
diff --git a/src/cpu/base.cc b/src/cpu/base.cc
index 1badf0f..ce82e3c 100644
--- a/src/cpu/base.cc
+++ b/src/cpu/base.cc
@@ -125,7 +125,7 @@
: ClockedObject(p), instCnt(0), _cpuId(p.cpu_id),
_socketId(p.socket_id),
_instRequestorId(p.system->getRequestorId(this, "inst")),
_dataRequestorId(p.system->getRequestorId(this, "data")),
- _taskId(ContextSwitchTaskId::Unknown), _pid(invldPid),
+ _taskId(context_switch_task_id::Unknown), _pid(invldPid),
_switchedOut(p.switched_out),
_cacheLineSize(p.system->cacheLineSize()),
interrupts(p.interrupts), numThreads(p.numThreads), system(p.system),
previousCycle(0), previousState(CPU_STATE_SLEEP),
diff --git a/src/dev/arm/gic_v3_its.cc b/src/dev/arm/gic_v3_its.cc
index ee30eee..c30c33a 100644
--- a/src/dev/arm/gic_v3_its.cc
+++ b/src/dev/arm/gic_v3_its.cc
@@ -96,7 +96,7 @@
RequestPtr req = std::make_shared<Request>(
addr, size, 0, its.requestorId);
- req->taskId(ContextSwitchTaskId::DMA);
+ req->taskId(context_switch_task_id::DMA);
a.pkt = new Packet(req, MemCmd::ReadReq);
a.pkt->dataStatic(ptr);
@@ -120,7 +120,7 @@
RequestPtr req = std::make_shared<Request>(
addr, size, 0, its.requestorId);
- req->taskId(ContextSwitchTaskId::DMA);
+ req->taskId(context_switch_task_id::DMA);
a.pkt = new Packet(req, MemCmd::WriteReq);
a.pkt->dataStatic(ptr);
diff --git a/src/dev/arm/smmu_v3_proc.cc b/src/dev/arm/smmu_v3_proc.cc
index cb8aca5..866939b 100644
--- a/src/dev/arm/smmu_v3_proc.cc
+++ b/src/dev/arm/smmu_v3_proc.cc
@@ -81,7 +81,7 @@
RequestPtr req = std::make_shared<Request>(
addr, size, 0, smmu.requestorId);
- req->taskId(ContextSwitchTaskId::DMA);
+ req->taskId(context_switch_task_id::DMA);
a.pkt = new Packet(req, MemCmd::ReadReq);
a.pkt->dataStatic(ptr);
@@ -114,7 +114,7 @@
RequestPtr req = std::make_shared<Request>(
addr, size, 0, smmu.requestorId);
- req->taskId(ContextSwitchTaskId::DMA);
+ req->taskId(context_switch_task_id::DMA);
a.pkt = new Packet(req, MemCmd::WriteReq);
a.pkt->dataStatic(ptr);
diff --git a/src/dev/dma_device.cc b/src/dev/dma_device.cc
index 9aebb7b..57cee49 100644
--- a/src/dev/dma_device.cc
+++ b/src/dev/dma_device.cc
@@ -114,7 +114,7 @@
gen.addr(), gen.size(), flags, id);
req->setStreamId(sid);
req->setSubstreamId(ssid);
- req->taskId(ContextSwitchTaskId::DMA);
+ req->taskId(context_switch_task_id::DMA);
PacketPtr pkt = new Packet(req, cmd);
diff --git a/src/mem/cache/cache_blk.hh b/src/mem/cache/cache_blk.hh
index ac2878a..ad1c052 100644
--- a/src/mem/cache/cache_blk.hh
+++ b/src/mem/cache/cache_blk.hh
@@ -201,7 +201,7 @@
clearPrefetched();
clearCoherenceBits(AllBits);
- setTaskId(ContextSwitchTaskId::Unknown);
+ setTaskId(context_switch_task_id::Unknown);
setWhenReady(MaxTick);
setRefCount(0);
setSrcRequestorId(Request::invldRequestorId);
diff --git a/src/mem/cache/prefetch/queued.cc
b/src/mem/cache/prefetch/queued.cc
index c294507..d6311e2 100644
--- a/src/mem/cache/prefetch/queued.cc
+++ b/src/mem/cache/prefetch/queued.cc
@@ -61,7 +61,7 @@
if (pfInfo.isSecure()) {
req->setFlags(Request::SECURE);
}
- req->taskId(ContextSwitchTaskId::Prefetcher);
+ req->taskId(context_switch_task_id::Prefetcher);
pkt = new Packet(req, MemCmd::HardPFReq);
pkt->allocate();
if (tag_prefetch && pfInfo.hasPC()) {
diff --git a/src/mem/cache/tags/base.cc b/src/mem/cache/tags/base.cc
index 57e9001..b378123 100644
--- a/src/mem/cache/tags/base.cc
+++ b/src/mem/cache/tags/base.cc
@@ -162,7 +162,7 @@
{
if (blk.isValid()) {
const uint32_t task_id = blk.getTaskId();
- assert(task_id < ContextSwitchTaskId::NumTaskId);
+ assert(task_id < context_switch_task_id::NumTaskId);
stats.occupanciesTaskId[task_id]++;
Tick age = blk.getAge();
@@ -185,7 +185,7 @@
void
BaseTags::computeStats()
{
- for (unsigned i = 0; i < ContextSwitchTaskId::NumTaskId; ++i) {
+ for (unsigned i = 0; i < context_switch_task_id::NumTaskId; ++i) {
stats.occupanciesTaskId[i] = 0;
for (unsigned j = 0; j < 5; ++j) {
stats.ageTaskId[i][j] = 0;
@@ -267,12 +267,12 @@
avgOccs = occupancies / Stats::constant(tags.numBlocks);
occupanciesTaskId
- .init(ContextSwitchTaskId::NumTaskId)
+ .init(context_switch_task_id::NumTaskId)
.flags(nozero | nonan)
;
ageTaskId
- .init(ContextSwitchTaskId::NumTaskId, 5)
+ .init(context_switch_task_id::NumTaskId, 5)
.flags(nozero | nonan)
;
diff --git a/src/mem/request.hh b/src/mem/request.hh
index 7052203..7ebcd8a 100644
--- a/src/mem/request.hh
+++ b/src/mem/request.hh
@@ -57,6 +57,7 @@
#include <vector>
#include "base/amo.hh"
+#include "base/compiler.hh"
#include "base/flags.hh"
#include "base/types.hh"
#include "cpu/inst_seq.hh"
@@ -70,8 +71,8 @@
* doesn't cause a problem with stats and is large enough to realistic
* benchmarks (Linux/Android boot, BBench, etc.)
*/
-
-namespace ContextSwitchTaskId {
+GEM5_DEPRECATED_NAMESPACE(ContextSwitchTaskId, context_switch_task_id);
+namespace context_switch_task_id {
enum TaskId
{
MaxNormalTaskId = 1021, /* Maximum number of normal tasks */
@@ -395,7 +396,7 @@
/**
* The task id associated with this request
*/
- uint32_t _taskId = ContextSwitchTaskId::Unknown;
+ uint32_t _taskId = context_switch_task_id::Unknown;
/**
* The stream ID uniquely identifies a device behind the
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45411
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If3884a5da7afe6144954d556b3b54f659bb7afb5
Gerrit-Change-Number: 45411
Gerrit-PatchSet: 1
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
