Uh oh!
There was an error while loading. Please reload this page.
Add RunSample target to mono.proj#2393
Uh oh!
There was an error while loading. Please reload this page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -5,6 +5,17 @@ | ||
| <PropertyGroup> | ||
| <MonoObjDir>$(ArtifactsObjDir)mono/$(PlatformConfigPathPart)/</MonoObjDir> | ||
| <MonoEnableLLVM Condition=" '$(MonoEnableLLVM)' == '' ">false</MonoEnableLLVM> | ||
| <DotNetExec Condition="'$(OS)' == 'Windows_NT'">dotnet.exe</DotNetExec> | ||
| <DotNetExec Condition="'$(DotNetExec)' == ''">dotnet</DotNetExec> | ||
| <LocalDotnetDir>..\..\.dotnet</LocalDotnetDir> | ||
| <LocalDotnet>$(LocalDotnetDir)\$(DotNetExec)</LocalDotnet> | ||
| <ScriptExt Condition="'$(OS)' == 'Windows_NT'">.cmd</ScriptExt> | ||
| <ScriptExt Condition="'$(OS)' != 'Windows_NT'">.sh</ScriptExt> | ||
| <_CoreClrFileName Condition="'$(TargetsWindows)' == 'true'">coreclr.dll</_CoreClrFileName> | ||
| <_CoreClrFileName Condition="'$(TargetsOSX)' == 'true'">libcoreclr.dylib</_CoreClrFileName> | ||
| <_CoreClrFileName Condition="'$(_CoreClrFileName)' == ''">libcoreclr.so</_CoreClrFileName> | ||
| <CoreClrTestConfig Condition="'$(CoreClrTestConfig)' == ''">$(Configuration)</CoreClrTestConfig> | ||
| <CoreClrTestCoreRoot>$(ArtifactsDir)tests\coreclr\$(OSGroup).$(Platform).$(CoreClrTestConfig)\Tests\Core_Root</CoreClrTestCoreRoot> | ||
| </PropertyGroup> | ||
| <!-- OSX/Linux Mono runtime build --> | ||
| @@ -52,10 +63,6 @@ | ||
| <_MonoRuntimeFilePath Condition="'$(TargetsWindows)' == 'true' and '$(Platform)' == 'x86'">$(MonoObjDir)Win32\Bin\$(Configuration)\mono-2.0-sgen.dll</_MonoRuntimeFilePath> | ||
| <_MonoRuntimeFilePath Condition="'$(TargetsOSX)' == 'true'">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.dylib</_MonoRuntimeFilePath> | ||
| <_MonoRuntimeFilePath Condition="'$(_MonoRuntimeFilePath)' == ''">$(MonoObjDir)mono\mini\.libs\libmonosgen-2.0.so</_MonoRuntimeFilePath> | ||
| </PropertyGroup> | ||
| <!-- Copy Mono runtime files to artifacts directory --> | ||
| @@ -81,4 +88,80 @@ | ||
| <Target Name="Test" /> | ||
| <!-- Copy Mono runtime bits to the local .dotnet dir for local experiments (temp solution) --> | ||
| <Target Name="PatchLocalDotnet" DependsOnTargets="ValidateLocalDotnet"> | ||
| <PropertyGroup> | ||
| <LocalDotnetRuntimeDir>$([System.IO.Directory]::GetDirectories("$(LocalDotnetDir)\shared\Microsoft.NETCore.App")[0])</LocalDotnetRuntimeDir> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <_MonoRuntimeArtifacts Include="$(BinDir)\*.*" /> | ||
| </ItemGroup> | ||
| <Copy SourceFiles="$(_MonoRuntimeArtifacts)" | ||
| DestinationFolder="$(LocalDotnetRuntimeDir)" | ||
| SkipUnchangedFiles="true" /> | ||
| </Target> | ||
| <!-- Copy Coreclr runtime bits to the local .dotnet dir --> | ||
| <Target Name="RestoreLocalDotnet" DependsOnTargets="ValidateLocalDotnet"> | ||
| <Copy SourceFiles="$(CoreCLRArtifactsPath)\System.Private.CoreLib.dll" | ||
| DestinationFiles="$(LocalDotnetRuntimeDir)\System.Private.CoreLib.dll" /> | ||
| <Copy SourceFiles="$(CoreCLRArtifactsPath)\$(_CoreClrFileName)" | ||
| DestinationFiles="$(LocalDotnetRuntimeDir)\$(_CoreClrFileName)" /> | ||
| </Target> | ||
| <!-- Copy Mono runtime bits to the coreclr's Core_Root in order to run runtime tests --> | ||
| <Target Name="PatchCoreClrCoreRoot" DependsOnTargets="ValidateLocalDotnet"> | ||
| <Error Condition="!Exists('$(CoreClrTestCoreRoot)')" Text="Core_Root ($(CoreClrTestCoreRoot)) doesn't exist. Have you built coreclr tests in $(CoreClrTestConfig) configuration?" /> | ||
| <ItemGroup> | ||
| <_MonoRuntimeArtifacts Include="$(BinDir)\*.*" /> | ||
| </ItemGroup> | ||
| <Copy SourceFiles="@(_MonoRuntimeArtifacts)" | ||
| DestinationFolder="$(CoreClrTestCoreRoot)" | ||
| SkipUnchangedFiles="true"/> | ||
| </Target> | ||
| <!-- Copy Coreclr runtime bits back to Core_Root --> | ||
| <Target Name="RestoreCoreClrCoreRoot" DependsOnTargets="ValidateLocalDotnet"> | ||
| <Copy SourceFiles="$(CoreCLRArtifactsPath)\System.Private.CoreLib.dll" | ||
| DestinationFiles="$(CoreClrTestCoreRoot)\System.Private.CoreLib.dll" /> | ||
| <Copy SourceFiles="$(CoreCLRArtifactsPath)\$(_CoreClrFileName)" | ||
| DestinationFiles="$(CoreClrTestCoreRoot)\$(_CoreClrFileName)" /> | ||
| </Target> | ||
| <!-- Run netcore\sample\HelloWorld sample using Mono Runtime --> | ||
Contributor There was a problem hiding this comment. I am not sure it's worth it. I'd prefer to have better documentation for this instead MemberAuthor There was a problem hiding this comment. @marek-safar um.. what exactly is not worth it? -- having the RunSample target? Contributor There was a problem hiding this comment. yeah, I'd much rather see documentation with working steps for Member There was a problem hiding this comment. Wouldn't this have temporary value until we figure that part out? I know some people like to use RunSample as an easy way to test their stuff. Contributor There was a problem hiding this comment. I guess we figure it out already if we can run the sample which is form of Member There was a problem hiding this comment. I see what you mean. Yeah, I agree. MemberAuthor There was a problem hiding this comment. it seems most of us use HelloWorld for experiments/fixes/improvements. Do you suggest to remove it and let everybody do: instead of Currently Contributor There was a problem hiding this comment. yep, I think having this document something is more valuable than having it in Makefile (although you can keep sample of this example if you think it's valuable) MemberAuthor There was a problem hiding this comment. I've simplified all the things so now runsample uses local dotnet. But I personally would prefer to keep it at least for a while. | ||
| <Target Name="RunSample" DependsOnTargets="PatchLocalDotnet"> | ||
| <Exec Command="$(LocalDotnet) run -c Release -f $(NetCoreAppCurrent) -p $(MonoProjectRoot)netcore\sample\HelloWorld" /> | ||
| </Target> | ||
| <!-- Run CoreCLR runtime test using testhost --> | ||
| <Target Name="RunCoreClrTest" DependsOnTargets="ValidateLocalDotnet;PatchCoreClrCoreRoot"> | ||
| <Error Condition="$(CoreClrTest) == ''" Text="'CoreClrTest' is not set. E.g. set it to `$(ArtifactsDir)tests/coreclr/$(OSGroup).$(Platform).$(CoreClrTestConfig)/JIT/opt/InstructionCombining/DivToMul/DivToMul$(ScriptExt)` in order to run DivToMul test." /> | ||
| <Exec Command="$(CoreClrTest) -coreroot="$(CoreClrTestCoreRoot)""/> | ||
| </Target> | ||
| <!-- Make sure coreclr tests are built (in $(CoreClrTestConfig) configuration), e.g. | ||
| *nix: `cd ../coreclr && ./build.sh -release && ./build-testh.sh -release` | ||
| Windows: `cd ../coreclr && build.cmd -release` --> | ||
| <Target Name="RunCoreClrTests" DependsOnTargets="ValidateLocalDotnet;PatchCoreClrCoreRoot"> | ||
| <ItemGroup> | ||
| <CoreClrTests Include="$(ArtifactsDir)tests\coreclr\$(OSGroup).$(Platform).$(CoreClrTestConfig)\**\*$(ScriptExt)" /> | ||
| </ItemGroup> | ||
| <Exec Condition="'$(OS)' == 'Windows_NT'" Command=""%(CoreClrTests.Identity)" -coreroot "$(CoreClrTestCoreRoot)"" ContinueOnError="WarnAndContinue" /> | ||
| <Exec Condition="'$(OS)' != 'Windows_NT'" Command="bash "%(CoreClrTests.Identity)" -coreroot="$(CoreClrTestCoreRoot)"" ContinueOnError="WarnAndContinue" /> | ||
| </Target> | ||
| <!-- Show summary for coreclr tests --> | ||
| <Target Name="CoreClrTestsSummary"> | ||
| <Exec Command="python $(MonoProjectRoot)..\coreclr\tests\runtest.py --analyze_results_only -test_location $(ArtifactsDir)tests\coreclr\$(OSGroup).$(Platform).$(CoreClrTestConfig) -build_type $(CoreClrTestConfig)" /> | ||
| </Target> | ||
| <Target Name="RunBenchmarks"> | ||
| <Error Condition="$(BenchmarksRepo) == ''" Text="BenchmarksRepo variable is not set" /> | ||
EgorBo marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| <Exec WorkingDirectory="$(BenchmarksRepo)\src\benchmarks\micro" Command="$(LocalDotnet) run -c Release -f $(NetCoreAppCurrent) --cli $(LocalDotnet)" /> | ||
| </Target> | ||
| <Target Name="ValidateLocalDotnet"> | ||
| <Error Condition="!Exists('$(LocalDotnet)')" Text="'$(LocalDotnet)' doesn't exist." /> | ||
| </Target> | ||
| </Project> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| DOTNET=../../../.dotnet/dotnet | ||
| # run sample using local .dotnet (will be patched with Mono Runtime) | ||
| run-sample: | ||
| $(DOTNET) msbuild /t:RunSample ../mono.proj | ||
| # run sample using dotnet from PATH | ||
| run-sample-coreclr: | ||
| dotnet run -c Release -p sample/HelloWorld -f netcoreapp3.1 | ||
| runtime: | ||
| $(DOTNET) msbuild /t:Build ../mono.proj | ||
| # temp: makes $(DOTNET) to use mono runtime (to run real-world apps using '$(DOTNET) run') | ||
| patch-local-dotnet: | ||
| $(DOTNET) msbuild /t:PatchLocalDotnet ../mono.proj | ||
| restore-local-dotnet: | ||
| $(DOTNET) msbuild /t:RestoreLocalDotnet ../mono.proj | ||
| # run specific coreclr test, e.g.: | ||
| # make run-tests-coreclr CoreClrTest="bash ../../artifacts/tests/coreclr/OSX.x64.Checked/JIT/opt/InstructionCombining/DivToMul/DivToMul.sh" | ||
| run-tests-coreclr: | ||
| $(DOTNET) msbuild /t:RunCoreClrTest /p:CoreClrTest="$(CoreClrTest)" ../mono.proj | ||
| # run all coreclr tests | ||
| run-tests-coreclr-all: | ||
| $(DOTNET) msbuild /t:RunCoreClrTests ../mono.proj | ||
| # show summary for coreclr tests | ||
| tests-coreclr-summary: | ||
| $(DOTNET) msbuild /t:CoreClrTestsSummary ../mono.proj | ||
| # run 'dotnet/performance' benchmarks | ||
| # e.g. 'make run-benchmarks BenchmarksRepo=/prj/performance' | ||
| # you can append BDN parameters at the end, e.g. ` -- --filter Burgers --keepFiles` | ||
| run-benchmarks: patch-local-dotnet | ||
| $(DOTNET) msbuild /t:RunBenchmarks /p:BenchmarksRepo=$(BenchmarksRepo) |
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.