[Wasi] switch to preview 2 - #104683

Merged
pavelsavara merged 15 commits into
dotnet:mainfrom
pavelsavara:wasip2
Jul 12, 2024
Merged

[Wasi] switch to preview 2#104683
pavelsavara merged 15 commits into
dotnet:mainfrom
pavelsavara:wasip2

Conversation

@pavelsavara

@pavelsavarapavelsavara commented Jul 10, 2024•
edited
Loading

Copy link
Copy Markdown
Member

After this PR dotnet will produce WASM component (preview 2) instead of WASM module

  • it has different binary header
  • component consumes WASI imports
  • it's not compatible with wasm-opt and old versions of wasm engines

Details

  • switch to WASIp2 sysroot
  • temporary wasi-sdk-p2.cmake file
  • new environment variable DOTNET_WASI_PRINT_EXIT_CODE
    • will print WASM EXIT 42 into stderr when it's not zero
    • because WASI components don't return numeric exit code
    • and because our unit tests usually need to know more than 0/1
  • new dotnet run option --forward-exit-code which sets it
    • the dotnet host will consume the line from stderr and return exit code to caller shell
  • minor wasi cleanup
  • fail fast if there is wasm-opt on PATH

WASI SDK 22 + patches

  • force WASI_SDK_PATH to src\mono\wasi\wasi-sdk if the env WASI_SDK_PATH points to unpatched location
  • new VERSION22PATCHED file to recognize patched installation
  • new _BuildNativeEnvironmentVariables for building native libs to propagate correct WASI_SDK_PATH to shell
    Most of it could go away after update to WASI SDK 23. see [wasi] upgrade to WASI SDK with LLVM 19 #104773

Contributes to #96419
Split from #103752

@pavelsavarapavelsavara added arch-wasm WebAssembly architecture area-Build-mono os-wasi Related to WASI variant of arch-wasm labels Jul 10, 2024
@pavelsavarapavelsavara added this to the 9.0.0 milestone Jul 10, 2024
@pavelsavarapavelsavara self-assigned this Jul 10, 2024
@dotnet-policy-service

dotnet-policy-serviceBot commented Jul 10, 2024

Copy link
Copy Markdown
Contributor

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

@pavelsavarapavelsavara mentioned this pull request Jul 10, 2024
Merged
pavelsavara
pavelsavara commented Jul 10, 2024
View reviewed changes
Comment threadsrc/mono/wasi/runtime/main.c
This was referenced Jul 11, 2024
Open
Closed
Closed
Closed
Closed
@pavelsavarapavelsavara mentioned this pull request Jul 11, 2024
Closed
@pavelsavara
Merge branch 'main' into wasip2
5db3e44
# Conflicts:
#	eng/native/gen-buildsys.cmd
#	eng/native/gen-buildsys.sh
#	src/mono/mono.proj
#	src/mono/wasi/build/WasiApp.targets
#	src/mono/wasi/wasi.proj
#	src/native/libs/build-native.sh
@pavelsavara
pavelsavara marked this pull request as ready for review July 11, 2024 16:47
@pavelsavara

pavelsavara commented Jul 11, 2024

Copy link
Copy Markdown
MemberAuthor

cc @dicej, feedback welcome

dicej
dicej reviewed Jul 11, 2024
View reviewed changes

@dicejdicej left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.

Comment threadeng/native/gen-buildsys.cmd Outdated
Comment threadeng/native/gen-buildsys.sh Outdated
SingleAccretion
SingleAccretion reviewed Jul 11, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
Comment threadsrc/mono/wasi/build/WasiApp.InTree.targets Outdated
Comment threadsrc/mono/wasi/build/WasiApp.targets
This was referenced Jul 11, 2024
Closed
Closed
pavelsavara
pavelsavara commented Jul 12, 2024
View reviewed changes
Comment threadsrc/native/libs/build-native.proj Outdated
pavelsavara
pavelsavara commented Jul 12, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
@pavelsavara
- stamp file VERSION22PATCHED
bb9ae44
- _BuildNativeEnvironmentVariables for build-native.sh and build-native.cmd
@pavelsavara
fix touch
9c4ffba
@pavelsavara

pavelsavara commented Jul 12, 2024•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

There is #104786 and #103520 on CI

maraf
maraf approved these changes Jul 12, 2024
View reviewed changes

@marafmaraf left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Changes looks good to me 👍

@pavelsavara

pavelsavara commented Jul 12, 2024

Copy link
Copy Markdown
MemberAuthor

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.

@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.

Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

This was referenced Jul 12, 2024
Open
Closed
@pavelsavara

pavelsavara commented Jul 12, 2024

Copy link
Copy Markdown
MemberAuthor

/ba-g last still running test is not relevant for this change, other CI issues are known and matched

@pavelsavara
pavelsavara merged commit a955d59 into dotnet:mainJul 12, 2024
@pavelsavara
pavelsavara deleted the wasip2 branch July 12, 2024 13:42
@dicej

dicej commented Jul 12, 2024

Copy link
Copy Markdown
Contributor

@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.

Sounds good. I'll be out the following week, but we can sync up after that. Enjoy your time off!

@SingleAccretion

SingleAccretion commented Jul 14, 2024•
edited
Loading

Copy link
Copy Markdown
Contributor

Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

I don't think there is a lot that can be upstream (and we try to keep it that way). As you've seen in the merge, the vast majority of actual NAOT-LLVM code is concentrated in the Jit/ILC/NAOT runtime.

One thing that I would love to unify is the EMSDK layout between dotnet/emsdk and upstream EMSDK. But that's orthogonal to this WASI effort (we are, fortunately, aligned on the build system with WASI).

