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.

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

[WGSL] Keep expression enums in sync with printed representation #9432

Merged

Conversation

djg
Copy link
Contributor

@djg djg commented Feb 1, 2023

6bc04af

[WGSL] Keep expression enums in sync with printed representation
https://bugs.webkit.org/show_bug.cgi?id=251484
rdar://problem/104902431

Reviewed by Myles C. Maxfield.

Use preprocess fruit lists to keep the enum definition and string representation
of binary and unary expression operations in sync.

* Source/WebGPU/WGSL/AST/ASTBinaryExpression.cpp:
(WGSL::AST::toString):
(WGSL::AST::printInternal): Deleted.
* Source/WebGPU/WGSL/AST/ASTBinaryExpression.h:
(WGSL::AST::toASCIILiteral):
* Source/WebGPU/WGSL/AST/ASTUnaryExpression.cpp:
(WGSL::AST::printInternal):
* Source/WebGPU/WGSL/AST/ASTUnaryExpression.h:
(WGSL::AST::toASCIILiteral):

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

26884b6

Misc iOS, tvOS & watchOS macOS Linux Windows
❌ πŸ§ͺ style βœ… πŸ›  ios βœ… πŸ›  mac βœ… πŸ›  wpe   πŸ›  wincairo
βœ… πŸ›  ios-sim βœ… πŸ›  mac-AS-debug βœ… πŸ›  gtk
βœ… πŸ§ͺ webkitperl   πŸ§ͺ ios-wk2 βœ… πŸ§ͺ api-mac   πŸ§ͺ gtk-wk2
βœ… πŸ§ͺ api-ios βœ… πŸ§ͺ mac-wk1   πŸ§ͺ api-gtk
βœ… πŸ›  tv βœ… πŸ§ͺ mac-wk2
βœ… πŸ›  tv-sim βœ… πŸ§ͺ mac-AS-debug-wk2
βœ… πŸ›  watch βœ… πŸ§ͺ mac-wk2-stress
βœ… πŸ›  πŸ§ͺ merge βœ… πŸ›  watch-sim

@djg djg self-assigned this Feb 1, 2023
@djg djg added the WebGPU For bugs in WebGPU label Feb 1, 2023
@djg djg requested a review from tadeuzagallo February 1, 2023 06:46
@djg
Copy link
Contributor Author

djg commented Feb 1, 2023

It's is possible to quieten the style check about the use of a macro inside an enum?

@tadeuzagallo
Copy link
Member

I don't think so, but I wouldn't worry about it. Looks like the commit title got messed up somehow.

@webkit-ews-buildbot webkit-ews-buildbot added the merging-blocked Applied to prevent a change from being merged label Feb 1, 2023
@djg djg removed the merging-blocked Applied to prevent a change from being merged label Feb 14, 2023
@djg djg force-pushed the wgsl/operation-fruit-lists branch from 47900d9 to 13528b3 Compare February 14, 2023 22:30
@djg djg changed the title [WGSL] Need a short description (OOPS!). [WGSL] Keep expression enums in sync with printed representation Feb 14, 2023
@djg djg requested a review from litherum February 14, 2023 22:36
@djg djg force-pushed the wgsl/operation-fruit-lists branch from 13528b3 to 26884b6 Compare February 14, 2023 22:47
@webkit-early-warning-system
Copy link
Collaborator

Starting EWS tests for 26884b6. Live statuses available at the PR page, #9432

@djg djg added the merge-queue Applied to send a pull request to merge-queue label Feb 15, 2023
https://bugs.webkit.org/show_bug.cgi?id=251484
rdar://problem/104902431

Reviewed by Myles C. Maxfield.

Use preprocess fruit lists to keep the enum definition and string representation
of binary and unary expression operations in sync.

* Source/WebGPU/WGSL/AST/ASTBinaryExpression.cpp:
(WGSL::AST::toString):
(WGSL::AST::printInternal): Deleted.
* Source/WebGPU/WGSL/AST/ASTBinaryExpression.h:
(WGSL::AST::toASCIILiteral):
* Source/WebGPU/WGSL/AST/ASTUnaryExpression.cpp:
(WGSL::AST::printInternal):
* Source/WebGPU/WGSL/AST/ASTUnaryExpression.h:
(WGSL::AST::toASCIILiteral):

Canonical link: https://commits.webkit.org/260290@main
@webkit-commit-queue
Copy link
Collaborator

Committed 260290@main (6bc04af): https://commits.webkit.org/260290@main

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

@webkit-commit-queue webkit-commit-queue removed the merge-queue Applied to send a pull request to merge-queue label Feb 15, 2023
@webkit-early-warning-system webkit-early-warning-system merged commit 6bc04af into WebKit:main Feb 15, 2023
@djg djg deleted the wgsl/operation-fruit-lists branch February 15, 2023 02:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WebGPU For bugs in WebGPU
Projects
None yet
6 participants