[mono][wasm] Move some runtime code to a separate runtime.h/runtime.c… #95834

vargaz · 2023-12-10T12:44:49Z

… so it can be shared with wasi.

vargaz · 2023-12-10T12:44:59Z

/azp run runtime-wasm

azure-pipelines · 2023-12-10T12:45:14Z

Azure Pipelines successfully started running 1 pipeline(s).

vargaz · 2023-12-10T13:17:33Z

/azp run runtime-wasm

azure-pipelines · 2023-12-10T13:17:43Z

Azure Pipelines successfully started running 1 pipeline(s).

vargaz · 2023-12-10T15:41:20Z

/azp run runtime-wasm

azure-pipelines · 2023-12-10T15:41:30Z

Azure Pipelines successfully started running 1 pipeline(s).

vargaz · 2023-12-10T19:07:53Z

The WasmBuildTests failures are relevant.

vargaz · 2023-12-11T04:06:15Z

/azp run runtime-wasm

azure-pipelines · 2023-12-11T04:06:25Z

Azure Pipelines successfully started running 1 pipeline(s).

pavelsavara

I like the C part. The build changes would be good to coordinate with #95775

src/mono/wasm/runtime/driver.c

pavelsavara · 2023-12-11T08:06:51Z

src/mono/wasm/runtime/runtime.c

I think we could kill this together with mono_wasm_enable_on_demand_gc. It's just internal and always on, AFAIK. Doesn't have to be on this PR.

Its part of the api right now.

pavelsavara · 2023-12-11T08:19:32Z

In src\mono\wasm\Wasm.Build.Tests\NativeRebuildTests\ReferenceNewAssemblyRebuildTest.cs line 55 there are expectations on which file was touched during native rebuild.

Log

My guess is that you need to add the new file to

runtime/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

Lines 284 to 294 in 6de7549

    
           Path.Combine(paths.BinDir, "publish", $"{buildArgs.ProjectName}.dll"), 
        
           Path.Combine(paths.ObjWasmDir, "driver.o"), 
        
           Path.Combine(paths.ObjWasmDir, "corebindings.o"), 
        
           Path.Combine(paths.ObjWasmDir, "pinvoke.o"), 
        
           Path.Combine(paths.ObjWasmDir, "icall-table.h"), 
        
           Path.Combine(paths.ObjWasmDir, "pinvoke-table.h"), 
        
           Path.Combine(paths.ObjWasmDir, "driver-gen.c"), 
        
           Path.Combine(paths.BundleDir, "_framework", "dotnet.native.wasm"), 
        
           Path.Combine(paths.BundleDir, "_framework", "dotnet.native.js"),

cc @radical

ghost · 2023-12-11T08:20:19Z

Tagging subscribers to 'arch-wasm': @lewing
See info in area-owners.md if you want to be subscribed.

Issue Details

… so it can be shared with wasi.

Author:	vargaz
Assignees:	vargaz
Labels:	`arch-wasm`, `area-Build-mono`
Milestone:	9.0.0

vargaz · 2023-12-11T12:12:48Z

In src\mono\wasm\Wasm.Build.Tests\NativeRebuildTests\ReferenceNewAssemblyRebuildTest.cs line 55 there are expectations on which file was touched during native rebuild.

Log

My guess is that you need to add the new file to

runtime/src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

Lines 284 to 294 in 6de7549

Path.Combine(paths.BinDir, "publish", $"{buildArgs.ProjectName}.dll"),

Path.Combine(paths.ObjWasmDir, "driver.o"),

Path.Combine(paths.ObjWasmDir, "corebindings.o"),

Path.Combine(paths.ObjWasmDir, "pinvoke.o"),

Path.Combine(paths.ObjWasmDir, "icall-table.h"),

Path.Combine(paths.ObjWasmDir, "pinvoke-table.h"),

Path.Combine(paths.ObjWasmDir, "driver-gen.c"),

Path.Combine(paths.BundleDir, "_framework", "dotnet.native.wasm"),

Path.Combine(paths.BundleDir, "_framework", "dotnet.native.js"),

cc @radical

Its added, the error complains that driver.o was rebuilt/not rebuilt.