@JanProvaznikJanProvaznik mentioned this pull request Jul 29, 2024
Merged
@github-actionsgithub-actionsBot locked and limited conversation to collaborators Aug 14, 2024
Sign up for freeto subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@marafmarafmaraf approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplingerakoeplinger is a code owner
@lambdageeklambdageekAwaiting requested review from lambdageek
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar
+2 more reviewers
@dicejdicejdicej left review comments
@SingleAccretionSingleAccretionSingleAccretion left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pavelsavarapavelsavara

Labels

arch-wasmWebAssembly architecturearea-Build-monoos-wasiRelated to WASI variant of arch-wasm

Projects

None yet

Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@pavelsavara@dicej@SingleAccretion@maraf
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Wasi] switch to preview 2 - #104683
Merged
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Jul 12, 2024
Merged
[Wasi] switch to preview 2#104683
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Conversation
@pavelsavara
@pavelsavarapavelsavara
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
After this PR dotnet will produce WASM component (preview 2) instead of WASM module
  • it has different binary header
  • component consumes WASI imports
  • it's not compatible with wasm-opt and old versions of wasm engines
Details
  • switch to WASIp2 sysroot
  • temporary wasi-sdk-p2.cmake file

  • new environment variable DOTNET_WASI_PRINT_EXIT_CODE
    • will print WASM EXIT 42 into stderr when it's not zero
    • because WASI components don't return numeric exit code
    • and because our unit tests usually need to know more than 0/1
  • new dotnet run option --forward-exit-code which sets it

    • the dotnet host will consume the line from stderr and return exit code to caller shell
  • minor wasi cleanup
  • fail fast if there is wasm-opt on PATH
WASI SDK 22 + patches
  • force WASI_SDK_PATH to src\mono\wasi\wasi-sdk if the env WASI_SDK_PATH points to unpatched location
  • new VERSION22PATCHED file to recognize patched installation
  • new _BuildNativeEnvironmentVariables for building native libs to propagate correct WASI_SDK_PATH to shell
    
Most of it could go away after update to WASI SDK 23. see [wasi] upgrade to WASI SDK with LLVM 19 #104773
Contributes to #96419

Split from #103752
@pavelsavarapavelsavara
added

arch-wasm
WebAssembly architecture
area-Build-mono

os-wasi
Related to WASI variant of arch-wasm
labels
Jul 10, 2024
@pavelsavarapavelsavara
added this to the 9.0.0 milestone
Jul 10, 2024
@pavelsavarapavelsavara
self-assigned this
Jul 10, 2024
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 10, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
@pavelsavarapavelsavara
mentioned this pull request
Jul 10, 2024
 Merged

pavelsavara
pavelsavara
commented
Jul 10, 2024
View reviewed changes
Comment threadsrc/mono/wasi/runtime/main.c

This was referenced Jul 11, 2024

Open


Closed


Closed


Closed


Closed

@pavelsavarapavelsavara
mentioned this pull request
Jul 11, 2024
 Closed

@pavelsavara
Merge branch 'main' into wasip2
5db3e44
# Conflicts:
#	eng/native/gen-buildsys.cmd
#	eng/native/gen-buildsys.sh
#	src/mono/mono.proj
#	src/mono/wasi/build/WasiApp.targets
#	src/mono/wasi/wasi.proj
#	src/native/libs/build-native.sh
@pavelsavara
pavelsavara
marked this pull request as ready for review
July 11, 2024 16:47
@pavelsavara
pavelsavara
commented
Jul 11, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dicej, feedback welcome
dicej
dicej
reviewed
Jul 11, 2024
View reviewed changes
@dicejdicej
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
Comment threadeng/native/gen-buildsys.cmd
Outdated

Comment threadeng/native/gen-buildsys.sh
Outdated

SingleAccretion
SingleAccretion
reviewed
Jul 11, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
Comment threadsrc/mono/wasi/build/WasiApp.InTree.targets
Outdated

Comment threadsrc/mono/wasi/build/WasiApp.targets

This was referenced Jul 11, 2024

Closed


Closed

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/native/libs/build-native.proj
Outdated

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
@pavelsavara
- stamp file VERSION22PATCHED
bb9ae44
- _BuildNativeEnvironmentVariables for build-native.sh and build-native.cmd
@pavelsavara
fix touch
9c4ffba
@pavelsavara
pavelsavara
commented
Jul 12, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
There is #104786 and #103520 on CI
maraf
maraf
approved these changes
Jul 12, 2024
View reviewed changes
@marafmaraf
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Changes looks good to me 👍
@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

This was referenced Jul 12, 2024

Open


Closed

@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
/ba-g last still running test is not relevant for this change, other CI issues are known and matched
@pavelsavara
pavelsavara
merged commit a955d59
into
dotnet:mainJul 12, 2024
@pavelsavara
pavelsavara
deleted the

wasip2

branch
July 12, 2024 13:42
@dicej
dicej
commented
Jul 12, 2024

Copy link


Copy Markdown

Contributor
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Sounds good. I'll be out the following week, but we can sync up after that. Enjoy your time off!
@SingleAccretion
SingleAccretion
commented
Jul 14, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?
I don't think there is a lot that can be upstream (and we try to keep it that way). As you've seen in the merge, the vast majority of actual NAOT-LLVM code is concentrated in the Jit/ILC/NAOT runtime.
One thing that I would love to unify is the EMSDK layout between dotnet/emsdk and upstream EMSDK. But that's orthogonal to this WASI effort (we are, fortunately, aligned on the build system with WASI).
@JanProvaznikJanProvaznik
mentioned this pull request
Jul 29, 2024
 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marafmarafmaraf approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplingerakoeplinger is a code owner
@lambdageeklambdageekAwaiting requested review from lambdageek
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar

+2 more reviewers

@dicejdicejdicej left review comments
@SingleAccretionSingleAccretionSingleAccretion left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pavelsavarapavelsavara

