vec3: difftest for layout size and alignment

Author: Firestar99

tests/difftests/tests/Cargo.lock

@@ -17,6 +17,8 @@ members = [
     "arch/push_constants/push_constants-wgsl",
     "storage_class/array_access/array_access-rust",
     "storage_class/array_access/array_access-wgsl",
+    "lang/abi/vector_layout/cpu",
+    "lang/abi/vector_layout/rust-gpu",
     "lang/control_flow/control_flow-rust",
     "lang/control_flow/control_flow-wgsl",
     "lang/control_flow_complex/control_flow_complex-rust",

tests/difftests/tests/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "abi-vector-layout-cpu"
+edition.workspace = true
+
+[lints]
+workspace = true
+
+# GPU deps
+[dependencies]
+spirv-std.workspace = true
+bytemuck.workspace = true
+
+# CPU deps (for the test harness)
+[target.'cfg(not(target_arch = "spirv"))'.dependencies]
+difftest.workspace = true

tests/difftests/tests/lang/abi/vector_layout/cpu/Cargo.toml

@@ -0,0 +1,9 @@
+use crate::layout::eval_layouts;
+use difftest::config::Config;
+
+pub fn run() {
+    let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
+    config
+        .write_result(bytemuck::bytes_of(&eval_layouts()))
+        .unwrap()
+}

tests/difftests/tests/lang/abi/vector_layout/cpu/src/cpu_driver.rs

@@ -0,0 +1,37 @@
+use bytemuck::{Pod, Zeroable};
+use spirv_std::glam::*;
+
+#[repr(C)]
+#[derive(Copy, Clone, Zeroable, Pod)]
+pub struct SizeAndAlign {
+    pub size: u32,
+    pub align: u32,
+}
+
+impl SizeAndAlign {
+    pub fn from<T>() -> Self {
+        Self {
+            size: size_of::<T>() as u32,
+            align: align_of::<T>() as u32,
+        }
+    }
+
+    pub fn flatten(&self) -> [u32; 2] {
+        [self.size, self.align]
+    }
+}
+
+pub type EvalResult = [SizeAndAlign; 8];
+
+pub fn eval_layouts() -> EvalResult {
+    [
+        SizeAndAlign::from::<u32>(),
+        SizeAndAlign::from::<UVec2>(),
+        SizeAndAlign::from::<UVec3>(),
+        SizeAndAlign::from::<UVec4>(),
+        SizeAndAlign::from::<f32>(),
+        SizeAndAlign::from::<Vec2>(),
+        SizeAndAlign::from::<Vec3>(),
+        SizeAndAlign::from::<Vec4>(),
+    ]
+}

tests/difftests/tests/lang/abi/vector_layout/cpu/src/layout.rs

@@ -0,0 +1,8 @@
+#![cfg_attr(target_arch = "spirv", no_std)]
+
+#[cfg(not(target_arch = "spirv"))]
+pub mod cpu_driver;
+pub mod layout;
+pub mod shader;
+#[cfg(not(target_arch = "spirv"))]
+pub mod shader_driver;

tests/difftests/tests/lang/abi/vector_layout/cpu/src/lib.rs

@@ -0,0 +1,3 @@
+fn main() {
+    abi_vector_layout_cpu::cpu_driver::run();
+}

tests/difftests/tests/lang/abi/vector_layout/cpu/src/main.rs

@@ -0,0 +1,7 @@
+use crate::layout::{EvalResult, eval_layouts};
+use spirv_std::spirv;
+
+#[spirv(compute(threads(1)))]
+pub fn main_cs(#[spirv(storage_buffer, descriptor_set = 0, binding = 0)] output: &mut EvalResult) {
+    *output = eval_layouts();
+}

tests/difftests/tests/lang/abi/vector_layout/cpu/src/shader.rs

@@ -0,0 +1,13 @@
+use crate::layout::EvalResult;
+use difftest::config::Config;
+use difftest::scaffold::compute::{BufferConfig, RustComputeShader, WgpuComputeTestMultiBuffer};
+
+pub fn run() {
+    let config = Config::from_path(std::env::args().nth(1).unwrap()).unwrap();
+    let test = WgpuComputeTestMultiBuffer::new(
+        RustComputeShader::default(),
+        [1, 1, 1],
+        Vec::from(&[BufferConfig::writeback(size_of::<EvalResult>())]),
+    );
+    test.run_test(&config).unwrap();
+}

tests/difftests/tests/lang/abi/vector_layout/cpu/src/shader_driver.rs

@@ -0,0 +1,16 @@
+[package]
+name = "abi-vector-layout-rust-gpu"
+edition.workspace = true
+
+[lib]
+crate-type = ["lib", "dylib"]
+
+[lints]
+workspace = true
+
+[dependencies]
+abi-vector-layout-cpu = { path = "../cpu" }
+
+# CPU deps (for the test harness)
+[target.'cfg(not(target_arch = "spirv"))'.dependencies]
+difftest.workspace = true