Skip to content

Added "Largest Term" to stats for On SortVerbose #875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Emaiks wants to merge 1 commit into
base: master
Choose a base branch
from
+32 −0
Open

Added "Largest Term" to stats for On SortVerbose #875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions sources/float.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1754,6 +1754,7 @@ int AddWithFloat(PHEAD WORD **ps1, WORD **ps2)
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( **ps1 > S->verbMaxTermSize ) S->verbMaxTermSize = **ps1;
return(1);
}

Expand Down
11 changes: 11 additions & 0 deletions sources/normal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,12 @@ int Normalize(PHEAD WORD *term)
PrintTerm(term,"Normalize");
*/

if ( AT.SS == AT.S0 ) {
if ( *term > AT.SS->verbMaxTermSize ) {
AT.SS->verbMaxTermSize = *term;
}
}

Restart:
didcontr = 0;
ReplaceType = -1;
Expand Down Expand Up @@ -4122,6 +4128,11 @@ regularratfun:;
MUNLOCK(ErrorMessageLock);
goto NormMin;
}
if ( AT.SS == AT.S0 ) {
if ( ( m + i - termout ) > AT.SS->verbMaxTermSize ) {
AT.SS->verbMaxTermSize = m+i-termout;
}
}
if ( ReplaceType >= 0 ) {
t = n_coef;
i--;
Expand Down
9 changes: 9 additions & 0 deletions sources/sort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,14 @@ void WriteStats(POSITION *plspace, WORD par, WORD checkLogType)
char humanBytesText[HUMANSTRLEN] = "";
char humanUnsortedBytesText[HUMANSTRLEN] = "";
char humanComparisonsText[HUMANSTRLEN] = "";
char humanMaxTermSizeText[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);
HumanString(humanMaxTermSizeText, (float)(S->verbMaxTermSize), humanTermsSuffix);
}

MLOCK(ErrorMessageLock);
Expand Down Expand Up @@ -325,6 +327,9 @@ void WriteStats(POSITION *plspace, WORD par, WORD checkLogType)
snprintf(buf, sizeof(buf), "%24s Comparisons =%11ld%s",
"",S->verbComparisons,humanComparisonsText);
MesPrint("%s", buf);
snprintf(buf, sizeof(buf), "%24s Largest Term =%11ld%s",
"",S->verbMaxTermSize,humanMaxTermSizeText);
MesPrint("%s", buf);
}
}

Expand Down Expand Up @@ -410,6 +415,7 @@ int NewSort(PHEAD0)

// Zero the SortVerbose counters:
S->verbComparisons = 0;
S->verbMaxTermSize = 0;
S->verbSBsortTerms = 0;
S->verbSBsortCap = 0;
S->verbLBsortPatches = 0;
Expand Down Expand Up @@ -1836,6 +1842,7 @@ int AddCoef(PHEAD WORD **ps1, WORD **ps2)
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( **ps1 > S->verbMaxTermSize ) S->verbMaxTermSize = **ps1;
return(1);
}

Expand Down Expand Up @@ -2022,6 +2029,7 @@ int AddPoly(PHEAD WORD **ps1, WORD **ps2)
MUNLOCK(ErrorMessageLock);
Terminate(-1);
}
if ( *m > S->verbMaxTermSize ) S->verbMaxTermSize = *m;
}
return(1);
}
Expand Down Expand Up @@ -4253,6 +4261,7 @@ int StoreTerm(PHEAD WORD *term)

// Update SortVerbose counters
S->verbUnsortedSize += *term * sizeof(*term);
if ( S->verbMaxTermSize < *term ) S->verbMaxTermSize = *term;

if ( ( ( AP.PreDebug & DUMPTOSORT ) == DUMPTOSORT ) && AR.sLevel == 0 ) {
#ifdef WITHPTHREADS
Expand Down
1 change: 1 addition & 0 deletions sources/structs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1163,6 +1163,7 @@ typedef struct sOrT {
LONG verbLBsortPatches;
LONG verbLBsortCap;
LONG verbUnsortedSize;
LONG verbMaxTermSize;
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) */
Expand Down
10 changes: 10 additions & 0 deletions sources/threads.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,6 +2006,8 @@ void *RunSortBot(void *dummy)
SETBASEPOSITION(AN.theposition,0);
// Reset the sortbot comparison count
AT.SS->verbComparisons = 0;
// Reset the maximal term size count
AT.SS->verbMaxTermSize = 0;
break;
/*
#] INISORTBOT :
Expand Down Expand Up @@ -4114,10 +4116,13 @@ int MasterMerge(void)
// 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
// The total maximal term size is the maximum of all maximal term sizes
S->GenTerms = 0;
for ( j = 1; j <= numberofworkers; j++ ) {
S->GenTerms += AB[j]->T.SS->GenTerms;
S->verbComparisons += AB[j]->T.SS->verbComparisons;
if ( S->verbMaxTermSize < AB[j]->T.SS->verbMaxTermSize )
S->verbMaxTermSize = AB[j]->T.SS->verbMaxTermSize;
S->verbSBsortTerms += AB[j]->T.SS->verbSBsortTerms;
S->verbSBsortCap += AB[j]->T.SS->verbSBsortCap;
S->verbLBsortPatches += AB[j]->T.SS->verbLBsortPatches;
Expand Down Expand Up @@ -4268,10 +4273,13 @@ int SortBotMasterMerge(void)
// 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
// The total maximal term size is the maximum of all maximal term sizes
S->GenTerms = 0;
for ( j = 1; j <= numberofworkers; j++ ) {
S->GenTerms += AB[j]->T.SS->GenTerms;
S->verbComparisons += AB[j]->T.SS->verbComparisons;
if ( S->verbMaxTermSize < AB[j]->T.SS->verbMaxTermSize )
S->verbMaxTermSize = AB[j]->T.SS->verbMaxTermSize;
S->verbSBsortTerms += AB[j]->T.SS->verbSBsortTerms;
S->verbSBsortCap += AB[j]->T.SS->verbSBsortCap;
S->verbLBsortPatches += AB[j]->T.SS->verbLBsortPatches;
Expand All @@ -4280,6 +4288,8 @@ int SortBotMasterMerge(void)
}
for ( j = numberofworkers+1; j <= numberofworkers+numberofsortbots; j++ ) {
S->verbComparisons += AB[j]->T.SS->verbComparisons;
if ( S->verbMaxTermSize < AB[j]->T.SS->verbMaxTermSize )
S->verbMaxTermSize = AB[j]->T.SS->verbMaxTermSize;
}

S->TermsLeft = numberofterms;
Expand Down