Switch to std::simd

.github/workflows/main.yml

@@ -11,8 +11,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.57.0
-          - stable
+          - nightly
     steps:
     - name: Checkout
       uses: actions/checkout@v2
@@ -23,16 +22,13 @@ jobs:
         toolchain: ${{ matrix.rust }}
         override: true
 
-    - name: Build with minimal features (no_std)
-      run: cargo build --verbose --no-default-features --features no-std-float
+    # - name: Build with minimal features (no_std)
+    #   run: cargo build --verbose --no-default-features --features no-std-float
 
     - name: Run tests for tiny-skia-path
       working-directory: path
       run: cargo test --verbose
 
-    - name: Run tests without SIMD
-      run: cargo test --verbose --no-default-features --features png-format
-
     - name: Run tests with SSE2
       env:
         RUSTFLAGS: -Ctarget-feature=+sse2
@@ -62,7 +58,7 @@ jobs:
     - name: Install toolchain
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: stable
+        toolchain: nightly
         override: true
         target: wasm32-wasi
 
@@ -71,11 +67,8 @@ jobs:
         curl https://wasmtime.dev/install.sh -sSf | bash
         echo "$HOME/.wasmtime/bin" >> $GITHUB_PATH
 
-    - name: Build with minimal features (no_std)
-      run: cargo build --target wasm32-wasi --verbose --no-default-features --features no-std-float
-
-    - name: Run tests without SIMD
-      run: cargo test --target wasm32-wasi --verbose --no-default-features --features png-format
+    # - name: Build with minimal features (no_std)
+    #   run: cargo build --target wasm32-wasi --verbose --no-default-features --features no-std-float
 
     - name: Run tests with SIMD128
       env:
@@ -91,18 +84,15 @@ jobs:
     - name: Install toolchain
       uses: actions-rs/toolchain@v1
       with:
-        toolchain: stable
+        toolchain: nightly
         override: true
         target: aarch64-unknown-linux-gnu
 
     - name: Install cross
       run: cargo install cross
 
-    - name: Build with minimal features (no_std)
-      run: cross build --target aarch64-unknown-linux-gnu --verbose --no-default-features --features no-std-float
-
-    - name: Run tests without SIMD
-      run: cross test --target aarch64-unknown-linux-gnu --verbose --no-default-features --features png-format
+    # - name: Build with minimal features (no_std)
+    #   run: cross build --target aarch64-unknown-linux-gnu --verbose --no-default-features --features no-std-float
 
     - name: Run tests with Neon
       run: cross test --target aarch64-unknown-linux-gnu

Cargo.toml

@@ -24,17 +24,12 @@ png = { version = "0.17", optional = true }
 tiny-skia-path = { version = "0.10.0", path = "path", default-features = false }
 
 [features]
-default = ["std", "simd", "png-format"]
+default = ["std", "png-format"]
 
 # Enables the use of the standard library. Deactivate this and activate the no-std-float
 # feature to compile for targets that don't have std.
 std = ["tiny-skia-path/std"]
 no-std-float = ["tiny-skia-path/no-std-float"]
 
-# Enables SIMD instructions on x86 (from SSE up to AVX2), WebAssembly (SIMD128)
-# and AArch64 (Neon).
-# Has no effect on other targets. Present mainly for testing.
-simd = []
-
 # Allows loading and saving `Pixmap` as PNG.
 png-format = ["std", "png"]

path/src/lib.rs

@@ -12,6 +12,7 @@
 //!
 //! Note that all types use single precision floats (`f32`), just like [Skia](https://skia.org/).
 
+#![feature(portable_simd)]
 #![no_std]
 #![warn(missing_docs)]
 #![warn(missing_copy_implementations)]
@@ -36,8 +37,6 @@ extern crate std;
 extern crate alloc;
 
 mod dash;
-mod f32x2_t;
-mod f32x4_t;
 mod floating_point;
 mod path;
 mod path_builder;
@@ -49,7 +48,6 @@ mod stroker;
 mod transform;
 
 pub use dash::StrokeDash;
-pub use f32x2_t::f32x2;
 pub use floating_point::*;
 pub use path::*;
 pub use path_builder::*;
@@ -86,16 +84,6 @@ impl Point {
         Point { x, y }
     }
 
-    /// Creates a new `Point` from `f32x2`.
-    pub fn from_f32x2(r: f32x2) -> Self {
-        Point::from_xy(r.x(), r.y())
-    }
-
-    /// Converts a `Point` into a `f32x2`.
-    pub fn to_f32x2(&self) -> f32x2 {
-        f32x2::new(self.x, self.y)
-    }
-
     /// Creates a point at 0x0 position.
     pub fn zero() -> Self {
         Point { x: 0.0, y: 0.0 }

path/src/path_geometry.rs

@@ -10,9 +10,10 @@
 
 #![allow(missing_docs)]
 
+use core::simd::f32x2;
+
 use crate::{Point, Transform};
 
-use crate::f32x2_t::f32x2;
 use crate::floating_point::FLOAT_PI;
 use crate::scalar::{Scalar, SCALAR_NEARLY_ZERO, SCALAR_ROOT_2_OVER_2};
 
@@ -22,6 +23,21 @@ use crate::path_builder::PathDirection;
 #[cfg(all(not(feature = "std"), feature = "no-std-float"))]
 use crate::NoStdFloat;
 
+trait PointExt {
+    fn from_f32x2(r: f32x2) -> Self;
+    fn to_f32x2(&self) -> f32x2;
+}
+
+impl PointExt for Point {
+    fn from_f32x2(r: f32x2) -> Self {
+        Point::from_xy(r.as_array()[0], r.as_array()[1])
+    }
+
+    fn to_f32x2(&self) -> f32x2 {
+        f32x2::from_array([self.x, self.y])
+    }
+}
+
 // use for : eval(t) == A * t^2 + B * t + C
 #[derive(Clone, Copy, Default, Debug)]
 pub struct QuadCoeff {