Daniel Carvalho has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45428 )
Change subject: cpu-minor: Rename Minor namespace as minor
......................................................................
cpu-minor: Rename Minor namespace as minor
As part of recent decisions regarding namespace
naming conventions, all namespaces will be changed
to snake case.
::Minor became ::minor.
Change-Id: I408aa3d269ed7454ed0f488bd363d521602e58af
Signed-off-by: Daniel R. Carvalho <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45428
Reviewed-by: Bobby R. Bruce <[email protected]>
Maintainer: Bobby R. Bruce <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/cpu/minor/activity.cc
M src/cpu/minor/activity.hh
M src/cpu/minor/buffers.hh
M src/cpu/minor/cpu.cc
M src/cpu/minor/cpu.hh
M src/cpu/minor/decode.cc
M src/cpu/minor/decode.hh
M src/cpu/minor/dyn_inst.cc
M src/cpu/minor/dyn_inst.hh
M src/cpu/minor/exec_context.hh
M src/cpu/minor/execute.cc
M src/cpu/minor/execute.hh
M src/cpu/minor/fetch1.cc
M src/cpu/minor/fetch1.hh
M src/cpu/minor/fetch2.cc
M src/cpu/minor/fetch2.hh
M src/cpu/minor/func_unit.cc
M src/cpu/minor/func_unit.hh
M src/cpu/minor/lsq.cc
M src/cpu/minor/lsq.hh
M src/cpu/minor/pipe_data.cc
M src/cpu/minor/pipe_data.hh
M src/cpu/minor/pipeline.cc
M src/cpu/minor/pipeline.hh
M src/cpu/minor/scoreboard.cc
M src/cpu/minor/scoreboard.hh
M src/cpu/minor/stats.cc
M src/cpu/minor/stats.hh
M src/cpu/minor/trace.hh
29 files changed, 111 insertions(+), 79 deletions(-)
Approvals:
Bobby R. Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/minor/activity.cc b/src/cpu/minor/activity.cc
index deabf06..0980eba 100644
--- a/src/cpu/minor/activity.cc
+++ b/src/cpu/minor/activity.cc
@@ -41,7 +41,8 @@
#include "cpu/minor/trace.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
void
@@ -59,8 +60,8 @@
stages << ',';
}
- Minor::minorTrace("activity=%d stages=%s\n", getActivityCount(),
+ minor::minorTrace("activity=%d stages=%s\n", getActivityCount(),
stages.str());
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/activity.hh b/src/cpu/minor/activity.hh
index 2872e6f..7deba3d 100644
--- a/src/cpu/minor/activity.hh
+++ b/src/cpu/minor/activity.hh
@@ -47,7 +47,8 @@
#include "cpu/activity.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** ActivityRecorder with a Ticked interface */
@@ -65,6 +66,6 @@
{ }
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_ACTIVITY_HH__ */
diff --git a/src/cpu/minor/buffers.hh b/src/cpu/minor/buffers.hh
index 77914f7..686329c 100644
--- a/src/cpu/minor/buffers.hh
+++ b/src/cpu/minor/buffers.hh
@@ -56,7 +56,8 @@
#include "cpu/minor/trace.hh"
#include "cpu/timebuf.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** Interface class for data with reporting/tracing facilities. This
@@ -208,7 +209,7 @@
data << ',';
}
- Minor::minorTrace("%s=%s\n", dataName, data.str());
+ minor::minorTrace("%s=%s\n", dataName, data.str());
}
};
@@ -547,7 +548,7 @@
data << ',';
}
- Minor::minorTrace("%s=%s\n", dataName, data.str());
+ minor::minorTrace("%s=%s\n", dataName, data.str());
}
};
@@ -654,6 +655,6 @@
}
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_BUFFERS_HH__ */
diff --git a/src/cpu/minor/cpu.cc b/src/cpu/minor/cpu.cc
index 02f934c..31de890 100644
--- a/src/cpu/minor/cpu.cc
+++ b/src/cpu/minor/cpu.cc
@@ -50,15 +50,15 @@
stats(this)
{
/* This is only written for one thread at the moment */
- Minor::MinorThread *thread;
+ minor::MinorThread *thread;
for (ThreadID i = 0; i < numThreads; i++) {
if (FullSystem) {
- thread = new Minor::MinorThread(this, i, params.system,
+ thread = new minor::MinorThread(this, i, params.system,
params.mmu, params.isa[i]);
thread->setStatus(ThreadContext::Halted);
} else {
- thread = new Minor::MinorThread(this, i, params.system,
+ thread = new minor::MinorThread(this, i, params.system,
params.workload[i], params.mmu,
params.isa[i]);
}
@@ -73,9 +73,9 @@
fatal("The Minor model doesn't support checking (yet)\n");
}
- Minor::MinorDynInst::init();
+ minor::MinorDynInst::init();
- pipeline = new Minor::Pipeline(*this, params);
+ pipeline = new minor::Pipeline(*this, params);
activityRecorder = pipeline->getActivityRecorder();
fetchEventWrapper = NULL;
@@ -269,7 +269,7 @@
/* Wake up the thread, wakeup the pipeline tick */
threads[thread_id]->activate();
- wakeupOnEvent(Minor::Pipeline::CPUStageId);
+ wakeupOnEvent(minor::Pipeline::CPUStageId);
if (!threads[thread_id]->getUseForClone())//the thread is not cloned
{
diff --git a/src/cpu/minor/cpu.hh b/src/cpu/minor/cpu.hh
index c26136d..306d5e5 100644
--- a/src/cpu/minor/cpu.hh
+++ b/src/cpu/minor/cpu.hh
@@ -44,6 +44,7 @@
#ifndef __CPU_MINOR_CPU_HH__
#define __CPU_MINOR_CPU_HH__
+#include "base/compiler.hh"
#include "cpu/minor/activity.hh"
#include "cpu/minor/stats.hh"
#include "cpu/base.hh"
@@ -51,15 +52,18 @@
#include "enums/ThreadPolicy.hh"
#include "params/MinorCPU.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
+
/** Forward declared to break the cyclic inclusion dependencies between
* pipeline and cpu */
class Pipeline;
/** Minor will use the SimpleThread state for now */
typedef SimpleThread MinorThread;
-};
+
+} // namespace minor
/**
* MinorCPU is an in-order CPU model with four fixed pipeline stages:
@@ -71,26 +75,26 @@
*
* This pipeline is carried in the MinorCPU::pipeline object.
* The exec_context interface is not carried by MinorCPU but by
- * Minor::ExecContext objects
- * created by Minor::Execute.
+ * minor::ExecContext objects
+ * created by minor::Execute.
*/
class MinorCPU : public BaseCPU
{
protected:
/** pipeline is a container for the clockable pipeline stage objects.
* Elements of pipeline call TheISA to implement the model. */
- Minor::Pipeline *pipeline;
+ minor::Pipeline *pipeline;
public:
/** Activity recording for pipeline. This belongs to Pipeline but
* stages will access it through the CPU as the MinorCPU object
* actually mediates idling behaviour */
- Minor::MinorActivityRecorder *activityRecorder;
+ minor::MinorActivityRecorder *activityRecorder;
/** These are thread state-representing objects for this CPU. If
* you need a ThreadContext for *any* reason, use
* threads[threadId]->getTC() */
- std::vector<Minor::MinorThread *> threads;
+ std::vector<minor::MinorThread *> threads;
public:
/** Provide a non-protected base class for Minor's Ports as derived
@@ -129,7 +133,7 @@
void wakeup(ThreadID tid) override;
/** Processor-specific statistics */
- Minor::MinorStats stats;
+ minor::MinorStats stats;
/** Stats interface from SimObject (by way of BaseCPU) */
void regStats() override;
diff --git a/src/cpu/minor/decode.cc b/src/cpu/minor/decode.cc
index 63c1b73..1398d03 100644
--- a/src/cpu/minor/decode.cc
+++ b/src/cpu/minor/decode.cc
@@ -42,7 +42,8 @@
#include "cpu/minor/pipeline.hh"
#include "debug/Decode.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
Decode::Decode(const std::string &name,
@@ -344,8 +345,8 @@
else
(*out.inputWire).reportData(data);
- Minor::minorTrace("insts=%s\n", data.str());
+ minor::minorTrace("insts=%s\n", data.str());
inputBuffer[0].minorTrace();
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/decode.hh b/src/cpu/minor/decode.hh
index 2f97c4b..17a7db4 100644
--- a/src/cpu/minor/decode.hh
+++ b/src/cpu/minor/decode.hh
@@ -53,7 +53,8 @@
#include "cpu/minor/dyn_inst.hh"
#include "cpu/minor/pipe_data.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/* Decode takes instructions from Fetch2 and decomposes them into micro-ops
@@ -160,6 +161,6 @@
bool isDrained();
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_DECODE_HH__ */
diff --git a/src/cpu/minor/dyn_inst.cc b/src/cpu/minor/dyn_inst.cc
index f94d6c9..fd28661 100644
--- a/src/cpu/minor/dyn_inst.cc
+++ b/src/cpu/minor/dyn_inst.cc
@@ -48,7 +48,8 @@
#include "debug/MinorExecute.hh"
#include "enums/OpClass.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
const InstSeqNum InstId::firstStreamSeqNum;
@@ -241,4 +242,4 @@
delete traceData;
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/dyn_inst.hh b/src/cpu/minor/dyn_inst.hh
index 1e47b46..b61e769 100644
--- a/src/cpu/minor/dyn_inst.hh
+++ b/src/cpu/minor/dyn_inst.hh
@@ -59,7 +59,8 @@
#include "sim/faults.hh"
#include "sim/insttracer.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
class MinorDynInst;
@@ -294,6 +295,6 @@
/** Print a summary of the instruction */
std::ostream &operator <<(std::ostream &os, const MinorDynInst &inst);
-}
+} // namespace minor
#endif /* __CPU_MINOR_DYN_INST_HH__ */
diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index c6cfc90..261db67 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -56,7 +56,8 @@
#include "mem/request.hh"
#include "debug/MinorExecute.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/* Forward declaration of Execute */
@@ -403,6 +404,6 @@
}
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_EXEC_CONTEXT_HH__ */
diff --git a/src/cpu/minor/execute.cc b/src/cpu/minor/execute.cc
index 855614e..5059e4f 100644
--- a/src/cpu/minor/execute.cc
+++ b/src/cpu/minor/execute.cc
@@ -53,7 +53,8 @@
#include "debug/MinorTrace.hh"
#include "debug/PCEvent.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
Execute::Execute(const std::string &name_,
@@ -1675,7 +1676,7 @@
stalled << ',';
}
- Minor::minorTrace("insts=%s inputIndex=%d streamSeqNum=%d"
+ minor::minorTrace("insts=%s inputIndex=%d streamSeqNum=%d"
" stalled=%s drainState=%d isInbetweenInsts=%d\n",
insts.str(), executeInfo[0].inputIndex,
executeInfo[0].streamSeqNum,
stalled.str(), executeInfo[0].drainState, isInbetweenInsts(0));
@@ -1896,4 +1897,4 @@
return lsq.getDcachePort();
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/execute.hh b/src/cpu/minor/execute.hh
index 02e5527..1facfae 100644
--- a/src/cpu/minor/execute.hh
+++ b/src/cpu/minor/execute.hh
@@ -56,7 +56,8 @@
#include "cpu/minor/pipe_data.hh"
#include "cpu/minor/scoreboard.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** Execute stage. Everything apart from fetching and decoding
instructions.
@@ -359,6 +360,6 @@
void drainResume();
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_EXECUTE_HH__ */
diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index 6be2481..b80cec5 100644
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -50,7 +50,8 @@
#include "debug/Fetch.hh"
#include "debug/MinorTrace.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
Fetch1::Fetch1(const std::string &name_,
@@ -764,7 +765,7 @@
else
(*out.inputWire).reportData(data);
- Minor::minorTrace("state=%s icacheState=%s in_tlb_mem=%s/%s"
+ minor::minorTrace("state=%s icacheState=%s in_tlb_mem=%s/%s"
" streamSeqNum=%d lines=%s\n", thread.state, icacheState,
numFetchesInITLB, numFetchesInMemorySystem,
thread.streamSeqNum, data.str());
@@ -772,4 +773,4 @@
transfers.minorTrace();
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/fetch1.hh b/src/cpu/minor/fetch1.hh
index 779c2b6..e668a6f 100644
--- a/src/cpu/minor/fetch1.hh
+++ b/src/cpu/minor/fetch1.hh
@@ -54,7 +54,8 @@
#include "cpu/minor/pipe_data.hh"
#include "mem/packet.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** A stage responsible for fetching "lines" from memory and passing
@@ -409,6 +410,6 @@
bool isDrained();
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_FETCH1_HH__ */
diff --git a/src/cpu/minor/fetch2.cc b/src/cpu/minor/fetch2.cc
index d6c608b..55a3625 100644
--- a/src/cpu/minor/fetch2.cc
+++ b/src/cpu/minor/fetch2.cc
@@ -49,7 +49,8 @@
#include "debug/Fetch.hh"
#include "debug/MinorTrace.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
Fetch2::Fetch2(const std::string &name,
@@ -642,10 +643,10 @@
else
(*out.inputWire).reportData(data);
- Minor::minorTrace("inputIndex=%d havePC=%d predictionSeqNum=%d
insts=%s\n",
+ minor::minorTrace("inputIndex=%d havePC=%d predictionSeqNum=%d
insts=%s\n",
fetchInfo[0].inputIndex, fetchInfo[0].havePC,
fetchInfo[0].predictionSeqNum, data.str());
inputBuffer[0].minorTrace();
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/fetch2.hh b/src/cpu/minor/fetch2.hh
index d2a5ee3..dbe58e4 100644
--- a/src/cpu/minor/fetch2.hh
+++ b/src/cpu/minor/fetch2.hh
@@ -54,7 +54,8 @@
#include "cpu/pred/bpred_unit.hh"
#include "params/MinorCPU.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** This stage receives lines of data from Fetch1, separates them into
@@ -227,6 +228,6 @@
bool isDrained();
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_FETCH2_HH__ */
diff --git a/src/cpu/minor/func_unit.cc b/src/cpu/minor/func_unit.cc
index 32cce24..150eaf3 100644
--- a/src/cpu/minor/func_unit.cc
+++ b/src/cpu/minor/func_unit.cc
@@ -71,7 +71,8 @@
opClasses(params.opClasses)
{ }
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
void
@@ -209,4 +210,4 @@
return NULL;
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/func_unit.hh b/src/cpu/minor/func_unit.hh
index ce51a99..7eb4438 100644
--- a/src/cpu/minor/func_unit.hh
+++ b/src/cpu/minor/func_unit.hh
@@ -195,7 +195,8 @@
{ }
};
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** Container class to box instructions in the FUs to make those
@@ -268,6 +269,6 @@
void advance();
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_FUNC_UNIT_HH__ */
diff --git a/src/cpu/minor/lsq.cc b/src/cpu/minor/lsq.cc
index b7e039f..fbc4eba 100644
--- a/src/cpu/minor/lsq.cc
+++ b/src/cpu/minor/lsq.cc
@@ -51,7 +51,8 @@
#include "debug/Activity.hh"
#include "debug/MinorMem.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
LSQ::LSQRequest::LSQRequest(LSQ &port_, MinorDynInstPtr inst_, bool
isLoad_,
@@ -950,7 +951,7 @@
os << ',';
}
- Minor::minorTrace("addr=%s num_unissued_stores=%d\n", os.str(),
+ minor::minorTrace("addr=%s num_unissued_stores=%d\n", os.str(),
numUnissuedAccesses);
}
@@ -1665,7 +1666,7 @@
void
LSQ::minorTrace() const
{
- Minor::minorTrace("state=%s in_tlb_mem=%d/%d stores_in_transfers=%d"
+ minor::minorTrace("state=%s in_tlb_mem=%d/%d stores_in_transfers=%d"
" lastMemBarrier=%d\n",
state, numAccessesInDTLB, numAccessesInMemorySystem,
numStoresInTransfers, lastMemBarrier[0]);
@@ -1794,4 +1795,4 @@
}
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/lsq.hh b/src/cpu/minor/lsq.hh
index 96e3023..fb4dda6 100644
--- a/src/cpu/minor/lsq.hh
+++ b/src/cpu/minor/lsq.hh
@@ -55,7 +55,8 @@
#include "cpu/minor/trace.hh"
#include "mem/packet.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/* Forward declaration */
@@ -741,6 +742,7 @@
* pushed into the packet as senderState */
PacketPtr makePacketForRequest(const RequestPtr &request, bool isLoad,
Packet::SenderState *sender_state = NULL, PacketDataPtr data = NULL);
-}
+
+} // namespace minor
#endif /* __CPU_MINOR_NEW_LSQ_HH__ */
diff --git a/src/cpu/minor/pipe_data.cc b/src/cpu/minor/pipe_data.cc
index a779bd6..d035e49 100644
--- a/src/cpu/minor/pipe_data.cc
+++ b/src/cpu/minor/pipe_data.cc
@@ -37,7 +37,8 @@
#include "cpu/minor/pipe_data.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
std::ostream &
@@ -284,4 +285,4 @@
}
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/pipe_data.hh b/src/cpu/minor/pipe_data.hh
index a795a68..fd9748e 100644
--- a/src/cpu/minor/pipe_data.hh
+++ b/src/cpu/minor/pipe_data.hh
@@ -54,7 +54,8 @@
#include "cpu/minor/dyn_inst.hh"
#include "cpu/base.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** Forward data betwen Execute and Fetch1 carrying
change-of-address/stream
@@ -288,6 +289,6 @@
void reportData(std::ostream &os) const;
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_PIPE_DATA_HH__ */
diff --git a/src/cpu/minor/pipeline.cc b/src/cpu/minor/pipeline.cc
index c3b1d27..ad1d810 100644
--- a/src/cpu/minor/pipeline.cc
+++ b/src/cpu/minor/pipeline.cc
@@ -48,7 +48,8 @@
#include "debug/MinorTrace.hh"
#include "debug/Quiesce.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
Pipeline::Pipeline(MinorCPU &cpu_, const MinorCPUParams ¶ms) :
@@ -254,4 +255,4 @@
return ret;
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/pipeline.hh b/src/cpu/minor/pipeline.hh
index b275f02..5f31c66 100644
--- a/src/cpu/minor/pipeline.hh
+++ b/src/cpu/minor/pipeline.hh
@@ -54,11 +54,12 @@
#include "params/MinorCPU.hh"
#include "sim/ticked_object.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/**
- * @namespace Minor
+ * @namespace minor
*
* Minor contains all the definitions within the MinorCPU apart from the
CPU
* class itself
@@ -138,6 +139,6 @@
MinorActivityRecorder *getActivityRecorder() { return
&activityRecorder; }
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_PIPELINE_HH__ */
diff --git a/src/cpu/minor/scoreboard.cc b/src/cpu/minor/scoreboard.cc
index 18eaf5d..235264d 100644
--- a/src/cpu/minor/scoreboard.cc
+++ b/src/cpu/minor/scoreboard.cc
@@ -41,7 +41,8 @@
#include "debug/MinorScoreboard.hh"
#include "debug/MinorTiming.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
bool
@@ -302,7 +303,7 @@
i++;
}
- Minor::minorTrace("busy=%s\n", result_stream.str());
+ minor::minorTrace("busy=%s\n", result_stream.str());
}
-}
+} // namespace minor
diff --git a/src/cpu/minor/scoreboard.hh b/src/cpu/minor/scoreboard.hh
index 7fefac8..3e865db 100644
--- a/src/cpu/minor/scoreboard.hh
+++ b/src/cpu/minor/scoreboard.hh
@@ -53,7 +53,8 @@
#include "cpu/minor/trace.hh"
#include "cpu/reg_class.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** A scoreboard of register dependencies including, for each register:
@@ -157,6 +158,6 @@
void minorTrace() const;
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_SCOREBOARD_HH__ */
diff --git a/src/cpu/minor/stats.cc b/src/cpu/minor/stats.cc
index 7d2030a..c9794d1 100644
--- a/src/cpu/minor/stats.cc
+++ b/src/cpu/minor/stats.cc
@@ -37,7 +37,8 @@
#include "cpu/minor/stats.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
MinorStats::MinorStats(BaseCPU *base_cpu)
@@ -77,4 +78,4 @@
committedInstType.ysubnames(enums::OpClassStrings);
}
-};
+} // namespace minor
diff --git a/src/cpu/minor/stats.hh b/src/cpu/minor/stats.hh
index e42b56f..601487c 100644
--- a/src/cpu/minor/stats.hh
+++ b/src/cpu/minor/stats.hh
@@ -48,7 +48,8 @@
#include "cpu/base.hh"
#include "sim/ticked_object.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** Currently unused stats class. */
@@ -80,6 +81,6 @@
};
-}
+} // namespace minor
#endif /* __CPU_MINOR_STATS_HH__ */
diff --git a/src/cpu/minor/trace.hh b/src/cpu/minor/trace.hh
index 1900ba0..a41c2db 100644
--- a/src/cpu/minor/trace.hh
+++ b/src/cpu/minor/trace.hh
@@ -54,7 +54,8 @@
#include "base/trace.hh"
#include "debug/MinorTrace.hh"
-namespace Minor
+GEM5_DEPRECATED_NAMESPACE(Minor, minor);
+namespace minor
{
/** DPRINTFN for MinorTrace reporting */
@@ -83,6 +84,6 @@
args...);
}
-}
+} // namespace minor
#endif /* __CPU_MINOR_TRACE_HH__ */
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45428
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: I408aa3d269ed7454ed0f488bd363d521602e58af
Gerrit-Change-Number: 45428
Gerrit-PatchSet: 10
Gerrit-Owner: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[email protected]>
Gerrit-Reviewer: ZHENGRONG WANG <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
