Merge branch 'main' of github.com:jcmnn/rust-gpu

Author: jcmnn

.github/workflows/ci.yaml

@@ -29,6 +29,11 @@ jobs:
         with:
           version: 1.4.309.0
           cache: true
+      - if: ${{ runner.os == 'Windows' }}
+        name: Install Vulkan Runtime with SwiftShader (Windows)
+        uses: NcStudios/VulkanCI@v1.2
+        with:
+          sdkVersion: 1.4.309.0
       - if: ${{ runner.os == 'Linux' }}
         name: Linux - Install native dependencies
         run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -88,6 +93,11 @@ jobs:
         with:
           version: 1.4.309.0
           cache: true
+      - if: ${{ runner.os == 'Windows' }}
+        name: Install Vulkan Runtime with SwiftShader (Windows)
+        uses: NcStudios/VulkanCI@v1.2
+        with:
+          sdkVersion: 1.4.309.0
       - name: install rust-toolchain
         run: cargo version
       - name: cargo fetch --locked
@@ -129,6 +139,11 @@ jobs:
         with:
           version: 1.4.309.0
           cache: true
+      - if: ${{ runner.os == 'Windows' }}
+        name: Install Vulkan Runtime with SwiftShader (Windows)
+        uses: NcStudios/VulkanCI@v1.2
+        with:
+          sdkVersion: 1.4.309.0
       - name: install rust-toolchain
         run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
       - name: cargo fetch --locked
@@ -149,6 +164,11 @@ jobs:
         with:
           version: 1.4.309.0
           cache: true
+      - if: ${{ runner.os == 'Windows' }}
+        name: Install Vulkan Runtime with SwiftShader (Windows)
+        uses: NcStudios/VulkanCI@v1.2
+        with:
+          sdkVersion: 1.4.309.0
       - if: ${{ runner.os == 'Linux' }}
         name: Linux - Install native dependencies
         run: sudo apt install libwayland-cursor0 libxkbcommon-dev libwayland-dev
@@ -222,7 +242,9 @@ jobs:
         run: |
           RUSTDOCFLAGS=-Dwarnings cargo +stable doc --no-deps -p spirv-std
           RUSTDOCFLAGS=-Dwarnings cargo +stable doc --no-deps -p spirv-builder --no-default-features
-      - name: Clippy & custom lints
+      - name: cargo clippy
+        run: cargo clippy --all-targets -- -D warnings
+      - name: custom lints
         run: .github/workflows/lint.sh
 
   cargo-deny:

.github/workflows/lint.sh

@@ -1,45 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-if [[ -z "${CI}" ]]; then
-    FEAT="use-compiled-tools"
-else
-    FEAT="use-installed-tools"
-fi
-
-function clippy() {
-    echo ::group::"$1"
-    cargo clippy \
-        --manifest-path "$1/Cargo.toml" \
-        --no-default-features \
-        --features "$FEAT" \
-        --all-targets \
-        -- -D warnings
-    echo ::endgroup::
-}
-
-function clippy_no_features() {
-    echo ::group::"$1"
-    cargo clippy \
-        --manifest-path "$1/Cargo.toml" \
-        --all-targets \
-        -- -D warnings
-    echo ::endgroup::
-}
-
-# Core crates
-clippy crates/rustc_codegen_spirv
-clippy crates/spirv-builder
-
-# Examples
-
-clippy examples/runners/ash
-clippy examples/runners/wgpu
-
-clippy_no_features examples/runners/cpu
-clippy_no_features examples/shaders/sky-shader
-clippy_no_features examples/shaders/simplest-shader
-
 # Custom lints
 
 # 1. Disallow `std::env` (mis)use from `rustc_codegen_spirv`
@@ -99,6 +60,11 @@ version_test crates/spirv-std
 # 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
