Merge branch 'main' of https://github.com/georges-hatem/1brc-ObjectPascal

Author: georges-hatem

entries/abouchez/README.md

@@ -81,14 +81,14 @@ You will find in the [`src` sub-folder](./src) several implementations of the ch
 
 The following table gives you an overview of these versions, in time implementation order. The first column gives direct access to each project source code:
 
-project                                      | shared | full | nobranch | submap | 41K  | 400
--------------------------------------------- |:------:|:----:|:--------:|:------:| ----:| ----:
-[`old`](./src/brcmormotold.lpr)                 |     | `X`  |          |        | 1814 | 1127
-[`sharedht`](./src/brcmormotsharedht.lpr)       | `X` |      |          |        | 1169 |  976
-[`fullcheck`](./src/brcmormotfullcheck.lpr)     |     | `X`  | `X`      | `X`    | 1295 |  991
-[`perthreadht`](./src/brcmormotperthreadht.lpr) |     |      | `X`      | `X`    |  933 |  952
-[*final* `-a`](./src/brcmormot.lpr)             | `X` |      | `X`      | `X`    |  913 |  885
-[*final* `-f -a`](./src/brcmormot.lpr)          | `X` | `X`  | `X`      | `X`    |      | 
+project                                         | shared | full | nobranch | submap | 41K  | 400
+----------------------------------------------- |:------:|:----:|:--------:|:------:| ----:| ----:
+[`old`](./src/brcmormotold.lpr)                    |     | `X`  |          |        | 1350 | 1102
+[`sharedht`](./src/brcmormotsharedht.lpr)          | `X` |      |          |        | 1135 |  923
+[`fullcheck`](./src/brcmormotfullcheck.lpr)        |     | `X`  | `X`      | `X`    | 1261 |  760
+[`perthreadht -a`](./src/brcmormotperthreadht.lpr) |     |      | `X`      | `X`    |  779 |  745
+[*final* `-a`](./src/brcmormot.lpr)                | `X` |      | `X`      | `X`    |  817 |  738
+[*final* `-f -a`](./src/brcmormot.lpr)             | `X` | `X`  | `X`      | `X`    | 1424 |  759
 
 Here are the columns meaning:
 
