benchmark related fixes

Xor-el · Xor-el · commit df4d07910440 · 2026-06-22T20:25:07.000+01:00
diff --git a/.github/workflows/make.pas b/.github/workflows/make.pas
@@ -2251,16 +2251,22 @@ function TMakeRunner.IsTestProject(const ALpiPath: string): Boolean;
 
 function TMakeRunner.IsBenchmarkProject(const ALpiPath: string): Boolean;
 var
-  LprPath, Content: string;
+  LprPath, Content, ProjectBaseName: string;
 begin
   Result := False;
-  if Pos('PerformanceBenchmark', ALpiPath) > 0 then
+  if not SameText(ExtractFileExt(ALpiPath), '.lpi') then
+    Exit;
+
+  ProjectBaseName := ChangeFileExt(ExtractFileName(ALpiPath), '');
+  if Pos('BenchmarkConsole', ProjectBaseName) > 0 then
     Exit(True);
+
   LprPath := ChangeFileExt(ALpiPath, '.lpr');
   if not FileExists(LprPath) then
     Exit;
+
   Content := TLazXml.ReadFile(LprPath);
-  Result := Pos('uPerformanceBenchmark', Content) > 0;
+  Result := Pos('TPerformanceBenchmark.Run', Content) > 0;
 end;
 
 procedure TMakeRunner.RunTestProject(const APath: string);
diff --git a/.github/workflows/make.yml b/.github/workflows/make.yml
@@ -46,7 +46,7 @@ env:
   MAKE_DEFINES: ''
   # When true, make.pas builds and runs console benchmarks after the test suite.
   # Override per job below, like MAKE_BUILD_BACKEND.
-  MAKE_RUN_BENCHMARK: false
+  MAKE_RUN_BENCHMARK: true
   # Set by the workflow_dispatch "debug" toggle; '1' enables `set -x` tracing in
   # install-fpc-lazarus.sh, '0' otherwise. Forwarded into the sandboxed jobs below.
   CI_DEBUG: ${{ github.event.inputs.debug == 'true' && '1' || '0' }}
diff --git a/HashLib.Benchmark/Delphi/HashLib.BenchmarkConsole.dpr b/HashLib.Benchmark/Delphi/HashLib.BenchmarkConsole.dpr
@@ -1,14 +1,14 @@
-program PerformanceBenchmarkConsole;
+program HashLib.BenchmarkConsole;
 
 {$APPTYPE CONSOLE}
 
 uses
   Classes,
   SysUtils,
-  uBenchmarkCommon in '..\src\Core\uBenchmarkCommon.pas',
-  uHashPerformanceBenchmark in '..\src\Core\uHashPerformanceBenchmark.pas',
-  uKdfPerformanceBenchmark in '..\src\Core\uKdfPerformanceBenchmark.pas',
-  uPerformanceBenchmark in '..\src\Core\uPerformanceBenchmark.pas',
+  BenchmarkCommon in '..\src\Core\BenchmarkCommon.pas',
+  HashPerformanceBenchmark in '..\src\Core\HashPerformanceBenchmark.pas',
+  KdfPerformanceBenchmark in '..\src\Core\KdfPerformanceBenchmark.pas',
+  PerformanceBenchmark in '..\src\Core\PerformanceBenchmark.pas',
   HlpHash in '..\..\HashLib\src\Base\HlpHash.pas',
   HlpKDF in '..\..\HashLib\src\Base\HlpKDF.pas',
   HlpHashBuffer in '..\..\HashLib\src\Base\HlpHashBuffer.pas',
diff --git a/HashLib.Benchmark/Delphi/HashLib.BenchmarkFMX.dpr b/HashLib.Benchmark/Delphi/HashLib.BenchmarkFMX.dpr
@@ -1,13 +1,13 @@
-program PerformanceBenchmarkFMX;
+program HashLib.BenchmarkFMX;
 
 uses
   System.StartUpCopy,
   FMX.Forms,
   fmxMainForm in '..\src\Forms\FMX\fmxMainForm.pas' {MainForm},
