add crate that uses assert_instr

Author: gnzlbg

Cargo.toml

@@ -3,6 +3,9 @@ members = [
   "crates/stdsimd-verify",
   "crates/stdsimd",
 ]
+exclude = [
+  "crates/wasm-assert-instr-tests"
+]
 
 [profile.release]
 debug = true

crates/stdsimd-test/Cargo.toml

@@ -11,3 +11,7 @@ cc = "1.0"
 lazy_static = "1.0"
 rustc-demangle = "0.1.8"
 wasm-bindgen = "0.2.15"
+
+[features]
+default = []
+git_wasm_bindgen = []

crates/stdsimd-test/src/lib.rs

@@ -258,13 +258,20 @@ fn parse_dumpbin(output: &str) -> HashMap<String, Vec<Function>> {
     ret
 }
 
-#[wasm_bindgen(module = "child_process", version = "*")]
+
+#[cfg_attr(feature = "git_wasm_bindgen",
+           wasm_bindgen(module = "child_process"))]
+#[cfg_attr(not(feature = "git_wasm_bindgen"),
+           wasm_bindgen(module = "child_process", version = "*"))]
 extern "C" {
     #[wasm_bindgen(js_name = execSync)]
     fn exec_sync(cmd: &str) -> Buffer;
 }
 
-#[wasm_bindgen(module = "buffer", version = "*")]
+#[cfg_attr(feature = "git_wasm_bindgen",
+           wasm_bindgen(module = "buffer"))]
+#[cfg_attr(not(feature = "git_wasm_bindgen"),
+           wasm_bindgen(module = "buffer", version = "*"))]
 extern "C" {
     type Buffer;
     #[wasm_bindgen(method, js_name = toString)]
@@ -307,7 +314,7 @@ fn parse_wasm2wat() -> HashMap<String, Vec<Function>> {
         if line.starts_with("(elem") {
             for (i, name) in line.split_whitespace().skip(3).enumerate() {
                 let name = name.trim_right_matches(")");
-                for f in ret.get_mut(name).unwrap() {
+                for f in ret.get_mut(name).expect("ret.get_mut(name) failed") {
                     f.addr = Some(i + 1);
                 }
             }
@@ -371,7 +378,8 @@ pub fn assert(fnptr: usize, fnname: &str, expected: &str) {
                 && expected.starts_with('"')
                 && expected.ends_with('"')
         );
-        expected.get(1..expected.len() - 1).unwrap()
+        expected.get(1..expected.len() - 1)
+            .expect("expected must be a '\"' delimited string, e.g., \"nop\"")
     };
     let mut fnname = fnname.to_string();
     let functions = get_functions(fnptr, &mut fnname);

crates/wasm-assert-instr-tests/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "wasm-assert-instr-tests"
+version = "0.1.0"
+authors = ["gnzlbg <[email protected]>"]
+
+[dependencies]
+coresimd = { path = "../coresimd" }
+[dev-dependencies]
+stdsimd-test = { path = "../stdsimd-test", features = ["git_wasm_bindgen"] }
+
+[target.wasm32-unknown-unknown.dev-dependencies]
+wasm-bindgen-test = { git = 'https://github.com/rustwasm/wasm-bindgen' }
+
+[patch.crates-io]
+wasm-bindgen = { git = 'https://github.com/rustwasm/wasm-bindgen' }
+wasm-bindgen-test = { git = 'https://github.com/rustwasm/wasm-bindgen' }

crates/wasm-assert-instr-tests/readme.md

@@ -0,0 +1,71 @@
+# assert_instr on WASM32
+
+This crate uses `assert_instr` to verify the assembly of wasm functions.
+
+# Set up
+
+This crate needs a couple of tools installed:
+
+1. Install latest version of `wasm-bindgen` CLI tools
+
+```
+git clone [email protected]:rustwasm/wasm-bindgen
+cd wasm-bindgen
+cargo install --path crates/cli
+
+# This makes wasm-bindgen-test-runner the test runner for wasm32-unknown-unknown:
+``` 
+
+2. Install WABT
+
+```
+# MacOSX
+brew install wabt
+
+# From source: 
+git clone --recursive https://github.com/WebAssembly/wabt
+make -C wabt -j
+
+# Add it to the path
+PATH=$PATH:/wabt/bin
+```
+
+The `stdsimd-test` proc macro needs to be able to find these in the path. We
+could add an environment variable to configure these.
+
+3. Install Node
+
+Using `nvm`, homebrew, or manually. The test runner needs to find a recent
+enough node in the `PATH`:
+
+```
+# MacOSX
+brew install node
+
+# Other
+curl https://nodejs.org/dist/v10.8.0/node-v10.8.0-linux-x64.tar.xz | tar xJf -
+PATH=$PATH:/node-v10.8.0-linux-x64/bin
+```
+
+4. Compile and install linker shim
+
+```
+# In stdsimd/
+cd ci
+rustc lld-shim -o lld-shim
+```
+
+# Running the tests
+
+This is how you can run the tests:
+
+```
+CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_LINKER=PATH/TO/lld-shim \
+CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner \
+cargo test --target=wasm32-unknown-unknown --release
+```
+
+you can also set the `CARGO_TARGET_WASM32_...` linker and test runner globally
+with `export ...`.
+
+To see the build fail, pass it `RUSTFLAGS="-C target-feature=+simd128"`.

crates/wasm-assert-instr-tests/src/lib.rs

@@ -0,0 +1,22 @@
+//! Includes assert_instr tests for wasm that currently pass.
+#![feature(stdsimd)]
+#![cfg_attr(test, feature(use_extern_macros))]
+
+extern crate coresimd;
+#[cfg(test)]
+extern crate stdsimd_test;
+#[cfg(all(test, target_arch = "wasm32"))]
+extern crate wasm_bindgen_test;
+
+use coresimd::arch::wasm32::*;
+
+#[cfg(test)]
+use stdsimd_test::assert_instr;
+
+#[cfg(test)]
+use wasm_bindgen_test::*;
+
+#[cfg_attr(test, assert_instr(foo))]
+pub fn i8x16_add(a: v128, b: v128) -> v128 {
+    unsafe { i8x16::add(a, b) }
+}