Skip to content

Fix primary assembly heuristic + clean up duplicate code #17151

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
T-Gro merged 6 commits into from
May 21, 2024
Merged

Fix primary assembly heuristic + clean up duplicate code #17151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f03c64d
Various
vzarytovskii May 15, 2024
0181327
Testing
vzarytovskii May 15, 2024
cf9b67f
Automated command ran: fantomas
github-actions[bot] May 15, 2024
0fe62fa
Merge branch 'main' into alloc-experiments
KevinRansom May 15, 2024
f379c3f
Merge branch 'main' into alloc-experiments
KevinRansom May 16, 2024
2b4a6e2
Update ilread.fs
vzarytovskii May 16, 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
8 changes: 4 additions & 4 deletions src/Compiler/AbstractIL/il.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,10 @@ type PrimaryAssembly =
static member IsPossiblePrimaryAssembly(fileName: string) =
let name = System.IO.Path.GetFileNameWithoutExtension(fileName)

String.Compare(name, "mscorlib", true) <> 0
|| String.Compare(name, "System.Runtime", true) <> 0
|| String.Compare(name, "netstandard", true) <> 0
|| String.Compare(name, "System.Private.CoreLib", true) <> 0
String.Equals(name, "System.Runtime", StringComparison.OrdinalIgnoreCase)
|| String.Equals(name, "mscorlib", StringComparison.OrdinalIgnoreCase)
|| String.Equals(name, "netstandard", StringComparison.OrdinalIgnoreCase)
|| String.Equals(name, "System.Private.CoreLib", StringComparison.OrdinalIgnoreCase)

// --------------------------------------------------------------------
// Utilities: type names
Expand Down
69 changes: 22 additions & 47 deletions src/Compiler/AbstractIL/ilread.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -926,58 +926,33 @@ type GenericParamsIdx = GenericParamsIdx of numTypars: int * TypeOrMethodDefTag
// Polymorphic caches for row and heap readers
//---------------------------------------------------------------------

let mkCacheInt32 lowMem _inbase _nm _sz =
let mkCacheGeneric lowMem _inbase _nm (sz: int) =
if lowMem then
(fun f x -> f x)
else
let mutable cache = null
let mutable count = 0
#if STATISTICS
addReport (fun oc ->
if count <> 0 then
oc.WriteLine((_inbase + string count + " " + _nm + " cache hits"): string))
#endif
fun f (idx: int32) ->
let cache =
match cache with
| Null ->
let v = ConcurrentDictionary<int32, _>(Environment.ProcessorCount, 11)
cache <- v
v
| NonNull v -> v

match cache.TryGetValue idx with
| true, res ->
count <- count + 1
res
| _ ->
let res = f idx
cache[idx] <- res
res
let mutable cache = Unchecked.defaultof<_>

let mkCacheGeneric lowMem _inbase _nm _sz =
if lowMem then
(fun f x -> f x)
else
let mutable cache = null
let mutable count = 0
#if STATISTICS
let mutable _count = 0

