difftest runner: cleanup wgpu runner, remove variants of runners, use shader passthrough for rust-gpu

Author: Firestar99

tests/difftests/runner/src/runner.rs

@@ -1,7 +1,6 @@
 use bytesize::ByteSize;
 use difftest_types::config::{OutputType, TestMetadata};
 use serde::{Deserialize, Serialize};
-use std::process::Stdio;
 use std::{
     collections::{HashMap, HashSet},
     fs,
@@ -292,8 +291,6 @@ impl Runner {
 
             let output = cmd
                 .current_dir(&package.absolute_path)
-                .stdout(Stdio::inherit())
-                .stderr(Stdio::inherit())
                 .output()
                 .map_err(|e| RunnerError::Io { source: e })?;
             let exit_code = output.status.code().unwrap_or(-1);

tests/difftests/tests/arch/push_constants/push_constants-rust/src/main.rs

@@ -1,6 +1,7 @@
 use difftest::config::Config;
+use difftest::scaffold::compute::wgpu::Features;
 use difftest::scaffold::compute::{
-    BufferConfig, BufferUsage, RustComputeShader, WgpuComputeTestPushConstants,
+    BufferConfig, BufferUsage, RustComputeShader, WgpuComputeTestMultiBuffer,
 };
 
 #[repr(C)]
@@ -30,7 +31,7 @@ fn main() {
         count: num_elements as u32,
     };
 
-    let test = WgpuComputeTestPushConstants::new(
+    let test = WgpuComputeTestMultiBuffer::new(
         RustComputeShader::default(),
         [4, 1, 1], // 256 / 64 = 4 workgroups
         vec![
@@ -45,9 +46,9 @@ fn main() {
                 initial_data: None,
             },
         ],
-        std::mem::size_of::<PushConstants>() as u32,
-        bytemuck::bytes_of(&push_constants).to_vec(),
-    );
+    )
+    .with_feature(Features::PUSH_CONSTANTS)
+    .with_push_constant(&push_constants);
 
     test.run_test(&config).unwrap();
 }

tests/difftests/tests/arch/push_constants/push_constants-wgsl/src/main.rs

@@ -1,6 +1,7 @@
 use difftest::config::Config;
+use difftest::scaffold::compute::wgpu::Features;
 use difftest::scaffold::compute::{
-    BufferConfig, BufferUsage, WgpuComputeTestPushConstants, WgslComputeShader,
+    BufferConfig, BufferUsage, WgpuComputeTestMultiBuffer, WgslComputeShader,
 };
 
 #[repr(C)]
@@ -30,7 +31,7 @@ fn main() {
         count: num_elements as u32,
     };
 
-    let test = WgpuComputeTestPushConstants::new(
+    let test = WgpuComputeTestMultiBuffer::new(
         WgslComputeShader::default(),
         [4, 1, 1], // 256 / 64 = 4 workgroups
         vec![
@@ -45,9 +46,9 @@ fn main() {
                 initial_data: None,
             },
         ],
-        std::mem::size_of::<PushConstants>() as u32,
-        bytemuck::bytes_of(&push_constants).to_vec(),
-    );
+    )
+    .with_feature(Features::PUSH_CONSTANTS)
+    .with_push_constant(&push_constants);
 
     test.run_test(&config).unwrap();
 }

tests/difftests/tests/lang/core/intrinsics/black_box_noop/with-black-box/src/main.rs

@@ -1,9 +1,13 @@
 use difftest::config::{Config, TestMetadata};
-use difftest::scaffold::compute::{RustComputeShader, WgpuComputeTest};
+use difftest::scaffold::compute::{RustComputeShader, WgpuComputeTestMultiBuffer};
 
 fn main() {
     let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
-    let test = WgpuComputeTest::new(RustComputeShader::default(), [1, 1, 1], 12 * 4);
+    let test = WgpuComputeTestMultiBuffer::new_single_buffer(
+        RustComputeShader::default(),
+        [1, 1, 1],
+        12 * 4,
+    );
     test.run_test(&config).unwrap();
     config
         .write_metadata(&TestMetadata::u32())

tests/difftests/tests/lang/core/intrinsics/black_box_noop/without-black-box/src/main.rs

@@ -1,9 +1,13 @@
 use difftest::config::{Config, TestMetadata};
-use difftest::scaffold::compute::{RustComputeShader, WgpuComputeTest};
+use difftest::scaffold::compute::{RustComputeShader, WgpuComputeTestMultiBuffer};
 
 fn main() {
     let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
-    let test = WgpuComputeTest::new(RustComputeShader::default(), [1, 1, 1], 12 * 4);
+    let test = WgpuComputeTestMultiBuffer::new_single_buffer(
+        RustComputeShader::default(),
+        [1, 1, 1],
+        12 * 4,
+    );
     test.run_test(&config).unwrap();
     config
         .write_metadata(&TestMetadata::u32())

…ts/tests/lib/src/scaffold/compute/ash.rs …s/lib/src/scaffold/compute/ash_runner.rstests/difftests/tests/lib/src/scaffold/compute/ash.rs renamed to tests/difftests/tests/lib/src/scaffold/compute/ash_runner.rs tests/difftests/tests/lib/src/scaffold/compute/ash.rs renamed to tests/difftests/tests/lib/src/scaffold/compute/ash_runner.rs

@@ -1,10 +1,10 @@
-mod ash;
+mod ash_runner;
 mod backend;
-mod wgpu;
+mod wgpu_runner;
 
 pub use crate::scaffold::shader::*;
-pub use ash::AshBackend;
+pub use ash;
+pub use ash_runner::AshBackend;
 pub use backend::{BufferConfig, BufferUsage, ComputeBackend, ComputeShaderTest, ComputeTest};
-pub use wgpu::{
-    WgpuBackend, WgpuComputeTest, WgpuComputeTestMultiBuffer, WgpuComputeTestPushConstants,
-};
+pub use wgpu;
+pub use wgpu_runner::WgpuComputeTestMultiBuffer;