From eddac53ff60c579eff28134bde84783fe36d6214 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Fri, 15 Apr 2011 10:44:32 -0700 Subject: trace: reimplement the DTRACE function so it doesn't use a vector At the same time, rename the trace flags to debug flags since they have broader usage than simply tracing. This means that --trace-flags is now --debug-flags and --trace-help is now --debug-help --- src/cpu/inorder/cpu.cc | 4 ++++ src/cpu/inorder/first_stage.cc | 1 + src/cpu/inorder/inorder_dyn_inst.cc | 1 + src/cpu/inorder/inorder_dyn_inst.hh | 1 + src/cpu/inorder/inorder_trace.cc | 3 ++- src/cpu/inorder/pipeline_stage.cc | 5 +++++ src/cpu/inorder/reg_dep_map.cc | 1 + src/cpu/inorder/resource.cc | 4 ++++ src/cpu/inorder/resource_pool.cc | 1 + src/cpu/inorder/resource_sked.cc | 1 + src/cpu/inorder/resources/agen_unit.cc | 1 + src/cpu/inorder/resources/bpred_unit.cc | 3 ++- src/cpu/inorder/resources/branch_predictor.cc | 2 ++ src/cpu/inorder/resources/cache_unit.cc | 8 ++++++++ src/cpu/inorder/resources/decode_unit.cc | 3 +++ src/cpu/inorder/resources/execution_unit.cc | 2 ++ src/cpu/inorder/resources/fetch_seq_unit.cc | 2 ++ src/cpu/inorder/resources/fetch_unit.cc | 5 +++++ src/cpu/inorder/resources/graduation_unit.cc | 1 + src/cpu/inorder/resources/inst_buffer.cc | 2 ++ src/cpu/inorder/resources/mult_div_unit.cc | 2 ++ src/cpu/inorder/resources/use_def.cc | 2 ++ src/cpu/inorder/thread_context.cc | 1 + 23 files changed, 54 insertions(+), 2 deletions(-) (limited to 'src/cpu/inorder') diff --git a/src/cpu/inorder/cpu.cc b/src/cpu/inorder/cpu.cc index f7fff05d3..c27020671 100644 --- a/src/cpu/inorder/cpu.cc +++ b/src/cpu/inorder/cpu.cc @@ -47,6 +47,10 @@ #include "cpu/exetrace.hh" #include "cpu/simple_thread.hh" #include "cpu/thread_context.hh" +#include "debug/Activity.hh" +#include "debug/InOrderCPU.hh" +#include "debug/RefCount.hh" +#include "debug/SkedCache.hh" #include "mem/translating_port.hh" #include "params/InOrderCPU.hh" #include "sim/process.hh" diff --git a/src/cpu/inorder/first_stage.cc b/src/cpu/inorder/first_stage.cc index bf57681a7..20fd9169f 100644 --- a/src/cpu/inorder/first_stage.cc +++ b/src/cpu/inorder/first_stage.cc @@ -34,6 +34,7 @@ #include "cpu/inorder/cpu.hh" #include "cpu/inorder/first_stage.hh" #include "cpu/inorder/resource_pool.hh" +#include "debug/InOrderStage.hh" #include "params/InOrderTrace.hh" using namespace std; diff --git a/src/cpu/inorder/inorder_dyn_inst.cc b/src/cpu/inorder/inorder_dyn_inst.cc index 90134f533..30a69bbb5 100644 --- a/src/cpu/inorder/inorder_dyn_inst.cc +++ b/src/cpu/inorder/inorder_dyn_inst.cc @@ -41,6 +41,7 @@ #include "cpu/inorder/cpu.hh" #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/exetrace.hh" +#include "debug/InOrderDynInst.hh" #include "mem/request.hh" using namespace std; diff --git a/src/cpu/inorder/inorder_dyn_inst.hh b/src/cpu/inorder/inorder_dyn_inst.hh index 1fbc476e8..033726df9 100644 --- a/src/cpu/inorder/inorder_dyn_inst.hh +++ b/src/cpu/inorder/inorder_dyn_inst.hh @@ -57,6 +57,7 @@ #include "cpu/op_class.hh" #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" +#include "debug/InOrderDynInst.hh" #include "mem/packet.hh" #include "sim/system.hh" diff --git a/src/cpu/inorder/inorder_trace.cc b/src/cpu/inorder/inorder_trace.cc index 8d40451bd..8edb5b1cc 100644 --- a/src/cpu/inorder/inorder_trace.cc +++ b/src/cpu/inorder/inorder_trace.cc @@ -37,6 +37,7 @@ #include "cpu/exetrace.hh" #include "cpu/static_inst.hh" #include "cpu/thread_context.hh" +#include "debug/ExecEnable.hh" #include "params/InOrderTrace.hh" using namespace std; @@ -64,7 +65,7 @@ InOrderTraceRecord * InOrderTrace::getInstRecord(unsigned num_stages, bool stage_tracing, ThreadContext *tc) { - if (!IsOn(ExecEnable)) + if (!Debug::ExecEnable) return NULL; if (!Trace::enabled) diff --git a/src/cpu/inorder/pipeline_stage.cc b/src/cpu/inorder/pipeline_stage.cc index b9e21e20f..fe97fb8f4 100644 --- a/src/cpu/inorder/pipeline_stage.cc +++ b/src/cpu/inorder/pipeline_stage.cc @@ -34,6 +34,11 @@ #include "cpu/inorder/cpu.hh" #include "cpu/inorder/pipeline_stage.hh" #include "cpu/inorder/resource_pool.hh" +#include "debug/Activity.hh" +#include "debug/InOrderStage.hh" +#include "debug/InOrderStall.hh" +#include "debug/Resource.hh" +#include "debug/ThreadModel.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/reg_dep_map.cc b/src/cpu/inorder/reg_dep_map.cc index 8eb7a3111..cf66f42c2 100644 --- a/src/cpu/inorder/reg_dep_map.cc +++ b/src/cpu/inorder/reg_dep_map.cc @@ -35,6 +35,7 @@ #include "cpu/inorder/inorder_dyn_inst.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/reg_dep_map.hh" +#include "debug/RegDepMap.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resource.cc b/src/cpu/inorder/resource.cc index b72dbd14f..bdcfbde7d 100644 --- a/src/cpu/inorder/resource.cc +++ b/src/cpu/inorder/resource.cc @@ -35,6 +35,10 @@ #include "base/str.hh" #include "cpu/inorder/cpu.hh" #include "cpu/inorder/resource.hh" +#include "debug/RefCount.hh" +#include "debug/ResReqCount.hh" +#include "debug/Resource.hh" + using namespace std; Resource::Resource(string res_name, int res_id, int res_width, diff --git a/src/cpu/inorder/resource_pool.cc b/src/cpu/inorder/resource_pool.cc index a9eb742f4..536a3b53c 100644 --- a/src/cpu/inorder/resource_pool.cc +++ b/src/cpu/inorder/resource_pool.cc @@ -34,6 +34,7 @@ #include "cpu/inorder/resources/resource_list.hh" #include "cpu/inorder/resource_pool.hh" +#include "debug/Resource.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resource_sked.cc b/src/cpu/inorder/resource_sked.cc index 443500870..96b4f84b6 100644 --- a/src/cpu/inorder/resource_sked.cc +++ b/src/cpu/inorder/resource_sked.cc @@ -35,6 +35,7 @@ #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource_sked.hh" +#include "debug/SkedCache.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resources/agen_unit.cc b/src/cpu/inorder/resources/agen_unit.cc index 3e26c4da3..d87ca364d 100644 --- a/src/cpu/inorder/resources/agen_unit.cc +++ b/src/cpu/inorder/resources/agen_unit.cc @@ -30,6 +30,7 @@ */ #include "cpu/inorder/resources/agen_unit.hh" +#include "debug/InOrderAGEN.hh" AGENUnit::AGENUnit(std::string res_name, int res_id, int res_width, int res_latency, InOrderCPU *_cpu, diff --git a/src/cpu/inorder/resources/bpred_unit.cc b/src/cpu/inorder/resources/bpred_unit.cc index 9e15a4fee..127843e96 100644 --- a/src/cpu/inorder/resources/bpred_unit.cc +++ b/src/cpu/inorder/resources/bpred_unit.cc @@ -33,9 +33,10 @@ #include "arch/utility.hh" #include "base/trace.hh" -#include "base/traceflags.hh" #include "config/the_isa.hh" #include "cpu/inorder/resources/bpred_unit.hh" +#include "debug/InOrderBPred.hh" +#include "debug/Resource.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resources/branch_predictor.cc b/src/cpu/inorder/resources/branch_predictor.cc index 4b8205070..829ae4346 100644 --- a/src/cpu/inorder/resources/branch_predictor.cc +++ b/src/cpu/inorder/resources/branch_predictor.cc @@ -31,6 +31,8 @@ #include "config/the_isa.hh" #include "cpu/inorder/resources/branch_predictor.hh" +#include "debug/InOrderBPred.hh" +#include "debug/InOrderStage.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/cache_unit.cc b/src/cpu/inorder/resources/cache_unit.cc index ce4c538da..620ba06c1 100644 --- a/src/cpu/inorder/resources/cache_unit.cc +++ b/src/cpu/inorder/resources/cache_unit.cc @@ -41,6 +41,14 @@ #include "cpu/inorder/cpu.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource_pool.hh" +#include "debug/Activity.hh" +#include "debug/AddrDep.hh" +#include "debug/InOrderCachePort.hh" +#include "debug/InOrderStall.hh" +#include "debug/InOrderTLB.hh" +#include "debug/LLSC.hh" +#include "debug/RefCount.hh" +#include "debug/ThreadModel.hh" #include "mem/request.hh" using namespace std; diff --git a/src/cpu/inorder/resources/decode_unit.cc b/src/cpu/inorder/resources/decode_unit.cc index 71d33ab90..559becaaf 100644 --- a/src/cpu/inorder/resources/decode_unit.cc +++ b/src/cpu/inorder/resources/decode_unit.cc @@ -31,6 +31,9 @@ #include "config/the_isa.hh" #include "cpu/inorder/resources/decode_unit.hh" +#include "debug/InOrderDecode.hh" +#include "debug/InOrderStall.hh" +#include "debug/Resource.hh" using namespace TheISA; using namespace ThePipeline; diff --git a/src/cpu/inorder/resources/execution_unit.cc b/src/cpu/inorder/resources/execution_unit.cc index 2ec340749..7ed9aed9a 100644 --- a/src/cpu/inorder/resources/execution_unit.cc +++ b/src/cpu/inorder/resources/execution_unit.cc @@ -35,6 +35,8 @@ #include "cpu/inorder/resources/execution_unit.hh" #include "cpu/inorder/cpu.hh" #include "cpu/inorder/resource_pool.hh" +#include "debug/InOrderExecute.hh" +#include "debug/InOrderStall.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resources/fetch_seq_unit.cc b/src/cpu/inorder/resources/fetch_seq_unit.cc index 8d9187c7a..df8c6de63 100644 --- a/src/cpu/inorder/resources/fetch_seq_unit.cc +++ b/src/cpu/inorder/resources/fetch_seq_unit.cc @@ -32,6 +32,8 @@ #include "config/the_isa.hh" #include "cpu/inorder/resources/fetch_seq_unit.hh" #include "cpu/inorder/resource_pool.hh" +#include "debug/InOrderFetchSeq.hh" +#include "debug/InOrderStall.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/fetch_unit.cc b/src/cpu/inorder/resources/fetch_unit.cc index 899fa8c08..692f78c7b 100644 --- a/src/cpu/inorder/resources/fetch_unit.cc +++ b/src/cpu/inorder/resources/fetch_unit.cc @@ -42,6 +42,11 @@ #include "cpu/inorder/cpu.hh" #include "cpu/inorder/pipeline_traits.hh" #include "cpu/inorder/resource_pool.hh" +#include "debug/Activity.hh" +#include "debug/InOrderCachePort.hh" +#include "debug/InOrderStall.hh" +#include "debug/RefCount.hh" +#include "debug/ThreadModel.hh" #include "mem/request.hh" using namespace std; diff --git a/src/cpu/inorder/resources/graduation_unit.cc b/src/cpu/inorder/resources/graduation_unit.cc index edc2fb3ff..a7530345e 100644 --- a/src/cpu/inorder/resources/graduation_unit.cc +++ b/src/cpu/inorder/resources/graduation_unit.cc @@ -30,6 +30,7 @@ */ #include "cpu/inorder/resources/graduation_unit.hh" +#include "debug/InOrderGraduation.hh" using namespace ThePipeline; diff --git a/src/cpu/inorder/resources/inst_buffer.cc b/src/cpu/inorder/resources/inst_buffer.cc index e0405879b..d64eb79f1 100644 --- a/src/cpu/inorder/resources/inst_buffer.cc +++ b/src/cpu/inorder/resources/inst_buffer.cc @@ -37,6 +37,8 @@ #include "cpu/inorder/resources/inst_buffer.hh" #include "cpu/inorder/cpu.hh" #include "cpu/inorder/pipeline_traits.hh" +#include "debug/InOrderInstBuffer.hh" +#include "debug/Resource.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/resources/mult_div_unit.cc b/src/cpu/inorder/resources/mult_div_unit.cc index 8fbfc231e..49df901e3 100644 --- a/src/cpu/inorder/resources/mult_div_unit.cc +++ b/src/cpu/inorder/resources/mult_div_unit.cc @@ -36,6 +36,8 @@ #include "cpu/inorder/cpu.hh" #include "cpu/inorder/resource_pool.hh" #include "cpu/op_class.hh" +#include "debug/InOrderMDU.hh" +#include "debug/Resource.hh" using namespace std; using namespace ThePipeline; diff --git a/src/cpu/inorder/resources/use_def.cc b/src/cpu/inorder/resources/use_def.cc index 8a00ab704..beb8d4dde 100644 --- a/src/cpu/inorder/resources/use_def.cc +++ b/src/cpu/inorder/resources/use_def.cc @@ -37,6 +37,8 @@ #include "cpu/inorder/resources/use_def.hh" #include "cpu/inorder/cpu.hh" #include "cpu/inorder/pipeline_traits.hh" +#include "debug/InOrderStall.hh" +#include "debug/InOrderUseDef.hh" using namespace std; using namespace TheISA; diff --git a/src/cpu/inorder/thread_context.cc b/src/cpu/inorder/thread_context.cc index 636bcee22..a217630a9 100644 --- a/src/cpu/inorder/thread_context.cc +++ b/src/cpu/inorder/thread_context.cc @@ -33,6 +33,7 @@ #include "config/the_isa.hh" #include "cpu/inorder/thread_context.hh" #include "cpu/exetrace.hh" +#include "debug/InOrderCPU.hh" using namespace TheISA; -- cgit v1.2.3