Added support for command-line overrides in tracebasedsim

Author: dramninjasUMD

IniReader.cpp

@@ -419,16 +419,19 @@ void IniReader::ReadIniFile(string filename, bool isSystemFile)
 	}
 }
 
-void IniReader::OverrideKeys(vector<string> keys, vector<string>values)
+void IniReader::OverrideKeys(const OverrideMap *map)
 {
-	if (keys.size() != values.size())
-	{
-		ERROR("-o option is messed up");
-		exit(-1);
-	}
-	for (size_t i=0; i<keys.size(); i++)
+	if (!map)
+		return; 
+
+	OverrideIterator it = map->begin();
+	DEBUG("Key overrides from command line:"); 
+	for (it=map->begin(); it != map->end(); it++)
 	{
-		IniReader::SetKey(keys[i], values[i]);
+		string key = it->first; 
+		string value = it->second; 
+		DEBUG("\t'"<< key <<"'->'"<< value<< "'"); 
+		IniReader::SetKey(key,value);
 	}
 }
 

IniReader.h

@@ -28,25 +28,18 @@
 *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *********************************************************************************/
 
-
-
-
-
-
-
-
 #ifndef INIREADER_H
 #define INIREADER_H
 
 #include <iostream>
 #include <fstream>
 #include <sstream>
 #include <string>
+#include <map> 
 #include "SystemConfiguration.h"
 
 using namespace std;
 
-// Uhhh, apparently the #name equals "name" -- HOORAY MACROS!
 #define DEFINE_UINT_PARAM(name, paramtype) {#name, &name, UINT, paramtype, false}
 #define DEFINE_STRING_PARAM(name, paramtype) {#name, &name, STRING, paramtype, false}
 #define DEFINE_FLOAT_PARAM(name,paramtype) {#name, &name, FLOAT, paramtype, false}
@@ -70,9 +63,13 @@ typedef struct _configMap
 
 class IniReader
 {
+
 public:
+	typedef std::map<string, string> OverrideMap;
+	typedef OverrideMap::const_iterator OverrideIterator; 
+
 	static void SetKey(string key, string value, bool isSystemParam = false, size_t lineNumber = 0);
-	static void OverrideKeys(vector<string> keys, vector<string> values);
+	static void OverrideKeys(const OverrideMap *map);
 	static void ReadIniFile(string filename, bool isSystemParam);
 	static void InitEnumsFromStrings();
 	static bool CheckIfAllSet();

MultiChannelMemorySystem.cpp

@@ -292,24 +292,33 @@ void MultiChannelMemorySystem::mkdirIfNotExist(string path)
 	}
 }
 
-void MultiChannelMemorySystem::overrideSystemParam(string key, string value)
+void MultiChannelMemorySystem::overrideParams(const IniReader::OverrideMap *map)
 {
-	cerr << "Override key " <<key<<"="<<value<<endl;
-	IniReader::SetKey(key, value, true);
+	if (!map)
+		return; 
+
+	if (map->find("NUM_CHANS") != map->end())
+	{
+		//FIXME: override for NUM_CHANS
+		ERROR("Currently no support for overriding the number of channels; if you need this, send me an email and I can implement it. "); 
+		abort(); 
+	}
+
+	IniReader::OverrideKeys(map); 
 }
 
-void MultiChannelMemorySystem::overrideSystemParam(string keyValuePair)
+void MultiChannelMemorySystem::overrideParam(string key, string value)
 {
-	size_t equalsign=-1;
-	string overrideKey, overrideVal;
-	//FIXME: could use some error checks on the string
-	if ((equalsign = keyValuePair.find_first_of('=')) != string::npos) {
-		overrideKey = keyValuePair.substr(0,equalsign);
-		overrideVal = keyValuePair.substr(equalsign+1);
-		overrideSystemParam(overrideKey, overrideVal);
+	if (key == "NUM_CHANS")
+	{
+		//FIXME: override for NUM_CHANS
+		ERROR("Currently no support for overriding the number of channels; if you need this, send me an email and I can implement it. "); 
+		abort(); 
 	}
+	IniReader::SetKey(key, value, true);
 }
 
+
 MultiChannelMemorySystem::~MultiChannelMemorySystem()
 {
 // Should only ever be called on exit, so don't bother to delete stuff, just

MultiChannelMemorySystem.h

@@ -31,6 +31,7 @@
 #include "Transaction.h"
 #include "SystemConfiguration.h"
 #include "MemorySystem.h"
+#include "IniReader.h"
 
 
 namespace DRAMSim {
@@ -56,8 +57,8 @@ class MultiChannelMemorySystem : public SimulatorObject
 	void InitOutputFiles(string tracefilename);
 
 	// mostly for other simulators
-	void overrideSystemParam(string key, string value);
-	void overrideSystemParam(string kvpair);
+	void overrideParams(const IniReader::OverrideMap *map); 
+	void overrideParam(string key, string value);
 
 	//output file
 	std::ofstream visDataOut;

TraceBasedSim.cpp

@@ -46,6 +46,7 @@
 #include "MemorySystem.h"
 #include "MultiChannelMemorySystem.h"
 #include "Transaction.h"
+#include "IniReader.h"
 
 
 using namespace DRAMSim;
@@ -138,13 +139,13 @@ class TransactionReceiver
 void usage()
 {
 	cout << "DRAMSim2 Usage: " << endl;
-	cout << "DRAMSim -t tracefile -s system.ini -d ini/device.ini [-c #] [-p pwd] [-q] [-S 2048] [-n] [-o OPTION_A=1234]" <<endl;
+	cout << "DRAMSim -t tracefile -s system.ini -d ini/device.ini [-c #] [-p pwd] [-q] [-S 2048] [-n] [-o OPTION_A=1234,tRC=14,tFAW=19]" <<endl;
 	cout << "\t-t, --tracefile=FILENAME \tspecify a tracefile to run  "<<endl;
 	cout << "\t-s, --systemini=FILENAME \tspecify an ini file that describes the memory system parameters  "<<endl;
 	cout << "\t-d, --deviceini=FILENAME \tspecify an ini file that describes the device-level parameters"<<endl;
 	cout << "\t-c, --numcycles=# \t\tspecify number of cycles to run the simulation for [default=30] "<<endl;
 	cout << "\t-q, --quiet \t\t\tflag to suppress simulation output (except final stats) [default=no]"<<endl;
-	cout << "\t-o, --option=OPTION_A=234\t\t\toverwrite any ini file option from the command line"<<endl;
+	cout << "\t-o, --option=OPTION_A=234,tFAW=14\t\t\toverwrite any ini file option from the command line"<<endl;
 	cout << "\t-p, --pwd=DIRECTORY\t\tSet the working directory (i.e. usually DRAMSim directory where ini/ and results/ are)"<<endl;
 	cout << "\t-S, --size=# \t\t\tSize of the memory system in megabytes [default=2048M]"<<endl;
 	cout << "\t-n, --notiming \t\t\tDo not use the clock cycle information in the trace file"<<endl;
@@ -331,6 +332,40 @@ void alignTransactionAddress(Transaction &trans)
 	trans.address >>= throwAwayBits;
 	trans.address <<= throwAwayBits;
 }
+
+/** 
+ * Override options can be specified on the command line as -o key1=value1,key2=value2
+ * this method should parse the key-value pairs and put them into a map 
+ **/ 
+IniReader::OverrideMap *parseParamOverrides(const string &kv_str)
+{
+	IniReader::OverrideMap *kv_map = new IniReader::OverrideMap(); 
+	size_t start = 0, comma=0, equal_sign=0;
+	// split the commas if they are there
+	while (1)
+	{
+		equal_sign = kv_str.find('=', start); 
+		if (equal_sign == string::npos)
+		{
+			break;
+		}
+
+		comma = kv_str.find(',', equal_sign);
+		if (comma == string::npos)
+		{
+			comma = kv_str.length();
+		}
+
+		string key = kv_str.substr(start, equal_sign-start);
+		string value = kv_str.substr(equal_sign+1, comma-equal_sign-1); 
+
+		(*kv_map)[key] = value; 
+		start = comma+1;
+
+	}
+	return kv_map; 
+}
+
 int main(int argc, char **argv)
 {
 	int c;
@@ -341,12 +376,8 @@ int main(int argc, char **argv)
 	string pwdString;
 	unsigned megsOfMemory=2048;
 	bool useClockCycle=true;
-
-	bool overrideOpt = false;
-	string overrideKey = "";
-	string overrideVal = "";
-	string tmp = "";
-	size_t equalsign;
+	
+	IniReader::OverrideMap *paramOverrides = NULL; 
 
 	unsigned numCycles=1000;
 	//getopt stuff
@@ -357,6 +388,7 @@ int main(int argc, char **argv)
 			{"deviceini", required_argument, 0, 'd'},
 			{"tracefile", required_argument, 0, 't'},
 			{"systemini", required_argument, 0, 's'},
+
 			{"pwd", required_argument, 0, 'p'},
 			{"numcycles",  required_argument,	0, 'c'},
 			{"option",  required_argument,	0, 'o'},
@@ -415,11 +447,7 @@ int main(int argc, char **argv)
 			useClockCycle=false;
 			break;
 		case 'o':
-			tmp = string(optarg);
-			equalsign = tmp.find_first_of('=');
-			overrideKey = tmp.substr(0,equalsign);
-			overrideVal = tmp.substr(equalsign+1,tmp.size()-equalsign+1);
-			overrideOpt = true;
+			paramOverrides = parseParamOverrides(string(optarg)); 
 			break;
 		case '?':
 			usage();
@@ -474,6 +502,7 @@ int main(int argc, char **argv)
 
 
 	MultiChannelMemorySystem *memorySystem = new MultiChannelMemorySystem(deviceIniFilename, systemIniFilename, pwdString, traceFileName, megsOfMemory);
+	memorySystem->overrideParams(paramOverrides);
 
 
 #ifdef RETURN_TRANSACTIONS