Merge branch 'difftest_refactor' into vec3-12-bytes

Author: Firestar99

.cargo/config.toml

@@ -1,6 +1,6 @@
 [alias]
 compiletest = "run --release -p compiletests --"
-difftest = "run --release -p difftests --"
+difftest = "nextest run --release -P difftests -p difftests"
 run-wasm = ["run", "--release", "-p", "run-wasm", "--"]
 
 [target.'cfg(target_arch = "wasm32")']

.config/nextest.toml

@@ -0,0 +1,10 @@
+[profile.default]
+default-filter = '!package(difftest*) & !package(compiletest*) & !package(example-runner-*)'
+fail-fast = false
+
+[profile.difftests]
+default-filter = 'package(difftests)'
+slow-timeout = "2m"
+
+[profile.difftest-runner]
+default-filter = 'package(difftest-runner) | package(difftest-types)'

.github/workflows/ci.yaml

@@ -16,6 +16,7 @@ jobs:
   test:
     name: Test
     strategy:
+      fail-fast: false
       matrix:
         os: [ ubuntu-24.04, windows-2022, macOS-latest ]
     runs-on: ${{ matrix.os }}
@@ -41,6 +42,8 @@ jobs:
       # figure out native target triple while we're at it
       - name: install rust-toolchain
         run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
+      - name: install nextest
+        uses: taiki-e/install-action@nextest
       # Fetch dependencies in a separate step to clearly show how long each part
       # of the testing takes
       - name: cargo fetch --locked
@@ -49,13 +52,13 @@ jobs:
       # Core crates
       # Compiled in --release because cargo compiletest would otherwise compile in release again.
       - name: rustc_codegen_spirv build
-        run: cargo test -p rustc_codegen_spirv --release --no-default-features --features "use-installed-tools" --no-run
+        run: cargo nextest run -p rustc_codegen_spirv --release --no-default-features --features "use-installed-tools" --no-run
 
       - name: rustc_codegen_spirv test
-        run: cargo test -p rustc_codegen_spirv --release --no-default-features --features "use-installed-tools"
+        run: cargo nextest run -p rustc_codegen_spirv --release --no-default-features --features "use-installed-tools"
 
       - name: workspace test (excluding examples & difftest)
-        run: cargo test --release --workspace --exclude "example-runner-*" --exclude "difftest*" --no-default-features --features "use-installed-tools"
+        run: cargo nextest run --release --workspace --exclude "example-runner-*" --exclude "difftest*" --no-default-features --features "use-installed-tools"
 
       # Examples
       - name: cargo check examples
@@ -129,6 +132,7 @@ jobs:
   compiletest:
     name: Compiletest
     strategy:
+      fail-fast: false
       matrix:
         os: [ ubuntu-24.04, windows-2022, macOS-latest ]
     runs-on: ${{ matrix.os }}
@@ -154,6 +158,7 @@ jobs:
   difftest:
     name: Difftest
     strategy:
+      fail-fast: false
       matrix:
         os: [ ubuntu-24.04, windows-2022, macOS-latest ]
     runs-on: ${{ matrix.os }}
@@ -181,14 +186,18 @@ jobs:
           sudo apt install -y xvfb libgl1-mesa-dri libxcb-xfixes0-dev mesa-vulkan-drivers
       - name: install rust-toolchain
         run: echo "TARGET=$(rustc --print host-tuple)" >> "$GITHUB_ENV"
+      - name: install nextest
+        uses: taiki-e/install-action@nextest
       - name: cargo fetch --locked
         run: cargo fetch --locked --target $TARGET
       - name: cargo fetch --locked difftests
         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: test difftest-runner
+        run: cargo nextest run -P difftest-runner -p difftest-runner -p difftest-types --release --no-default-features --features "use-installed-tools"
+      - name: build difftests (without shaders)
+        run: cargo build --manifest-path ./tests/difftests/tests/Cargo.toml --workspace --release --no-default-features --features "use-installed-tools"
       - name: difftests
-        run: cargo run -p difftests --release --no-default-features --features "use-installed-tools"
+        run: cargo nextest run -P difftests -p difftests --release --no-default-features --features "use-installed-tools"
 
   # This allows us to have a single job we can branch protect on, rather than needing
   # to update the branch protection rules when the test matrix changes

Cargo.lock

@@ -29,7 +29,8 @@ members = [
     "tests/compiletests",
     "tests/compiletests/deps-helper",
     "tests/difftests/bin",
-    "tests/difftests/lib",
+    "tests/difftests/runner",
+    "tests/difftests/types",
 ]
 
 [workspace.package]
@@ -53,7 +54,9 @@ rustc_codegen_spirv-types = { path = "./crates/rustc_codegen_spirv-types", versi
 rustc_codegen_spirv-target-specs = { path = "crates/rustc_codegen_spirv-target-specs", version = "=0.9.0" }
 
 # difftest libraries mirrored from difftest workspace
-difftest = { path = "tests/difftests/lib" }
+difftest = { path = "tests/difftests/tests/lib" }
+difftest-runner = { path = "tests/difftests/runner", default-features = false }
+difftest-types = { path = "tests/difftests/types" }
 
 # External dependencies that need to be mentioned more than once.
 tracing = "0.1"

Cargo.toml

@@ -34,7 +34,7 @@ skip-toolchain-check = []
 # HACK(eddyb) these only exist to unify features across dependency trees,
 # in order to avoid multiple separate instances of `rustc_codegen_spirv`.
 ahash = { version = "0.8.11", features = ["no-rng"] }
-bytemuck = { version = "1.20.0", features = ["aarch64_simd", "derive"] }
+bytemuck = { workspace = true, features = ["aarch64_simd"] }
 log = { version = "0.4.22", features = ["std"] }
 regex = { version = "1", features = ["perf"] }
 rustix = { version = "1.0.8", features = ["all-apis"] }

crates/rustc_codegen_spirv/Cargo.toml

@@ -14,7 +14,7 @@ workspace = true
 spirv-std-types.workspace = true
 spirv-std-macros.workspace = true
 bitflags = "1.3.2"
-bytemuck = { version = "1.18.0", features = ["derive"], optional = true }
+bytemuck = { workspace = true, optional = true }
 
 [target.'cfg(target_arch = "spirv")'.dependencies]
 num-traits = { workspace = true, features = ["libm"] }

crates/spirv-std/Cargo.toml

@@ -9,23 +9,17 @@ repository.workspace = true
 # See rustc_codegen_spirv/Cargo.toml for details on these features
 [features]
 default = ["use-compiled-tools"]
-use-installed-tools = []
-use-compiled-tools = []
+use-installed-tools = ["difftest-runner/use-installed-tools"]
+use-compiled-tools = ["difftest-runner/use-compiled-tools"]
 
 [dependencies]
 anyhow = "1.0"
-tracing = "0.1"
-tracing-subscriber = { version = "0.3.20", features = ["fmt", "env-filter"] }
-tempfile = "3.5"
-tester = "0.9.1"
-serde = { version = "1.0", features = ["derive"] }
-serde_json = "1.0"
-thiserror = "2.0.12"
-toml = { version = "0.9.2", default-features = false, features = ["parse", "serde"] }
-bytesize = "2.0.1"
-bytemuck = "1.21.0"
-difftest = { path = "../lib" }
-tabled = { version = "0.20.0", default-features = false, features = ["std"] }
+difftest-runner.workspace = true
 
 [lints]
 workspace = true
+
+[[test]]
+name = "difftests"
+path = "src/test.rs"
+harness = false