Skip to content

init on the main thread seems faster? #166

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

Merged
merged 3 commits into from
May 9, 2024
Merged

init on the main thread seems faster? #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
59296a7
init on the main thread seems faster?
georges-hatem May 9, 2024
3f57ed7
propagate changes to large-rec version
georges-hatem May 9, 2024
d09eabb
Merge branch 'gcarreno:main' into main
georges-hatem May 9, 2024
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
14 changes: 5 additions & 9 deletions entries/ghatem-fpc/src/OneBRC-parts-largerec.lpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ TOneBRC = class
// for a line between idx [aStart; aEnd], returns the station-name length, and the integer-value of temperature
procedure ExtractLineData(const aStart: Int64; const aEnd: Int64; out aLength: ShortInt; out aTemp: SmallInt); {$IFNDEF VALGRIND} inline; {$ENDIF}
procedure GetNextPart (var aStart, aEnd: Int64);
procedure InitMinMax (const aThreadNb: TThreadCount);
procedure InitMinMax (const aThreadNb: TThreadCount); inline;

public
constructor Create (const aThreadCount: TThreadCount);
Expand Down Expand Up @@ -148,20 +148,18 @@ TOneBRC = class

TThreadProc = procedure (aThreadNb: TThreadCount; aStartIdx: Int64; aEndIdx: Int64) of object;
TGetNextPart = procedure (var aStart, aEnd: Int64) of object;
TInitMinMax = procedure (const aThreadNb: TThreadCount) of object;

TBRCThread = class (TThread)
private
FProc: TThreadProc;
FGetNextPart: TGetNextPart;
FInitMinMax: TInitMinMax;
FThreadNb: TThreadCount;
FStart: Int64;
FEnd: Int64;
protected
procedure Execute; override;
public
constructor Create (aProc: TThreadProc; aGetNextPart: TGetNextPart; aInitMinMax: TInitMinMax;
constructor Create (aProc: TThreadProc; aGetNextPart: TGetNextPart;
aThreadNb: TThreadCount; aStart: Int64; aEnd: Int64);
end;

Expand Down Expand Up @@ -439,7 +437,8 @@ procedure TOneBRC.DispatchThreads;
FDone := cPart * FThreadCount;

for I := 0 to FThreadCount - 1 do begin
FThreads[I] := TBRCThread.Create (@ProcessData, @GetNextPart, @InitMinMax, I, I*cPart, (I+1)*cPart);
InitMinMax(I);
FThreads[I] := TBRCThread.Create (@ProcessData, @GetNextPart, I, I*cPart, (I+1)*cPart);
end;
end;

Expand Down Expand Up @@ -668,22 +667,19 @@ procedure TOneBRC.GenerateOutput;

procedure TBRCThread.Execute;
begin
FInitMinMax (FThreadNb);

while true do begin
FProc (FThreadNb, FStart, FEnd);
FGetNextPart(FStart, FEnd);
if FStart = -1 then break;
end;
end;

constructor TBRCThread.Create(aProc: TThreadProc; aGetNextPart: TGetNextPart; aInitMinMax: TInitMinMax;
constructor TBRCThread.Create(aProc: TThreadProc; aGetNextPart: TGetNextPart;
aThreadNb: TThreadCount; aStart: Int64; aEnd: Int64);
begin
inherited Create(False);
FProc := aProc;
FGetNextPart := aGetNextPart;
FInitMinMax := aInitMinMax;
FThreadNb := aThreadNb;
FStart := aStart;
FEnd := aEnd;
Expand Down
14 changes: 5 additions & 9 deletions entries/ghatem-fpc/src/OneBRC-parts.lpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ TOneBRC = class
// for a line between idx [aStart; aEnd], returns the station-name length, and the integer-value of temperature
procedure ExtractLineData(const aStart: Int64; const aEnd: Int64; out aLength: ShortInt; out aTemp: SmallInt); {$IFNDEF VALGRIND} inline; {$ENDIF}
procedure GetNextPart (var aStart, aEnd: Int64);
procedure InitMinMax (const aThreadNb: TThreadCount);
procedure InitMinMax (const aThreadNb: TThreadCount); inline;

public
constructor Create (const aThreadCount: TThreadCount);
Expand Down Expand Up @@ -148,20 +148,18 @@ TOneBRC = class

TThreadProc = procedure (aThreadNb: TThreadCount; aStartIdx: Int64; aEndIdx: Int64) of object;
TGetNextPart = procedure (var aStart, aEnd: Int64) of object;
TInitMinMax = procedure (const aThreadNb: TThreadCount) of object;

TBRCThread = class (TThread)
private
FProc: TThreadProc;
FGetNextPart: TGetNextPart;
FInitMinMax: TInitMinMax;
FThreadNb: TThreadCount;
FStart: Int64;
FEnd: Int64;
protected
procedure Execute; override;
public
constructor Create (aProc: TThreadProc; aGetNextPart: TGetNextPart; aInitMinMax: TInitMinMax;
constructor Create (aProc: TThreadProc; aGetNextPart: TGetNextPart;
aThreadNb: TThreadCount; aStart: Int64; aEnd: Int64);
end;

Expand Down Expand Up @@ -439,7 +437,8 @@ procedure TOneBRC.DispatchThreads;
FDone := cPart * FThreadCount;

for I := 0 to FThreadCount - 1 do begin
FThreads[I] := TBRCThread.Create (@ProcessData, @GetNextPart, @InitMinMax, I, I*cPart, (I+1)*cPart);
InitMinMax(I);
FThreads[I] := TBRCThread.Create (@ProcessData, @GetNextPart, I, I*cPart, (I+1)*cPart);
end;
end;

Expand Down Expand Up @@ -668,22 +667,19 @@ procedure TOneBRC.GenerateOutput;

procedure TBRCThread.Execute;
begin
FInitMinMax (FThreadNb);

while true do begin
FProc (FThreadNb, FStart, FEnd);
FGetNextPart(FStart, FEnd);
if FStart = -1 then break;
end;
end;

constructor TBRCThread.Create(aProc: TThreadProc; aGetNextPart: TGetNextPart; aInitMinMax: TInitMinMax;
constructor TBRCThread.Create(aProc: TThreadProc; aGetNextPart: TGetNextPart;
aThreadNb: TThreadCount; aStart: Int64; aEnd: Int64);
begin
inherited Create(False);
FProc := aProc;
FGetNextPart := aGetNextPart;
FInitMinMax := aInitMinMax;
FThreadNb := aThreadNb;
FStart := aStart;
FEnd := aEnd;
Expand Down