Skip to content

Enable Wasm OMG JIT on Windows#32204

Merged
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
iangrunert:ig/enable-wasm-omg-win
Aug 15, 2024
Merged

Enable Wasm OMG JIT on Windows#32204
webkit-commit-queue merged 1 commit into
WebKit:mainfrom
iangrunert:ig/enable-wasm-omg-win

Conversation

@iangrunert

@iangrunert iangrunert commented Aug 14, 2024

Copy link
Copy Markdown
Contributor

172739a

Enable Wasm OMG JIT on Windows
https://bugs.webkit.org/show_bug.cgi?id=278116

Reviewed by Yusuke Suzuki.

Six test failures remaining on JSTests/wasm.yaml:

wasm.yaml/wasm/gc/array_new_fixed_long.js.wasm-eager
wasm.yaml/wasm/gc/array_new_fixed_long.js.wasm-no-cjit
wasm.yaml/wasm/gc/array_new_fixed_long.js.wasm-aggressive-inline
wasm.yaml/wasm/lowExecutableMemory/executable-memory-oom.js.default-wasm
wasm.yaml/wasm/lowExecutableMemory/exports-oom.js.default-wasm
wasm.yaml/wasm/lowExecutableMemory/imports-oom.js.default-wasm

* Source/JavaScriptCore/assembler/MacroAssembler.h:
* Source/JavaScriptCore/assembler/ProbeContext.cpp:
(JSC::Probe::executeJSCJITProbe):
* Source/JavaScriptCore/runtime/Options.cpp:
(JSC::Options::notifyOptionsChanged):
* Source/JavaScriptCore/runtime/UGPRPair.h:
* Source/JavaScriptCore/wasm/WasmIRGeneratorHelpers.h:
(JSC::Wasm::buildEntryBufferForCatch):
* Source/JavaScriptCore/wasm/WasmOperations.h:
* Tools/Scripts/run-jsc-stress-tests:

Canonical link: https://commits.webkit.org/282316@main

70591a7

Misc iOS, visionOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios ✅ 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
✅ 🧪 bindings ✅ 🛠 ios-sim ✅ 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl ✅ 🧪 ios-wk2 ✅ 🧪 api-mac ✅ 🧪 api-wpe
✅ 🧪 ios-wk2-wpt ✅ 🧪 mac-wk1 ✅ 🛠 wpe-cairo
✅ 🛠 🧪 jsc ✅ 🧪 api-ios ✅ 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 🧪 jsc-arm64 ✅ 🛠 vision ✅ 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 vision-sim ✅ 🧪 mac-wk2-stress ✅ 🧪 api-gtk
✅ 🧪 vision-wk2 ✅ 🛠 jsc-armv7
✅ 🛠 🧪 unsafe-merge ✅ 🛠 tv ✅ 🧪 jsc-armv7-tests
✅ 🛠 tv-sim
✅ 🛠 watch
✅ 🛠 watch-sim

@iangrunert iangrunert requested review from a team and JonWBedard as code owners August 14, 2024 17:56
@Ahmad-S792 Ahmad-S792 added the JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues. label Aug 14, 2024
@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Aug 14, 2024
@iangrunert iangrunert force-pushed the ig/enable-wasm-omg-win branch from 8e33b91 to afbb3f7 Compare August 14, 2024 18:17

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

This doesn't work on the Apple Watch build, which is surprising to me.

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.

This does not work on Apple Watch since it is using ARM64_32 ABI. You can change void* to UCPURegister.

@Constellation Constellation 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.

Commented on Apple Watch build failure.

@iangrunert iangrunert force-pushed the ig/enable-wasm-omg-win branch from afbb3f7 to 27a3599 Compare August 14, 2024 21:18

@Constellation Constellation 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.

r=me

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.

Change this to UCPURegister too

@iangrunert iangrunert force-pushed the ig/enable-wasm-omg-win branch from 27a3599 to 70591a7 Compare August 15, 2024 15:55
@Constellation Constellation added unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing and removed merging-blocked Applied to prevent a change from being merged labels Aug 15, 2024
https://bugs.webkit.org/show_bug.cgi?id=278116

Reviewed by Yusuke Suzuki.

Six test failures remaining on JSTests/wasm.yaml:

wasm.yaml/wasm/gc/array_new_fixed_long.js.wasm-eager
wasm.yaml/wasm/gc/array_new_fixed_long.js.wasm-no-cjit
wasm.yaml/wasm/gc/array_new_fixed_long.js.wasm-aggressive-inline
wasm.yaml/wasm/lowExecutableMemory/executable-memory-oom.js.default-wasm
wasm.yaml/wasm/lowExecutableMemory/exports-oom.js.default-wasm
wasm.yaml/wasm/lowExecutableMemory/imports-oom.js.default-wasm

* Source/JavaScriptCore/assembler/MacroAssembler.h:
* Source/JavaScriptCore/assembler/ProbeContext.cpp:
(JSC::Probe::executeJSCJITProbe):
* Source/JavaScriptCore/runtime/Options.cpp:
(JSC::Options::notifyOptionsChanged):
* Source/JavaScriptCore/runtime/UGPRPair.h:
* Source/JavaScriptCore/wasm/WasmIRGeneratorHelpers.h:
(JSC::Wasm::buildEntryBufferForCatch):
* Source/JavaScriptCore/wasm/WasmOperations.h:
* Tools/Scripts/run-jsc-stress-tests:

Canonical link: https://commits.webkit.org/282316@main
@webkit-commit-queue

Copy link
Copy Markdown
Collaborator

Committed 282316@main (172739a): https://commits.webkit.org/282316@main

Reviewed commits have been landed. Closing PR #32204 and removing active labels.

@webkit-commit-queue webkit-commit-queue merged commit 172739a into WebKit:main Aug 15, 2024
@webkit-commit-queue webkit-commit-queue removed the unsafe-merge-queue Applied to send a pull request to merge-queue, but skip building and testing label Aug 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

JavaScriptCore For bugs in JavaScriptCore, the JS engine used by WebKit, other than kxmlcore issues.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants