X-Git-Url: http://plrg.eecs.uci.edu/git/?p=satune.git;a=blobdiff_plain;f=src%2FTuner%2Fsearchtuner.cc;h=3e9586096e36a1d0121db35b760556c49b6597f2;hp=c3c1af7910e23d11da7dd51d64494f564230a7fb;hb=7ce425ac7ed2ff3b348d1d8be37df8a5e3db21f2;hpb=87e67ce60ad79d235655d7c74276ba27d1d98632

diff --git a/src/Tuner/searchtuner.cc b/src/Tuner/searchtuner.cc
index c3c1af7..3e95860 100644
--- a/src/Tuner/searchtuner.cc
+++ b/src/Tuner/searchtuner.cc
@@ -2,21 +2,31 @@
 
 TunableSetting::TunableSetting(VarType _type, TunableParam _param) :
 	hasVar(true),
-	type(_type),
+	type1(_type),
+	type2(0),
+	param(_param) {
+}
+
+TunableSetting::TunableSetting(VarType _type1, VarType _type2, TunableParam _param) :
+	hasVar(true),
+	type1(_type1),
+	type2(_type2),
 	param(_param) {
 }
 
 TunableSetting::TunableSetting(TunableParam _param) :
 	hasVar(false),
-	type(0),
+	type1(0),
+	type2(0),
 	param(_param) {
 }
 
-TunableSetting::TunableSetting(TunableSetting * ts) :
+TunableSetting::TunableSetting(TunableSetting *ts) :
 	hasVar(ts->hasVar),
-	type(ts->type),
+	type1(ts->type1),
+	type2(ts->type2),
 	param(ts->param),
-  lowValue(ts->lowValue),
+	lowValue(ts->lowValue),
 	highValue(ts->highValue),
 	defaultValue(ts->defaultValue),
 	selectedValue(ts->selectedValue)
@@ -32,30 +42,32 @@ void TunableSetting::setDecision(int _low, int _high, int _default, int _selecti
 
 void TunableSetting::print() {
 	if (hasVar) {
-		model_print("Type %" PRIu64 ", ", type);
+		model_print("Type1 %" PRIu64 ", ", type1);
+		model_print("Type2 %" PRIu64 ", ", type2);
 	}
 	model_print("Param %u = %u\n", param, selectedValue);
 }
 
 unsigned int tunableSettingHash(TunableSetting *setting) {
-	return setting->hasVar ^ setting->type ^ setting->param;
+	return setting->hasVar ^ setting->type1 ^ setting->type2 ^ setting->param;
 }
 
 bool tunableSettingEquals(TunableSetting *setting1, TunableSetting *setting2) {
 	return setting1->hasVar == setting2->hasVar &&
-		setting1->type == setting2->type &&
+		setting1->type1 == setting2->type1 &&
+		setting1->type2 == setting2->type2 &&
 		setting1->param == setting2->param;
 }
 
 SearchTuner::SearchTuner() {
 }
 
-SearchTuner * SearchTuner::copyUsed() {
-	SearchTuner * tuner = new SearchTuner();
-	SetIteratorTunableSetting *iterator=usedSettings.iterator();
-	while(iterator->hasNext()) {
-		TunableSetting *setting=iterator->next();
-		TunableSetting *copy=new TunableSetting(setting);
+SearchTuner *SearchTuner::copyUsed() {
+	SearchTuner *tuner = new SearchTuner();
+	SetIteratorTunableSetting *iterator = usedSettings.iterator();
+	while (iterator->hasNext()) {
+		TunableSetting *setting = iterator->next();
+		TunableSetting *copy = new TunableSetting(setting);
 		tuner->settings.add(copy);
 	}
 	delete iterator;
@@ -63,9 +75,9 @@ SearchTuner * SearchTuner::copyUsed() {
 }
 
 SearchTuner::~SearchTuner() {
-	SetIteratorTunableSetting *iterator=settings.iterator();
-	while(iterator->hasNext()) {
-		TunableSetting *setting=iterator->next();
+	SetIteratorTunableSetting *iterator = settings.iterator();
+	while (iterator->hasNext()) {
+		TunableSetting *setting = iterator->next();
 		delete setting;
 	}
 	delete iterator;
@@ -73,12 +85,12 @@ SearchTuner::~SearchTuner() {
 
 int SearchTuner::getTunable(TunableParam param, TunableDesc *descriptor) {
 	TunableSetting setting(param);
-	TunableSetting * result = usedSettings.get(&setting);
+	TunableSetting *result = usedSettings.get(&setting);
 	if (result == NULL) {
 		result = settings.get(&setting);
 		if ( result == NULL) {
-			result=new TunableSetting(param);
-			uint value = descriptor->lowValue + (random() % (1+ descriptor->highValue - descriptor->lowValue));
+			result = new TunableSetting(param);
+			uint value = descriptor->lowValue + (random() % (1 + descriptor->highValue - descriptor->lowValue));
 			result->setDecision(descriptor->lowValue, descriptor->highValue, descriptor->defaultValue, value);
 			settings.add(result);
 		}
@@ -88,13 +100,18 @@ int SearchTuner::getTunable(TunableParam param, TunableDesc *descriptor) {
 }
 
 int SearchTuner::getVarTunable(VarType vartype, TunableParam param, TunableDesc *descriptor) {
-	TunableSetting setting(vartype, param);
-	TunableSetting * result = usedSettings.get(&setting);
+	return getVarTunable(vartype, 0, param, descriptor);
+}
+
+int SearchTuner::getVarTunable(VarType vartype1, VarType vartype2, TunableParam param, TunableDesc *descriptor) {
+	TunableSetting setting(vartype1, vartype2, param);
+	TunableSetting *result = usedSettings.get(&setting);
 	if (result == NULL) {
 		result = settings.get(&setting);
 		if ( result == NULL) {
-			result=new TunableSetting(vartype, param);
-			uint value = descriptor->lowValue + (random() % (1+ descriptor->highValue - descriptor->lowValue));
+			result = new
+				TunableSetting(vartype1, vartype2, param);
+			uint value = descriptor->lowValue + (random() % (1 + descriptor->highValue - descriptor->lowValue));
 			result->setDecision(descriptor->lowValue, descriptor->highValue, descriptor->defaultValue, value);
 			settings.add(result);
 		}
@@ -104,9 +121,9 @@ int SearchTuner::getVarTunable(VarType vartype, TunableParam param, TunableDesc
 }
 
 void SearchTuner::randomMutate() {
-	TunableSetting * randomSetting = settings.getRandomElement();
-	int range=randomSetting->highValue-randomSetting->lowValue;
-	int randomchoice=(random() % range) + randomSetting->lowValue;
+	TunableSetting *randomSetting = settings.getRandomElement();
+	int range = randomSetting->highValue - randomSetting->lowValue;
+	int randomchoice = (random() % range) + randomSetting->lowValue;
 	if (randomchoice < randomSetting->selectedValue)
 		randomSetting->selectedValue = randomchoice;
 	else
@@ -114,9 +131,9 @@ void SearchTuner::randomMutate() {
 }
 
 void SearchTuner::print() {
-	SetIteratorTunableSetting *iterator=settings.iterator();
-	while(iterator->hasNext()) {
-		TunableSetting *setting=iterator->next();
+	SetIteratorTunableSetting *iterator = settings.iterator();
+	while (iterator->hasNext()) {
+		TunableSetting *setting = iterator->next();
 		setting->print();
 	}
 	delete iterator;
@@ -124,9 +141,9 @@ void SearchTuner::print() {
 }
 
 void SearchTuner::printUsed() {
-	SetIteratorTunableSetting *iterator=usedSettings.iterator();
-	while(iterator->hasNext()) {
-		TunableSetting *setting=iterator->next();
+	SetIteratorTunableSetting *iterator = usedSettings.iterator();
+	while (iterator->hasNext()) {
+		TunableSetting *setting = iterator->next();
 		setting->print();
 	}
 	delete iterator;