From cdeb9f7fdb2d6c76daed36da96ac6d9d61add101 Mon Sep 17 00:00:00 2001 From: Ivan Boldyrev Date: Sun, 10 Sep 2023 18:57:24 +0400 Subject: [PATCH] Misc textual improvements --- Cargo.toml | 6 +++--- README.md | 4 ++-- build.rs | 2 +- src/wasm32_simd.rs | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 99dddbe..59fc524 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,9 +18,9 @@ default = ["std"] # implementation uses C intrinsics and requires a C compiler. neon = [] -# The WASM-SIMD implementation does not participate in dynamic feature detection, -# which is currently x86-only. If "wasm_simd" is on, WASM SIMD support is assumed. -# Note that not all WASM implementation may support WASM-SIMD specification. +# The Wasm SIMD implementation does not participate in dynamic feature detection, +# which is currently x86-only. If "wasm_simd" is on, Wasm SIMD support is assumed. +# Note that not all Wasm implementation may support Wasm SIMD specification. wasm32_simd = [] # This crate uses libstd for std::io trait implementations, and also for diff --git a/README.md b/README.md index a63d5f2..d9bd6f7 100644 --- a/README.md +++ b/README.md @@ -35,8 +35,8 @@ This repository is the official implementation of BLAKE3. It includes: * The [`blake3`](https://crates.io/crates/blake3) Rust crate, which includes optimized implementations for SSE2, SSE4.1, AVX2, AVX-512, - and NEON, with automatic runtime CPU feature detection on x86. The - `rayon` feature provides multithreading. + NEON and Wasm SIMD, with automatic runtime CPU feature detection on x86. + The `rayon` feature provides multithreading. * The [`b3sum`](https://crates.io/crates/b3sum) Rust crate, which provides a command line interface. It uses multithreading by default, diff --git a/build.rs b/build.rs index 9cef911..d7a04f3 100644 --- a/build.rs +++ b/build.rs @@ -235,7 +235,7 @@ fn build_neon_c_intrinsics() { fn build_wasm32_simd() { assert!(is_wasm32()); - // No C code to compile here. Set the cfg flags that enable the WASM SIMD. + // No C code to compile here. Set the cfg flags that enable the Wasm SIMD. // The regular Cargo build will compile it. println!("cargo:rustc-cfg=blake3_wasm32_simd"); } diff --git a/src/wasm32_simd.rs b/src/wasm32_simd.rs index 184072d..531b600 100644 --- a/src/wasm32_simd.rs +++ b/src/wasm32_simd.rs @@ -5,11 +5,11 @@ * Performance measurements with a primitive benchmark with ~16Kb of data: * * | M1 native | 11,610 ns | - * | M1 WASM SIMD | 13,355 ns | - * | M1 WASM | 22,037 ns | + * | M1 Wasm SIMD | 13,355 ns | + * | M1 Wasm | 22,037 ns | * | x64 native | 6,713 ns | - * | x64 WASM SIMD | 11,985 ns | - * | x64 WASM | 25,978 ns | + * | x64 Wasm SIMD | 11,985 ns | + * | x64 Wasm | 25,978 ns | * * wasmtime v12.0.1 was used on both platforms. */ @@ -690,7 +690,7 @@ unsafe fn hash1( block_flags = flags; slice = &slice[BLOCK_LEN..]; } - *out = core::mem::transmute(cv); // x86 is little-endian + *out = core::mem::transmute(cv); } #[target_feature(enable = "simd128")]