safesparrow
diff --git a/‎.fantomasignore‎
Lines changed: 4 additions & 0 deletions b/‎.fantomasignore‎
Lines changed: 4 additions & 0 deletions
diff --git a/‎FSharp.sln‎
Lines changed: 17 additions & 0 deletions b/‎FSharp.sln‎
Lines changed: 17 additions & 0 deletions
diff --git a/‎input.txt‎
Lines changed: 3 additions & 0 deletions b/‎input.txt‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎scripts/perftests.ps1‎
Lines changed: 152 additions & 0 deletions b/‎scripts/perftests.ps1‎
Lines changed: 152 additions & 0 deletions
diff --git a/‎scripts/tests.json‎
Lines changed: 20 additions & 0 deletions b/‎scripts/tests.json‎
Lines changed: 20 additions & 0 deletions
diff --git a/‎src/Compiler/Checking/PostInferenceChecks.fs‎
Lines changed: 8 additions & 6 deletions b/‎src/Compiler/Checking/PostInferenceChecks.fs‎
Lines changed: 8 additions & 6 deletions
diff --git a/‎src/Compiler/Driver/CompilerConfig.fs‎
Lines changed: 16 additions & 3 deletions b/‎src/Compiler/Driver/CompilerConfig.fs‎
Lines changed: 16 additions & 3 deletions
diff --git a/‎src/Compiler/Driver/CompilerConfig.fsi‎
Lines changed: 16 additions & 4 deletions b/‎src/Compiler/Driver/CompilerConfig.fsi‎
Lines changed: 16 additions & 4 deletions
@@ -11,6 +11,10 @@ vsintegration/*
 !vsintegration/tests/FSharp.Editor.Tests
 artifacts/
 
+# Explicitly formatted Tests/ subdirectories (with exceptions)
+!tests/ParallelTypeCheckingTests/
+*/.fcs_test/
+
 # Explicitly unformatted implementation files
 
 src/Compiler/Checking/AccessibilityLogic.fs
 
@@ -100,11 +100,15 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "HistoricalBenchmark", "test
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Benchmarks", "tests\benchmarks\FCSBenchmarks\CompilerServiceBenchmarks\FSharp.Compiler.Benchmarks.fsproj", "{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}"
+EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D58BFE8B-7C85-4D3B-B5F3-9A7BB90FF1EE}"
 	ProjectSection(SolutionItems) = preProject
 		src\Compiler\FSComp.txt = src\Compiler\FSComp.txt
 	EndProjectSection
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "ParallelTypeCheckingTests", "tests\ParallelTypeCheckingTests\ParallelTypeCheckingTests.fsproj", "{59C31D40-97E0-4A69-ABD9-D316BD798ED8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -415,6 +419,18 @@ Global
 		{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|x86.ActiveCfg = Release|Any CPU
 		{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1}.Release|x86.Build.0 = Release|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Debug|x86.Build.0 = Debug|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Proto|Any CPU.ActiveCfg = Debug|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Proto|Any CPU.Build.0 = Debug|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Proto|x86.ActiveCfg = Debug|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Proto|x86.Build.0 = Debug|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Release|x86.ActiveCfg = Release|Any CPU
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -446,6 +462,7 @@ Global
 		{209C7D37-8C01-413C-8698-EC25F4C86976} = {B8DDA694-7939-42E3-95E5-265C2217C142}
 		{BEC6E796-7E53-4888-AAFC-B8FD55C425DF} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
 		{9C7523BA-7AB2-4604-A5FD-653E82C2BAD1} = {CE70D631-C5DC-417E-9CDA-B16097BEF1AC}
+		{59C31D40-97E0-4A69-ABD9-D316BD798ED8} = {CFE3259A-2D30-4EB0-80D5-E8B5F3D01449}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BD5177C7-1380-40E7-94D2-7768E1A8B1B8}
 
@@ -0,0 +1,3 @@
+abbrevia
+baba
+baba.ba
@@ -0,0 +1,152 @@
+param(
+    [Parameter(Mandatory = $true)][string]$Cache,
+    [Parameter(Mandatory = $true)][string]$TestsPath,
+    [string]$Repository,
+    [string]$Revision,
+    [string[]]$BeforeSteps = $null,
+    [string[]]$Projects,
+    [string[]]$Configurations = @("Debug")
+)
+
+class TestCase {
+    [CheckoutSpec]$CheckoutSpec
+    [string[]]$Projects
+    [string[]]$Configurations = @("Debug")
+}
+
+class Tests {
+    [string]$Cache
+    [TestCase[]]$Tests
+    # TODO FSC path
+}
+
+class CheckoutSpec {
+    [string]$Repository
+    [string]$Revision
+    [string[]]$BeforeSteps = @()
+    
+    [string]GetDir($CacheBase){
+        return Join-Path (Join-Path $CacheBase $this.Repository) $this.Revision
+    }
+    [string]GetRepositoryUrl(){
+        $repo = $this.Repository
+        return "https://github.com/$repo"
+    }
+}
+
+class Checkout {
+    [string]$Cache
+    [CheckoutSpec]$Spec    
+    [string]GetDir(){
+        return $this.Spec.GetDir($this.Cache)
+    }
+    [string]GetRepositoryUrl(){
+        return $this.Spec.GetRepositoryUrl()
+    }
+}
+
+function Checkout-Codebase {
+    [OutputType([string])]
+    param(
+        [Parameter(Mandatory = $true)][Checkout]$checkout
+    )
+    $repositoryUrl = $checkout.GetRepositoryUrl()
+    $cacheDir = $checkout.GetDir()
+
+    if(Test-Path -Path $cacheDir){
+        Write-Host "'$cacheDir' exists - assuming that it contains the correct code revision."
+    } else {
+        Write-Host "git clone '$repositoryUrl' into '$cacheDir'"
+        git clone $repositoryUrl $cacheDir > Write-Host
+        Write-Host "git clone finished"
+    }
+}
+
+Set-StrictMode -Version Latest
+$oldLocation = Get-Location
+
+function SingleTest{
+    param(
+        [Parameter(Mandatory = $true)][string]$Cache,
+        [Parameter(Mandatory = $true)][TestCase]$Test
+    )
+    $checkoutSpec = $test.CheckoutSpec
+    $checkout = [Checkout]::new()
+    $checkout.Cache = $Cache
+    $checkout.Spec = $checkoutSpec
+    Checkout-Codebase -Checkout $checkout
+    $checkoutDir = $checkout.GetDir()
+    Set-Location $checkoutDir
+
+    $beforeSteps = $checkoutSpec.BeforeSteps
+    if($null -eq $beforeSteps){
+        $beforeSteps = @()
+    }
+    foreach ($step in $beforeSteps) {
+        Write-Host "Running BeforeStep: '$step'"
+        Invoke-Expression "$step" > $null
+    }
+
+    function BuildProjectCollectTimings{
+        param(
+            [Parameter(Mandatory = $true)][string]$Project,
+            [Parameter(Mandatory = $true)][string]$Configuration
+        )
+        $projectDir = (Get-ChildItem -Path $Project -File).DirectoryName
+        $projectName = (Get-ChildItem -Path $Project -File).Name
+        Set-Location $projectDir
+        dotnet build -c $Configuration $Project > $null
+        $logPath = "msbuild.log"
+        dotnet build -c $Configuration --no-incremental --no-dependencies $projectName /p:OtherFlags="--times" -fl "-flp:logfile=$logPath;verbosity=detailed" > $null
+        $lines = Get-Content $logPath | Select-String -pattern "Realdelta" | % {$_.Line.Trim()}
+        return $lines
+    }
+
+    foreach ($configuration in $Test.Configurations) {
+        foreach ($project in $Test.Projects) {
+            $projectPath = Join-Path $checkoutDir -ChildPath $Project
+            if(-not (Test-Path -Path $projectPath)) {
+                throw "Project file '$projectPath' does not exist."
+            }
+            $lines = BuildProjectCollectTimings -Project $projectPath -Configuration $configuration
+            Write-Host "Timings for '$configuration - $project':"
+            $lines | Write-Host
+        }
+    }
+}
+
+function Run-Tests{
+    param(
+        [Parameter(Mandatory = $true)][Tests]$Tests
+    )
+    foreach ($test in $Tests.Tests) {
+        SingleTest -Cache $Tests.Cache -Test $test
+    }
+}
+
+function Build-SingleTest {
+    $checkoutSpec = [CheckoutSpec]::new()
+    $checkoutSpec.Repository = $Repository
+    $checkoutSpec.Revision = $Revision
+
+    $test = [TestCase]::new()
+    $test.CheckoutSpec = $checkoutSpec
+    $test.Projects = $Projects
+    $test.Configuration = $Configuration
+
+    $tests = [Tests]::new()
+    $tests.Cache = $Cache
+    $tests.Tests = @($test)
+}
+
+function Parse-Tests {
+    return Get-Content $TestsPath | ConvertFrom-Json
+}
+
+#$tests = Build-SingleTest
+$tests = [Tests]::new()
+$tests.Cache = $Cache
+$tests.Tests = Parse-Tests
+Run-Tests -Tests $tests
+
+Set-Location $oldLocation
@@ -0,0 +1,20 @@
+[
+    {
+        "checkoutSpec": {
+            "repository": "safesparrow/fsharp-benchmark-generator",
+            "revision": "main",
+            "beforeSteps": []
+        },
+        "projects": ["Generator.fsproj", "Runner/Runner.fsproj"],
+        "configurations": ["Debug", "Release"]
+    },
+    {
+        "checkoutSpec": {
+            "repository": "dotnet/fsharp",
+            "revision": "main",
+            "beforeSteps": ["./build.cmd -noVisualStudio"]
+        },
+        "projects": ["src/compiler/FSharp.Compiler.Service.fsproj"],
+        "configurations": ["Debug", "Release"]
+    }
+]
@@ -492,7 +492,7 @@ let AccessInternalsVisibleToAsInternal thisCompPath internalsVisibleToPaths acce
         accessSubstPaths (thisCompPath, internalsVisibleToPath) access)
 
 
-let CheckTypeForAccess (cenv: cenv) env objName valAcc m ty =
+let CheckTypeForAccess (cenv: cenv) env _objName valAcc _m ty =
     if cenv.reportErrors then 
 
         let visitType ty =         
@@ -504,11 +504,12 @@ let CheckTypeForAccess (cenv: cenv) env objName valAcc m ty =
                 let thisCompPath = compPathOfCcu cenv.viewCcu
                 let tyconAcc = tcref.Accessibility |> AccessInternalsVisibleToAsInternal thisCompPath cenv.internalsVisibleToPaths
                 if isLessAccessible tyconAcc valAcc then
-                    errorR(Error(FSComp.SR.chkTypeLessAccessibleThanType(tcref.DisplayName, (objName())), m))
+                    ()
+                    //errorR(Error(FSComp.SR.chkTypeLessAccessibleThanType(tcref.DisplayName, (objName())), m))
 
         CheckTypeDeep cenv (visitType, None, None, None, None) cenv.g env false ty
 
-let WarnOnWrongTypeForAccess (cenv: cenv) env objName valAcc m ty =
+let WarnOnWrongTypeForAccess (cenv: cenv) env _objName valAcc _m ty =
     if cenv.reportErrors then 
 
         let visitType ty =         
@@ -520,9 +521,10 @@ let WarnOnWrongTypeForAccess (cenv: cenv) env objName valAcc m ty =
                 let thisCompPath = compPathOfCcu cenv.viewCcu
                 let tyconAcc = tcref.Accessibility |> AccessInternalsVisibleToAsInternal thisCompPath cenv.internalsVisibleToPaths
                 if isLessAccessible tyconAcc valAcc then
-                    let errorText = FSComp.SR.chkTypeLessAccessibleThanType(tcref.DisplayName, (objName())) |> snd
-                    let warningText = errorText + Environment.NewLine + FSComp.SR.tcTypeAbbreviationsCheckedAtCompileTime()
-                    warning(AttributeChecking.ObsoleteWarning(warningText, m))
+                    ()
+                    // let errorText = FSComp.SR.chkTypeLessAccessibleThanType(tcref.DisplayName, (objName())) |> snd
+                    // let warningText = errorText + Environment.NewLine + FSComp.SR.tcTypeAbbreviationsCheckedAtCompileTime()
+                    // warning(AttributeChecking.ObsoleteWarning(warningText, m))
 
         CheckTypeDeep cenv (visitType, None, None, None, None) cenv.g env false ty 
 
 
@@ -393,6 +393,15 @@ type ParallelReferenceResolution =
     | On
     | Off
 
+[<RequireQualifiedAccess>]
+type TypeCheckingMode =
+    | Sequential
+    | ParallelCheckingOfBackedImplFiles
+    | Graph
+
+[<RequireQualifiedAccess>]
+type TypeCheckingConfig = { Mode: TypeCheckingMode }
+
 [<NoEquality; NoComparison>]
 type TcConfigBuilder =
     {
@@ -507,7 +516,6 @@ type TcConfigBuilder =
         mutable emitTailcalls: bool
         mutable deterministic: bool
         mutable concurrentBuild: bool
-        mutable parallelCheckingWithSignatureFiles: bool
         mutable emitMetadataAssembly: MetadataAssemblyGeneration
         mutable preferredUiLang: string option
         mutable lcid: int option
@@ -588,6 +596,8 @@ type TcConfigBuilder =
         mutable exiter: Exiter
 
         mutable parallelReferenceResolution: ParallelReferenceResolution
+
+        mutable typeCheckingConfig: TypeCheckingConfig
     }
 
     // Directories to start probing in
@@ -734,7 +744,6 @@ type TcConfigBuilder =
             emitTailcalls = true
             deterministic = false
             concurrentBuild = true
-            parallelCheckingWithSignatureFiles = false
             emitMetadataAssembly = MetadataAssemblyGeneration.None
             preferredUiLang = None
             lcid = None
@@ -777,6 +786,10 @@ type TcConfigBuilder =
             xmlDocInfoLoader = None
             exiter = QuitProcessExiter
             parallelReferenceResolution = ParallelReferenceResolution.Off
+            typeCheckingConfig =
+                {
+                    TypeCheckingConfig.Mode = TypeCheckingMode.Sequential
+                }
         }
 
     member tcConfigB.FxResolver =
@@ -1288,7 +1301,6 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
     member _.emitTailcalls = data.emitTailcalls
     member _.deterministic = data.deterministic
     member _.concurrentBuild = data.concurrentBuild
-    member _.parallelCheckingWithSignatureFiles = data.parallelCheckingWithSignatureFiles
     member _.emitMetadataAssembly = data.emitMetadataAssembly
     member _.pathMap = data.pathMap
     member _.langVersion = data.langVersion
@@ -1322,6 +1334,7 @@ type TcConfig private (data: TcConfigBuilder, validate: bool) =
     member _.xmlDocInfoLoader = data.xmlDocInfoLoader
     member _.exiter = data.exiter
     member _.parallelReferenceResolution = data.parallelReferenceResolution
+    member _.typeCheckingConfig = data.typeCheckingConfig
 
     static member Create(builder, validate) =
         use _ = UseBuildPhase BuildPhase.Parameter
 
@@ -203,6 +203,18 @@ type ParallelReferenceResolution =
     | On
     | Off
 
+[<RequireQualifiedAccess>]
+type TypeCheckingMode =
+    /// Default mode where all source files are processed sequentially in compilation order.
+    | Sequential
+    /// Signature files and implementation files without backing files are processed sequentially, then backed implementation files are processed in parallel.
+    | ParallelCheckingOfBackedImplFiles
+    /// Parallel type-checking that uses automated file-to-file dependency detection to construct a highly-parallelisable file graph.
+    | Graph
+
+[<RequireQualifiedAccess>]
+type TypeCheckingConfig = { Mode: TypeCheckingMode }
+
 [<NoEquality; NoComparison>]
 type TcConfigBuilder =
     {
@@ -412,8 +424,6 @@ type TcConfigBuilder =
 
         mutable concurrentBuild: bool
 
-        mutable parallelCheckingWithSignatureFiles: bool
-
         mutable emitMetadataAssembly: MetadataAssemblyGeneration
 
         mutable preferredUiLang: string option
@@ -491,6 +501,8 @@ type TcConfigBuilder =
         mutable exiter: Exiter
 
         mutable parallelReferenceResolution: ParallelReferenceResolution
+
+        mutable typeCheckingConfig: TypeCheckingConfig
     }
 
     static member CreateNew:
@@ -734,8 +746,6 @@ type TcConfig =
 
     member concurrentBuild: bool
 
-    member parallelCheckingWithSignatureFiles: bool
-
     member emitMetadataAssembly: MetadataAssemblyGeneration
 
     member pathMap: PathMap
@@ -858,6 +868,8 @@ type TcConfig =
 
     member parallelReferenceResolution: ParallelReferenceResolution
 
+    member typeCheckingConfig: TypeCheckingConfig
+
 /// Represents a computation to return a TcConfig. Normally this is just a constant immutable TcConfig,
 /// but for F# Interactive it may be based on an underlying mutable TcConfigBuilder.
 [<Sealed>]