Skip to content
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

Jump to bottom

[WGSL] shader,execution,expression,constructor,non_zero:* is failing #28724

Merged
merged 1 commit into from
May 20, 2024
Merged

[WGSL] shader,execution,expression,constructor,non_zero:* is failing #28724

merged 1 commit into from
May 20, 2024

Conversation

tadeuzagallo
Copy link
Member

@tadeuzagallo tadeuzagallo commented May 17, 2024 •
edited by webkit-early-warning-system

73ee009

[WGSL] shader,execution,expression,constructor,non_zero:* is failing
https://bugs.webkit.org/show_bug.cgi?id=274319
rdar://128283127

Reviewed by Mike Wyrzykowski.

There were 2 issues:
- A metal compilation failure when assigning an array of packed vectors to an
  array of unpacked vectors
- array<vec3<T>> needs to be converted to array<S>, where S is a struct with the
  packed vec3<T> and explicit padding

* Source/WebGPU/WGSL/GlobalVariableRewriter.cpp:
(WGSL::RewriteGlobalVariables::pack):
* Source/WebGPU/WGSL/Metal/MetalFunctionWriter.cpp:
(WGSL::Metal::FunctionDefinitionWriter::emitNecessaryHelpers):
(WGSL::Metal::FunctionDefinitionWriter::generatePackingHelpers):
(WGSL::Metal::FunctionDefinitionWriter::visit):
* Source/WebGPU/WGSL/Types.cpp:
(WGSL::Type::packing const):
* Source/WebGPU/WGSL/Types.h:
* Source/WebGPU/WGSL/WGSLShaderModule.h:
(WGSL::ShaderModule::usesPackedVec3 const):
(WGSL::ShaderModule::setUsesPackedVec3):
(WGSL::ShaderModule::clearUsesPackedVec3):

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

5b40688

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios loading 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
loading 🛠 ios-sim loading 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl loading 🧪 ios-wk2 loading 🧪 api-mac loading 🧪 api-wpe
loading 🧪 ios-wk2-wpt loading 🧪 mac-wk1 ✅ 🛠 wpe-cairo
loading 🧪 api-ios loading 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 tv loading 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv-sim loading 🧪 mac-wk2-stress loading-orange 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🛠 watch
loading 🛠 watch-sim

@tadeuzagallo tadeuzagallo self-assigned this May 17, 2024
@tadeuzagallo tadeuzagallo added the WebGPU For bugs in WebGPU label May 17, 2024
@webkit-early-warning-system
Copy link
Collaborator

EWS run on current version of this PR (hash 5b40688)

Misc iOS, tvOS & watchOS macOS Linux Windows
✅ 🧪 style ✅ 🛠 ios loading 🛠 mac ✅ 🛠 wpe ✅ 🛠 wincairo
loading 🛠 ios-sim loading 🛠 mac-AS-debug ✅ 🧪 wpe-wk2 ✅ 🧪 wincairo-tests
✅ 🧪 webkitperl loading 🧪 ios-wk2 loading 🧪 api-mac loading 🧪 api-wpe
loading 🧪 ios-wk2-wpt loading 🧪 mac-wk1 ✅ 🛠 wpe-cairo
loading 🧪 api-ios loading 🧪 mac-wk2 ✅ 🛠 gtk
✅ 🛠 tv loading 🧪 mac-AS-debug-wk2 ✅ 🧪 gtk-wk2
✅ 🛠 tv-sim loading 🧪 mac-wk2-stress loading-orange 🧪 api-gtk
✅ 🛠 🧪 merge ✅ 🛠 watch
loading 🛠 watch-sim

@tadeuzagallo tadeuzagallo added the merge-queue Applied to send a pull request to merge-queue label May 20, 2024
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WGSL-shaderexecutionexpressionconstructornon_zero-is-failing branch from 5b40688 to 713df29 Compare May 20, 2024 09:58
@tadeuzagallo
[WGSL] shader,execution,expression,constructor,non_zero:* is failing
73ee009 
https://bugs.webkit.org/show_bug.cgi?id=274319
rdar://128283127

Reviewed by Mike Wyrzykowski.

There were 2 issues:
- A metal compilation failure when assigning an array of packed vectors to an
  array of unpacked vectors
- array<vec3<T>> needs to be converted to array<S>, where S is a struct with the
  packed vec3<T> and explicit padding

* Source/WebGPU/WGSL/GlobalVariableRewriter.cpp:
(WGSL::RewriteGlobalVariables::pack):
* Source/WebGPU/WGSL/Metal/MetalFunctionWriter.cpp:
(WGSL::Metal::FunctionDefinitionWriter::emitNecessaryHelpers):
(WGSL::Metal::FunctionDefinitionWriter::generatePackingHelpers):
(WGSL::Metal::FunctionDefinitionWriter::visit):
* Source/WebGPU/WGSL/Types.cpp:
(WGSL::Type::packing const):
* Source/WebGPU/WGSL/Types.h:
* Source/WebGPU/WGSL/WGSLShaderModule.h:
(WGSL::ShaderModule::usesPackedVec3 const):
(WGSL::ShaderModule::setUsesPackedVec3):
(WGSL::ShaderModule::clearUsesPackedVec3):

Canonical link: https://commits.webkit.org/278991@main
@webkit-commit-queue webkit-commit-queue force-pushed the eng/WGSL-shaderexecutionexpressionconstructornon_zero-is-failing branch from 713df29 to 73ee009 Compare May 20, 2024 10:00
@webkit-commit-queue
Copy link
Collaborator

Committed 278991@main (73ee009): https://commits.webkit.org/278991@main

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

@webkit-commit-queue webkit-commit-queue merged commit 73ee009 into WebKit:main May 20, 2024
@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mwyrzykowski mwyrzykowski mwyrzykowski approved these changes

@djg djg Awaiting requested review from djg djg is a code owner

Assignees

@tadeuzagallo tadeuzagallo

Labels
WebGPU For bugs in WebGPU
Projects
None yet
Milestone
No milestone
4 participants
@tadeuzagallo @webkit-early-warning-system @webkit-commit-queue @mwyrzykowski