Labels

arch-wasmWebAssembly architecturearea-Build-monoos-wasiRelated to WASI variant of arch-wasm

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@pavelsavara@dicej@SingleAccretion@maraf

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Wasi] switch to preview 2 - #104683
Merged
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Jul 12, 2024
Merged
[Wasi] switch to preview 2#104683
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Conversation
@pavelsavara
@pavelsavarapavelsavara
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
After this PR dotnet will produce WASM component (preview 2) instead of WASM module
  • it has different binary header
  • component consumes WASI imports
  • it's not compatible with wasm-opt and old versions of wasm engines
Details
  • switch to WASIp2 sysroot
  • temporary wasi-sdk-p2.cmake file

  • new environment variable DOTNET_WASI_PRINT_EXIT_CODE
    • will print WASM EXIT 42 into stderr when it's not zero
    • because WASI components don't return numeric exit code
    • and because our unit tests usually need to know more than 0/1
  • new dotnet run option --forward-exit-code which sets it

    • the dotnet host will consume the line from stderr and return exit code to caller shell
  • minor wasi cleanup
  • fail fast if there is wasm-opt on PATH
WASI SDK 22 + patches
  • force WASI_SDK_PATH to src\mono\wasi\wasi-sdk if the env WASI_SDK_PATH points to unpatched location
  • new VERSION22PATCHED file to recognize patched installation
  • new _BuildNativeEnvironmentVariables for building native libs to propagate correct WASI_SDK_PATH to shell
    
Most of it could go away after update to WASI SDK 23. see [wasi] upgrade to WASI SDK with LLVM 19 #104773
Contributes to #96419

Split from #103752
@pavelsavarapavelsavara
added

arch-wasm
WebAssembly architecture
area-Build-mono

os-wasi
Related to WASI variant of arch-wasm
labels
Jul 10, 2024
@pavelsavarapavelsavara
added this to the 9.0.0 milestone
Jul 10, 2024
@pavelsavarapavelsavara
self-assigned this
Jul 10, 2024
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 10, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
@pavelsavarapavelsavara
mentioned this pull request
Jul 10, 2024
 Merged

pavelsavara
pavelsavara
commented
Jul 10, 2024
View reviewed changes
Comment threadsrc/mono/wasi/runtime/main.c

This was referenced Jul 11, 2024

Open


Closed


Closed


Closed


Closed

@pavelsavarapavelsavara
mentioned this pull request
Jul 11, 2024
 Closed

@pavelsavara
Merge branch 'main' into wasip2
5db3e44
# Conflicts:
#	eng/native/gen-buildsys.cmd
#	eng/native/gen-buildsys.sh
#	src/mono/mono.proj
#	src/mono/wasi/build/WasiApp.targets
#	src/mono/wasi/wasi.proj
#	src/native/libs/build-native.sh
@pavelsavara
pavelsavara
marked this pull request as ready for review
July 11, 2024 16:47
@pavelsavara
pavelsavara
commented
Jul 11, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dicej, feedback welcome
dicej
dicej
reviewed
Jul 11, 2024
View reviewed changes
@dicejdicej
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
Comment threadeng/native/gen-buildsys.cmd
Outdated

Comment threadeng/native/gen-buildsys.sh
Outdated

SingleAccretion
SingleAccretion
reviewed
Jul 11, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
Comment threadsrc/mono/wasi/build/WasiApp.InTree.targets
Outdated

Comment threadsrc/mono/wasi/build/WasiApp.targets

This was referenced Jul 11, 2024

Closed


Closed

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/native/libs/build-native.proj
Outdated

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
@pavelsavara
- stamp file VERSION22PATCHED
bb9ae44
- _BuildNativeEnvironmentVariables for build-native.sh and build-native.cmd
@pavelsavara
fix touch
9c4ffba
@pavelsavara
pavelsavara
commented
Jul 12, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
There is #104786 and #103520 on CI
maraf
maraf
approved these changes
Jul 12, 2024
View reviewed changes
@marafmaraf
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Changes looks good to me 👍
@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

This was referenced Jul 12, 2024

Open


Closed

@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
/ba-g last still running test is not relevant for this change, other CI issues are known and matched
@pavelsavara
pavelsavara
merged commit a955d59
into
dotnet:mainJul 12, 2024
@pavelsavara
pavelsavara
deleted the

wasip2

branch
July 12, 2024 13:42
@dicej
dicej
commented
Jul 12, 2024

Copy link


Copy Markdown

Contributor
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Sounds good. I'll be out the following week, but we can sync up after that. Enjoy your time off!
@SingleAccretion
SingleAccretion
commented
Jul 14, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?
I don't think there is a lot that can be upstream (and we try to keep it that way). As you've seen in the merge, the vast majority of actual NAOT-LLVM code is concentrated in the Jit/ILC/NAOT runtime.
One thing that I would love to unify is the EMSDK layout between dotnet/emsdk and upstream EMSDK. But that's orthogonal to this WASI effort (we are, fortunately, aligned on the build system with WASI).
@JanProvaznikJanProvaznik
mentioned this pull request
Jul 29, 2024
 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marafmarafmaraf approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplingerakoeplinger is a code owner
@lambdageeklambdageekAwaiting requested review from lambdageek
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar

+2 more reviewers

@dicejdicejdicej left review comments
@SingleAccretionSingleAccretionSingleAccretion left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pavelsavarapavelsavara

Labels

arch-wasmWebAssembly architecturearea-Build-monoos-wasiRelated to WASI variant of arch-wasm

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@pavelsavara@dicej@SingleAccretion@maraf

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Wasi] switch to preview 2 - #104683
Merged
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Jul 12, 2024
Merged
[Wasi] switch to preview 2#104683
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Conversation
@pavelsavara
@pavelsavarapavelsavara
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
After this PR dotnet will produce WASM component (preview 2) instead of WASM module
  • it has different binary header
  • component consumes WASI imports
  • it's not compatible with wasm-opt and old versions of wasm engines
