Merge pull request #124 from synopse/main

abouchez/mormot: let all entries only support single LF

Author: gcarreno

README.md

@@ -17,7 +17,7 @@ Grab all your threads, reach out to SIMD,  or pull any other trick, and create t
 <img src="img/1brc.png" alt="1BRC" style="display: block; margin-left: auto; margin-right: auto; margin-bottom:1em; width: 50%;">
 </p>
 
-The text file contains temperature values for a range of weather stations. Each row is one measurement in the format `<string: station name>;<double: measurement>`, with the measurement value having exactly one fractional digit.
+The text file contains temperature values for a range of weather stations. Each row is one measurement in the format `<string: station name>;<double: measurement>`, with the measurement value having exactly one fractional digit. Rows are separated by a single line feed equal of LF (ascii 10) for consistency with the original challenge - and not CR+LF (ascii 13+10) any more.
 The following shows ten rows as an example:
 
 ```
@@ -119,7 +119,7 @@ C:> CertUtil -hashfile .\data\measurements.txt SHA256
 Get-FileHash .\data\measurements.txt -Algorithm SHA256
 ```
 Expected `SHA256` hash:
-`ebad17b266ee9f5cb3d118531f197e6f68c9ab988abc5cb9506e6257e1a52ce6`
+`2b48bc2fa0b82d748925a820f43f75df01cc06df7447c7571e52d3962e675960`
 
 ## Verify Output File
 

entries/abouchez/src/brcmormot.lpr

@@ -111,7 +111,7 @@ procedure ParseLine(var chunk: TBrcChunk); nostackframe; assembler;
          setne    dl
          mov      eax, dword ptr [r8 + 1]   // eax = xx.x or x.x
          shl      cl, 3
-         lea      r8, [r8 + rdx + 6]        // r8 = next line
+         lea      r8, [r8 + rdx + 5]        // r8 = next line (LF only)
          shl      eax, cl                   // normalized as xx.x
          and      eax, $0f000f0f            // from ascii to digit
          imul     rax, rax, 1 + 10 shl 16 + 100 shl 24
@@ -156,14 +156,14 @@ function CompareMem(a, b: PAnsiChar; l: PtrInt): boolean; nostackframe; assemble
         cmp     rax, rdx
         jl      @by1
         align   8
-@by8:   mov     rcx, qword ptr [rdi + rdx] // branchless for l>=8
+@by8:   mov     rcx, qword ptr [rdi + rdx] // branchless for 8..16 bytes
         cmp     rcx, qword ptr [rsi + rdx]
         jne     @set
         sub     rdx, rax
         jz      @ok
         cmp     rax, rdx
-        jge     @by8
-        mov     rcx, qword ptr [rdi + rax] // may overlap
+        jg      @by8
+        mov     rcx, qword ptr [rdi + rax] // compare last 8 bytes - may overlap
         cmp     rcx, qword ptr [rsi + rax]
 @set:   sete    al
         ret
@@ -194,7 +194,7 @@ procedure ParseLine(var chunk: TBrcChunk); inline;
   // branchless parsing of the temperature
   neg := ord(p[1] <> '-') * 2 - 1;         // neg = +1 or -1
   inc(p, ord(p[1] = '-'));                 // ignore '-' sign
-  chunk.Start := @p[ord(p[2] <> '.') + 6]; // next line
+  chunk.Start := @p[ord(p[2] <> '.') + 5]; // next line (LF only)
   chunk.Value := PtrInt(cardinal((QWord((PCardinal(p + 1)^ shl
                    (byte(ord(p[2] = '.') shl 3))) and $0f000f0f) *
          (1 + 10 shl 16 + 100 shl 24)) shr 24) and cardinal(1023)) * neg;
@@ -216,7 +216,7 @@ function CompareMem(a, b: PAnsiChar; l: PtrInt): boolean;
       dec(l, ptrsiz);
       if l = 0 then
         exit
-      else if l <= ptrsiz then
+      else if l < ptrsiz then
         continue;
       result := PPtrUInt(@a[ptrsiz])^ = PPtrUInt(@b[ptrsiz])^; // may overlap
       exit;
@@ -246,7 +246,7 @@ constructor TBrcThread.Create(owner: TBrcMain);
   FreeOnTerminate := true;
   SetLength(fStation, fOwner.fMax);
   InterlockedIncrement(fOwner.fRunning);
-  inherited Create({suspended=}false);
+  inherited Create({suspended=}false, {stacksize=}16384);
 end;
 
 
