Merge branch 'main' into linker-speedup

Author: LegNeato

.cargo/config.toml

@@ -3,6 +3,8 @@ compiletest = "run --release -p compiletests --"
 
 [target.'cfg(all())']
 rustflags = [
+    # FIXME(eddyb) update/review these lints.
+    #
     # BEGIN - Embark standard lints v6 for Rust 1.55+
     # do not change or add/remove here, but one can add exceptions after this section
     # for more info see: <https://github.com/EmbarkStudios/rust-ecosystem/issues/59>
@@ -47,7 +49,6 @@ rustflags = [
     "-Wclippy::match_wild_err_arm",
     "-Wclippy::match_wildcard_for_single_variants",
     "-Wclippy::mem_forget",
-    "-Wclippy::mismatched_target_os",
     "-Wclippy::missing_enforced_import_renames",
     "-Wclippy::mut_mut",
     "-Wclippy::mutex_integer",

.github/CODEOWNERS

@@ -1 +1 @@
-* @eddyb @LegNeato @fornwall
+* @eddyb @LegNeato @Firestar99 @schell

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,8 +1,10 @@
 ---
 name: Bug Report
 about: Report a bug with using rust-gpu.
-title: '(my bug report)'
-labels: 't: bug'
+title: "(my bug report)"
+labels: bug
+assignees: ''
+
 ---
 
 <!-- Thank you for filing a bug report! 🐛 -->

.github/ISSUE_TEMPLATE/enhancement.md

@@ -2,7 +2,9 @@
 name: Enhancement
 about: Propose a minor improvement or feature to the project.
 title: "(My enhancement)"
-labels: "t: enhancement"
+labels: enhancement
+assignees: ''
+
 ---
 
 <!--
@@ -15,4 +17,3 @@ Existing Issues: https://github.com/rust-gpu/rust-gpu/issues?q=is%3Aopen+is%3Ais
 Closed Issues: https://github.com/rust-gpu/rust-gpu/labels/s%3A%20wontfix
 
 -->
-

.github/workflows/ci.yaml

@@ -76,13 +76,18 @@ jobs:
       - name: build example shaders
         if: ${{ matrix.target != 'aarch64-linux-android' }}
         env:
-          OUT_DIR: "target/tmp"
+          PROFILE: release
+          OUT_DIR: "target/release/ci/out"
         run: cargo run -p example-runner-wgpu-builder --release --no-default-features --features "use-installed-tools"
 
-      - name: build example shaders dev
-        if: ${{ matrix.target != 'aarch64-linux-android' && matrix.target != 'x86_64-apple-darwin' }}
+      - name: build example shaders (dev aka "debug mode")
+        if: ${{ matrix.target != 'aarch64-linux-android' }}
         env:
-          OUT_DIR: "target/tmp"
+          # HACK(eddyb) see `[profile.dev]` in `Cargo.toml` for more on why
+          # `-Zshare-generics=off` is useful (and why it had to be moved here).
+          RUSTFLAGS: -Zshare-generics=off
+          PROFILE: debug
+          OUT_DIR: "target/debug/ci/out"
         run: cargo run -p example-runner-wgpu-builder --no-default-features --features "use-installed-tools"
 
       - name: Build WGPU Example for Android
@@ -98,7 +103,7 @@ jobs:
           echo "::endgroup::"
 
           echo "::group::Install cargo-apk"
-          cargo install cargo-apk
+          cargo +stable install cargo-apk
           echo "::endgroup::"
 
           echo "::group::Add aarch64-linux-android target"
@@ -155,4 +160,4 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
-      - uses: EmbarkStudios/cargo-deny-action@v1
+      - uses: EmbarkStudios/cargo-deny-action@v2

.github/workflows/lint.sh

@@ -49,10 +49,16 @@ clippy_no_features examples/shaders/simplest-shader
 # which could be disastrous because env vars access can't be tracked by
 # `rustc`, unlike its CLI flags (which are integrated with incremental).
 if (
-    egrep -r '::\s*env|env\s*::' crates/rustc_codegen_spirv/src/ |
+    egrep -r '::\s*env|env\s*::' crates/rustc_codegen_spirv/src |
     # HACK(eddyb) exclude the one place in `rustc_codegen_spirv`
     # needing access to an env var (only for codegen args `--help`).
-    egrep -v '^crates/rustc_codegen_spirv/src/codegen_cx/mod.rs:            let help_flag_comes_from_spirv_builder_env_var = std::env::var\(spirv_builder_env_var\)$'
+    egrep -v '^crates/rustc_codegen_spirv/src/codegen_cx/mod.rs:            let help_flag_comes_from_spirv_builder_env_var = std::env::var\(spirv_builder_env_var\)$' |
+    # HACK(LegNeato) exclude logging. This mirrors `rustc` (`RUSTC_LOG`) and 
+    #`rustdoc` (`RUSTDOC_LOG`).
+    # There is not a risk of this being disastrous as it does not change the build settings.
+    egrep -v '^crates/rustc_codegen_spirv/src/lib.rs:.*(RUSTGPU_LOG|RUSTGPU_LOG_FORMAT|RUSTGPU_LOG_COLOR).*$' |
+    egrep -v '^crates/rustc_codegen_spirv/src/lib.rs:    use std::env::{self, VarError};$'
+
 ); then
     echo '^^^'
     echo '!!! Found disallowed `std::env` usage in `rustc_codegen_spirv` !!!'
@@ -87,3 +93,16 @@ function version_test() {
 # FIXME(eddyb) try to get this working for `spirv-builder`, which has a larger
 # dependency graph, with too much imprecision in upstream `Cargo.toml` files.
 version_test crates/spirv-std
+
+# 3. Ensure `rustc_codegen_spirv` still compiles with `rustc_codegen_ssa`.
+
+# HACK(eddyb) see `crates/rustc_codegen_spirv/build.rs` for more on `pqp_cg_ssa`
+# (a patched copy of `rustc_codegen_ssa`).
+echo ::group::rustc_codegen_spirv_disable_pqp_cg_ssa
+cargo clippy \
+    --manifest-path "crates/rustc_codegen_spirv/Cargo.toml" \
+    --no-default-features \
+    --features "$FEAT" \
+    --all-targets \
+    -- -D warnings --cfg rustc_codegen_spirv_disable_pqp_cg_ssa
+echo ::endgroup::