-  uBenchmarkCommon in '..\src\Core\uBenchmarkCommon.pas',
-  uHashPerformanceBenchmark in '..\src\Core\uHashPerformanceBenchmark.pas',
-  uKdfPerformanceBenchmark in '..\src\Core\uKdfPerformanceBenchmark.pas',
-  uPerformanceBenchmark in '..\src\Core\uPerformanceBenchmark.pas',
+  BenchmarkCommon in '..\src\Core\BenchmarkCommon.pas',
+  HashPerformanceBenchmark in '..\src\Core\HashPerformanceBenchmark.pas',
+  KdfPerformanceBenchmark in '..\src\Core\KdfPerformanceBenchmark.pas',
+  PerformanceBenchmark in '..\src\Core\PerformanceBenchmark.pas',
   HlpHash in '..\..\HashLib\src\Base\HlpHash.pas',
   HlpKDF in '..\..\HashLib\src\Base\HlpKDF.pas',
   HlpHashBuffer in '..\..\HashLib\src\Base\HlpHashBuffer.pas',
diff --git a/HashLib.Benchmark/Lazarus/HashLib.BenchmarkConsole.lpi b/HashLib.Benchmark/Lazarus/HashLib.BenchmarkConsole.lpi
@@ -11,7 +11,7 @@
         <CompatibilityMode Value="True"/>
       </Flags>
       <SessionStorage Value="InProjectDir"/>
-      <Title Value="PerformanceBenchmarkConsole"/>
+      <Title Value="HashLib.BenchmarkConsole"/>
       <UseAppBundle Value="False"/>
       <ResourceType Value="res"/>
     </General>
@@ -22,7 +22,7 @@
           <Version Value="11"/>
           <PathDelim Value="\"/>
           <Target>
-            <Filename Value="PerformanceBenchmarkConsole"/>
+            <Filename Value="HashLib.BenchmarkConsole"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -70,23 +70,23 @@
     </RequiredPackages>
     <Units Count="5">
       <Unit0>
-        <Filename Value="PerformanceBenchmarkConsole.lpr"/>
+        <Filename Value="HashLib.BenchmarkConsole.lpr"/>
         <IsPartOfProject Value="True"/>
       </Unit0>
       <Unit1>
-        <Filename Value="..\src\Core\uPerformanceBenchmark.pas"/>
+        <Filename Value="..\src\Core\PerformanceBenchmark.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit1>
       <Unit2>
-        <Filename Value="..\src\Core\uBenchmarkCommon.pas"/>
+        <Filename Value="..\src\Core\BenchmarkCommon.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit2>
       <Unit3>
-        <Filename Value="..\src\Core\uHashPerformanceBenchmark.pas"/>
+        <Filename Value="..\src\Core\HashPerformanceBenchmark.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit3>
       <Unit4>
-        <Filename Value="..\src\Core\uKdfPerformanceBenchmark.pas"/>
+        <Filename Value="..\src\Core\KdfPerformanceBenchmark.pas"/>
         <IsPartOfProject Value="True"/>
       </Unit4>
     </Units>
@@ -95,7 +95,7 @@
     <Version Value="11"/>
     <PathDelim Value="\"/>
     <Target>
-      <Filename Value="PerformanceBenchmarkConsole"/>
+      <Filename Value="HashLib.BenchmarkConsole"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>
diff --git a/HashLib.Benchmark/Lazarus/HashLib.BenchmarkConsole.lpr b/HashLib.Benchmark/Lazarus/HashLib.BenchmarkConsole.lpr
@@ -1,10 +1,10 @@
-program PerformanceBenchmarkConsole;
+program HashLib.BenchmarkConsole;
 
 {$MODE DELPHI}
 
 uses
   SysUtils,
-  uPerformanceBenchmark;
+  PerformanceBenchmark;
 
 procedure ConsoleLog(const AMessage: String);
 begin
diff --git a/HashLib.Benchmark/src/Core/BenchmarkCommon.pas b/HashLib.Benchmark/src/Core/BenchmarkCommon.pas
@@ -1,4 +1,4 @@
-unit uBenchmarkCommon;
+unit BenchmarkCommon;
 
 {$IFDEF FPC}
 {$MODE DELPHI}
diff --git a/HashLib.Benchmark/src/Core/HashPerformanceBenchmark.pas b/HashLib.Benchmark/src/Core/HashPerformanceBenchmark.pas
@@ -1,4 +1,4 @@
-unit uHashPerformanceBenchmark;
+unit HashPerformanceBenchmark;
 
 {$IFDEF FPC}
 {$MODE DELPHI}
