[naga] Make compaction preserve named types, even if unused. #4734

jimblandy · 2023-11-21T01:11:22Z

Have compact::compact preserve entries in the Module::types arena if they have names.

Future abstract type support will require the WGSL front end to compact the module before validation. Without this change, that will drop alias declarations, making it harder to test type validation.

Checklist

Run cargo fmt.
Run cargo clippy. If applicable, add:
Run cargo xtask test to run tests.
Add change to CHANGELOG.md. See simple instructions inside file.

teoxoy

I suppose this is only needed if we retain aliases in the IR (#4733) right?

jimblandy · 2023-11-21T17:37:08Z

I suppose this is only needed if we retain aliases in the IR (#4733) right?

Yes, the two PRs are collaborative, but they'll both be required for abstract types.

Have `compact::compact` preserve entries in the `Module::types` arena if they have names. Future abstract type support will require the WGSL front end to compact the module before validation. Without this change, that will drop `alias` declarations, making it harder to test type validation.

…7ab0a860eec. r=webgpu-reviewers,supply-chain-reviewers,ErichDonGubler # Changelog * #4708 Fix max_vertex_buffers validation By nical in gfx-rs/wgpu#4708 * #4729 Remove expected failure on AMD/DX12 from msaa example By teoxoy in gfx-rs/wgpu#4729 * #4711 [naga] Add `Literal::I64`, for signed 64-bit integer literals. By jimblandy in gfx-rs/wgpu#4711 * #4736 Bump serde from 1.0.192 to 1.0.193 By dependabot[bot] in gfx-rs/wgpu#4736 * #4735 [naga]: Let `TypeInner::Matrix` hold a `Scalar`, not just a width. By jimblandy in gfx-rs/wgpu#4735 * #4741 [naga] Fix type error in test. By jimblandy in gfx-rs/wgpu#4741 * #4742 [naga]: Make snapshot tests include paths in errors. By jimblandy in gfx-rs/wgpu#4742 * #4723 Test And Normalize Vertex Behavior on All Backends By cwfitzgerald in gfx-rs/wgpu#4723 * #4746 Skip Flaky Test By cwfitzgerald in gfx-rs/wgpu#4746 * #4744 Ensure DeviceLostClosureC callbacks have null-terminated message strings By bradwerth in gfx-rs/wgpu#4744 * #4745 [naga wgsl-in] Test hex float suffix handling corner case. By jimblandy in gfx-rs/wgpu#4745 * #4737 Make the command_encoder_clear_buffer's size an Option<BufferAddress> By nical in gfx-rs/wgpu#4737 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4733 [naga wgsl-in] Preserve type names in `alias` declarations. By jimblandy in gfx-rs/wgpu#4733 * #4734 [naga] Make compaction preserve named types, even if unused. By jimblandy in gfx-rs/wgpu#4734 * #4752 Logging cleanups in device/global.rs By nical in gfx-rs/wgpu#4752 * #4753 Fix Mac Event Loop By cwfitzgerald in gfx-rs/wgpu#4753 * #4754 wgpu-hal(vk): Add WGPU_ALLOW_NONCOMPLIANT_ADAPTER By i509VCB in gfx-rs/wgpu#4754 * #4748 Allow Tests to Expect Certain Panic or Validation Messages By cwfitzgerald in gfx-rs/wgpu#4748 * #4756 Move to A Single Example Executable By cwfitzgerald in gfx-rs/wgpu#4756 * #4747 [naga wgsl-in] Experimental 64-bit floating-point literals. By jimblandy in gfx-rs/wgpu#4747 * #4747 [naga wgsl-in] Experimental 64-bit floating-point literals. By jimblandy in gfx-rs/wgpu#4747 * #4761 [naga] Make the `example_wgsl` test build without `wgsl-in` feature. By jimblandy in gfx-rs/wgpu#4761 * #4769 Conditionally lift API logging from trace to info level By nical in gfx-rs/wgpu#4769 * #4771 Downgrade some of wgpu_core's logging level from info to trace and debug By nical in gfx-rs/wgpu#4771 * #4760 Rename `ALLOW_NONCOMPLIANT_ADAPTER` to `ALLOW_UNDERLYING_NONCOMPLIANT_ADAPTER` By teoxoy in gfx-rs/wgpu#4760 * #4772 Downgrade resource lifetime management log level to trace. By nical in gfx-rs/wgpu#4772 * #4765 Revamp Examples to Match Website By cwfitzgerald in gfx-rs/wgpu#4765 * #4774 Update examples readme files By roffs in gfx-rs/wgpu#4774 * #4781 remove_abandoned fix By gents83 in gfx-rs/wgpu#4781 * #4777 Bump web-sys to 0.3.65 By torokati44 in gfx-rs/wgpu#4777 * #4780 Fixes for Skybox and All Examples By cwfitzgerald in gfx-rs/wgpu#4780 * #4782 Remove resources ONLY when needed inside wgpu and not in user land By gents83 in gfx-rs/wgpu#4782 * #4786 Don't keep a strong ref in storage for destroyed resources By gents83 in gfx-rs/wgpu#4786 * #4795 Fix Arcanization changelog By a1phyr in gfx-rs/wgpu#4795 * #4794 Delete/rename now-unused gpu.rs By exrook in gfx-rs/wgpu#4794 * #4794 Delete/rename now-unused gpu.rs By exrook in gfx-rs/wgpu#4794 * #4573 Support nv12 texture format By xiaopengli89 in gfx-rs/wgpu#4573 * #4789 Bump js-sys from 0.3.65 to 0.3.66 By dependabot[bot] in gfx-rs/wgpu#4789 * #4784 Bump winit from 0.29.3 to 0.29.4 By dependabot[bot] in gfx-rs/wgpu#4784 * #4798 Bump JamesIves/github-pages-deploy-action from 4.4.3 to 4.5.0 By dependabot[bot] in gfx-rs/wgpu#4798 * #4800 Bump web-sys from 0.3.65 to 0.3.66 By dependabot[bot] in gfx-rs/wgpu#4800 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4799 Bump wasm-bindgen-futures from 0.4.38 to 0.4.39 By dependabot[bot] in gfx-rs/wgpu#4799 * #4796 Remove surface extent validation (and thus fix the annoying `Requested size ... is outside of the supported range` warning) By Wumpf in gfx-rs/wgpu#4796 * #4804 Add space to a comment inside make_spirv_raw By ComfyFluffy in gfx-rs/wgpu#4804 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4805 [naga] Improve ConstantEvaluatorError::InvalidCastArg message. By jimblandy in gfx-rs/wgpu#4805 * #4801 update deno By crowlKats in gfx-rs/wgpu#4801 * #4806 Fixes and changes to the documentation for increasing clarity By Blatko1 in gfx-rs/wgpu#4806 * #4809 [naga wgsl-in] Use a better span for errors in constructors. By jimblandy in gfx-rs/wgpu#4809 * #4808 [naga wgsl-in] Drop spanless labels from front-end error messages. By jimblandy in gfx-rs/wgpu#4808 * #4822 Fix expected error message By teoxoy in gfx-rs/wgpu#4822 * #4759 Add feature float32-filterable By almarklein in gfx-rs/wgpu#4759 * #4813 Bump core-graphics-types from 0.1.2 to 0.1.3 By dependabot[bot] in gfx-rs/wgpu#4813 Differential Revision: https://phabricator.services.mozilla.com/D195438

…7ab0a860eec. r=webgpu-reviewers,supply-chain-reviewers,ErichDonGubler # Changelog * #4708 Fix max_vertex_buffers validation By nical in gfx-rs/wgpu#4708 * #4729 Remove expected failure on AMD/DX12 from msaa example By teoxoy in gfx-rs/wgpu#4729 * #4711 [naga] Add `Literal::I64`, for signed 64-bit integer literals. By jimblandy in gfx-rs/wgpu#4711 * #4736 Bump serde from 1.0.192 to 1.0.193 By dependabot[bot] in gfx-rs/wgpu#4736 * #4735 [naga]: Let `TypeInner::Matrix` hold a `Scalar`, not just a width. By jimblandy in gfx-rs/wgpu#4735 * #4741 [naga] Fix type error in test. By jimblandy in gfx-rs/wgpu#4741 * #4742 [naga]: Make snapshot tests include paths in errors. By jimblandy in gfx-rs/wgpu#4742 * #4723 Test And Normalize Vertex Behavior on All Backends By cwfitzgerald in gfx-rs/wgpu#4723 * #4746 Skip Flaky Test By cwfitzgerald in gfx-rs/wgpu#4746 * #4744 Ensure DeviceLostClosureC callbacks have null-terminated message strings By bradwerth in gfx-rs/wgpu#4744 * #4745 [naga wgsl-in] Test hex float suffix handling corner case. By jimblandy in gfx-rs/wgpu#4745 * #4737 Make the command_encoder_clear_buffer's size an Option<BufferAddress> By nical in gfx-rs/wgpu#4737 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4701 [naga msl-out] Emit and init `struct` member padding always By ErichDonGubler in gfx-rs/wgpu#4701 * #4733 [naga wgsl-in] Preserve type names in `alias` declarations. By jimblandy in gfx-rs/wgpu#4733 * #4734 [naga] Make compaction preserve named types, even if unused. By jimblandy in gfx-rs/wgpu#4734 * #4752 Logging cleanups in device/global.rs By nical in gfx-rs/wgpu#4752 * #4753 Fix Mac Event Loop By cwfitzgerald in gfx-rs/wgpu#4753 * #4754 wgpu-hal(vk): Add WGPU_ALLOW_NONCOMPLIANT_ADAPTER By i509VCB in gfx-rs/wgpu#4754 * #4748 Allow Tests to Expect Certain Panic or Validation Messages By cwfitzgerald in gfx-rs/wgpu#4748 * #4756 Move to A Single Example Executable By cwfitzgerald in gfx-rs/wgpu#4756 * #4747 [naga wgsl-in] Experimental 64-bit floating-point literals. By jimblandy in gfx-rs/wgpu#4747 * #4747 [naga wgsl-in] Experimental 64-bit floating-point literals. By jimblandy in gfx-rs/wgpu#4747 * #4761 [naga] Make the `example_wgsl` test build without `wgsl-in` feature. By jimblandy in gfx-rs/wgpu#4761 * #4769 Conditionally lift API logging from trace to info level By nical in gfx-rs/wgpu#4769 * #4771 Downgrade some of wgpu_core's logging level from info to trace and debug By nical in gfx-rs/wgpu#4771 * #4760 Rename `ALLOW_NONCOMPLIANT_ADAPTER` to `ALLOW_UNDERLYING_NONCOMPLIANT_ADAPTER` By teoxoy in gfx-rs/wgpu#4760 * #4772 Downgrade resource lifetime management log level to trace. By nical in gfx-rs/wgpu#4772 * #4765 Revamp Examples to Match Website By cwfitzgerald in gfx-rs/wgpu#4765 * #4774 Update examples readme files By roffs in gfx-rs/wgpu#4774 * #4781 remove_abandoned fix By gents83 in gfx-rs/wgpu#4781 * #4777 Bump web-sys to 0.3.65 By torokati44 in gfx-rs/wgpu#4777 * #4780 Fixes for Skybox and All Examples By cwfitzgerald in gfx-rs/wgpu#4780 * #4782 Remove resources ONLY when needed inside wgpu and not in user land By gents83 in gfx-rs/wgpu#4782 * #4786 Don't keep a strong ref in storage for destroyed resources By gents83 in gfx-rs/wgpu#4786 * #4795 Fix Arcanization changelog By a1phyr in gfx-rs/wgpu#4795 * #4794 Delete/rename now-unused gpu.rs By exrook in gfx-rs/wgpu#4794 * #4794 Delete/rename now-unused gpu.rs By exrook in gfx-rs/wgpu#4794 * #4573 Support nv12 texture format By xiaopengli89 in gfx-rs/wgpu#4573 * #4789 Bump js-sys from 0.3.65 to 0.3.66 By dependabot[bot] in gfx-rs/wgpu#4789 * #4784 Bump winit from 0.29.3 to 0.29.4 By dependabot[bot] in gfx-rs/wgpu#4784 * #4798 Bump JamesIves/github-pages-deploy-action from 4.4.3 to 4.5.0 By dependabot[bot] in gfx-rs/wgpu#4798 * #4800 Bump web-sys from 0.3.65 to 0.3.66 By dependabot[bot] in gfx-rs/wgpu#4800 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4743 Implement WGSL abstract types for global `const` declarations and constructor calls. By jimblandy in gfx-rs/wgpu#4743 * #4799 Bump wasm-bindgen-futures from 0.4.38 to 0.4.39 By dependabot[bot] in gfx-rs/wgpu#4799 * #4796 Remove surface extent validation (and thus fix the annoying `Requested size ... is outside of the supported range` warning) By Wumpf in gfx-rs/wgpu#4796 * #4804 Add space to a comment inside make_spirv_raw By ComfyFluffy in gfx-rs/wgpu#4804 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4803 `features`/`limits` refactors By teoxoy in gfx-rs/wgpu#4803 * #4805 [naga] Improve ConstantEvaluatorError::InvalidCastArg message. By jimblandy in gfx-rs/wgpu#4805 * #4801 update deno By crowlKats in gfx-rs/wgpu#4801 * #4806 Fixes and changes to the documentation for increasing clarity By Blatko1 in gfx-rs/wgpu#4806 * #4809 [naga wgsl-in] Use a better span for errors in constructors. By jimblandy in gfx-rs/wgpu#4809 * #4808 [naga wgsl-in] Drop spanless labels from front-end error messages. By jimblandy in gfx-rs/wgpu#4808 * #4822 Fix expected error message By teoxoy in gfx-rs/wgpu#4822 * #4759 Add feature float32-filterable By almarklein in gfx-rs/wgpu#4759 * #4813 Bump core-graphics-types from 0.1.2 to 0.1.3 By dependabot[bot] in gfx-rs/wgpu#4813 Differential Revision: https://phabricator.services.mozilla.com/D195438 UltraBlame original commit: 985aabb5bf419ffcc9248010353ff190c225ba61

jimblandy requested a review from a team as a code owner November 21, 2023 01:11

jimblandy force-pushed the naga-compact-retain-named-types branch from bf5dc64 to a3d9c33 Compare November 21, 2023 01:25

teoxoy reviewed Nov 21, 2023

View reviewed changes

teoxoy approved these changes Nov 22, 2023

View reviewed changes

teoxoy force-pushed the naga-compact-retain-named-types branch from a3d9c33 to 66301da Compare November 22, 2023 17:17

teoxoy enabled auto-merge (rebase) November 22, 2023 17:19

teoxoy merged commit 4f9cc28 into gfx-rs:trunk Nov 22, 2023
27 checks passed

jimblandy deleted the naga-compact-retain-named-types branch December 13, 2023 16:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[naga] Make compaction preserve named types, even if unused. #4734

[naga] Make compaction preserve named types, even if unused. #4734

jimblandy commented Nov 21, 2023 •

edited

Loading

teoxoy left a comment

jimblandy commented Nov 21, 2023

[naga] Make compaction preserve named types, even if unused. #4734

[naga] Make compaction preserve named types, even if unused. #4734

Conversation

jimblandy commented Nov 21, 2023 • edited Loading

teoxoy left a comment

Choose a reason for hiding this comment

jimblandy commented Nov 21, 2023

jimblandy commented Nov 21, 2023 •

edited

Loading