From 245cbfb7ada72c099ac33445d5fb8458c4494010 Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Wed, 3 Jan 2024 15:25:39 +0100
Subject: [PATCH 1/2] Facelifting FCS benchmarks

---
 .../BenchmarkComparison/HistoricalBenchmark.fsproj         | 7 -------
 .../FCSBenchmarks/CompilerServiceBenchmarks/Benchmarks.fs  | 1 -
 .../CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs | 6 +++---
 .../CompilerServiceBenchmarks/FileCascadeBenchmarks.fs     | 2 +-
 .../FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj     | 1 +
 tests/benchmarks/FCSBenchmarks/FCSSourceFiles/Program.fs   | 7 +++----
 6 files changed, 8 insertions(+), 16 deletions(-)
 delete mode 100644 tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/Benchmarks.fs

diff --git a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
index a477f61af81..2534ba292b5 100644
--- a/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/BenchmarkComparison/HistoricalBenchmark.fsproj
@@ -5,13 +5,6 @@
     <TargetFramework>net8.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <Configurations>Release</Configurations>
-    <!-- Workaround to get rid of:
-        error NU1505: Duplicate 'PackageDownload' items found.
-        Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior.
-        The duplicate 'PackageDownload' items are:
-          Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2].
-    -->
-    <NoWarn>$(NoWarn);NU1505</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/Benchmarks.fs b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/Benchmarks.fs
deleted file mode 100644
index 5f282702bb0..00000000000
--- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/Benchmarks.fs
+++ /dev/null
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs
index 679989520c2..4910b2e19eb 100644
--- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs
+++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/CompilerServiceBenchmarks.fs
@@ -124,13 +124,13 @@ type CompilerServiceBenchmarks() =
                 |> Some
     
     [<Benchmark>]
-    member _.ParsingTypeCheckerFs() =
+    member _.ParsingCheckExpressionsFs() =
         let config = getConfig()
         let results = config.Checker.ParseFile("CheckExpressions.fs", config.Source |> SourceText.toFSharpSourceText, parsingOptions) |> Async.RunSynchronously
         if results.ParseHadErrors then failwithf $"parse had errors: %A{results.Diagnostics}"
 
-    [<IterationCleanup(Target = "ParsingTypeCheckerFs")>]
-    member _.ParsingTypeCheckerFsSetup() =
+    [<IterationCleanup(Target = "ParsingCheckExpressionsFs")>]
+    member _.ParsingCheckExpressionsFsSetup() =
         let checker = getConfig().Checker
         checker.InvalidateAll()
         checker.ClearLanguageServiceRootCachesAndCollectAndFinalizeAllTransients()
diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FileCascadeBenchmarks.fs b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FileCascadeBenchmarks.fs
index 17822adeb96..686153577fa 100644
--- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FileCascadeBenchmarks.fs
+++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FileCascadeBenchmarks.fs
@@ -68,7 +68,7 @@ let processFunc{number} (x) (func:MyFunctionType{number}) =
     }}
 //$COMMENTAREA$"""
 
-/// Code create using FSharpCheckFileResults.GenerateSignature()
+/// Code created using FSharpCheckFileResults.GenerateSignature()
     let generateFsi number = 
         $"""
 module Benchmark{number}
diff --git a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
index 5f0d38af2ef..3774aa87023 100644
--- a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/FCSSourceFiles.fsproj
@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/Program.fs b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/Program.fs
index 136897e081b..9c8148ed4da 100644
--- a/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/Program.fs
+++ b/tests/benchmarks/FCSBenchmarks/FCSSourceFiles/Program.fs
@@ -270,7 +270,7 @@ module Project =
               OriginalLoadReferences = []
               Stamp = None }
 
-        FSharpReferencedProject.CreateFSharp(
+        FSharpReferencedProject.FSharpReference(
             __SOURCE_DIRECTORY__ + @"\..\..\..\..\artifacts\bin\FSharp.Core\Debug\netstandard2.1\FSharp.Core.dll",
             projectOptions
         )
@@ -459,7 +459,7 @@ module Project =
               OriginalLoadReferences = []
               Stamp = None }
 
-        FSharpReferencedProject.CreateFSharp(
+        FSharpReferencedProject.FSharpReference(
             __SOURCE_DIRECTORY__ + @"\..\..\..\..\artifacts\bin\FSharp.DependencyManager.Nuget\Debug\netstandard2.0\FSharp.DependencyManager.Nuget.dll",
             projectOptions
         )
@@ -890,8 +890,7 @@ type CompilerService() =
         | None -> 
             sourceOpt <- 
                 projectOptions.SourceFiles
-                |> Array.filter (fun filePath -> filePath.EndsWith("CheckDeclarations.fs")) // || filePath.EndsWith("CheckExpressions.fs"))
-                                                 // || filePath.EndsWith("lex.fs") || filePath.EndsWith("pars.fs"))
+                |> Array.filter (fun filePath -> filePath.EndsWith("CheckDeclarations.fs"))
                 |> Array.map (fun filePath -> filePath, SourceText.ofString (File.ReadAllText(filePath)))
                 |> Some
         | _ -> ()

From 0b4ddad40fee36403bd4133c90a36e247265d5fd Mon Sep 17 00:00:00 2001
From: Petr <psfinaki@users.noreply.github.com>
Date: Wed, 3 Jan 2024 16:54:11 +0100
Subject: [PATCH 2/2] Update FSharp.Compiler.Benchmarks.fsproj

---
 .../FSharp.Compiler.Benchmarks.fsproj                     | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
index a8c8ff31bc6..19c7f7a7e96 100644
--- a/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
+++ b/tests/benchmarks/FCSBenchmarks/CompilerServiceBenchmarks/FSharp.Compiler.Benchmarks.fsproj
@@ -4,13 +4,6 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-    <!-- Workaround to get rid of:
-        error NU1505: Duplicate 'PackageDownload' items found.
-        Remove the duplicate items or use the Update functionality to ensure a consistent restore behavior.
-        The duplicate 'PackageDownload' items are:
-          Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2], Microsoft.NETCore.App.Host.win-x64 [6.0.2].
-    -->
-    <NoWarn>$(NoWarn);NU1505</NoWarn>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
   </PropertyGroup>
 
@@ -26,7 +19,6 @@
 
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
-    <!-- <PackageReference Include="Microsoft.CodeAnalysis.EditorFeatures.Text" Version="2.9.0" /> -->
   </ItemGroup>
 
   <ItemGroup>