Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit3bf3960

Browse files
authored
update mem perf driver (dotnet#2376)
* update mem perf driver* use multiple files* add flush-the-caches* add pause
1 parenta58b501 commit3bf3960

File tree

5 files changed

+196
-81
lines changed

5 files changed

+196
-81
lines changed

‎build-everything.proj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
<ItemGroupCondition="'$(BUILD_VS)'=='1'">
3232
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-src-build.proj" />
33+
<ProjectsWithNet40Include="vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj" />
3334
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-project-templates-build.proj" />
3435
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-item-templates-build.proj" />
3536
<ProjectsWithNet40Include="vsintegration/fsharp-vsintegration-vsix-build.proj" />
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<configuration>
33
<startup>
4-
<supportedRuntimeversion="v4.0"sku=".NETFramework,Version=v4.6.2" />
4+
<supportedRuntimeversion="v4.0"sku=".NETFramework,Version=v4.6" />
55
</startup>
66
</configuration>

‎vsintegration/Utils/LanguageServiceProfiling/LanguageServiceProfiling.fsproj‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,6 @@
4444
</DocumentationFile>
4545
<Prefer32Bit>true</Prefer32Bit>
4646
</PropertyGroup>
47-
<PropertyGroup>
48-
<MinimumVisualStudioVersionCondition="'$(MinimumVisualStudioVersion)' == ''">11</MinimumVisualStudioVersion>
49-
</PropertyGroup>
50-
<Choose>
51-
<WhenCondition="'$(VisualStudioVersion)' == '11.0'">
52-
<PropertyGroupCondition="Exists('$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets')">
53-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\..\Microsoft SDKs\F#\3.0\Framework\v4.0\Microsoft.FSharp.Targets</FSharpTargetsPath>
54-
</PropertyGroup>
55-
</When>
56-
<Otherwise>
57-
<PropertyGroupCondition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets')">
58-
<FSharpTargetsPath>$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\FSharp\Microsoft.FSharp.Targets</FSharpTargetsPath>
59-
</PropertyGroup>
60-
</Otherwise>
61-
</Choose>
62-
<ImportProject="$(FSharpTargetsPath)" />
6347
<ItemGroup>
6448
<CompileInclude="AssemblyInfo.fs" />
6549
<CompileInclude="ProjectCracker.fs" />
@@ -74,7 +58,7 @@
7458
<ReferenceInclude="System.Core" />
7559
<ReferenceInclude="System.Numerics" />
7660
<ReferenceInclude="System.ValueTuple">
77-
<HintPath>..\..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
61+
<HintPath>$(FSharpSourcesRoot)\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
7862
</Reference>
7963
<ReferenceInclude="System.Xml" />
8064
</ItemGroup>
@@ -90,11 +74,5 @@
9074
<Private>True</Private>
9175
</ProjectReference>
9276
</ItemGroup>
93-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
94-
Other similar extension points exist, see Microsoft.Common.targets.
95-
<Target Name="BeforeBuild">
96-
</Target>
97-
<Target Name="AfterBuild">
98-
</Target>
99-
-->
77+
<ImportProject="$(FSharpSourcesRoot)\FSharpSource.targets" />
10078
</Project>

‎vsintegration/Utils/LanguageServiceProfiling/Options.fs‎

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
moduleinternalrec LanguageServiceProfiling.Options
1+
moduleinternalLanguageServiceProfiling.Options
22

33
openMicrosoft.FSharp.Compiler
44
openMicrosoft.FSharp.Compiler.Range
@@ -17,22 +17,16 @@ type CompletionPosition = {
1717
typeOptions=
1818
{ Options:FSharpProjectOptions
1919
FileToCheck:string
20+
FilesToCheck:string list
2021
SymbolText:string
2122
SymbolPos:pos
2223
CompletionPositions:CompletionPosition list}
2324

24-
letget(repositoryDir:string):Options=
25-
match DirectoryInfo(repositoryDir).Name.ToLower()with
26-
|"fsharp.compiler.service"-> FCS(repositoryDir)
27-
|"fsharpvspowertools"-> VFPT(repositoryDir)
28-
|_-> failwithf"%s is not supported" repositoryDir
2925

3026
letFCS(repositoryDir:string):Options=
31-
{ Options=
32-
{ProjectFileName= repositoryDir</>@"src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj"
33-
ProjectFileNames=
34-
[|@"src\fsharp\FSharp.Compiler.Service\obj\Debug\FSComp.fs"
35-
@"src\fsharp\FSharp.Compiler.Service\obj\Debug\FSIstrings.fs"
27+
letfiles=
28+
[|@"src\fsharp\FSharp.Compiler.Service\obj\Release\FSComp.fs"
29+
@"src\fsharp\FSharp.Compiler.Service\obj\Release\FSIstrings.fs"
3630
@"src\assemblyinfo\assemblyinfo.FSharp.Compiler.Service.dll.fs"
3731
@"src\assemblyinfo\assemblyinfo.shared.fs"
3832
@"src\utils\reshapedreflection.fs"
@@ -199,9 +193,12 @@ let FCS (repositoryDir: string) : Options =
199193
@"src\fsharp\vs\SimpleServices.fs"
200194
@"src\fsharp\fsi\fsi.fsi"
201195
@"src\fsharp\fsi\fsi.fs"|]
202-
|> Array.map(fun x-> repositoryDir</> x)
196+
197+
{ Options=
198+
{ProjectFileName= repositoryDir</>@"src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj"
199+
ProjectFileNames= files|> Array.map(fun x-> repositoryDir</> x)
203200
OtherOptions=
204-
[|@"-o:obj\Debug\FSharp.Compiler.Service.dll";"-g";"--noframework";
201+
[|@"-o:obj\Release\FSharp.Compiler.Service.dll";"-g";"--noframework";
205202
@"--baseaddress:0x06800000";"--define:DEBUG";
206203
@"--define:CROSS_PLATFORM_COMPILER";"--define:FX_ATLEAST_45";
207204
@"--define:FX_ATLEAST_40";"--define:BE_SECURITY_TRANSPARENT";
@@ -219,6 +216,7 @@ let FCS (repositoryDir: string) : Options =
219216
@"-r:"+(repositoryDir</>@"packages\Microsoft.DiaSymReader.PortablePdb\lib\net45\Microsoft.DiaSymReader.PortablePdb.dll");
220217
@"-r:C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll";
221218
@"-r:"+(repositoryDir</>@"packages\System.Collections.Immutable\lib\netstandard1.0\System.Collections.Immutable.dll");
219+
@"-r:"+(repositoryDir</>@"packages\FSharp.Core\lib\net40\FSharp.Core.dll");
222220
@"-r:C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Core.dll";
223221
@"-r:C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.dll";
224222
@"-r:C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\System.Numerics.dll";
@@ -286,6 +284,17 @@ let FCS (repositoryDir: string) : Options =
286284
UnresolvedReferences= None;
287285
OriginalLoadReferences=[]
288286
ExtraProjectInfo= None}
287+
FilesToCheck=
288+
files
289+
|> Array.filter(fun s-> s.Contains"TypeChecker.fs"||
290+
s.Contains"Optimizer.fs"||
291+
s.Contains"IlxGen.fs"||
292+
s.Contains"TastOps.fs"||
293+
s.Contains"TcGlobals.fs"||
294+
s.Contains"CompileOps.fs"||
295+
s.Contains"CompileOptions.fs")
296+
|> Array.map(fun x-> repositoryDir</> x)
297+
|> Array.toList
289298
FileToCheck= repositoryDir</>@"src\fsharp\TypeChecker.fs"
290299
SymbolText="Some"
291300
SymbolPos= mkPos1207
@@ -395,6 +404,7 @@ let VFPT (repositoryDir: string) : Options =
395404
UnresolvedReferences= None
396405
OriginalLoadReferences=[]
397406
ExtraProjectInfo= None}
407+
FilesToCheck=[]
398408
FileToCheck= repositoryDir</>@"src\FSharp.Editing\CodeGeneration\RecordStubGenerator.fs"
399409
SymbolText="option"
400410
SymbolPos= mkPos1923
@@ -404,4 +414,12 @@ let VFPT (repositoryDir: string) : Options =
404414
QualifyingNames=[]
405415
PartialName=""
406416
}]
407-
}
417+
}
418+
419+
letget(repositoryDir:string):Options=
420+
letrepositoryDir= Path.GetFullPath(repositoryDir)
421+
match DirectoryInfo(Path.GetFullPath(repositoryDir)).Name.ToLower()with
422+
|"fsharp.compiler.service"-> FCS(repositoryDir)
423+
|"fsharpvspowertools"-> VFPT(repositoryDir)
424+
|_-> failwithf"%s is not supported" repositoryDir
425+

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp