Commit 34e2930f authored by Siyuan Niu's avatar Siyuan Niu

change html model name

parent b49cd333
......@@ -70,8 +70,8 @@ public:
\param iName Name of the device
\param iScheduler Pointer to the scheduler object
*/
CPU(ID iID, std::string iName, WorkloadSource* iScheduler, unsigned int iAmountOfCore, std::string iModelName): SchedulableDevice(iID, iName, iScheduler), _lastTransaction(0),
amountOfCore(iAmountOfCore), _modelName(iModelName)/*,_schedulingNeeded(false)*/{
CPU(ID iID, std::string iName, WorkloadSource* iScheduler, unsigned int iAmountOfCore): SchedulableDevice(iID, iName, iScheduler), _lastTransaction(0),
amountOfCore(iAmountOfCore)/*,_schedulingNeeded(false)*/{
}
///Destructor
virtual ~CPU(){
......@@ -113,9 +113,6 @@ public:
return os;
}
inline unsigned int getAmoutOfCore(){ return amountOfCore;}
inline std::string getModelName() {return _modelName;}
//inline void setModelName(std::string s) {_modelName=s;}
//inline std::string getModelName() {return _modelName;}
///Invalidate schedule of CPU
/*void setRescheduleFlag(){
_schedulingNeeded=true;
......@@ -275,8 +272,6 @@ protected:
BusMasterList _busMasterList;
///Amount of cores
unsigned int amountOfCore;
///model name
std::string _modelName;
///Dirty flag of the current scheduling decision
//bool _schedulingNeeded;
};
......
......@@ -51,7 +51,6 @@
MultiCoreCPU::MultiCoreCPU(ID iID,
std::string iName,
WorkloadSource* iScheduler,
std::string iModelName,
TMLTime iTimePerCycle,
unsigned int iCyclesPerExeci,
unsigned int iCyclesPerExecc,
......@@ -61,7 +60,7 @@ MultiCoreCPU::MultiCoreCPU(ID iID,
unsigned int iChangeIdleModeCycles,
unsigned int iCyclesBeforeIdle,
unsigned int ibyteDataSize,
unsigned int iAmountOfCore): CPU(iID, iName, iScheduler, iAmountOfCore, iModelName), /*_lastTransaction(0),*/ _masterNextTransaction(0), _timePerCycle(iTimePerCycle),
unsigned int iAmountOfCore): CPU(iID, iName, iScheduler, iAmountOfCore), /*_lastTransaction(0),*/ _masterNextTransaction(0), _timePerCycle(iTimePerCycle),
coreNumber(0)
#ifdef PENALTIES_ENABLED
, _pipelineSize(iPipelineSize), _taskSwitchingCycles(iTaskSwitchingCycles),_brachingMissrate(iBranchingMissrate)
......
......@@ -77,7 +77,7 @@ public:
\param iCyclesBeforeIdle Idle cycles which elapse before entering idle mode
\param ibyteDataSize Machine word length
*/
MultiCoreCPU(ID iID, std::string iName, WorkloadSource* iScheduler,std::string iModelName,TMLTime iTimePerCycle, unsigned int iCyclesPerExeci, unsigned int iCyclesPerExecc, unsigned int iPipelineSize, unsigned int iTaskSwitchingCycles, unsigned int iBranchingMissrate, unsigned int iChangeIdleModeCycles, unsigned int iCyclesBeforeIdle, unsigned int ibyteDataSize, unsigned int iAmountOfCore);
MultiCoreCPU(ID iID, std::string iName, WorkloadSource* iScheduler,TMLTime iTimePerCycle, unsigned int iCyclesPerExeci, unsigned int iCyclesPerExecc, unsigned int iPipelineSize, unsigned int iTaskSwitchingCycles, unsigned int iBranchingMissrate, unsigned int iChangeIdleModeCycles, unsigned int iCyclesBeforeIdle, unsigned int ibyteDataSize, unsigned int iAmountOfCore);
///Destructor
virtual ~MultiCoreCPU();
///Determines the next CPU transaction to be executed
......
......@@ -51,7 +51,6 @@
SingleCoreCPU::SingleCoreCPU( ID iID,
std::string iName,
WorkloadSource* iScheduler,
std::string iModelName,
TMLTime iTimePerCycle,
unsigned int iCyclesPerExeci,
unsigned int iCyclesPerExecc,
......@@ -60,7 +59,7 @@ SingleCoreCPU::SingleCoreCPU( ID iID,
unsigned int iBranchingMissrate,
unsigned int iChangeIdleModeCycles,
unsigned int iCyclesBeforeIdle,
unsigned int ibyteDataSize ) : CPU( iID, iName, iScheduler, 1, iModelName), /*_lastTransaction(0),*/ _masterNextTransaction(0), _timePerCycle(iTimePerCycle)
unsigned int ibyteDataSize ) : CPU( iID, iName, iScheduler, 1), /*_lastTransaction(0),*/ _masterNextTransaction(0), _timePerCycle(iTimePerCycle)
#ifdef PENALTIES_ENABLED
, _pipelineSize(iPipelineSize), _taskSwitchingCycles(iTaskSwitchingCycles),_brachingMissrate(iBranchingMissrate)
, _changeIdleModeCycles(iChangeIdleModeCycles), _cyclesBeforeIdle(iCyclesBeforeIdle)
......
......@@ -77,7 +77,7 @@ public:
\param iCyclesBeforeIdle Idle cycles which elapse before entering idle mode
\param ibyteDataSize Machine word length
*/
SingleCoreCPU(ID iID, std::string iName, WorkloadSource* iScheduler, std::string iModelName, TMLTime iTimePerCycle, unsigned int iCyclesPerExeci, unsigned int iCyclesPerExecc, unsigned int iPipelineSize, unsigned int iTaskSwitchingCycles, unsigned int iBranchingMissrate, unsigned int iChangeIdleModeCycles, unsigned int iCyclesBeforeIdle, unsigned int ibyteDataSize);
SingleCoreCPU(ID iID, std::string iName, WorkloadSource* iScheduler, TMLTime iTimePerCycle, unsigned int iCyclesPerExeci, unsigned int iCyclesPerExecc, unsigned int iPipelineSize, unsigned int iTaskSwitchingCycles, unsigned int iBranchingMissrate, unsigned int iChangeIdleModeCycles, unsigned int iCyclesBeforeIdle, unsigned int ibyteDataSize);
///Destructor
virtual ~SingleCoreCPU();
///Determines the next CPU transaction to be executed
......
......@@ -518,6 +518,7 @@ class EBRDD;
class EBRDDCommand;
class SignalConstraint;
///Datatype used for time measurements
typedef unsigned long long TMLTime;
///Datatype used to indicate the virtual length of commands (execution units, data units)
......
......@@ -69,6 +69,12 @@ public:
SimComponents(int iHashValue);
///Destructor
virtual ~SimComponents();
///Add name of model
/**
\param msg is the name of model
*/
inline void addModelName(std::string msg) {_modelName=msg;}
inline std::string getModelName() {return _modelName;}
///Add a task
/**
\param iTask Pointer to task
......@@ -307,6 +313,8 @@ protected:
ChannelList _channelList;
///TEPE listener listener
TEPEListenerList _tepeListenerList;
///name of model
std::string _modelName;
#ifdef EBRDD_ENABLED
///List holding EBRDDs
EBRDDList _ebrddList;
......
......@@ -57,7 +57,7 @@
#include <EBRDDCommand.h>
#include <ERC.h>
#endif
class CurrentComponents;
Simulator::Simulator(SimServSyncInfo* iSyncInfo):_syncInfo(iSyncInfo), _simComp(_syncInfo->_simComponents), _busy(false), _simTerm(false), _randChoiceBreak(_syncInfo->_simComponents), _wasReset(true), _longRunTime(0), _shortRunTime(-1), _replyToServer(true), _branchCoverage(60), _commandCoverage(100), _terminateExplore(false), _simDuration(0){
}
......@@ -303,7 +303,8 @@ std::cout<<"schedule2HTML--------------------------------------*****************
std::ofstream myfile(iTraceFileName.c_str());
myfile<<"model name: "<<(*_simComp->getCPUList().begin())->getModelName();
//myfile<<"model name: "<<iTraceFileName.c_str();
myfile<<"model name: "<< _simComp->getModelName();
if (myfile.is_open()) {
myfile << " date: " << asctime(aTimeinfo)<<std::endl;
......
......@@ -370,5 +370,6 @@ protected:
long _nbOfBranchesToExplore;
long _nbOfBranchesExplored;
std::string _end;
};
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment