const folding: difftest with rustc const block

Author: Firestar99

tests/difftests/tests/Cargo.lock

@@ -27,6 +27,8 @@ members = [
     "lang/core/ops/matrix_ops/matrix_ops-rust",
     "lang/core/ops/matrix_ops/matrix_ops-wgsl",
     "lang/core/ops/bitwise_ops/bitwise_ops-rust",
+    "lang/core/ops/const_fold_int/const-expr-cpu",
+    "lang/core/ops/const_fold_int/const-expr-shader",
     "lang/core/ops/const_fold_int/const-fold-cpu",
     "lang/core/ops/const_fold_int/const-fold-shader",
     "lang/core/ops/const_fold_int/dynamic-values-cpu",

tests/difftests/tests/Cargo.toml

@@ -0,0 +1,15 @@
+[package]
+name = "const_fold_int-const-expr-cpu"
+edition.workspace = true
+
+[lints]
+workspace = true
+
+# GPU deps
+[dependencies]
+const_fold_int-const-fold-cpu = { path = "../const-fold-cpu" }
+
+# CPU deps (for the test harness)
+[target.'cfg(not(target_arch = "spirv"))'.dependencies]
+difftest.workspace = true
+bytemuck.workspace = true

tests/difftests/tests/lang/core/ops/const_fold_int/const-expr-cpu/Cargo.toml

@@ -0,0 +1,5 @@
+use const_fold_int_const_fold_cpu::Variants;
+
+fn main() {
+    const_fold_int_const_fold_cpu::cpu_driver::run(Variants::ConstExpr);
+}

tests/difftests/tests/lang/core/ops/const_fold_int/const-expr-cpu/src/main.rs

@@ -0,0 +1,18 @@
+[package]
+name = "const_fold_int-const-expr-shader"
+edition.workspace = true
+
+[lints]
+workspace = true
+
+[lib]
+crate-type = ["dylib"]
+
+# GPU deps
+[dependencies]
+const_fold_int-const-fold-cpu = { path = "../const-fold-cpu" }
+
+# CPU deps (for the test harness)
+[target.'cfg(not(target_arch = "spirv"))'.dependencies]
+difftest.workspace = true
+bytemuck.workspace = true

tests/difftests/tests/lang/core/ops/const_fold_int/const-expr-shader/Cargo.toml

@@ -0,0 +1,4 @@
+#![cfg_attr(target_arch = "spirv", no_std)]
+#![allow(arithmetic_overflow)]
+
+pub use const_fold_int_const_fold_cpu::shader::main_cs;

tests/difftests/tests/lang/core/ops/const_fold_int/const-expr-shader/src/lib.rs

@@ -0,0 +1,5 @@
+use const_fold_int_const_fold_cpu::Variants;
+
+fn main() {
+    const_fold_int_const_fold_cpu::shader_driver::run(Variants::ConstExpr);
+}

tests/difftests/tests/lang/core/ops/const_fold_int/const-expr-shader/src/main.rs

@@ -14,20 +14,12 @@ macro_rules! op_u {
         [
             ($value << 0) as u32,
             ($value << 1) as u32,
-            ($value << 2) as u32,
             ($value << 30) as u32,
             ($value << 31) as u32,
-            ($value << 32) as u32,
-            ($value << 33) as u32,
-            ($value << 34) as u32,
             ($value >> 0) as u32,
             ($value >> 1) as u32,
-            ($value >> 2) as u32,
             ($value >> 30) as u32,
             ($value >> 31) as u32,
-            ($value >> 32) as u32,
-            ($value >> 33) as u32,
-            ($value >> 34) as u32,
         ]
     };
 }
@@ -66,21 +58,21 @@ pub const INTERESTING_PATTERNS: [u32; 8] = interesting_patterns!(identity);
 pub enum Variants {
     /// const folding in rust-gpu
     ConstFold,
-    // /// `const {}` expr for const eval within rustc
-    // ConstExpr,
+    /// `const {}` expr for const eval within rustc
+    ConstExpr,
     /// dynamic values from `input_patterns`
     DynamicValues,
 }
 
-pub type EvalResult = [[[u32; 16]; 8]; 2];
+pub type EvalResult = [[[u32; 8]; 8]; 2];
 
 impl Variants {
     pub fn eval(&self, input_patterns: &[u32; 8]) -> EvalResult {
         match self {
             Variants::ConstFold => [interesting_patterns!(op_u), interesting_patterns!(op_i)],
-            // Variants::ConstExpr => {
-            //     const { [interesting_patterns!(op_u), interesting_patterns!(op_i)] }
-            // }
+            Variants::ConstExpr => {
+                const { [interesting_patterns!(op_u), interesting_patterns!(op_i)] }
+            }
             Variants::DynamicValues => [
                 [
                     op_u!(input_patterns[0]),