Details
  • switch to WASIp2 sysroot
  • temporary wasi-sdk-p2.cmake file

  • new environment variable DOTNET_WASI_PRINT_EXIT_CODE
    • will print WASM EXIT 42 into stderr when it's not zero
    • because WASI components don't return numeric exit code
    • and because our unit tests usually need to know more than 0/1
  • new dotnet run option --forward-exit-code which sets it

    • the dotnet host will consume the line from stderr and return exit code to caller shell
  • minor wasi cleanup
  • fail fast if there is wasm-opt on PATH
WASI SDK 22 + patches
  • force WASI_SDK_PATH to src\mono\wasi\wasi-sdk if the env WASI_SDK_PATH points to unpatched location
  • new VERSION22PATCHED file to recognize patched installation
  • new _BuildNativeEnvironmentVariables for building native libs to propagate correct WASI_SDK_PATH to shell
    
Most of it could go away after update to WASI SDK 23. see [wasi] upgrade to WASI SDK with LLVM 19 #104773
Contributes to #96419

Split from #103752
@pavelsavarapavelsavara
added

arch-wasm
WebAssembly architecture
area-Build-mono

os-wasi
Related to WASI variant of arch-wasm
labels
Jul 10, 2024
@pavelsavarapavelsavara
added this to the 9.0.0 milestone
Jul 10, 2024
@pavelsavarapavelsavara
self-assigned this
Jul 10, 2024
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 10, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
@pavelsavarapavelsavara
mentioned this pull request
Jul 10, 2024
 Merged

pavelsavara
pavelsavara
commented
Jul 10, 2024
View reviewed changes
Comment threadsrc/mono/wasi/runtime/main.c

This was referenced Jul 11, 2024

Open


Closed


Closed


Closed


Closed

@pavelsavarapavelsavara
mentioned this pull request
Jul 11, 2024
 Closed

@pavelsavara
Merge branch 'main' into wasip2
5db3e44
# Conflicts:
#	eng/native/gen-buildsys.cmd
#	eng/native/gen-buildsys.sh
#	src/mono/mono.proj
#	src/mono/wasi/build/WasiApp.targets
#	src/mono/wasi/wasi.proj
#	src/native/libs/build-native.sh
@pavelsavara
pavelsavara
marked this pull request as ready for review
July 11, 2024 16:47
@pavelsavara
pavelsavara
commented
Jul 11, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dicej, feedback welcome
dicej
dicej
reviewed
Jul 11, 2024
View reviewed changes
@dicejdicej
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
Comment threadeng/native/gen-buildsys.cmd
Outdated

Comment threadeng/native/gen-buildsys.sh
Outdated

SingleAccretion
SingleAccretion
reviewed
Jul 11, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
Comment threadsrc/mono/wasi/build/WasiApp.InTree.targets
Outdated

Comment threadsrc/mono/wasi/build/WasiApp.targets

This was referenced Jul 11, 2024

Closed


Closed

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/native/libs/build-native.proj
Outdated

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
@pavelsavara
- stamp file VERSION22PATCHED
bb9ae44
- _BuildNativeEnvironmentVariables for build-native.sh and build-native.cmd
@pavelsavara
fix touch
9c4ffba
@pavelsavara
pavelsavara
commented
Jul 12, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
There is #104786 and #103520 on CI
maraf
maraf
approved these changes
Jul 12, 2024
View reviewed changes
@marafmaraf
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Changes looks good to me 👍
@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

This was referenced Jul 12, 2024

Open


Closed

@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
/ba-g last still running test is not relevant for this change, other CI issues are known and matched
@pavelsavara
pavelsavara
merged commit a955d59
into
dotnet:mainJul 12, 2024
@pavelsavara
pavelsavara
deleted the

wasip2

branch
July 12, 2024 13:42
@dicej
dicej
commented
Jul 12, 2024

Copy link


Copy Markdown

Contributor
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Sounds good. I'll be out the following week, but we can sync up after that. Enjoy your time off!
@SingleAccretion
SingleAccretion
commented
Jul 14, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?
I don't think there is a lot that can be upstream (and we try to keep it that way). As you've seen in the merge, the vast majority of actual NAOT-LLVM code is concentrated in the Jit/ILC/NAOT runtime.
One thing that I would love to unify is the EMSDK layout between dotnet/emsdk and upstream EMSDK. But that's orthogonal to this WASI effort (we are, fortunately, aligned on the build system with WASI).
@JanProvaznikJanProvaznik
mentioned this pull request
Jul 29, 2024
 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marafmarafmaraf approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplingerakoeplinger is a code owner
@lambdageeklambdageekAwaiting requested review from lambdageek
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar

+2 more reviewers

@dicejdicejdicej left review comments
@SingleAccretionSingleAccretionSingleAccretion left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pavelsavarapavelsavara

Labels

arch-wasmWebAssembly architecturearea-Build-monoos-wasiRelated to WASI variant of arch-wasm

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@pavelsavara@dicej@SingleAccretion@maraf

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Wasi] switch to preview 2 - #104683
Merged
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Jul 12, 2024
Merged
[Wasi] switch to preview 2#104683
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Conversation
@pavelsavara
@pavelsavarapavelsavara
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
After this PR dotnet will produce WASM component (preview 2) instead of WASM module
  • it has different binary header
  • component consumes WASI imports
  • it's not compatible with wasm-opt and old versions of wasm engines
Details
  • switch to WASIp2 sysroot
  • temporary wasi-sdk-p2.cmake file

  • new environment variable DOTNET_WASI_PRINT_EXIT_CODE
    • will print WASM EXIT 42 into stderr when it's not zero
    • because WASI components don't return numeric exit code
    • and because our unit tests usually need to know more than 0/1
  • new dotnet run option --forward-exit-code which sets it

    • the dotnet host will consume the line from stderr and return exit code to caller shell
  • minor wasi cleanup
  • fail fast if there is wasm-opt on PATH
WASI SDK 22 + patches
  • force WASI_SDK_PATH to src\mono\wasi\wasi-sdk if the env WASI_SDK_PATH points to unpatched location
  • new VERSION22PATCHED file to recognize patched installation
  • new _BuildNativeEnvironmentVariables for building native libs to propagate correct WASI_SDK_PATH to shell
    
Most of it could go away after update to WASI SDK 23. see [wasi] upgrade to WASI SDK with LLVM 19 #104773
Contributes to #96419

Split from #103752
@pavelsavarapavelsavara
added

arch-wasm
WebAssembly architecture
area-Build-mono

os-wasi
Related to WASI variant of arch-wasm
labels
Jul 10, 2024
@pavelsavarapavelsavara
added this to the 9.0.0 milestone
Jul 10, 2024
@pavelsavarapavelsavara
self-assigned this
Jul 10, 2024
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 10, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
@pavelsavarapavelsavara
mentioned this pull request
Jul 10, 2024
 Merged

pavelsavara
pavelsavara
commented
Jul 10, 2024
View reviewed changes
Comment threadsrc/mono/wasi/runtime/main.c

This was referenced Jul 11, 2024

Open


Closed


Closed


Closed


Closed

@pavelsavarapavelsavara
mentioned this pull request
Jul 11, 2024
 Closed

@pavelsavara
Merge branch 'main' into wasip2
5db3e44
# Conflicts:
#	eng/native/gen-buildsys.cmd
#	eng/native/gen-buildsys.sh
#	src/mono/mono.proj
#	src/mono/wasi/build/WasiApp.targets
#	src/mono/wasi/wasi.proj
#	src/native/libs/build-native.sh
@pavelsavara
pavelsavara
marked this pull request as ready for review
July 11, 2024 16:47
@pavelsavara
pavelsavara
commented
Jul 11, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dicej, feedback welcome
dicej
dicej
reviewed
Jul 11, 2024
View reviewed changes
@dicejdicej
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
Comment threadeng/native/gen-buildsys.cmd
Outdated

Comment threadeng/native/gen-buildsys.sh
Outdated

SingleAccretion
SingleAccretion
reviewed
Jul 11, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
Comment threadsrc/mono/wasi/build/WasiApp.InTree.targets
Outdated

Comment threadsrc/mono/wasi/build/WasiApp.targets

This was referenced Jul 11, 2024

Closed


Closed

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/native/libs/build-native.proj
Outdated

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
@pavelsavara
- stamp file VERSION22PATCHED
bb9ae44
- _BuildNativeEnvironmentVariables for build-native.sh and build-native.cmd
@pavelsavara
fix touch
9c4ffba
@pavelsavara
pavelsavara
commented
Jul 12, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
There is #104786 and #103520 on CI
maraf
maraf
approved these changes
Jul 12, 2024
View reviewed changes
@marafmaraf
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Changes looks good to me 👍
@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

This was referenced Jul 12, 2024

Open


Closed

@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
/ba-g last still running test is not relevant for this change, other CI issues are known and matched
@pavelsavara
pavelsavara
merged commit a955d59
into
dotnet:mainJul 12, 2024
@pavelsavara
pavelsavara
deleted the

wasip2

branch
July 12, 2024 13:42
@dicej
dicej
commented
Jul 12, 2024

Copy link


Copy Markdown

Contributor
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Sounds good. I'll be out the following week, but we can sync up after that. Enjoy your time off!
@SingleAccretion
SingleAccretion
commented
Jul 14, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?
I don't think there is a lot that can be upstream (and we try to keep it that way). As you've seen in the merge, the vast majority of actual NAOT-LLVM code is concentrated in the Jit/ILC/NAOT runtime.
One thing that I would love to unify is the EMSDK layout between dotnet/emsdk and upstream EMSDK. But that's orthogonal to this WASI effort (we are, fortunately, aligned on the build system with WASI).
@JanProvaznikJanProvaznik
mentioned this pull request
Jul 29, 2024
 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marafmarafmaraf approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplingerakoeplinger is a code owner
@lambdageeklambdageekAwaiting requested review from lambdageek
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar

+2 more reviewers

@dicejdicejdicej left review comments
@SingleAccretionSingleAccretionSingleAccretion left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pavelsavarapavelsavara

Labels

arch-wasmWebAssembly architecturearea-Build-monoos-wasiRelated to WASI variant of arch-wasm

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@pavelsavara@dicej@SingleAccretion@maraf

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Wasi] switch to preview 2 - #104683
Merged
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Jul 12, 2024
Merged
[Wasi] switch to preview 2#104683
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Conversation
@pavelsavara
@pavelsavarapavelsavara
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
After this PR dotnet will produce WASM component (preview 2) instead of WASM module
  • it has different binary header
  • component consumes WASI imports
  • it's not compatible with wasm-opt and old versions of wasm engines
Details
  • switch to WASIp2 sysroot
  • temporary wasi-sdk-p2.cmake file

  • new environment variable DOTNET_WASI_PRINT_EXIT_CODE
    • will print WASM EXIT 42 into stderr when it's not zero
    • because WASI components don't return numeric exit code
    • and because our unit tests usually need to know more than 0/1
  • new dotnet run option --forward-exit-code which sets it

    • the dotnet host will consume the line from stderr and return exit code to caller shell
  • minor wasi cleanup
  • fail fast if there is wasm-opt on PATH
WASI SDK 22 + patches
  • force WASI_SDK_PATH to src\mono\wasi\wasi-sdk if the env WASI_SDK_PATH points to unpatched location
  • new VERSION22PATCHED file to recognize patched installation
  • new _BuildNativeEnvironmentVariables for building native libs to propagate correct WASI_SDK_PATH to shell
    
Most of it could go away after update to WASI SDK 23. see [wasi] upgrade to WASI SDK with LLVM 19 #104773
Contributes to #96419

Split from #103752
@pavelsavarapavelsavara
added

arch-wasm
WebAssembly architecture
area-Build-mono

os-wasi
Related to WASI variant of arch-wasm
labels
Jul 10, 2024
@pavelsavarapavelsavara
added this to the 9.0.0 milestone
Jul 10, 2024
@pavelsavarapavelsavara
self-assigned this
Jul 10, 2024
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 10, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
@pavelsavarapavelsavara
mentioned this pull request
Jul 10, 2024
 Merged

pavelsavara
pavelsavara
commented
Jul 10, 2024
View reviewed changes
Comment threadsrc/mono/wasi/runtime/main.c

This was referenced Jul 11, 2024

Open


Closed


Closed


Closed


Closed

@pavelsavarapavelsavara
mentioned this pull request
Jul 11, 2024
 Closed

@pavelsavara
Merge branch 'main' into wasip2
5db3e44
# Conflicts:
#	eng/native/gen-buildsys.cmd
#	eng/native/gen-buildsys.sh
#	src/mono/mono.proj
#	src/mono/wasi/build/WasiApp.targets
#	src/mono/wasi/wasi.proj
#	src/native/libs/build-native.sh
@pavelsavara
pavelsavara
marked this pull request as ready for review
July 11, 2024 16:47
@pavelsavara
pavelsavara
commented
Jul 11, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dicej, feedback welcome
dicej
dicej
reviewed
Jul 11, 2024
View reviewed changes
@dicejdicej
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
Comment threadeng/native/gen-buildsys.cmd
Outdated

Comment threadeng/native/gen-buildsys.sh
Outdated

SingleAccretion
SingleAccretion
reviewed
Jul 11, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
Comment threadsrc/mono/wasi/build/WasiApp.InTree.targets
Outdated

Comment threadsrc/mono/wasi/build/WasiApp.targets

This was referenced Jul 11, 2024

Closed


Closed

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/native/libs/build-native.proj
Outdated

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
@pavelsavara
- stamp file VERSION22PATCHED
bb9ae44
- _BuildNativeEnvironmentVariables for build-native.sh and build-native.cmd
@pavelsavara
fix touch
9c4ffba
@pavelsavara
pavelsavara
commented
Jul 12, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
There is #104786 and #103520 on CI
maraf
maraf
approved these changes
Jul 12, 2024
View reviewed changes
@marafmaraf
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Changes looks good to me 👍
@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

This was referenced Jul 12, 2024

Open


Closed

@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
/ba-g last still running test is not relevant for this change, other CI issues are known and matched
@pavelsavara
pavelsavara
merged commit a955d59
into
dotnet:mainJul 12, 2024
@pavelsavara
pavelsavara
deleted the

wasip2

branch
July 12, 2024 13:42
@dicej
dicej
commented
Jul 12, 2024

Copy link


Copy Markdown

Contributor
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Sounds good. I'll be out the following week, but we can sync up after that. Enjoy your time off!
@SingleAccretion
SingleAccretion
commented
Jul 14, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?
I don't think there is a lot that can be upstream (and we try to keep it that way). As you've seen in the merge, the vast majority of actual NAOT-LLVM code is concentrated in the Jit/ILC/NAOT runtime.
One thing that I would love to unify is the EMSDK layout between dotnet/emsdk and upstream EMSDK. But that's orthogonal to this WASI effort (we are, fortunately, aligned on the build system with WASI).
@JanProvaznikJanProvaznik
mentioned this pull request
Jul 29, 2024
 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marafmarafmaraf approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplingerakoeplinger is a code owner
@lambdageeklambdageekAwaiting requested review from lambdageek
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar

+2 more reviewers

@dicejdicejdicej left review comments
@SingleAccretionSingleAccretionSingleAccretion left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pavelsavarapavelsavara

Labels

arch-wasmWebAssembly architecturearea-Build-monoos-wasiRelated to WASI variant of arch-wasm

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@pavelsavara@dicej@SingleAccretion@maraf

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Wasi] switch to preview 2 - #104683
Merged
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Jul 12, 2024
Merged
[Wasi] switch to preview 2#104683
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Conversation
@pavelsavara
@pavelsavarapavelsavara
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
After this PR dotnet will produce WASM component (preview 2) instead of WASM module
  • it has different binary header
  • component consumes WASI imports
  • it's not compatible with wasm-opt and old versions of wasm engines
Details
  • switch to WASIp2 sysroot
  • temporary wasi-sdk-p2.cmake file

  • new environment variable DOTNET_WASI_PRINT_EXIT_CODE
    • will print WASM EXIT 42 into stderr when it's not zero
    • because WASI components don't return numeric exit code
    • and because our unit tests usually need to know more than 0/1
  • new dotnet run option --forward-exit-code which sets it

    • the dotnet host will consume the line from stderr and return exit code to caller shell
  • minor wasi cleanup
  • fail fast if there is wasm-opt on PATH
WASI SDK 22 + patches
  • force WASI_SDK_PATH to src\mono\wasi\wasi-sdk if the env WASI_SDK_PATH points to unpatched location
  • new VERSION22PATCHED file to recognize patched installation
  • new _BuildNativeEnvironmentVariables for building native libs to propagate correct WASI_SDK_PATH to shell
    
Most of it could go away after update to WASI SDK 23. see [wasi] upgrade to WASI SDK with LLVM 19 #104773
Contributes to #96419

Split from #103752
@pavelsavarapavelsavara
added

arch-wasm
WebAssembly architecture
area-Build-mono

os-wasi
Related to WASI variant of arch-wasm
labels
Jul 10, 2024
@pavelsavarapavelsavara
added this to the 9.0.0 milestone
Jul 10, 2024
@pavelsavarapavelsavara
self-assigned this
Jul 10, 2024
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 10, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
@pavelsavarapavelsavara
mentioned this pull request
Jul 10, 2024
 Merged

pavelsavara
pavelsavara
commented
Jul 10, 2024
View reviewed changes
Comment threadsrc/mono/wasi/runtime/main.c

This was referenced Jul 11, 2024

Open


Closed


Closed


Closed


Closed

@pavelsavarapavelsavara
mentioned this pull request
Jul 11, 2024
 Closed

@pavelsavara
Merge branch 'main' into wasip2
5db3e44
# Conflicts:
#	eng/native/gen-buildsys.cmd
#	eng/native/gen-buildsys.sh
#	src/mono/mono.proj
#	src/mono/wasi/build/WasiApp.targets
#	src/mono/wasi/wasi.proj
#	src/native/libs/build-native.sh
@pavelsavara
pavelsavara
marked this pull request as ready for review
July 11, 2024 16:47
@pavelsavara
pavelsavara
commented
Jul 11, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dicej, feedback welcome
dicej
dicej
reviewed
Jul 11, 2024
View reviewed changes
@dicejdicej
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
Comment threadeng/native/gen-buildsys.cmd
Outdated

Comment threadeng/native/gen-buildsys.sh
Outdated

SingleAccretion
SingleAccretion
reviewed
Jul 11, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
Comment threadsrc/mono/wasi/build/WasiApp.InTree.targets
Outdated

Comment threadsrc/mono/wasi/build/WasiApp.targets

This was referenced Jul 11, 2024

Closed


Closed

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/native/libs/build-native.proj
Outdated

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
@pavelsavara
- stamp file VERSION22PATCHED
bb9ae44
- _BuildNativeEnvironmentVariables for build-native.sh and build-native.cmd
@pavelsavara
fix touch
9c4ffba
@pavelsavara
pavelsavara
commented
Jul 12, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
There is #104786 and #103520 on CI
maraf
maraf
approved these changes
Jul 12, 2024
View reviewed changes
@marafmaraf
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Changes looks good to me 👍
@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

This was referenced Jul 12, 2024

Open


Closed

@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
/ba-g last still running test is not relevant for this change, other CI issues are known and matched
@pavelsavara
pavelsavara
merged commit a955d59
into
dotnet:mainJul 12, 2024
@pavelsavara
pavelsavara
deleted the

wasip2

branch
July 12, 2024 13:42
@dicej
dicej
commented
Jul 12, 2024

Copy link


Copy Markdown

Contributor
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Sounds good. I'll be out the following week, but we can sync up after that. Enjoy your time off!
@SingleAccretion
SingleAccretion
commented
Jul 14, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?
I don't think there is a lot that can be upstream (and we try to keep it that way). As you've seen in the merge, the vast majority of actual NAOT-LLVM code is concentrated in the Jit/ILC/NAOT runtime.
One thing that I would love to unify is the EMSDK layout between dotnet/emsdk and upstream EMSDK. But that's orthogonal to this WASI effort (we are, fortunately, aligned on the build system with WASI).
@JanProvaznikJanProvaznik
mentioned this pull request
Jul 29, 2024
 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marafmarafmaraf approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplingerakoeplinger is a code owner
@lambdageeklambdageekAwaiting requested review from lambdageek
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar

+2 more reviewers

@dicejdicejdicej left review comments
@SingleAccretionSingleAccretionSingleAccretion left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pavelsavarapavelsavara

Labels

arch-wasmWebAssembly architecturearea-Build-monoos-wasiRelated to WASI variant of arch-wasm

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@pavelsavara@dicej@SingleAccretion@maraf

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Wasi] switch to preview 2 - #104683
Merged
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Jul 12, 2024
Merged
[Wasi] switch to preview 2#104683
pavelsavara merged 15 commits into
dotnet:mainfrom 
pavelsavara:wasip2
Conversation
@pavelsavara
@pavelsavarapavelsavara
commented
Jul 10, 2024•

edited

Loading

Copy link


Copy Markdown

Member
After this PR dotnet will produce WASM component (preview 2) instead of WASM module
  • it has different binary header
  • component consumes WASI imports
  • it's not compatible with wasm-opt and old versions of wasm engines
Details
  • switch to WASIp2 sysroot
  • temporary wasi-sdk-p2.cmake file

  • new environment variable DOTNET_WASI_PRINT_EXIT_CODE
    • will print WASM EXIT 42 into stderr when it's not zero
    • because WASI components don't return numeric exit code
    • and because our unit tests usually need to know more than 0/1
  • new dotnet run option --forward-exit-code which sets it

    • the dotnet host will consume the line from stderr and return exit code to caller shell
  • minor wasi cleanup
  • fail fast if there is wasm-opt on PATH
WASI SDK 22 + patches
  • force WASI_SDK_PATH to src\mono\wasi\wasi-sdk if the env WASI_SDK_PATH points to unpatched location
  • new VERSION22PATCHED file to recognize patched installation
  • new _BuildNativeEnvironmentVariables for building native libs to propagate correct WASI_SDK_PATH to shell
    
Most of it could go away after update to WASI SDK 23. see [wasi] upgrade to WASI SDK with LLVM 19 #104773
Contributes to #96419

Split from #103752
@pavelsavarapavelsavara
added

arch-wasm
WebAssembly architecture
area-Build-mono

os-wasi
Related to WASI variant of arch-wasm
labels
Jul 10, 2024
@pavelsavarapavelsavara
added this to the 9.0.0 milestone
Jul 10, 2024
@pavelsavarapavelsavara
self-assigned this
Jul 10, 2024
@dotnet-policy-service
dotnet-policy-serviceBot
commented
Jul 10, 2024

Copy link


Copy Markdown

Contributor
Tagging subscribers to 'arch-wasm': @lewing

See info in area-owners.md if you want to be subscribed.
@pavelsavarapavelsavara
mentioned this pull request
Jul 10, 2024
 Merged

pavelsavara
pavelsavara
commented
Jul 10, 2024
View reviewed changes
Comment threadsrc/mono/wasi/runtime/main.c

This was referenced Jul 11, 2024

Open


Closed


Closed


Closed


Closed

@pavelsavarapavelsavara
mentioned this pull request
Jul 11, 2024
 Closed

@pavelsavara
Merge branch 'main' into wasip2
5db3e44
# Conflicts:
#	eng/native/gen-buildsys.cmd
#	eng/native/gen-buildsys.sh
#	src/mono/mono.proj
#	src/mono/wasi/build/WasiApp.targets
#	src/mono/wasi/wasi.proj
#	src/native/libs/build-native.sh
@pavelsavara
pavelsavara
marked this pull request as ready for review
July 11, 2024 16:47
@pavelsavara
pavelsavara
commented
Jul 11, 2024

Copy link


Copy Markdown

MemberAuthor
cc @dicej, feedback welcome
dicej
dicej
reviewed
Jul 11, 2024
View reviewed changes
@dicejdicej
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
Comment threadeng/native/gen-buildsys.cmd
Outdated

Comment threadeng/native/gen-buildsys.sh
Outdated

SingleAccretion
SingleAccretion
reviewed
Jul 11, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
Comment threadsrc/mono/wasi/build/WasiApp.InTree.targets
Outdated

Comment threadsrc/mono/wasi/build/WasiApp.targets

This was referenced Jul 11, 2024

Closed


Closed

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/native/libs/build-native.proj
Outdated

pavelsavara
pavelsavara
commented
Jul 12, 2024
View reviewed changes
Comment threadsrc/mono/mono.proj
@pavelsavara
- stamp file VERSION22PATCHED
bb9ae44
- _BuildNativeEnvironmentVariables for build-native.sh and build-native.cmd
@pavelsavara
fix touch
9c4ffba
@pavelsavara
pavelsavara
commented
Jul 12, 2024•

edited

Loading

Copy link


Copy Markdown

MemberAuthor
There is #104786 and #103520 on CI
maraf
maraf
approved these changes
Jul 12, 2024
View reviewed changes
@marafmaraf
left a comment


Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

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

Changes looks good to me 👍
@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
LGTM overall. Given that some of the Bash files have changed, is one of the goals of this PR to support Linux and/or MacOS? If so, I can try building and running the smoke tests locally. Otherwise, I can fix any problems with the Linux build that pop up downstream when rebasing and testing dotnet/runtimelab#2614.
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?

This was referenced Jul 12, 2024

Open


Closed

@pavelsavara
pavelsavara
commented
Jul 12, 2024

Copy link


Copy Markdown

MemberAuthor
/ba-g last still running test is not relevant for this change, other CI issues are known and matched
@pavelsavara
pavelsavara
merged commit a955d59
into
dotnet:mainJul 12, 2024
@pavelsavara
pavelsavara
deleted the

wasip2

branch
July 12, 2024 13:42
@dicej
dicej
commented
Jul 12, 2024

Copy link


Copy Markdown

Contributor
@dicej since I'm out next week, I will try to merge as much as possible today. I will be happy to help to upstream any of your fixes later.
Sounds good. I'll be out the following week, but we can sync up after that. Enjoy your time off!
@SingleAccretion
SingleAccretion
commented
Jul 14, 2024•

edited

Loading

Copy link


Copy Markdown

Contributor
Overall I think that we should consider broader set of changes from the fork. In order to make future code flow downstream easier. @SingleAccretion are there such candidates ?
I don't think there is a lot that can be upstream (and we try to keep it that way). As you've seen in the merge, the vast majority of actual NAOT-LLVM code is concentrated in the Jit/ILC/NAOT runtime.
One thing that I would love to unify is the EMSDK layout between dotnet/emsdk and upstream EMSDK. But that's orthogonal to this WASI effort (we are, fortunately, aligned on the build system with WASI).
@JanProvaznikJanProvaznik
mentioned this pull request
Jul 29, 2024
 Merged

@github-actionsgithub-actionsBot
locked and limited conversation to collaborators
Aug 14, 2024
Sign up for freeto subscribe to this conversation on GitHub.
Already have an account?
Sign in.


Reviewers

@marafmarafmaraf approved these changes
@lewinglewingAwaiting requested review from lewinglewing is a code owner
@akoeplingerakoeplingerAwaiting requested review from akoeplingerakoeplinger is a code owner
@lambdageeklambdageekAwaiting requested review from lambdageek
@steveisoksteveisokAwaiting requested review from steveisoksteveisok is a code owner
@marek-safarmarek-safarAwaiting requested review from marek-safar

+2 more reviewers

@dicejdicejdicej left review comments
@SingleAccretionSingleAccretionSingleAccretion left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

@pavelsavarapavelsavara

Labels

arch-wasmWebAssembly architecturearea-Build-monoos-wasiRelated to WASI variant of arch-wasm

Projects


None yet


Milestone

9.0.0

Development

Successfully merging this pull request may close these issues.

4 participants

@pavelsavara@dicej@SingleAccretion@maraf