diff --git a/DRAMSys/simulator/resources/configs/mcconfigs/sms.xml b/DRAMSys/simulator/resources/configs/mcconfigs/sms.xml index 84551d57..088a9f66 100644 --- a/DRAMSys/simulator/resources/configs/mcconfigs/sms.xml +++ b/DRAMSys/simulator/resources/configs/mcconfigs/sms.xml @@ -3,10 +3,8 @@ - - - - + + diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp index e410f639..f0fd7f68 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp +++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.cpp @@ -146,10 +146,8 @@ void Configuration::setParameter(std::string name, std::string value) } else { SJFProbability = string2int(value); } - else if (name == "ReadyBatchSize") - ReadyBatchSize = string2int(value); - else if (name == "ReadyBatchThresholdAge") - ReadyBatchThresholdAge = string2int(value); + else if (name == "RequestBufferSize") + RequestBufferSize = string2int(value); else if(name == "Capsize") Capsize = string2int(value); else if(name == "PowerDownTimeout") diff --git a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h index c52f4655..2f158053 100644 --- a/DRAMSys/simulator/src/controller/core/configuration/Configuration.h +++ b/DRAMSys/simulator/src/controller/core/configuration/Configuration.h @@ -63,8 +63,7 @@ struct Configuration unsigned int MaxNrOfTransactions = 8; std::string Scheduler; unsigned int SJFProbability; - unsigned int ReadyBatchSize; - unsigned int ReadyBatchThresholdAge; + unsigned int RequestBufferSize; unsigned int Capsize = 5; sc_time getPowerDownTimeout(){return powerDownTimeoutInClk*memSpec.clk;} EPowerDownMode PowerDownMode = EPowerDownMode::Staggered; diff --git a/DRAMSys/simulator/src/controller/scheduler/SMS.cpp b/DRAMSys/simulator/src/controller/scheduler/SMS.cpp index d4336415..7b89d885 100644 --- a/DRAMSys/simulator/src/controller/scheduler/SMS.cpp +++ b/DRAMSys/simulator/src/controller/scheduler/SMS.cpp @@ -248,7 +248,7 @@ void SMS::updateMPKCs(sc_time memClk) { } bool SMS::isExceededReqBufferSize(Thread thread) { - return requestBuffers[thread].size() == REQUEST_BUFFER_SIZE; + return requestBuffers[thread].size() == Configuration::getInstance().RequestBufferSize; } bool SMS::isRequestBuffersEmpty() { diff --git a/DRAMSys/simulator/src/controller/scheduler/SMS.h b/DRAMSys/simulator/src/controller/scheduler/SMS.h index 73675a41..3d4282aa 100644 --- a/DRAMSys/simulator/src/controller/scheduler/SMS.h +++ b/DRAMSys/simulator/src/controller/scheduler/SMS.h @@ -16,7 +16,6 @@ #define MEDIUM_THRESHOLD_AGE 50 #define HIGH_THRESHOLD_AGE 200 #define MPKC_RESET_CYCLE 10000 -#define REQUEST_BUFFER_SIZE 10 using namespace std; typedef std::deque::iterator gp_deque_iterator;