Merge remote-tracking branch 'upstream/main' into dev-zmr233

Author: zmr-233

.github/workflows/ci.yaml

@@ -17,13 +17,7 @@ jobs:
     name: Test
     strategy:
       matrix:
-        include:
-          - os: ubuntu-24.04
-            target: x86_64-unknown-linux-gnu
-          - os: windows-2022
-            target: x86_64-pc-windows-msvc
-          - os: macOS-latest
-            target: aarch64-apple-darwin
+        os: [ ubuntu-24.04, windows-2022, macOS-latest ]
     runs-on: ${{ matrix.os }}
     env:
       RUSTUP_UNPACK_RAM: "26214400"
@@ -38,13 +32,14 @@ jobs:
       - if: ${{ runner.os == 'Linux' }}
         name: Linux - Install native dependencies
         run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
-      # cargo version is a random command that forces the installation of rust-toolchain
+      # just need a random command that forces the installation of rust-toolchain
+      # figure out native target triple while we're at it
       - name: install rust-toolchain
-        run: cargo version
+        run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
       # Fetch dependencies in a separate step to clearly show how long each part
       # of the testing takes
       - name: cargo fetch --locked
-        run: cargo fetch --locked --target ${{ matrix.target }}
+        run: cargo fetch --locked --target $TARGET
 
       # Core crates
       # Compiled in --release because cargo compiletest would otherwise compile in release again.
@@ -80,10 +75,8 @@ jobs:
     name: Android
     strategy:
       matrix:
-        include:
-          - os: ubuntu-24.04
-            target: aarch64-linux-android
-            host: x86_64-unknown-linux-gnu
+        os: [ ubuntu-24.04 ]
+        target: [ aarch64-linux-android ]
     runs-on: ${{ matrix.os }}
     env:
       RUSTUP_UNPACK_RAM: "26214400"
@@ -95,11 +88,8 @@ jobs:
         with:
           version: 1.4.309.0
           cache: true
-      # cargo version is a random command that forces the installation of rust-toolchain
       - name: install rust-toolchain
         run: cargo version
-      # Fetch dependencies in a separate step to clearly show how long each part
-      # of the testing takes
       - name: cargo fetch --locked
         run: cargo fetch --locked --target ${{ matrix.target }}
 
@@ -130,13 +120,7 @@ jobs:
     name: Compiletest
     strategy:
       matrix:
-        include:
-          - os: ubuntu-24.04
-            target: x86_64-unknown-linux-gnu
-          - os: windows-2022
-            target: x86_64-pc-windows-msvc
-          - os: macOS-latest
-            target: aarch64-apple-darwin
+        os: [ ubuntu-24.04, windows-2022, macOS-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -145,25 +129,18 @@ jobs:
         with:
           version: 1.4.309.0
           cache: true
-      # cargo version is a random command that forces the installation of rust-toolchain
       - name: install rust-toolchain
-        run: cargo version
+        run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
       - name: cargo fetch --locked
-        run: cargo fetch --locked --target ${{ matrix.target }}
+        run: cargo fetch --locked --target $TARGET
       - name: compiletest
-        run: cargo run -p compiletests --release --no-default-features --features "use-installed-tools" -- --target-env vulkan1.1,vulkan1.2,spv1.3
+        run: cargo run -p compiletests --release --no-default-features --features "use-installed-tools" -- --target-env vulkan1.1,vulkan1.2,vulkan1.3,vulkan1.4,spv1.3
 
   difftest:
     name: Difftest
     strategy:
       matrix:
-        include:
-          - os: ubuntu-24.04
-            target: x86_64-unknown-linux-gnu
-          - os: windows-2022
-            target: x86_64-pc-windows-msvc
-          - os: macOS-latest
-            target: aarch64-apple-darwin
+        os: [ ubuntu-24.04, windows-2022, macOS-latest ]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4
@@ -182,13 +159,12 @@ jobs:
           sudo add-apt-repository ppa:kisak/turtle -y
           sudo apt-get update
           sudo apt install -y xvfb libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
-      # cargo version is a random command that forces the installation of rust-toolchain
       - name: install rust-toolchain
-        run: cargo version
+        run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
       - name: cargo fetch --locked
-        run: cargo fetch --locked --target ${{ matrix.target }}
+        run: cargo fetch --locked --target $TARGET
       - name: cargo fetch --locked difftests
-        run: cargo fetch --locked --manifest-path=tests/difftests/tests/Cargo.toml --target ${{ matrix.target }}
+        run: cargo fetch --locked --manifest-path=tests/difftests/tests/Cargo.toml --target $TARGET
       - name: test difftest
         run: cargo test -p "difftest*" --release --no-default-features --features "use-installed-tools"
       - name: difftests
@@ -246,3 +222,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: EmbarkStudios/cargo-deny-action@v2
+
+defaults:
+  run:
+    shell: bash

Cargo.lock

@@ -46,7 +46,7 @@ spirv-builder = { path = "./crates/spirv-builder", version = "=0.9.0", default-f
 spirv-std = { path = "./crates/spirv-std", version = "=0.9.0" }
 spirv-std-types = { path = "./crates/spirv-std/shared", version = "=0.9.0" }
 spirv-std-macros = { path = "./crates/spirv-std/macros", version = "=0.9.0" }
-spirv-tools = { version = "0.11", default-features = false }
+spirv-tools = { version = "0.12", default-features = false }
 rustc_codegen_spirv = { path = "./crates/rustc_codegen_spirv", version = "=0.9.0", default-features = false }
 rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", version = "=0.9.0" }
 rustc_codegen_spirv-target-specs = { path = "crates/rustc_codegen_spirv-target-specs", version = "=0.9.0" }

Cargo.toml

@@ -44,6 +44,10 @@ pub const TARGET_SPECS: &[(&str, &str)] = &[
         "spirv-unknown-spv1.5.json",
         include_str!("../target-specs/spirv-unknown-spv1.5.json"),
     ),
+    (
+        "spirv-unknown-spv1.6.json",
+        include_str!("../target-specs/spirv-unknown-spv1.6.json"),
+    ),
     (
         "spirv-unknown-vulkan1.0.json",
         include_str!("../target-specs/spirv-unknown-vulkan1.0.json"),
@@ -60,4 +64,12 @@ pub const TARGET_SPECS: &[(&str, &str)] = &[
         "spirv-unknown-vulkan1.2.json",
         include_str!("../target-specs/spirv-unknown-vulkan1.2.json"),
     ),
+    (
+        "spirv-unknown-vulkan1.3.json",
+        include_str!("../target-specs/spirv-unknown-vulkan1.3.json"),
+    ),
+    (
+        "spirv-unknown-vulkan1.4.json",
+        include_str!("../target-specs/spirv-unknown-vulkan1.4.json"),
+    ),
 ];

crates/rustc_codegen_spirv-target-specs/src/include_str.rs

@@ -0,0 +1,26 @@
+{
+  "allows-weak-linkage": false,
+  "arch": "spirv",
+  "crt-objects-fallback": "false",
+  "crt-static-allows-dylibs": true,
+  "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
+  "dll-prefix": "",
+  "dll-suffix": ".spv.json",
+  "dynamic-linking": true,
+  "emit-debug-gdb-scripts": false,
+  "env": "spv1.6",
+  "linker-flavor": "unix",
+  "linker-is-gnu": false,
+  "llvm-target": "spirv-unknown-spv1.6",
+  "main-needs-argc-argv": false,
+  "metadata": {
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
+  },
+  "os": "unknown",
+  "panic-strategy": "abort",
+  "simd-types-indirect": false,
+  "target-pointer-width": "32"
+}

crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-spv1.6.json

@@ -0,0 +1,26 @@
+{
+  "allows-weak-linkage": false,
+  "arch": "spirv",
+  "crt-objects-fallback": "false",
+  "crt-static-allows-dylibs": true,
+  "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
+  "dll-prefix": "",
+  "dll-suffix": ".spv.json",
+  "dynamic-linking": true,
+  "emit-debug-gdb-scripts": false,
+  "env": "vulkan1.3",
+  "linker-flavor": "unix",
+  "linker-is-gnu": false,
+  "llvm-target": "spirv-unknown-vulkan1.3",
+  "main-needs-argc-argv": false,
+  "metadata": {
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
+  },
+  "os": "unknown",
+  "panic-strategy": "abort",
+  "simd-types-indirect": false,
+  "target-pointer-width": "32"
+}

crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.3.json

@@ -0,0 +1,26 @@
+{
+  "allows-weak-linkage": false,
+  "arch": "spirv",
+  "crt-objects-fallback": "false",
+  "crt-static-allows-dylibs": true,
+  "data-layout": "e-m:e-p:32:32:32-i64:64-n8:16:32:64",
+  "dll-prefix": "",
+  "dll-suffix": ".spv.json",
+  "dynamic-linking": true,
+  "emit-debug-gdb-scripts": false,
+  "env": "vulkan1.4",
+  "linker-flavor": "unix",
+  "linker-is-gnu": false,
+  "llvm-target": "spirv-unknown-vulkan1.4",
+  "main-needs-argc-argv": false,
+  "metadata": {
+    "description": null,
+    "host_tools": null,
+    "std": null,
+    "tier": null
+  },
+  "os": "unknown",
+  "panic-strategy": "abort",
+  "simd-types-indirect": false,
+  "target-pointer-width": "32"
+}

crates/rustc_codegen_spirv-target-specs/target-specs/spirv-unknown-vulkan1.4.json

@@ -4,7 +4,8 @@ use crate::maybe_pqp_cg_ssa as rustc_codegen_ssa;
 use super::Builder;
 use crate::builder_spirv::{SpirvValue, SpirvValueExt, SpirvValueKind};
 use crate::spirv_type::SpirvType;
-use rspirv::spirv::Word;
+use rspirv::spirv::{Decoration, Word};
+use rustc_codegen_spirv_types::Capability;
 use rustc_codegen_ssa::traits::BuilderMethods;
 use rustc_errors::ErrorGuaranteed;
 use rustc_span::DUMMY_SP;
@@ -41,11 +42,20 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         };
         let u32_ty = SpirvType::Integer(32, false).def(DUMMY_SP, self);
         let u32_ptr = self.type_ptr_to(u32_ty);
+        let array = array.def(self);
+        let actual_index = actual_index.def(self);
         let ptr = self
             .emit()
-            .in_bounds_access_chain(u32_ptr, None, array.def(self), [actual_index.def(self)])
+            .in_bounds_access_chain(u32_ptr, None, array, [actual_index])
             .unwrap()
             .with_type(u32_ptr);
+        if self.builder.has_capability(Capability::ShaderNonUniform) {
+            // apply NonUniform to the operation and the index
+            self.emit()
+                .decorate(ptr.def(self), Decoration::NonUniform, []);
+            self.emit()
+                .decorate(actual_index, Decoration::NonUniform, []);
+        }
         self.load(u32_ty, ptr, Align::ONE)
     }
 
@@ -233,11 +243,20 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
         };
         let u32_ty = SpirvType::Integer(32, false).def(DUMMY_SP, self);
         let u32_ptr = self.type_ptr_to(u32_ty);
+        let array = array.def(self);
+        let actual_index = actual_index.def(self);
         let ptr = self
             .emit()
-            .in_bounds_access_chain(u32_ptr, None, array.def(self), [actual_index.def(self)])
+            .in_bounds_access_chain(u32_ptr, None, array, [actual_index])
             .unwrap()
             .with_type(u32_ptr);
+        if self.builder.has_capability(Capability::ShaderNonUniform) {
+            // apply NonUniform to the operation and the index
+            self.emit()
+                .decorate(ptr.def(self), Decoration::NonUniform, []);
+            self.emit()
+                .decorate(actual_index, Decoration::NonUniform, []);
+        }
         self.store(value, ptr, Align::ONE);
         Ok(())
     }

crates/rustc_codegen_spirv/src/builder/byte_addressable_buffer.rs

@@ -472,6 +472,11 @@ pub fn link(
         duplicates::remove_duplicate_debuginfo(&mut output);
     }
 
+    {
+        let _timer = sess.timer("link_remove_non_uniform");
+        simple_passes::remove_non_uniform_decorations(sess, &mut output)?;
+    }
+
     // NOTE(eddyb) SPIR-T pipeline is entirely limited to this block.
     {
         let (spv_words, module_or_err, lower_from_spv_timer) =

crates/rustc_codegen_spirv/src/linker/mod.rs

@@ -1,6 +1,7 @@
 use super::{Result, get_name, get_names};
 use rspirv::dr::{Block, Function, Module};
-use rspirv::spirv::{ExecutionModel, Op, Word};
+use rspirv::spirv::{Decoration, ExecutionModel, Op, Word};
+use rustc_codegen_spirv_types::Capability;
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_session::Session;
 use std::iter::once;
@@ -264,3 +265,19 @@ pub fn check_fragment_insts(sess: &Session, module: &Module) -> Result<()> {
         }
     }
 }
+
+/// Remove all [`Decoration::NonUniform`] if this module does *not* have [`Capability::ShaderNonUniform`].
+/// This allows image asm to always declare `NonUniform` and not worry about conditional compilation.
+pub fn remove_non_uniform_decorations(_sess: &Session, module: &mut Module) -> Result<()> {
+    let has_shader_non_uniform_capability = module.capabilities.iter().any(|inst| {
+        inst.class.opcode == Op::Capability
+            && inst.operands[0].unwrap_capability() == Capability::ShaderNonUniform
+    });
+    if !has_shader_non_uniform_capability {
+        module.annotations.retain(|inst| {
+            !(inst.class.opcode == Op::Decorate
+                && inst.operands[1].unwrap_decoration() == Decoration::NonUniform)
+        });
+    }
+    Ok(())
+}