chore: refactor compiler macros

Signed-off-by: Henry Gressmann <mail@henrygressmann.de>

Author: explodingcamera

.github/workflows/test.yaml

@@ -99,11 +99,3 @@ jobs:
           target: ${{ matrix.target }}
           toolchain: ${{ matrix.rust }}
         if: matrix.target != ''
-
-      - name: Run clippy (${{ matrix.target }})
-        uses: houseabsolute/actions-rust-cross@v0.0.13
-        with:
-          command: clippy
-          target: ${{ matrix.target }}
-          toolchain: ${{ matrix.rust }}
-        if: matrix.target != ''

Cargo.lock

@@ -0,0 +1,130 @@
+// WIP
+
+struct V128([u8; 16]);
+
+impl V128 {
+    fn f32x4(&self) -> [f32; 4] {
+        let mut res = [0.0; 4];
+        for i in 0..4 {
+            let mut f = [0; 4];
+            for j in 0..4 {
+                f[j] = self.0[i * 4 + j];
+            }
+            res[i] = f32::from_le_bytes(f);
+        }
+        res
+    }
+
+    fn i32x4(&self) -> [i32; 4] {
+        let mut res = [0; 4];
+        for i in 0..4 {
+            let mut f = [0; 4];
+            for j in 0..4 {
+                f[j] = self.0[i * 4 + j];
+            }
+            res[i] = i32::from_le_bytes(f);
+        }
+        res
+    }
+
+    fn i64x2(&self) -> [i64; 2] {
+        let mut res = [0; 2];
+        for i in 0..2 {
+            let mut f = [0; 8];
+            for j in 0..8 {
+                f[j] = self.0[i * 8 + j];
+            }
+            res[i] = i64::from_le_bytes(f);
+        }
+        res
+    }
+
+    fn f64x2(&self) -> [f64; 2] {
+        let mut res = [0.0; 2];
+        for i in 0..2 {
+            let mut f = [0; 8];
+            for j in 0..8 {
+                f[j] = self.0[i * 8 + j];
+            }
+            res[i] = f64::from_le_bytes(f);
+        }
+        res
+    }
+
+    fn i16x8(&self) -> [i16; 8] {
+        let mut res = [0; 8];
+        for i in 0..8 {
+            let mut f = [0; 2];
+            for j in 0..2 {
+                f[j] = self.0[i * 2 + j];
+            }
+            res[i] = i16::from_le_bytes(f);
+        }
+        res
+    }
+
+    fn i8x16(&self) -> [i8; 16] {
+        let mut res = [0; 16];
+        for i in 0..16 {
+            res[i] = i8::from_le_bytes([self.0[i]]);
+        }
+        res
+    }
+}
+
+fn vvunop(c1: V128) -> V128 {
+    let mut res = [0; 16];
+    for i in 0..16 {
+        res[i] = !c1.0[i];
+    }
+    V128(res)
+}
+
+fn vvbinop(c1: V128, c2: V128) -> V128 {
+    let mut res = [0; 16];
+    for i in 0..16 {
+        res[i] = c1.0[i] & c2.0[i];
+    }
+    V128(res)
+}
+
+fn vvternop(c1: V128, c2: V128, c3: V128) -> V128 {
+    let mut res = [0; 16];
+    for i in 0..16 {
+        res[i] = c1.0[i] & c2.0[i] | !c1.0[i] & c3.0[i];
+    }
+    V128(res)
+}
+
+fn any_true(val: V128) -> bool {
+    val.0.iter().any(|&x| x != 0)
+}
+
+fn i8x16_swizzle(c1: V128, c2: V128) -> V128 {
+    let mut res = [0; 16];
+    for i in 0..16 {
+        res[i] = c1.0[c2.0[i] as usize];
+    }
+    V128(res)
+}
+
+fn i18x16_shuffle(c1: V128, c2: V128) -> V128 {
+    let mut res = [0; 16];
+    for i in 0..16 {
+        res[i] = c1.0[(c2.0[i] & 0xf) as usize];
+    }
+    V128(res)
+}
+
+fn f32x4_abs(val: V128) -> V128 {
+    let mut res = [0; 16];
+    for i in 0..4 {
+        let f = val.f32x4();
+        let f = f32::abs(f[i]);
+        let f = f.to_le_bytes();
+        for j in 0..4 {
+            res[i * 4 + j] = f[j];
+        }
+    }
+    V128(res)
+}

crates/parser/src/visit.rs