@@ -274,7 +274,7 @@ constructor TBrcMain.Create(const fn: TFileName; threads, chunkmb, max: integer;
   if not fullsearch then
     SetLength(fNameHash, fMax);
   SetLength(fNameLine, fMax);
-  // we tried pre-loading a first chunk here but it was not faster
+  // (we tried pre-loading a first chunk here but it was not faster)
   // run the thread workers
   core := 0;
   cores := SystemInfo.dwNumberOfProcessors;

entries/abouchez/src/brcmormotfullcheck.lpr

@@ -117,7 +117,7 @@ procedure ParseLine(var chunk: TBrcChunk); nostackframe; assembler;
          setne    dl
          mov      eax, dword ptr [r8 + 1]   // eax = xx.x or x.x
          shl      cl, 3
-         lea      r8, [r8 + rdx + 6]        // r8 = next line
+         lea      r8, [r8 + rdx + 5]        // r8 = next line
          shl      eax, cl                   // normalized as xx.x
          and      eax, $0f000f0f            // from ascii to digit
          imul     rax, rax, 1 + 10 shl 16 + 100 shl 24
@@ -208,7 +208,7 @@ procedure ParseLine(var chunk: TBrcChunk); inline;
   // branchless parsing of the temperature
   neg := ord(p[1] <> '-') * 2 - 1;         // neg = +1 or -1
   inc(p, ord(p[1] = '-'));                 // ignore '-' sign
-  chunk.Start := @p[ord(p[2] <> '.') + 6]; // next line
+  chunk.Start := @p[ord(p[2] <> '.') + 5]; // next line
   chunk.Value := PtrInt(cardinal((QWord((PCardinal(p + 1)^ shl
                    (byte(ord(p[2] = '.') shl 3))) and $0f000f0f) *
          (1 + 10 shl 16 + 100 shl 24)) shr 24) and cardinal(1023)) * neg;

entries/abouchez/src/brcmormotold.lpr

@@ -306,12 +306,12 @@ procedure TBrcThread.Execute;
       begin
         // note: the PCardinal(p)^ + "shr and $ff" trick is actually slower
         v := (p[0] * 100 + p[1] * 10 + p[3] - (ord('0') * 111)) * neg;
-        p := @p[6]; // also jump ending $13/$10
+        p := @p[5]; // also jump ending $10
       end
       else
       begin
         v := (p[0] * 10 + p[2] - (ord('0') * 11)) * neg; // x.x
-        p := @p[5];
+        p := @p[4];
       end;
       // store the value
       {$ifdef CUSTOMHASH}

entries/abouchez/src/brcmormotpertheadht.lpr

@@ -112,7 +112,7 @@ procedure ParseLine(var chunk: TBrcChunk); nostackframe; assembler;
          setne    dl
          mov      eax, dword ptr [r8 + 1]   // eax = xx.x or x.x
          shl      cl, 3
-         lea      r8, [r8 + rdx + 6]        // r8 = next line
+         lea      r8, [r8 + rdx + 5]        // r8 = next line
          shl      eax, cl                   // normalized as xx.x
          and      eax, $0f000f0f            // from ascii to digit
          imul     rax, rax, 1 + 10 shl 16 + 100 shl 24
@@ -164,7 +164,7 @@ procedure ParseLine(var chunk: TBrcChunk); inline;
   // branchless parsing of the temperature
   neg := ord(p[1] <> '-') * 2 - 1;         // neg = +1 or -1
   inc(p, ord(p[1] = '-'));                 // ignore '-' sign
-  chunk.Start := @p[ord(p[2] <> '.') + 6]; // next line
+  chunk.Start := @p[ord(p[2] <> '.') + 5]; // next line
   chunk.Value := PtrInt(cardinal((QWord((PCardinal(p + 1)^ shl
                    (byte(ord(p[2] = '.') shl 3))) and $0f000f0f) *
          (1 + 10 shl 16 + 100 shl 24)) shr 24) and cardinal(1023)) * neg;

entries/abouchez/src/brcmormotsharedht.lpr

@@ -411,12 +411,12 @@ procedure TBrcThread.Execute;
       begin
         // note: the PCardinal(p)^ + "shr and $ff" trick is actually slower
         v := (p[0] * 100 + p[1] * 10 + p[3] - (ord('0') * 111)) * neg;
-        p := @p[6]; // also jump ending $13/$10
+        p := @p[5]; // also jump ending $13/$10
       end
       else
       begin
         v := (p[0] * 10 + p[2] - (ord('0') * 11)) * neg; // x.x
-        p := @p[5];
+        p := @p[4];
       end;
       // store the value
       if s^.Count = 0 then