+if [[ -z "${CI}" ]]; then
+    FEAT="use-compiled-tools"
+else
+    FEAT="use-installed-tools"
+fi
 cargo clippy \
     --manifest-path "crates/rustc_codegen_spirv/Cargo.toml" \
     --no-default-features \

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.12", default-features = false }
+spirv-tools = { version = "0.12.1", 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

@@ -15,7 +15,7 @@ use crate::maybe_pqp_cg_ssa as rustc_codegen_ssa;
 
 use itertools::Itertools as _;
 use rspirv::dr::{Module, Operand};
-use rspirv::spirv::{Decoration, LinkageType, Op, Word};
+use rspirv::spirv::{Decoration, LinkageType, Word};
 use rustc_abi::{AddressSpace, HasDataLayout, TargetDataLayout};
 use rustc_ast::ast::{InlineAsmOptions, InlineAsmTemplatePiece};
 use rustc_codegen_ssa::mir::debuginfo::{FunctionDebugContext, VariableKind};
@@ -37,7 +37,7 @@ use rustc_target::spec::{HasTargetSpec, Target, TargetTuple};
 use std::cell::RefCell;
 use std::collections::BTreeSet;
 use std::iter::once;
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::rc::Rc;
 use std::str::FromStr;
 
@@ -767,25 +767,6 @@ impl CodegenArgs {
 
         if self.disassemble_globals {
             for inst in module.global_inst_iter() {
-                // HACK: On Windows, paths are printed like `OpString "D:\\dir\\blah"`.
-                // Unfortunately, compiletest will only normalize `D:\dir\blah` to `$DIR/blah` -
-                // one backslash, not two. So, when disassembling for compiletest, check if the
-                // argument to OpString can be parsed as an absolute path, and if it is, replace it
-                // with just the filename component of the path.
-                if inst.class.opcode == Op::String {
-                    let path = Path::new(inst.operands[0].unwrap_literal_string());
-                    if path.is_absolute()
-                        && let Some(file_name) = path.file_name()
-                    {
-                        let mut inst = inst.clone();
-                        inst.operands[0] = Operand::LiteralString(format!(
-                            "$OPSTRING_FILENAME/{}",
-                            file_name.to_string_lossy(),
-                        ));
-                        eprintln!("{}", inst.disassemble());
-                        continue;
-                    }
-                }
                 eprintln!("{}", inst.disassemble());
             }
         }

crates/rustc_codegen_spirv/src/codegen_cx/mod.rs

@@ -481,16 +481,6 @@ pub fn link(
         simple_passes::remove_non_uniform_decorations(sess, &mut output)?;
     }
 
-    {
-        let _timer = sess.timer("link_remove_unused_type_capabilities");
-        simple_passes::remove_unused_type_capabilities(&mut output);
-    }
-
-    {
-        let _timer = sess.timer("link_type_capability_check");
-        simple_passes::check_type_capabilities(sess, &output)?;
-    }
-
     // NOTE(eddyb) SPIR-T pipeline is entirely limited to this block.
     {
         let (spv_words, module_or_err, lower_from_spv_timer) =
@@ -563,10 +553,16 @@ pub fn link(
                 module,
                 &opts.spirt_passes,
                 |name, _module| before_pass(name),
-                after_pass,
+                &mut after_pass,
             );
         }
 
+        {
+            let timer = before_pass("spirt_passes::validate");
+            spirt_passes::validate::validate(module);
+            after_pass("validate", module, timer);
+        }
+
         {
             let _timer = before_pass("spirt_passes::diagnostics::report_diagnostics");
             spirt_passes::diagnostics::report_diagnostics(sess, opts, module).map_err(
@@ -634,6 +630,11 @@ pub fn link(
         }
     }
 
+    {
+        let _timer = sess.timer("link_remove_unused_type_capabilities");
+        simple_passes::remove_unused_type_capabilities(&mut output);
+    }
+
     {
         let _timer = sess.timer("link_gather_all_interface_vars_from_uses");
         entry_interface::gather_all_interface_vars_from_uses(&mut output);