@@ -7,7 +7,7 @@ fn main() -> Result<()> {
     let mut test_suite = TestSuite::new();
 
     TestSuite::set_log_level(log::LevelFilter::Off);
-    test_suite.run_spec_group(wasm_testsuite::V2_DRAFT_1_TESTS)?;
+    test_suite.run_spec_group(wasm_testsuite::V2_TESTS)?;
     test_suite.save_csv("./tests/generated/wasm-2.csv", env!("CARGO_PKG_VERSION"))?;
 
     if test_suite.failed() {

crates/tinywasm/src/interpreter/simd.rs

@@ -10,7 +10,7 @@ rust-version.workspace=true
 
 [dependencies]
 log={workspace=true, optional=true}
-rkyv={version="0.8.0-rc.2", optional=true, default-features=false, features=["alloc", "bytecheck"]}
+rkyv={version="0.8.1", optional=true, default-features=false, features=["alloc", "bytecheck"]}
 
 [features]
 default=["std", "logging", "archive"]

crates/tinywasm/tests/test-wasm-2.rs

@@ -42,24 +42,6 @@ pub enum ConstInstruction {
 // should be kept as small as possible (16 bytes max)
 #[rustfmt::skip]
 pub enum Instruction {
-    // > Custom Instructions
-    // // LocalGet + I32Const + I32Add
-    // I32LocalGetConstAdd(LocalAddr, i32),
-    // // LocalGet + I32Const + I32Store
-    // I32ConstStoreLocal { local: LocalAddr, const_i32: i32, offset: u32, mem_addr: u8 },
-    // // LocalGet + LocalGet + I32Store
-    // I32StoreLocal { local_a: LocalAddr, local_b: LocalAddr, offset: u32, mem_addr: u8 },
-    // // I64Xor + I64Const + I64RotL 
-    // // Commonly used by a few crypto libraries
-    // I64XorConstRotl(i64),
-    // // LocalTee + LocalGet
-    // LocalTeeGet(LocalAddr, LocalAddr),
-    // LocalGet2(LocalAddr, LocalAddr),
-    // LocalGet3(LocalAddr, LocalAddr, LocalAddr),
-    // LocalGetSet(LocalAddr, LocalAddr),
- 
-    // LocalGetGet32(LocalAddr, LocalAddr), LocalGetGet64(LocalAddr, LocalAddr), LocalGetGet128(LocalAddr, LocalAddr),
-    // LocalTeeGet32(LocalAddr, LocalAddr), LocalTeeGet64(LocalAddr, LocalAddr), LocalTeeGet128(LocalAddr, LocalAddr),
     LocalCopy32(LocalAddr, LocalAddr), LocalCopy64(LocalAddr, LocalAddr), LocalCopy128(LocalAddr, LocalAddr), LocalCopy128Ref(LocalAddr, LocalAddr), LocalCopyRef(LocalAddr, LocalAddr),
     LocalsStore32(LocalAddr, LocalAddr, u32, MemAddr), LocalsStore64(LocalAddr, LocalAddr, u32, MemAddr), LocalsStore128(LocalAddr, LocalAddr, u32, MemAddr), LocalsStoreRef(LocalAddr, LocalAddr, u32, MemAddr),
 
@@ -205,4 +187,8 @@ pub enum Instruction {
     MemoryFill(MemAddr),
     DataDrop(DataAddr),
     ElemDrop(ElemAddr),
+
+    // // > SIMD Instructions
+    // V128Load(MemoryArg), V128Load8x8S { offset: u64, mem_addr: MemAddr }, V128Load8x8U { offset: u64, mem_addr: MemAddr }, V128Load16x4S { offset: u64, mem_addr: MemAddr }, V128Load16x4U { offset: u64, mem_addr: MemAddr }, V128Load32x2S { offset: u64, mem_addr: MemAddr }, V128Load32x2U { offset: u64, mem_addr: MemAddr }, V128Load8Splat { offset: u64, mem_addr: MemAddr }, V128Load16Splat { offset: u64, mem_addr: MemAddr }, V128Load32Splat { offset: u64, mem_addr: MemAddr }, V128Load64Splat { offset: u64, mem_addr: MemAddr }, V128Load32Zero { offset: u64, mem_addr: MemAddr }, V128Load64Zero { offset: u64, mem_addr: MemAddr }, 
+    // V128Store { offset: u64, mem_addr: MemAddr }, V128Store8x8 { offset: u64, mem_addr: MemAddr }, V128Store16x4 { offset: u64, mem_addr: MemAddr }, V128Store32x2 { offset: u64, mem_addr: MemAddr },
 }

crates/types/Cargo.toml

@@ -32,7 +32,7 @@ pub const MVP_TESTS: &[&str] = &["address.wast", "align.wast", "binary-leb128.wa
 
 /// List of all tests that apply to the V2 draft 1 spec.
 #[rustfmt::skip]
-pub const V2_DRAFT_1_TESTS: &[&str] = &["address.wast", "align.wast", "binary-leb128.wast", "binary.wast", "block.wast", "br.wast", "br_if.wast", "br_table.wast", "bulk.wast", "call.wast", "call_indirect.wast", "comments.wast", "const.wast", "conversions.wast", "custom.wast", "data.wast", "elem.wast", "endianness.wast", "exports.wast", "f32.wast", "f32_bitwise.wast", "f32_cmp.wast", "f64.wast", "f64_bitwise.wast", "f64_cmp.wast", "fac.wast", "float_exprs.wast", "float_literals.wast", "float_memory.wast", "float_misc.wast", "forward.wast", "func.wast", "func_ptrs.wast", "global.wast", "i32.wast", "i64.wast", "if.wast", "imports.wast", "inline-module.wast", "int_exprs.wast", "int_literals.wast", "labels.wast", "left-to-right.wast", "linking.wast", "load.wast", "local_get.wast", "local_set.wast", "local_tee.wast", "loop.wast", "memory.wast", "memory_copy.wast", "memory_fill.wast", "memory_grow.wast", "memory_init.wast", "memory_redundancy.wast", "memory_size.wast", "memory_trap.wast", "names.wast", "nop.wast", "obsolete-keywords.wast", "ref_func.wast", "ref_is_null.wast", "ref_null.wast", "return.wast", "select.wast", "skip-stack-guard-page.wast", "stack.wast", "start.wast", "store.wast", "switch.wast", "table-sub.wast", "table.wast", "table_copy.wast", "table_fill.wast", "table_get.wast", "table_grow.wast", "table_init.wast", "table_set.wast", "table_size.wast", "token.wast", "traps.wast", "type.wast", "unreachable.wast", "unreached-invalid.wast", "unreached-valid.wast", "unwind.wast", "utf8-custom-section-id.wast", "utf8-import-field.wast", "utf8-import-module.wast", "utf8-invalid-encoding.wast"];
+pub const V2_TESTS: &[&str] = &["address.wast", "align.wast", "binary-leb128.wast", "binary.wast", "block.wast", "br.wast", "br_if.wast", "br_table.wast", "bulk.wast", "call.wast", "call_indirect.wast", "comments.wast", "const.wast", "conversions.wast", "custom.wast", "data.wast", "elem.wast", "endianness.wast", "exports.wast", "f32.wast", "f32_bitwise.wast", "f32_cmp.wast", "f64.wast", "f64_bitwise.wast", "f64_cmp.wast", "fac.wast", "float_exprs.wast", "float_literals.wast", "float_memory.wast", "float_misc.wast", "forward.wast", "func.wast", "func_ptrs.wast", "global.wast", "i32.wast", "i64.wast", "if.wast", "imports.wast", "inline-module.wast", "int_exprs.wast", "int_literals.wast", "labels.wast", "left-to-right.wast", "linking.wast", "load.wast", "local_get.wast", "local_set.wast", "local_tee.wast", "loop.wast", "memory.wast", "memory_copy.wast", "memory_fill.wast", "memory_grow.wast", "memory_init.wast", "memory_redundancy.wast", "memory_size.wast", "memory_trap.wast", "names.wast", "nop.wast", "obsolete-keywords.wast", "ref_func.wast", "ref_is_null.wast", "ref_null.wast", "return.wast", "select.wast", "skip-stack-guard-page.wast", "stack.wast", "start.wast", "store.wast", "switch.wast", "table-sub.wast", "table.wast", "table_copy.wast", "table_fill.wast", "table_get.wast", "table_grow.wast", "table_init.wast", "table_set.wast", "table_size.wast", "token.wast", "traps.wast", "type.wast", "unreachable.wast", "unreached-invalid.wast", "unreached-valid.wast", "unwind.wast", "utf8-custom-section-id.wast", "utf8-import-field.wast", "utf8-import-module.wast", "utf8-invalid-encoding.wast"];
 
 /// List of all tests that apply to the simd proposal
 #[rustfmt::skip]