@@ -97,11 +97,11 @@ Here are the columns meaning:
 - "full" indicates that the full station name is checked, byte-per-byte, to detect any hash collision (not required by our Pascal challenge, but required by the original Java challenge) - so no `X` here states that the ["perfect hash trick"](#perfect-hash-trick) is used by this solution;
 - "nobranch" indicates that the temperature parsing is using a branchless algorithm;
 - "submap" indicates that `mmap()` is not called for the whole 16GB input file, but for each chunk in its own worker thread;
-- "41K" and "400" are the time (in milliseconds) reported on OVH public cloud by `paweld` in [the "Alternative results" discussion thread](https://github.com/gcarreno/1brc-ObjectPascal/discussions/103#discussioncomment-9273061) for 41343 or 400 stations - so it is on AMD CPU, but not the "official" timing.
+- "41K" and "400" are the time (in milliseconds) reported on OVH public cloud by `paweld` in [the "Alternative results" discussion thread](https://github.com/gcarreno/1brc-ObjectPascal/discussions/103#discussioncomment-9307532) for 41343 or 400 stations - so it is on AMD CPU, but not the "official" timing.
 
 So we have a good coverage on what should be the best solution to propose.
 
-Note that those timings differs from what I got on my own Intel Core i5 computer, on which the 400 stations version is much faster than the 41K stations. Seems to be because of diverse CPU cache sizes - [see below](#analysis).
+Note that those timings differs from what I got on my own Intel Core i5 computer, on which the 400 stations version is much faster than the 41K stations, and the *final* project is always faster (by a noticeable margin). Seems to be because of diverse CPU cache sizes - [see below](#analysis).
 
 ## Why L1 Cache Matters
 

entries/hgrosser/src/1brc_th.lpi

@@ -24,7 +24,7 @@
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
-            <Filename Value="../../../bin/hgrosser"/>
+            <Filename Value="../../../bin/hgrosser-th"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -59,7 +59,7 @@
         <CompilerOptions>
           <Version Value="11"/>
           <Target>
-            <Filename Value="../../../bin/hgrosser"/>
+            <Filename Value="../../../bin/hgrosser-th"/>
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
@@ -111,7 +111,7 @@
   <CompilerOptions>
     <Version Value="11"/>
     <Target>
-      <Filename Value="../../../bin/hgrosser"/>
+      <Filename Value="../../../bin/hgrosser-th"/>
     </Target>
     <SearchPaths>
       <IncludeFiles Value="$(ProjOutDir)"/>

entries/ikelaiah/README.md

@@ -141,6 +141,10 @@ Iwan Kelaiah
   * Reduced buffer for `TStreamReader` to `65536 * 2`. This saves approx 5 seconds.
   * Changed hashmap from `TGHashMapLP` (linear probing) to `TGHashMapQP` (quadratic probing). This saves approx 5 seconds.
 
+* 1.11
+  * Revision release - Sequential approach. 3-5 mins on my Inspiron 15 7510 laptop, around 2m55s (no improvement on speed).
+  * Replaced `LGenerics` with `Generics.Collections` for the time being.
+
 ## License
 
 This project is licensed under the MIT License - see the LICENSE.md file for details
@@ -166,4 +170,4 @@ Inspiration, code snippets, libraries, etc.
  5. Shraddha Agrawal - https://www.bytesizego.com/blog/one-billion-row-challenge-go.
       - The advice for not storing measurements for each station in a data structure.
  6. Arman Hajisafi - https://arman-hs.github.io
-      - Encouragements and inspirations.
+      - Encouragements and inspirations.

entries/ikelaiah/src/OneBRC.lpi

@@ -26,7 +26,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="..\..\..\baseline\Common"/>
+            <OtherUnitFiles Value="..\..\..\baseline;lgenerics"/>
             <UnitOutputDirectory Value="..\..\..\bin\lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <Parsing>
@@ -69,7 +69,7 @@
           </Target>
           <SearchPaths>
             <IncludeFiles Value="$(ProjOutDir)"/>
-            <OtherUnitFiles Value="..\..\..\baseline\Common"/>
+            <OtherUnitFiles Value="..\..\..\baseline\Common;lgenerics"/>
             <UnitOutputDirectory Value="..\..\..\bin\lib\$(TargetCPU)-$(TargetOS)"/>
           </SearchPaths>
           <CodeGeneration>
@@ -100,11 +100,6 @@
     <RunParams>
       <FormatVersion Value="2"/>
     </RunParams>
-    <RequiredPackages Count="1">
-      <Item1>
-        <PackageName Value="LGenerics"/>
-      </Item1>
-    </RequiredPackages>
     <Units Count="3">
       <Unit0>
         <Filename Value="OneBRC.lpr"/>

entries/ikelaiah/src/OneBRC.lpr

@@ -36,7 +36,7 @@
   WeatherStation;
 
 const
-  version = '1.5';
+  version = '1.11';
 
 type
 

entries/ikelaiah/src/weatherstation.pas

@@ -10,7 +10,8 @@ interface
   , Math
   , streamex
   , bufstream
-  , lgHashMap
+  //, lgHashMap
+  , generics.Collections
   {$IFDEF DEBUG}
   , Stopwatch
   {$ENDIF}
@@ -35,11 +36,11 @@   TStat = record
 
 type
   // Using this dictionary, now approx 4 mins faster than Generics.Collections.TDictionary
-  TWeatherDictionaryLG = specialize TGHashMapQP<ShortString, PStat>;
+  TWeatherDictionaryLG = specialize TFastHashMap<ShortString, PStat>;
 
 type
   // a type for storing valid lookup temperature
-  TValidTemperatureDictionary = specialize TGHashMapQP<ShortString, int64>;
+  TValidTemperatureDictionary = specialize TFastHashMap<ShortString, int64>;
 
 type
   // Create a class to encapsulate the temperature observations of each weather station.
@@ -121,10 +122,10 @@ constructor TWeatherStation.Create(const filename: string);
   // Create a lookup
   self.lookupStrFloatToIntList := TValidTemperatureDictionary.Create;
   // Set expected capacity - saves 10 seconds.
-  self.lookupStrFloatToIntList.EnsureCapacity(44691);
+  self.lookupStrFloatToIntList.Capacity := 44691;
   // Create a dictionary
   weatherDictionary := TWeatherDictionaryLG.Create;
-  weatherDictionary.EnsureCapacity(44691);
+  weatherDictionary.Capacity := 44691;
   // Create a TStringList for sorting
   weatherStationList := TStringList.Create;
 end;