radical · 2023-12-11T21:53:13Z

@vargaz my PR has merged

src/mono/wasm/build/WasmApp.targets

src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs

… so it can be shared with wasi.

vargaz requested review from kg, lewing, pavelsavara and radical as code owners December 10, 2023 12:44

ghost added the area-Build-mono label Dec 10, 2023

ghost assigned vargaz Dec 10, 2023

vargaz force-pushed the wasm-common branch from 4f1e973 to 8d766eb Compare December 10, 2023 13:17

vargaz requested a review from marek-safar as a code owner December 10, 2023 13:17

This was referenced Dec 10, 2023

[wasm][debugger] Debugger tests disabled #89409

Open

The active test run was aborted. Reason: Test host process crashed dotnet/dnceng#451

Closed

vargaz force-pushed the wasm-common branch from 82d6630 to c37e6b6 Compare December 11, 2023 04:08

pavelsavara approved these changes Dec 11, 2023

View reviewed changes

pavelsavara added this to the 9.0.0 milestone Dec 11, 2023

pavelsavara added the arch-wasm WebAssembly architecture label Dec 11, 2023

vargaz force-pushed the wasm-common branch from c37e6b6 to c1052c7 Compare December 11, 2023 12:11

vargaz mentioned this pull request Dec 11, 2023

[wasm/wasi] Consolidate build targets #95775

Merged

vargaz force-pushed the wasm-common branch from cfea7ea to 7869145 Compare December 11, 2023 15:15

vargaz force-pushed the wasm-common branch 2 times, most recently from 322edae to 4a0cc88 Compare December 12, 2023 02:35

radical reviewed Dec 12, 2023

View reviewed changes

src/mono/wasm/build/WasmApp.targets Outdated Show resolved Hide resolved

radical reviewed Dec 12, 2023

View reviewed changes

src/mono/wasm/Wasm.Build.Tests/ProjectProviderBase.cs Outdated Show resolved Hide resolved

vargaz force-pushed the wasm-common branch from 4a0cc88 to e12e496 Compare December 12, 2023 03:03

vargaz added 7 commits December 12, 2023 06:43

[mono][wasm] Move some runtime code to a separate runtime.h/runtime.c…

930a4c6

… so it can be shared with wasi.

Use the shared files in wasi.

a931fb0

Fix tests.

8759fc3

Merge parts of the code in mono_wasm_load_runtime ().

4956025

Move more code to runtime.c

1abf889

Remove duplicate pinvoke.h/pinvoke.c from wasi.

f463e9f

Fix driver.c/runtime.c dependencies.

b6476c6

vargaz force-pushed the wasm-common branch from e12e496 to b6476c6 Compare December 12, 2023 11:45

Fix tests.

27d479d

vargaz merged commit d636522 into dotnet:main Dec 12, 2023

vargaz deleted the wasm-common branch December 12, 2023 17:57

github-actions bot locked and limited conversation to collaborators Jan 12, 2024

[mono][wasm] Move some runtime code to a separate runtime.h/runtime.c… #95834

[mono][wasm] Move some runtime code to a separate runtime.h/runtime.c… #95834

Uh oh!

Conversation

vargaz commented Dec 10, 2023

Uh oh!

vargaz commented Dec 10, 2023

Uh oh!

azure-pipelines bot commented Dec 10, 2023

Uh oh!

vargaz commented Dec 10, 2023

Uh oh!

azure-pipelines bot commented Dec 10, 2023

Uh oh!

vargaz commented Dec 10, 2023

Uh oh!

azure-pipelines bot commented Dec 10, 2023

Uh oh!

vargaz commented Dec 10, 2023

Uh oh!

vargaz commented Dec 11, 2023

Uh oh!

azure-pipelines bot commented Dec 11, 2023

Uh oh!

pavelsavara left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

pavelsavara Dec 11, 2023

Choose a reason for hiding this comment

Uh oh!

vargaz Dec 11, 2023

Choose a reason for hiding this comment

Uh oh!

pavelsavara commented Dec 11, 2023

Uh oh!

ghost commented Dec 11, 2023

Uh oh!

vargaz commented Dec 11, 2023

Uh oh!

radical commented Dec 11, 2023

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants