Skip to content
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

fix parsing table cache bug #17816

Merged
merged 4 commits into from
Oct 8, 2024
Merged

fix parsing table cache bug #17816

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec936d0
fix parsing table cache bug
Martin521 Sep 29, 2024
69506dd
ran fantomas
Martin521 Sep 29, 2024
653008b
Merge branch 'main' into fix-parse-table-cache-bug
Martin521 Sep 30, 2024
b860027
Merge branch 'main' into fix-parse-table-cache-bug
Martin521 Sep 30, 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: 6 additions & 8 deletions src/Compiler/Facilities/prim-parsing.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,10 @@ module internal Implementation =
//-------------------------------------------------------------------------
// Read the tables written by FSYACC.

type AssocTable(elemTab: uint16[], offsetTab: uint16[], cache: int[], cacheSize: int) =
type AssocTable(elemTab: uint16[], offsetTab: uint16[], cache: int[]) =

do Array.fill cache 0 cache.Length -1
let cacheSize = cache.Length / 2

member t.ReadAssoc(minElemNum, maxElemNum, defaultValueOfAssoc, keyToFind) =
// do a binary chop on the table
Expand Down Expand Up @@ -273,13 +276,8 @@ module internal Implementation =
let lhsPos = (Array.zeroCreate 2: Position[])
let reductions = tables.reductions
let cacheSize = 7919 // the 1000'th prime
// Use a simpler hash table with faster lookup, but only one
// hash bucket per key.
let actionTableCache = ArrayPool<int>.Shared.Rent(cacheSize * 2)
let gotoTableCache = ArrayPool<int>.Shared.Rent(cacheSize * 2)
// Clear the arrays since ArrayPool does not
Array.Clear(actionTableCache, 0, actionTableCache.Length)
Array.Clear(gotoTableCache, 0, gotoTableCache.Length)

use _cacheDisposal =
{ new IDisposable with
Expand All @@ -289,10 +287,10 @@ module internal Implementation =
}

let actionTable =
AssocTable(tables.actionTableElements, tables.actionTableRowOffsets, actionTableCache, cacheSize)
AssocTable(tables.actionTableElements, tables.actionTableRowOffsets, actionTableCache)

let gotoTable =
AssocTable(tables.gotos, tables.sparseGotoTableRowOffsets, gotoTableCache, cacheSize)
AssocTable(tables.gotos, tables.sparseGotoTableRowOffsets, gotoTableCache)

let stateToProdIdxsTable =
IdxToIdxListTable(tables.stateToProdIdxsTableElements, tables.stateToProdIdxsTableRowOffsets)
Expand Down
Loading