@@ -13,7 +13,7 @@ interface
   HlpIHash,
   HlpHashFactory,
   HlpCRC,
-  uBenchmarkCommon;
+  BenchmarkCommon;
 
 type
   THashPerformanceBenchmark = class sealed(TObject)
diff --git a/HashLib.Benchmark/src/Core/KdfPerformanceBenchmark.pas b/HashLib.Benchmark/src/Core/KdfPerformanceBenchmark.pas
@@ -1,4 +1,4 @@
-unit uKdfPerformanceBenchmark;
+unit KdfPerformanceBenchmark;
 
 {$IFDEF FPC}
 {$MODE DELPHI}
@@ -8,7 +8,7 @@
 interface
 
 uses
-  uBenchmarkCommon,
+  BenchmarkCommon,
   HlpIKDF;
 
 type
diff --git a/HashLib.Benchmark/src/Core/PerformanceBenchmark.pas b/HashLib.Benchmark/src/Core/PerformanceBenchmark.pas
@@ -1,4 +1,4 @@
-unit uPerformanceBenchmark;
+unit PerformanceBenchmark;
 
 {$IFDEF FPC}
 {$MODE DELPHI}
@@ -8,9 +8,7 @@
 interface
 
 uses
-  uBenchmarkCommon,
-  uHashPerformanceBenchmark,
-  uKdfPerformanceBenchmark;
+  BenchmarkCommon;
 
 type
   TPerformanceBenchmark = class sealed(TObject)
@@ -23,7 +21,9 @@   TPerformanceBenchmark = class sealed(TObject)
 implementation
 
 uses
-  Math;
+  Math,
+  HashPerformanceBenchmark,
+  KdfPerformanceBenchmark;
 
 class procedure TPerformanceBenchmark.Run(ALogProc: TBenchmarkLogProc;
   const ABufferSizes: array of Int32);
diff --git a/HashLib.Benchmark/src/Forms/FMX/fmxMainForm.fmx b/HashLib.Benchmark/src/Forms/FMX/fmxMainForm.fmx
@@ -2,7 +2,7 @@ object MainForm: TMainForm
   Left = 0
   Top = 0
   BorderIcons = [biSystemMenu, biMinimize]
-  Caption = 'PerformanceBenchmarkFMX'
+  Caption = 'HashLib.BenchmarkFMX'
   ClientHeight = 480
   ClientWidth = 636
   Position = MainFormCenter
diff --git a/HashLib.Benchmark/src/Forms/FMX/fmxMainForm.pas b/HashLib.Benchmark/src/Forms/FMX/fmxMainForm.pas
@@ -6,7 +6,7 @@ interface
   System.SysUtils, System.Types, System.UITypes, System.Classes,
   System.Variants,
   FMX.Types, FMX.Controls, FMX.Forms, FMX.Graphics, FMX.Dialogs, FMX.StdCtrls,
-  FMX.Controls.Presentation, FMX.ScrollBox, FMX.Memo, uPerformanceBenchmark, FMX.Memo.Types;
+  FMX.Controls.Presentation, FMX.ScrollBox, FMX.Memo, PerformanceBenchmark, FMX.Memo.Types;
 
 type
   TMainForm = class(TForm)
diff --git a/HashLib/src/Checksum/HlpAdler32Dispatch.pas b/HashLib/src/Checksum/HlpAdler32Dispatch.pas
@@ -113,7 +113,7 @@ procedure Adler32_Update_Simd(AData: PByte; ALength: UInt32; ASums: Pointer;
   end;
 end;
 
-{$ENDIF}
+{$IFEND}
 
 {$IFDEF HASHLIB_X86_SIMD}
 
diff --git a/HashLib/src/Hash64/HlpXXHash3Dispatch.pas b/HashLib/src/Hash64/HlpXXHash3Dispatch.pas
@@ -188,7 +188,7 @@ procedure XXH3_Accumulate_Loop(AAcc: Pointer; AInput: Pointer;
       PByte(ASecret) + N * XXH_SECRET_CONSUME_RATE);
 end;
 
-{$ENDIF}
+{$IFEND}
 
 {$IFDEF HASHLIB_X86_SIMD}
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-unit uBenchmarkCommon;`
	`1`	`+unit BenchmarkCommon;`
`2`	`2`
`3`	`3`	`{$IFDEF FPC}`
`4`	`4`	`{$MODE DELPHI}`