Skip to content
Snippets Groups Projects
Commit a1a7f689 authored by as29's avatar as29
Browse files

Merge branch 'master' of gitlab.engr.illinois.edu:samarth5/queues

Resolved conflicts
parents c5a3a7f4 2d54dc56
No related branches found
No related tags found
No related merge requests found
...@@ -87,75 +87,86 @@ int main() ...@@ -87,75 +87,86 @@ int main()
Operation<char*> enqueueDequeueOperation4(make_shared<LockQueue<char*>>(), EnqueueNItems, numberOfItemsToEnqueueLarge, DequeueNItems, numberOfItemsToDequeueLarge, numberOfMicrosecondsToDequeueFor); Operation<char*> enqueueDequeueOperation4(make_shared<LockQueue<char*>>(), EnqueueNItems, numberOfItemsToEnqueueLarge, DequeueNItems, numberOfItemsToDequeueLarge, numberOfMicrosecondsToDequeueFor);
Operation<char*> enqueueDequeueOperation12(make_shared<CharmQueue>(), EnqueueNItems, numberOfItemsToEnqueueLarge, DequeueNItems, numberOfItemsToDequeueLarge, numberOfMicrosecondsToDequeueFor); Operation<char*> enqueueDequeueOperation12(make_shared<CharmQueue>(), EnqueueNItems, numberOfItemsToEnqueueLarge, DequeueNItems, numberOfItemsToDequeueLarge, numberOfMicrosecondsToDequeueFor);
Operation<char*> enqueueDequeueOperation16(make_shared<TbbQueue<char*>>(), EnqueueNItems, numberOfItemsToEnqueueLarge, DequeueNItems, numberOfItemsToDequeueLarge, numberOfMicrosecondsToDequeueFor); Operation<char*> enqueueDequeueOperation16(make_shared<TbbQueue<char*>>(), EnqueueNItems, numberOfItemsToEnqueueLarge, DequeueNItems, numberOfItemsToDequeueLarge, numberOfMicrosecondsToDequeueFor);
ofstream numMeasuresFile;
numMeasuresFile.open("numMeasures.txt");
numMeasuresFile<< numberOfMeasurements;
numMeasuresFile.close();
ofstream file1; ofstream file1;
file1.open("1.txt"); file1.open("1.txt");
file1<< "Ne per thread: " << numberOfItemsToEnqueueSmall <<"\tNt: " << 1 <<endl file1<< "ItemsEnqueued per thread: " << numberOfItemsToEnqueueSmall <<"\tNumberOfThreads: " << 1 <<endl
<<"Index\t\tValues"<<endl <<"Index\t\tValues"<<endl
<<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation1, isOnlyEnqueueOperation, numberOfMeasurements) <<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation1, isOnlyEnqueueOperation, numberOfMeasurements)
<<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation9, isOnlyEnqueueOperation, numberOfMeasurements) <<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation9, isOnlyEnqueueOperation, numberOfMeasurements)
<<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation13, isOnlyEnqueueOperation, numberOfMeasurements); <<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation13, isOnlyEnqueueOperation, numberOfMeasurements);
file1.close();
ofstream file2; ofstream file2;
file2.open("2.txt"); file2.open("2.txt");
file2<< "Ne per thread: " << numberOfItemsToEnqueueLarge <<"\tNt: " << 1 <<endl file2<< "ItemsEnqueued per thread: " << numberOfItemsToEnqueueLarge <<"\tNumberOfThreads: " << 1 <<endl
<<"Index\t\tValues"<<endl <<"Index\t\tValues"<<endl
<<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation2, isOnlyEnqueueOperation, numberOfMeasurements) <<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation2, isOnlyEnqueueOperation, numberOfMeasurements)
<<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation10, isOnlyEnqueueOperation, numberOfMeasurements) <<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation10, isOnlyEnqueueOperation, numberOfMeasurements)
<<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation14, isOnlyEnqueueOperation, numberOfMeasurements); <<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation14, isOnlyEnqueueOperation, numberOfMeasurements);
file2.close();
ofstream file3; ofstream file3;
file3.open("3.txt"); file3.open("3.txt");
file3<< "Ne per thread: " << numberOfItemsToEnqueueSmall <<"\tNt: " << maxThreads <<endl file3<< "ItemsEnqueued per thread: " << numberOfItemsToEnqueueSmall <<"\tNumberOfThreads: " << maxThreads <<endl
<<"Index\t\tValues"<<endl <<"Index\t\tValues"<<endl
<<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation3, isOnlyEnqueueOperation, numberOfMeasurements) <<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation3, isOnlyEnqueueOperation, numberOfMeasurements)
<<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation11, isOnlyEnqueueOperation, numberOfMeasurements) <<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation11, isOnlyEnqueueOperation, numberOfMeasurements)
<<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation15, isOnlyEnqueueOperation, numberOfMeasurements); <<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation15, isOnlyEnqueueOperation, numberOfMeasurements);
file3.close();
ofstream file4; ofstream file4;
file4.open("4.txt"); file4.open("4.txt");
file4<< "Ne per thread: " << numberOfItemsToEnqueueLarge <<"\tNt: " << maxThreads <<endl file4<< "ItemsEnqueued per thread: " << numberOfItemsToEnqueueLarge <<"\tNumberOfThreads: " << maxThreads <<endl
<<"Index\t\tValues"<<endl <<"Index\t\tValues"<<endl
<<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation4, isOnlyEnqueueOperation, numberOfMeasurements) <<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation4, isOnlyEnqueueOperation, numberOfMeasurements)
<<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation12, isOnlyEnqueueOperation, numberOfMeasurements) <<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation12, isOnlyEnqueueOperation, numberOfMeasurements)
<<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation16, isOnlyEnqueueOperation, numberOfMeasurements); <<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueOperation16, isOnlyEnqueueOperation, numberOfMeasurements);
file4.close();
ofstream file5; ofstream file5;
file5.open("5.txt"); file5.open("5.txt");
file5<< "Ne per thread: " << numberOfItemsToEnqueueSmall << "\tNd: " << numberOfItemsToDequeueSmall << "\tNt: " << maxThreads <<"\tDequeueInterval: " << numberOfMicrosecondsToDequeueFor << endl file5<< "ItemsEnqueued per thread: " << numberOfItemsToEnqueueSmall << "\tItemsDequeued: " << numberOfItemsToDequeueSmall << "\tNumberOfThreads: " << maxThreads <<"\tDequeueIntervalMicroSeconds: " << numberOfMicrosecondsToDequeueFor << endl
// file5<<"##EnqueueDequeue: Small number of items to enqueue, small number of items to dequeue and one thread per hardware thread."<<endl
<<"Index\t\tValues"<<endl <<"Index\t\tValues"<<endl
<<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation1, !isOnlyEnqueueOperation, numberOfMeasurements) <<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation1, !isOnlyEnqueueOperation, numberOfMeasurements)
<<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation9, !isOnlyEnqueueOperation, numberOfMeasurements) <<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation9, !isOnlyEnqueueOperation, numberOfMeasurements)
<<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation13, !isOnlyEnqueueOperation, numberOfMeasurements); <<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation13, !isOnlyEnqueueOperation, numberOfMeasurements);
file5.close();
ofstream file6; ofstream file6;
file6.open("6.txt"); file6.open("6.txt");
file6<< "Ne per thread: " << numberOfItemsToEnqueueLarge << "\tNd: " << numberOfItemsToDequeueSmall << "\tNt: " << maxThreads <<"\tDequeueInterval: " << numberOfMicrosecondsToDequeueFor << endl file6<< "ItemsEnqueued per thread: " << numberOfItemsToEnqueueLarge << "\tItemsDequeued: " << numberOfItemsToDequeueSmall << "\tNumberOfThreads: " << maxThreads <<"\tDequeueIntervalMicroSeconds: " << numberOfMicrosecondsToDequeueFor << endl
// file6<<"##EnqueueDequeue: Large number of items to enqueue, small number of items to dequeue and one thread per hardware thread."<<endl
<<"Index\t\tValues"<<endl <<"Index\t\tValues"<<endl
<<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation2, !isOnlyEnqueueOperation, numberOfMeasurements) <<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation2, !isOnlyEnqueueOperation, numberOfMeasurements)
<<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation10, !isOnlyEnqueueOperation, numberOfMeasurements) <<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation10, !isOnlyEnqueueOperation, numberOfMeasurements)
<<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation14, !isOnlyEnqueueOperation, numberOfMeasurements); <<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation14, !isOnlyEnqueueOperation, numberOfMeasurements);
file6.close();
ofstream file7; ofstream file7;
file7.open("7.txt"); file7.open("7.txt");
file7<< "Ne per thread: " << numberOfItemsToEnqueueSmall << "\tNd: " << numberOfItemsToDequeueLarge << "\tNt: " << maxThreads <<"\tDequeueInterval: " << numberOfMicrosecondsToDequeueFor << endl file7<< "ItemsEnqueued per thread: " << numberOfItemsToEnqueueSmall << "\tItemsDequeued: " << numberOfItemsToDequeueLarge << "\tNumberOfThreads: " << maxThreads <<"\tDequeueIntervalMicroSeconds: " << numberOfMicrosecondsToDequeueFor << endl
// file7<<"##EnqueueDequeue: Large number of items to enqueue, large number of items to dequeue and one thread per hardware thread."<<endl
<<"Index\t\tValues"<<endl <<"Index\t\tValues"<<endl
<<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation3, !isOnlyEnqueueOperation, numberOfMeasurements) <<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation3, !isOnlyEnqueueOperation, numberOfMeasurements)
<<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation11, !isOnlyEnqueueOperation, numberOfMeasurements) <<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation11, !isOnlyEnqueueOperation, numberOfMeasurements)
<<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation15, !isOnlyEnqueueOperation, numberOfMeasurements); <<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation15, !isOnlyEnqueueOperation, numberOfMeasurements);
file7.close();
ofstream file8; ofstream file8;
file8.open("8.txt"); file8.open("8.txt");
// file8<<"##EnqueueDequeue: Large number of items to enqueue, large number of items to dequeue and one thread per hardware thread."<<endl file8<< "ItemsEnqueued per thread: " << numberOfItemsToEnqueueLarge << "\tItemsDequeued: " << numberOfItemsToDequeueLarge << "\tNumberOfThreads: " << maxThreads <<"\tDequeueIntervalMicroSeconds: " << numberOfMicrosecondsToDequeueFor << endl
file8<< "Ne per thread: " << numberOfItemsToEnqueueLarge << "\tNd: " << numberOfItemsToDequeueLarge << "\tNt: " << maxThreads <<"\tDequeueInterval: " << numberOfMicrosecondsToDequeueFor << endl
<<"Index\t\tValues"<<endl <<"Index\t\tValues"<<endl
<<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation4, !isOnlyEnqueueOperation, numberOfMeasurements) <<"1\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation4, !isOnlyEnqueueOperation, numberOfMeasurements)
<<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation12, !isOnlyEnqueueOperation, numberOfMeasurements) <<"2\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation12, !isOnlyEnqueueOperation, numberOfMeasurements)
<<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation16, !isOnlyEnqueueOperation, numberOfMeasurements); <<"3\t"<<benchmark.GetBenchmarkMeasure(enqueueDequeueOperation16, !isOnlyEnqueueOperation, numberOfMeasurements);
file8.close();
// // LockLessQueue // // LockLessQueue
//int DataNodeSize_local = 1024; //2^10 //int DataNodeSize_local = 1024; //2^10
......
...@@ -22,8 +22,13 @@ for i in range(1,9): ...@@ -22,8 +22,13 @@ for i in range(1,9):
valuesToPlot.append(map(float, details[1].split(","))) valuesToPlot.append(map(float, details[1].split(",")))
fileValues.append(valuesToPlot) fileValues.append(valuesToPlot)
numMeasures = 0
with open("numMeasures.txt") as fileHandle:
numMeasures = int(fileHandle.readline())
r = 0 r = 0
title_font = {'fontname':'Arial', 'size':'8', 'color':'black', 'weight':'normal', 'verticalalignment':'center'} title_font = {'size':'8', 'color':'black', 'weight':'normal', 'verticalalignment':'center'}
for fileValue in fileValues: for fileValue in fileValues:
ax[ir, jr].boxplot(fileValue) ax[ir, jr].boxplot(fileValue)
ax[ir, jr].set_title(titles[r].expandtabs(), title_font) ax[ir, jr].set_title(titles[r].expandtabs(), title_font)
...@@ -35,4 +40,9 @@ for fileValue in fileValues: ...@@ -35,4 +40,9 @@ for fileValue in fileValues:
jr = 0 jr = 0
plt.subplots_adjust(left=None, bottom=None, right=None, top=None, wspace=0.2, hspace=0.4) plt.subplots_adjust(left=None, bottom=None, right=None, top=None, wspace=0.2, hspace=0.4)
<<<<<<< HEAD
plt.show()
=======
plt.suptitle("Number of measurements: " + str(numMeasures))
plt.show() plt.show()
>>>>>>> 2d54dc563d30379daa55d2e72b1bb2d4650c9425
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment