Skip to content

[WIP] fsc.exe - Parallel Parsing #10208

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

Closed
wants to merge 2 commits into from
Closed

[WIP] fsc.exe - Parallel Parsing #10208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0899c2
Initial parallel parsing commit
TIHan Oct 2, 2020
76b77fc
Update src/fsharp/fsc.fs
TIHan Oct 2, 2020
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
25 changes: 16 additions & 9 deletions src/fsharp/fsc.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ open System.IO
open System.Reflection
open System.Text
open System.Threading
open System.Threading.Tasks

open Internal.Utilities
open Internal.Utilities.Collections
Expand Down Expand Up @@ -1841,14 +1842,21 @@ let main0(ctok, argv, legacyReferenceResolver, bannerAlreadyPrinted,
let inputs =
try
let isLastCompiland, isExe = sourceFiles |> tcConfig.ComputeCanContainEntryPoint
isLastCompiland |> List.zip sourceFiles
// PERF: consider making this parallel, once uses of global state relevant to parsing are cleaned up
|> List.choose (fun (filename: string, isLastCompiland) ->
let pathOfMetaCommandSource = Path.GetDirectoryName filename
match ParseOneInputFile(tcConfig, lexResourceManager, ["COMPILED"], filename, (isLastCompiland, isExe), errorLogger, (*retryLocked*)false) with
| Some input -> Some (input, pathOfMetaCommandSource)
| None -> None
)
let sourceFiles = isLastCompiland |> List.zip sourceFiles |> Array.ofSeq

let parallelOptions = ParallelOptions(MaxDegreeOfParallelism=min Environment.ProcessorCount sourceFiles.Length)

let results = Array.zeroCreate sourceFiles.Length
Parallel.For(0, sourceFiles.Length, parallelOptions, fun i ->
results.[i] <-
let (filename: string, isLastCompiland) = sourceFiles.[i]
let pathOfMetaCommandSource = Path.GetDirectoryName filename
match ParseOneInputFile(tcConfig, lexResourceManager, ["COMPILED"], filename, (isLastCompiland, isExe), errorLogger, (*retryLocked*)false) with
Copy link
Contributor Author

@TIHan TIHan Oct 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The errorLogger is probably not concurrent safe; will need to solve that.

| Some input -> Some (input, pathOfMetaCommandSource)
| None -> None) |> ignore
results
|> Array.choose id
|> List.ofArray
with e ->
errorRecoveryNoRange e
exiter.Exit 1
Expand Down Expand Up @@ -2250,4 +2258,3 @@ let mainCompile
typecheckAndCompile
(ctok, argv, legacyReferenceResolver, bannerAlreadyPrinted, reduceMemoryUsage,
defaultCopyFSharpCore, exiter, errorLoggerProvider, tcImportsCapture, dynamicAssemblyCreator)

2 changes: 1 addition & 1 deletion src/fsharp/lexhelp.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ type LightSyntaxStatus(initial:bool,warn:bool) =
/// Manage lexer resources (string interning)
[<Sealed>]
type LexResourceManager(?capacity: int) =
let strings = new System.Collections.Generic.Dictionary<string, Parser.token>(defaultArg capacity 1024)
let strings = new System.Collections.Concurrent.ConcurrentDictionary<string, Parser.token>(Environment.ProcessorCount, defaultArg capacity 1024)
member x.InternIdentifierToken(s) =
match strings.TryGetValue s with
| true, res -> res
Expand Down