Skip to content

Add RunSample target to mono.proj #2393

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
EgorBo merged 25 commits into from
Feb 4, 2020
Merged

Add RunSample target to mono.proj #2393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
a47178e
Add RunSample target to mono.proj
EgorBo Jan 30, 2020
c76494f
Add Makefile
EgorBo Jan 31, 2020
c5121da
move more rules from mono/mono
EgorBo Jan 31, 2020
312f60b
Merge branch 'master' of github.com:dotnet/runtime into fix-mono-sample
EgorBo Feb 2, 2020
562adf8
Move more things from Makefile to mono.proj
EgorBo Feb 2, 2020
691fc3c
Clean up
EgorBo Feb 2, 2020
7e1d20d
Merge branch 'master' of github.com:dotnet/runtime into fix-mono-sample
EgorBo Feb 2, 2020
758e482
Fix build
EgorBo Feb 2, 2020
9446e42
Fix build
EgorBo Feb 2, 2020
1f9188c
Add RunCoreClrTest target
EgorBo Feb 3, 2020
462dc21
Add RunCoreClrTests target
EgorBo Feb 3, 2020
76acb13
Address feedback
EgorBo Feb 3, 2020
4b65117
fix build
EgorBo Feb 3, 2020
5fb59f6
Address feedback
EgorBo Feb 3, 2020
55fba2d
Improve RunCoreClrTests target
EgorBo Feb 3, 2020
f746fa8
Add run-sample-coreclr rule
EgorBo Feb 3, 2020
99f89cf
Fix RunCoreClrTest on *nix
EgorBo Feb 3, 2020
344b05e
Update mono.proj
EgorBo Feb 3, 2020
695c25c
Clean up
EgorBo Feb 3, 2020
7ec8353
Clean up
EgorBo Feb 3, 2020
4ccea53
Don't require Checked config for coreclr tests
EgorBo Feb 4, 2020
b9b4a64
Clean up
EgorBo Feb 4, 2020
27bf198
Address feedback
EgorBo Feb 4, 2020
3df9964
Update src/mono/mono.proj
EgorBo Feb 4, 2020
0583a93
Update src/mono/mono.proj
EgorBo Feb 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/mono/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

<ArchGroup Condition="'$(ArchGroup)' == ''">x64</ArchGroup>
<Platform>$(ArchGroup)</Platform>
<TargetArchitecture>$(ArchGroup)</TargetArchitecture>

<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>

Expand Down
2 changes: 1 addition & 1 deletion src/mono/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AM_CFLAGS = $(WERROR_CFLAGS)

SUBDIRS = @MONO_SUBDIRS@
noinst_SUBDIRS = @MONO_NOINST_SUBDIRS@
DIST_SUBDIRS = $(SUBDIRS) m4 netcore netcore/corerun
DIST_SUBDIRS = $(SUBDIRS) m4 netcore

if !ENABLE_NETCORE

Expand Down
91 changes: 87 additions & 4 deletions src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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>

<_CoreClrFileName Condition="'$(TargetsWindows)' == 'true'">coreclr.dll</_CoreClrFileName>
<_CoreClrFileName Condition="'$(TargetsOSX)' == 'true'">libcoreclr.dylib</_CoreClrFileName>
<_CoreClrFileName Condition="'$(_CoreClrFileName)' == ''">libcoreclr.so</_CoreClrFileName>
</PropertyGroup>

<!-- Copy Mono runtime files to artifacts directory -->
Expand All @@ -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 -->
Copy link
Contributor

@marek-safar marek-safar Feb 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure it's worth it. I'd prefer to have better documentation for this instead

Copy link
Member Author

@EgorBo EgorBo Feb 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@marek-safar um.. what exactly is not worth it? -- having the RunSample target?

Copy link
Contributor

@marek-safar marek-safar Feb 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I'd much rather see documentation with working steps for dotnet new .... to run on MonoVM

Copy link
Member

@steveisok steveisok Feb 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Copy link
Contributor

@marek-safar marek-safar Feb 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we figure it out already if we can run the sample which is form of dotnet new console

Copy link
Member

@steveisok steveisok Feb 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see what you mean. Yeah, I agree.

Copy link
Member Author

@EgorBo EgorBo Feb 3, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems most of us use HelloWorld for experiments/fixes/improvements. Do you suggest to remove it and let everybody do:

dotnet new console
dotnet publish -c Release -r osx-x64
copy libcoreclr.dylib & SPC.dll by hands to the publish directory

instead of make run-sample ?

Currently run-sample doesn't require patching local .dotnet (which imo should be avoided if possible). Also there is a rule make run-sample-coreclr which does use local .dotnet (useful to compare results between both runtimes)

Copy link
Contributor

@marek-safar marek-safar Feb 3, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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)

Copy link
Member Author

@EgorBo EgorBo Feb 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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=&quot;$(CoreClrTestCoreRoot)&quot;"/>
</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="&quot;%(CoreClrTests.Identity)&quot; -coreroot &quot;$(CoreClrTestCoreRoot)&quot;" ContinueOnError="WarnAndContinue" />
<Exec Condition="'$(OS)' != 'Windows_NT'" Command="bash &quot;%(CoreClrTests.Identity)&quot; -coreroot=&quot;$(CoreClrTestCoreRoot)&quot;" 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" />
<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>
38 changes: 38 additions & 0 deletions src/mono/netcore/Makefile
View file
Open in desktop
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)
2 changes: 0 additions & 2 deletions src/mono/netcore/corerun/.gitignore
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions src/mono/netcore/corerun/Makefile.am
View file
Open in desktop

This file was deleted.

125 changes: 0 additions & 125 deletions src/mono/netcore/corerun/coreclrhost.h
View file
Open in desktop

This file was deleted.

Loading