feat: add "On SortVerbose;" for extra sort info

Add information to the final sort summaries (per thread and master)
including the number of comparisons made, the number of times
the small and large buffers were sorted due to their capacities, and
the total size of the unsorted, uncomressed generated terms.

Author: jodavies

sources/sort.c

@@ -156,11 +156,13 @@ void WriteStats(POSITION *plspace, WORD par, WORD checkLogType)
 		char humanGenTermsText[HUMANSTRLEN] = "";
 		char humanTermsLeftText[HUMANSTRLEN] = "";
 		char humanBytesText[HUMANSTRLEN] = "";
+		char humanUnsortedBytesText[HUMANSTRLEN] = "";
 		char humanComparisonsText[HUMANSTRLEN] = "";
 		if ( AC.HumanStatsFlag ) {
 			HumanString(humanGenTermsText, (float)(S->GenTerms), humanTermsSuffix);
 			HumanString(humanTermsLeftText, (float)(S->TermsLeft), humanTermsSuffix);
 			HumanString(humanBytesText, (float)(BASEPOSITION(*plspace)), humanBytesSuffix);
+			HumanString(humanUnsortedBytesText, (float)(S->verbUnsortedSize), humanBytesSuffix);
 			HumanString(humanComparisonsText, (float)(S->verbComparisons), humanTermsSuffix);
 		}
 
@@ -311,15 +313,18 @@ void WriteStats(POSITION *plspace, WORD par, WORD checkLogType)
 
 		if ( par == STATSPOSTSORT ) {
 			if ( AC.SortVerbose ) {
-				snprintf(buf, sizeof(buf), "%24s Comparisons     =%11ld%s",
-					"",S->verbComparisons,humanComparisonsText);
+				snprintf(buf, sizeof(buf), "%24s Unsorted bytes  =%11ld%s",
+					"",S->verbUnsortedSize,humanUnsortedBytesText);
 				MesPrint("%s", buf);
 				snprintf(buf, sizeof(buf), "%24s Small Buffer    =%5ld,%5ld",
 					"",S->verbSBsortTerms,S->verbSBsortCap);
 				MesPrint("%s", buf);
 				snprintf(buf, sizeof(buf), "%24s Large Buffer    =%5ld,%5ld",
 					"",S->verbLBsortPatches,S->verbLBsortCap);
 				MesPrint("%s", buf);
+				snprintf(buf, sizeof(buf), "%24s Comparisons     =%11ld%s",
+					"",S->verbComparisons,humanComparisonsText);
+				MesPrint("%s", buf);
 			}
 		}
 
@@ -414,6 +419,7 @@ int NewSort(PHEAD0)
 	S->verbSBsortCap = 0;
 	S->verbLBsortPatches = 0;
 	S->verbLBsortCap = 0;
+	S->verbUnsortedSize = 0;
 	return(0);
 }
 
@@ -2342,10 +2348,8 @@ WORD Compare1(PHEAD WORD *term1, WORD *term2, WORD level)
 	WORD prevorder;
 	WORD count = -1, localPoly, polyhit = -1;
 
-	if ( AR.sLevel == 0 ) {
-		// Update SortVerbose counter at ground level only
-		S->verbComparisons++;
-	}
+	// Update SortVerbose counter
+	S->verbComparisons++;
 
 	if ( S->PolyFlag ) {
 /*
@@ -4245,6 +4249,9 @@ int StoreTerm(PHEAD WORD *term)
 	POSITION pp;
 	LONG lSpace, sSpace, RetCode, over, tover;
 
+	// Update SortVerbose counters
+	S->verbUnsortedSize += *term * sizeof(*term);
+
 	if ( ( ( AP.PreDebug & DUMPTOSORT ) == DUMPTOSORT ) && AR.sLevel == 0 ) {
 #ifdef WITHPTHREADS
 		snprintf((char *)(THRbuf),100,"StoreTerm(%d)",AT.identity);

sources/structs.h

@@ -1161,6 +1161,7 @@ typedef struct sOrT {
     LONG verbSBsortCap;
     LONG verbLBsortPatches;
     LONG verbLBsortCap;
+    LONG verbUnsortedSize;
     int MaxPatches;             /* Maximum number of patches in large buffer */
     int MaxFpatches;            /* Maximum number of patches in one filesort */
     int type;                   /* Main, function or sub(routine) */

sources/threads.c

@@ -4059,6 +4059,7 @@ int MasterMerge(void)
 	// The total GenTerms is the sum of the thread GenTerms.
 	// The total small/large buffer sort info is the sum of the thread info.
 	// The total comparison count is the sum of the thread counts.
+	// The total unsorted size is the sum of the total generated terms sizes
 	S->GenTerms = 0;
 	for ( j = 1; j <= numberofworkers; j++ ) {
 		S->GenTerms += AB[j]->T.SS->GenTerms;
@@ -4067,6 +4068,7 @@ int MasterMerge(void)
 		S->verbSBsortCap += AB[j]->T.SS->verbSBsortCap;
 		S->verbLBsortPatches += AB[j]->T.SS->verbLBsortPatches;
 		S->verbLBsortCap += AB[j]->T.SS->verbLBsortCap;
+		S->verbUnsortedSize += AB[j]->T.SS->verbUnsortedSize;
 	}
 
 	WriteStats(&position,STATSPOSTSORT,NOCHECKLOGTYPE);
@@ -4211,6 +4213,7 @@ int SortBotMasterMerge(void)
 	// The total GenTerms is the sum of the thread GenTerms.
 	// The total small/large buffer sort info is the sum of the thread info.
 	// The total comparison count is the sum of the thread and sortbot counts.
+	// The total unsorted size is the sum of the total generated terms sizes
 	S->GenTerms = 0;
 	for ( j = 1; j <= numberofworkers; j++ ) {
 		S->GenTerms += AB[j]->T.SS->GenTerms;
@@ -4219,6 +4222,7 @@ int SortBotMasterMerge(void)
 		S->verbSBsortCap += AB[j]->T.SS->verbSBsortCap;
 		S->verbLBsortPatches += AB[j]->T.SS->verbLBsortPatches;
 		S->verbLBsortCap += AB[j]->T.SS->verbLBsortCap;
+		S->verbUnsortedSize += AB[j]->T.SS->verbUnsortedSize;
 	}
 	for ( j = numberofworkers+1; j <= numberofworkers+numberofsortbots; j++ ) {
 		S->verbComparisons += AB[j]->T.SS->verbComparisons;