Skip to content

Commit

Permalink
Map graph to dependencies.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nojaf
nojaf committed Dec 15, 2022
1 parent 0beff48 commit e6ee19f
Show file tree
Hide file tree
Showing 9 changed files with 223 additions and 115 deletions.
133 changes: 64 additions & 69 deletions src/Compiler/Driver/ParseAndCheckInputs.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1426,7 +1426,7 @@ let CheckOneInputAux'
tcState: TcState,
inp: ParsedInput,
_skipImplIfSigExists: bool): (unit -> bool) * TcConfig * TcImports * TcGlobals * LongIdent option * TcResultsSink * TcState * ParsedInput * bool)
: Cancellable<bool -> TcState -> PartialResult * TcState> =
: Cancellable<TcState -> PartialResult * TcState> =

cancellable {
try
Expand Down Expand Up @@ -1478,43 +1478,27 @@ let CheckOneInputAux'

// printfn $"Finished Processing Sig {file.FileName}"
return
fun isFinalFold tcState ->
printfn $"Applying Sig {file.FileName} (final: {isFinalFold})"
fun tcState ->
// printfn $"Applying Sig {file.FileName}"

let fsiPartialResult, tcState =
let rootSigs = Zmap.add qualNameOfFile sigFileType tcState.tcsRootSigs
let rootSigs = Zmap.add qualNameOfFile sigFileType tcState.tcsRootSigs

let tcSigEnv =
AddLocalRootModuleOrNamespace TcResultsSink.NoSink tcGlobals amap m tcState.tcsTcSigEnv sigFileType
let tcSigEnv =
AddLocalRootModuleOrNamespace TcResultsSink.NoSink tcGlobals amap m tcState.tcsTcSigEnv sigFileType

// Add the signature to the signature env (unless it had an explicit signature)
let ccuSigForFile = CombineCcuContentFragments [ sigFileType; tcState.tcsCcuSig ]
// Add the signature to the signature env (unless it had an explicit signature)
let ccuSigForFile = CombineCcuContentFragments [ sigFileType; tcState.tcsCcuSig ]

let partialResult = tcEnv, EmptyTopAttrs, None, ccuSigForFile
let partialResult = tcEnv, EmptyTopAttrs, None, ccuSigForFile

let tcState =
{ tcState with
tcsTcSigEnv = tcSigEnv
tcsRootSigs = rootSigs
tcsCreatesGeneratedProvidedTypes =
tcState.tcsCreatesGeneratedProvidedTypes || createsGeneratedProvidedTypes
}
let tcState =
{ tcState with
tcsTcSigEnv = tcSigEnv
tcsRootSigs = rootSigs
tcsCreatesGeneratedProvidedTypes = tcState.tcsCreatesGeneratedProvidedTypes || createsGeneratedProvidedTypes
}

partialResult, tcState

if isFinalFold then
fsiPartialResult, tcState
else
// Train of thought: I'm not sure you want to add the results to the tcState,
// when this function is called right before it will check the implementation file.

// Update the TcEnv of implementation files to also contain the signature data.
let _ccuSigForFile, tcState =
AddCheckResultsToTcState
(tcGlobals, amap, true, prefixPathOpt, tcSink, tcState.tcsTcImplEnv, qualNameOfFile, sigFileType)
tcState

fsiPartialResult, tcState
partialResult, tcState

| ParsedInput.ImplFile file ->
// printfn $"Processing Impl {file.FileName}"
Expand Down Expand Up @@ -1543,45 +1527,34 @@ let CheckOneInputAux'

// printfn $"Finished Processing Impl {file.FileName}"
return
fun isFinalFold tcState ->
let addResultToState () =
// Check if we've already seen an implementation for this fragment
if Zset.contains qualNameOfFile tcState.tcsRootImpls then
errorR (Error(FSComp.SR.buildImplementationAlreadyGiven (qualNameOfFile.Text), m))

// printfn $"Applying Impl Backed={backed} {file.FileName}"
let ccuSigForFile, fsTcState =
AddCheckResultsToTcState
(tcGlobals, amap, false, prefixPathOpt, tcSink, tcState.tcsTcImplEnv, qualNameOfFile, implFile.Signature)
tcState

// backed impl files must not add results as there are already results from .fsi files
//let fsTcState = if backed then tcState else fsTcState

let partialResult = tcEnvAtEnd, topAttrs, Some implFile, ccuSigForFile

let tcState =
{ fsTcState with
tcsCreatesGeneratedProvidedTypes =
fsTcState.tcsCreatesGeneratedProvidedTypes || createsGeneratedProvidedTypes
}

// printfn $"Finished applying Impl {file.FileName}"
partialResult, tcState

match rootSigOpt with
| None -> addResultToState ()
| Some _ when isFinalFold -> addResultToState ()
| Some rootSig ->
// In this case, we are skipping the step where we add the results of the implementation file to the tcState.
// The fold function of a signature file will add the result (of the signature),
// to the implementation when it is not processing the final fold.
let partialResult = tcEnvAtEnd, topAttrs, Some implFile, rootSig
partialResult, tcState
fun tcState ->
// Check if we've already seen an implementation for this fragment
if Zset.contains qualNameOfFile tcState.tcsRootImpls then
errorR (Error(FSComp.SR.buildImplementationAlreadyGiven (qualNameOfFile.Text), m))

// printfn $"Applying Impl Backed={backed} {file.FileName}"
let ccuSigForFile, fsTcState =
AddCheckResultsToTcState
(tcGlobals, amap, false, prefixPathOpt, tcSink, tcState.tcsTcImplEnv, qualNameOfFile, implFile.Signature)
tcState

// backed impl files must not add results as there are already results from .fsi files
//let fsTcState = if backed then tcState else fsTcState

let partialResult = tcEnvAtEnd, topAttrs, Some implFile, ccuSigForFile

let tcState =
{ fsTcState with
tcsCreatesGeneratedProvidedTypes =
fsTcState.tcsCreatesGeneratedProvidedTypes || createsGeneratedProvidedTypes
}

// printfn $"Finished applying Impl {file.FileName}"
partialResult, tcState

with e ->
errorRecovery e range0
return fun _ tcState -> (tcState.TcEnvFromSignatures, EmptyTopAttrs, None, tcState.tcsCcuSig), tcState
return fun tcState -> (tcState.TcEnvFromSignatures, EmptyTopAttrs, None, tcState.tcsCcuSig), tcState
}

/// Typecheck a single file (or interactive entry into F# Interactive). If skipImplIfSigExists is set to true
Expand All @@ -1596,9 +1569,31 @@ let CheckOneInput'
tcState: TcState,
input: ParsedInput,
skipImplIfSigExists: bool): (unit -> bool) * TcConfig * TcImports * TcGlobals * LongIdent option * TcResultsSink * TcState * ParsedInput * bool)
: Cancellable<bool -> TcState -> PartialResult * TcState> =
: Cancellable<TcState -> PartialResult * TcState> =
CheckOneInputAux'(checkForErrors, tcConfig, tcImports, tcGlobals, prefixPathOpt, tcSink, tcState, input, skipImplIfSigExists)

let AddSignatureResultToTcImplEnv (tcImports: TcImports, tcGlobals, prefixPathOpt, tcSink, tcState, input: ParsedInput) =
let qualNameOfFile = input.QualifiedName
let rootSigOpt = tcState.tcsRootSigs.TryFind qualNameOfFile

match rootSigOpt with
| None -> failwithf $"No signature data was found for %s{input.FileName}"
| Some rootSig ->
fun (tcState: TcState) ->
let amap = tcImports.GetImportMap()

// Add the results of type checking the signature file to the TcEnv of implementation files.
let ccuSigForFile, tcState =
AddCheckResultsToTcState
(tcGlobals, amap, true, prefixPathOpt, tcSink, tcState.tcsTcImplEnv, qualNameOfFile, rootSig)
tcState

// This partial result will be discarded in the end of the graph resolution.
let partialResult: PartialResult =
tcState.tcsTcSigEnv, EmptyTopAttrs, None, ccuSigForFile

partialResult, tcState

// Within a file, equip loggers to locally filter w.r.t. scope pragmas in each input
let DiagnosticsLoggerForInput (tcConfig: TcConfig, input: ParsedInput, oldLogger) =
GetDiagnosticsLoggerFilteringByScopedPragmas(false, input.ScopedPragmas, tcConfig.diagnosticsOptions, oldLogger)
Expand Down
11 changes: 10 additions & 1 deletion src/Compiler/Driver/ParseAndCheckInputs.fsi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,16 @@ val CheckOneInput':
tcState: TcState *
input: ParsedInput *
skipImplIfSigExists: bool ->
Cancellable<bool -> TcState -> PartialResult * TcState>
Cancellable<TcState -> PartialResult * TcState>

val AddSignatureResultToTcImplEnv:
tcImports: TcImports *
tcGlobals: TcGlobals *
prefixPathOpt: LongIdent option *
tcSink: NameResolution.TcResultsSink *
tcState: TcState *
input: ParsedInput ->
(TcState -> PartialResult * TcState)

val CheckMultipleInputsInParallel:
(CompilationThreadToken * (unit -> bool) * TcConfig * TcImports * TcGlobals * LongIdent option * TcState * (PhasedDiagnostic -> PhasedDiagnostic) * ParsedInput list) ->
Expand Down
20 changes: 3 additions & 17 deletions tests/ParallelTypeCheckingTests/Code/DependencyResolution.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,28 +177,14 @@ let collectGhostDependencies (fileIndex: int) (trie: TrieNode) (queryTrie: Query
// The partial open did eventually lead to a link in a file
Array.empty)

let mkGraph (files: FileWithAST array) : Graph<int> =
// Map to easily retrieve the signature file index
let implToSig =
Array.choose
(fun f ->
match f.AST with
| ParsedInput.SigFile _ ->
files
|> Array.skip (f.Idx + 1)
|> Array.tryFind (fun (implFile: FileWithAST) -> $"{implFile.File}i" = f.File)
|> Option.map (fun (implFile: FileWithAST) -> (implFile.Idx, f.Idx))
| ParsedInput.ImplFile _ -> None)
files
|> Map.ofArray

let mkGraph (filePairs: FilePairMap) (files: FileWithAST array) : Graph<int> =
// Implementation files backed by signatures should be excluded to construct the trie.
let trieInput =
Array.choose
(fun f ->
match f.AST with
| ParsedInput.SigFile _ -> Some f
| ParsedInput.ImplFile _ -> if Map.containsKey f.Idx implToSig then None else Some f)
| ParsedInput.ImplFile _ -> if filePairs.HasSignature f.Idx then None else Some f)
files

let trie = TrieMapping.mkTrie trieInput
Expand All @@ -221,7 +207,7 @@ let mkGraph (files: FileWithAST array) : Graph<int> =

// Automatically add a link from an implementation to its signature file (if present)
let signatureDependency =
match Map.tryFind file.Idx implToSig with
match filePairs.TryGetSignatureIndex file.Idx with
| None -> Array.empty
| Some sigIdx -> Array.singleton sigIdx

Expand Down
2 changes: 2 additions & 0 deletions tests/ParallelTypeCheckingTests/Code/GraphProcessing.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ type ProcessedNode<'Item, 'Result> =
let processGraph<'Item, 'Result when 'Item: equality and 'Item: comparison>
(graph: Graph<'Item>)
(work: ('Item -> ProcessedNode<'Item, 'Result>) -> NodeInfo<'Item> -> 'Result)
(includeInFinalState: 'Item -> bool)
(ct: CancellationToken)
: ('Item * 'Result)[] =
let transitiveDeps = graph |> Graph.transitiveOpt
Expand Down Expand Up @@ -125,6 +126,7 @@ let processGraph<'Item, 'Result when 'Item: equality and 'Item: comparison>
waitHandle.WaitOne() |> ignore

nodes.Values
|> Seq.filter (fun node -> includeInFinalState node.Info.Item)
|> Seq.map (fun node ->
let result =
node.Result
Expand Down

0 comments on commit e6ee19f

Please sign in to comment.