addReport (fun oc ->
if !count <> 0 then
oc.WriteLine((_inbase + string !count + " " + _nm + " cache hits"): string))
if !_count <> 0 then
oc.WriteLine((_inbase + string !_count + " " + _nm + " cache hits"): string))
#endif
fun f (idx: 'T) ->
let cache =
match cache with
| Null ->
let v = ConcurrentDictionary<_, _>(Environment.ProcessorCount, 11 (* sz: int *) )
let v = ConcurrentDictionary<_, _>(Environment.ProcessorCount, sz)
cache <- v
v
| NonNull v -> v

match cache.TryGetValue idx with
| true, v ->
count <- count + 1
#if STATISTICS
_count <- _count + 1
#endif
v
| _ ->
let res = f idx
Expand Down Expand Up @@ -1700,7 +1675,7 @@ let readStringHeapUncached ctxtH idx =

let readStringHeap (ctxt: ILMetadataReader) idx = ctxt.readStringHeap idx

let readStringHeapOption (ctxt: ILMetadataReader) idx =
let inline readStringHeapOption (ctxt: ILMetadataReader) idx =
if idx = 0 then None else Some(readStringHeap ctxt idx)

let readBlobHeapUncached ctxtH idx =
Expand Down Expand Up @@ -4375,7 +4350,7 @@ let openMetadataReader

// All the caches. The sizes are guesstimates for the rough sharing-density of the assembly
let cacheAssemblyRef =
mkCacheInt32 false inbase "ILAssemblyRef" (getNumRows TableNames.AssemblyRef)
mkCacheGeneric false inbase "ILAssemblyRef" (getNumRows TableNames.AssemblyRef)

let cacheMethodSpecAsMethodData =
mkCacheGeneric reduceMemoryUsage inbase "MethodSpecAsMethodData" (getNumRows TableNames.MethodSpec / 20 + 1)
Expand All @@ -4387,7 +4362,7 @@ let openMetadataReader
mkCacheGeneric reduceMemoryUsage inbase "CustomAttr" (getNumRows TableNames.CustomAttribute / 50 + 1)

let cacheTypeRef =
mkCacheInt32 false inbase "ILTypeRef" (getNumRows TableNames.TypeRef / 20 + 1)
mkCacheGeneric false inbase "ILTypeRef" (getNumRows TableNames.TypeRef / 20 + 1)

let cacheTypeRefAsType =
mkCacheGeneric reduceMemoryUsage inbase "TypeRefAsType" (getNumRows TableNames.TypeRef / 20 + 1)
Expand All @@ -4405,38 +4380,38 @@ let openMetadataReader
mkCacheGeneric reduceMemoryUsage inbase "TypeDefAsType" (getNumRows TableNames.TypeDef / 20 + 1)

let cacheMethodDefAsMethodData =
mkCacheInt32 reduceMemoryUsage inbase "MethodDefAsMethodData" (getNumRows TableNames.Method / 20 + 1)
mkCacheGeneric reduceMemoryUsage inbase "MethodDefAsMethodData" (getNumRows TableNames.Method / 20 + 1)

let cacheGenericParams =
mkCacheGeneric reduceMemoryUsage inbase "GenericParams" (getNumRows TableNames.GenericParam / 20 + 1)

let cacheFieldDefAsFieldSpec =
mkCacheInt32 reduceMemoryUsage inbase "FieldDefAsFieldSpec" (getNumRows TableNames.Field / 20 + 1)
mkCacheGeneric reduceMemoryUsage inbase "FieldDefAsFieldSpec" (getNumRows TableNames.Field / 20 + 1)

let cacheUserStringHeap =
mkCacheInt32 reduceMemoryUsage inbase "UserStringHeap" (userStringsStreamSize / 20 + 1)
mkCacheGeneric reduceMemoryUsage inbase "UserStringHeap" (userStringsStreamSize / 20 + 1)
// nb. Lots and lots of cache hits on this cache, hence never optimize cache away
let cacheStringHeap =
mkCacheInt32 false inbase "string heap" (stringsStreamSize / 50 + 1)
mkCacheGeneric false inbase "string heap" (stringsStreamSize / 50 + 1)

let cacheBlobHeap =
mkCacheInt32 reduceMemoryUsage inbase "blob heap" (blobsStreamSize / 50 + 1)
mkCacheGeneric reduceMemoryUsage inbase "blob heap" (blobsStreamSize / 50 + 1)

// These tables are not required to enforce sharing fo the final data
// structure, but are very useful as searching these tables gives rise to many reads
// in standard applications.

let cacheNestedRow =
mkCacheInt32 reduceMemoryUsage inbase "Nested Table Rows" (getNumRows TableNames.Nested / 20 + 1)
mkCacheGeneric reduceMemoryUsage inbase "Nested Table Rows" (getNumRows TableNames.Nested / 20 + 1)

let cacheConstantRow =
mkCacheInt32 reduceMemoryUsage inbase "Constant Rows" (getNumRows TableNames.Constant / 20 + 1)
mkCacheGeneric reduceMemoryUsage inbase "Constant Rows" (getNumRows TableNames.Constant / 20 + 1)

let cacheMethodSemanticsRow =
mkCacheInt32 reduceMemoryUsage inbase "MethodSemantics Rows" (getNumRows TableNames.MethodSemantics / 20 + 1)
mkCacheGeneric reduceMemoryUsage inbase "MethodSemantics Rows" (getNumRows TableNames.MethodSemantics / 20 + 1)

let cacheTypeDefRow =
mkCacheInt32 reduceMemoryUsage inbase "ILTypeDef Rows" (getNumRows TableNames.TypeDef / 20 + 1)
mkCacheGeneric reduceMemoryUsage inbase "ILTypeDef Rows" (getNumRows TableNames.TypeDef / 20 + 1)

let rowAddr (tab: TableName) idx =
tablePhysLocations[tab.Index] + (idx - 1) * tableRowSizes[tab.Index]
Expand Down