summaryrefslogtreecommitdiff
path: root/src/cpu/inorder
diff options
context:
space:
mode:
authorNathan Binkert <nate@binkert.org>2011-04-19 18:45:21 -0700
committerNathan Binkert <nate@binkert.org>2011-04-19 18:45:21 -0700
commit63371c86648ed65a453a95aec80f326f15a9666d (patch)
treebad7198bed5c6de0acddb58e662a0b2dc1888ca9 /src/cpu/inorder
parent615c5e0eaa8318528cdada0a9008c02b1d741ee1 (diff)
downloadgem5-63371c86648ed65a453a95aec80f326f15a9666d.tar.xz
stats: rename stats so they can be used as python expressions
Diffstat (limited to 'src/cpu/inorder')
-rw-r--r--src/cpu/inorder/pipeline_stage.cc2
-rw-r--r--src/cpu/inorder/resource_pool.9stage.cc39
-rw-r--r--src/cpu/inorder/resource_pool.cc20
3 files changed, 36 insertions, 25 deletions
diff --git a/src/cpu/inorder/pipeline_stage.cc b/src/cpu/inorder/pipeline_stage.cc
index fe97fb8f4..51e16b6c4 100644
--- a/src/cpu/inorder/pipeline_stage.cc
+++ b/src/cpu/inorder/pipeline_stage.cc
@@ -88,7 +88,7 @@ PipelineStage::init(Params *params)
std::string
PipelineStage::name() const
{
- return cpu->name() + ".stage-" + to_string(stageNum);
+ return cpu->name() + ".stage" + to_string(stageNum);
}
diff --git a/src/cpu/inorder/resource_pool.9stage.cc b/src/cpu/inorder/resource_pool.9stage.cc
index 93b0ac4e4..78a7d4b88 100644
--- a/src/cpu/inorder/resource_pool.9stage.cc
+++ b/src/cpu/inorder/resource_pool.9stage.cc
@@ -48,37 +48,48 @@ ResourcePool::ResourcePool(InOrderCPU *_cpu, InOrderCPUParams *params)
// Declare Resource Objects
// name - id - bandwidth - latency - CPU - Parameters
// --------------------------------------------------
- resources.push_back(new FetchSeqUnit("Fetch-Seq-Unit", FetchSeq, StageWidth * 2, 0, _cpu, params));
+ resources.push_back(new FetchSeqUnit("fetch_seq_unit", FetchSeq,
+ StageWidth * 2, 0, _cpu, params));
- resources.push_back(new TLBUnit("I-TLB", ITLB, StageWidth, 0, _cpu, params));
+ resources.push_back(new TLBUnit("itlb", ITLB, StageWidth, 0, _cpu, params));
memObjects.push_back(ICache);
- resources.push_back(new CacheUnit("icache_port", ICache, StageWidth * MaxThreads, 0, _cpu, params));
+ resources.push_back(new CacheUnit("icache_port", ICache,
+ StageWidth * MaxThreads, 0, _cpu, params));
- resources.push_back(new DecodeUnit("Decode-Unit", Decode, StageWidth, 0, _cpu, params));
+ resources.push_back(new DecodeUnit("decode_unit", Decode, StageWidth, 0,
+ _cpu, params));
- resources.push_back(new BranchPredictor("Branch-Predictor", BPred, StageWidth, 0, _cpu, params));
+ resources.push_back(new BranchPredictor("branch_predictor", BPred,
+ StageWidth, 0, _cpu, params));
for (int i = 0; i < params->numberOfThreads; i++) {
char fbuff_name[20];
- sprintf(fbuff_name, "Fetch-Buffer-T%i", i);
- resources.push_back(new InstBuffer(fbuff_name, FetchBuff + i, 4, 0, _cpu, params));
+ sprintf(fbuff_name, "fetch_buffer_t%i", i);
+ resources.push_back(new InstBuffer(fbuff_name, FetchBuff + i, 4, 0,
+ _cpu, params));
}
- resources.push_back(new UseDefUnit("RegFile-Manager", RegManager, StageWidth * MaxThreads, 0, _cpu, params));
+ resources.push_back(new UseDefUnit("regfile_manager", RegManager,
+ StageWidth * MaxThreads, 0, _cpu, params));
- resources.push_back(new AGENUnit("AGEN-Unit", AGEN, StageWidth, 0, _cpu, params));
+ resources.push_back(new AGENUnit("agen_unit", AGEN, StageWidth, 0, _cpu,
+ params));
- resources.push_back(new ExecutionUnit("Execution-Unit", ExecUnit, StageWidth, 0, _cpu, params));
+ resources.push_back(new ExecutionUnit("execution_unit", ExecUnit,
+ StageWidth, 0, _cpu, params));
- resources.push_back(new MultDivUnit("Mult-Div-Unit", MDU, 5, 0, _cpu, params));
+ resources.push_back(new MultDivUnit("mult_div_unit", MDU, 5, 0, _cpu,
+ params));
- resources.push_back(new TLBUnit("D-TLB", DTLB, StageWidth, 0, _cpu, params));
+ resources.push_back(new TLBUnit("dtlb", DTLB, StageWidth, 0, _cpu, params));
memObjects.push_back(DCache);
- resources.push_back(new CacheUnit("dcache_port", DCache, StageWidth * MaxThreads, 0, _cpu, params));
+ resources.push_back(new CacheUnit("dcache_port", DCache,
+ StageWidth * MaxThreads, 0, _cpu, params));
- resources.push_back(new GraduationUnit("Graduation-Unit", Grad, StageWidth * MaxThreads, 0, _cpu, params));
+ resources.push_back(new GraduationUnit("graduation_unit", Grad,
+ StageWidth * MaxThreads, 0, _cpu, params));
}
void
diff --git a/src/cpu/inorder/resource_pool.cc b/src/cpu/inorder/resource_pool.cc
index 536a3b53c..263512611 100644
--- a/src/cpu/inorder/resource_pool.cc
+++ b/src/cpu/inorder/resource_pool.cc
@@ -51,7 +51,7 @@ ResourcePool::ResourcePool(InOrderCPU *_cpu, ThePipeline::Params *params)
// Declare Resource Objects
// name - id - bandwidth - latency - CPU - Parameters
// --------------------------------------------------
- resources.push_back(new FetchSeqUnit("Fetch-Seq-Unit", FetchSeq,
+ resources.push_back(new FetchSeqUnit("fetch_seq_unit", FetchSeq,
stage_width * 2, 0, _cpu, params));
memObjects.push_back(ICache);
@@ -59,26 +59,26 @@ ResourcePool::ResourcePool(InOrderCPU *_cpu, ThePipeline::Params *params)
stage_width * 2 + MaxThreads, 0, _cpu,
params));
- resources.push_back(new DecodeUnit("Decode-Unit", Decode,
+ resources.push_back(new DecodeUnit("decode_unit", Decode,
stage_width, 0, _cpu, params));
- resources.push_back(new BranchPredictor("Branch-Predictor", BPred,
+ resources.push_back(new BranchPredictor("branch_predictor", BPred,
stage_width, 0, _cpu, params));
- resources.push_back(new InstBuffer("Fetch-Buffer-T0", FetchBuff, 4,
+ resources.push_back(new InstBuffer("fetch_buffer_t0", FetchBuff, 4,
0, _cpu, params));
- resources.push_back(new UseDefUnit("RegFile-Manager", RegManager,
+ resources.push_back(new UseDefUnit("regfile_manager", RegManager,
stage_width * 3, 0, _cpu,
params));
- resources.push_back(new AGENUnit("AGEN-Unit", AGEN,
+ resources.push_back(new AGENUnit("agen_unit", AGEN,
stage_width, 0, _cpu, params));
- resources.push_back(new ExecutionUnit("Execution-Unit", ExecUnit,
+ resources.push_back(new ExecutionUnit("execution_unit", ExecUnit,
stage_width, 0, _cpu, params));
- resources.push_back(new MultDivUnit("Mult-Div-Unit", MDU,
+ resources.push_back(new MultDivUnit("mult_div_unit", MDU,
stage_width * 2, 0, _cpu, params));
memObjects.push_back(DCache);
@@ -86,11 +86,11 @@ ResourcePool::ResourcePool(InOrderCPU *_cpu, ThePipeline::Params *params)
stage_width * 2 + MaxThreads, 0, _cpu,
params));
- resources.push_back(new GraduationUnit("Graduation-Unit", Grad,
+ resources.push_back(new GraduationUnit("graduation_unit", Grad,
stage_width, 0, _cpu,
params));
- resources.push_back(new InstBuffer("Fetch-Buffer-T1", FetchBuff2, 4,
+ resources.push_back(new InstBuffer("fetch_buffer_t1", FetchBuff2, 4,
0, _cpu, params));
}