Test with my AVX2 version of fearless_simd

Cargo.toml

@@ -115,7 +115,7 @@ rayon = { version = "1.10.0" }
 thread_local = "1.1.8"
 crossbeam-channel = "0.5.15"
 ordered-channel = { version = "1.2.0", features = ["crossbeam-channel"] }
-fearless_simd = { version = "0.3.0", default-features = false }
+fearless_simd = { git = "https://github.com/valadaptive/fearless_simd", branch = "more-avx2", default-features = false }
 
 # The below crates are experimental!
 vello_api = { path = "sparse_strips/vello_api", default-features = false }

sparse_strips/vello_bench/Cargo.toml

@@ -18,6 +18,7 @@ parley = { version = "0.5.0", default-features = true }
 rand = { workspace = true }
 smallvec = { workspace = true }
 usvg = { workspace = true }
+fearless_simd = { workspace = true, features = ["force_support_fallback"] }
 
 [features]
 

sparse_strips/vello_bench/src/glyph.rs

@@ -25,7 +25,7 @@ pub fn glyph(c: &mut Criterion) {
         strip_generator: StripGenerator::new(
             WIDTH,
             HEIGHT,
-            Level::try_detect().unwrap_or(Level::fallback()),
+            Level::try_detect().unwrap_or(Level::baseline()),
         ),
         strip_storage: StripStorage::default(),
         glyph_caches: Default::default(),

sparse_strips/vello_common/Cargo.toml

@@ -28,6 +28,10 @@ smallvec = { workspace = true }
 libm = { version = "0.2.15", optional = true }
 log = { workspace = true }
 
+[dev-dependencies]
+# We use Level::fallback() in tests
+fearless_simd = { workspace = true, features = ["force_support_fallback"] }
+
 [features]
 default = ["std", "png", "text"]
 # Enable using SIMD instructions for rendering

sparse_strips/vello_common/src/strip_generator.rs

@@ -158,7 +158,7 @@ mod tests {
 
     #[test]
     fn reset() {
-        let mut generator = StripGenerator::new(100, 100, Level::fallback());
+        let mut generator = StripGenerator::new(100, 100, Level::new());
         let mut storage = StripStorage::default();
         let rect = Rect::new(0.0, 0.0, 100.0, 100.0);
 

sparse_strips/vello_common/src/tile.rs

@@ -357,7 +357,7 @@ mod tests {
             p1: Point { x: 9.0, y: -1.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
 
         assert!(tiles.is_empty());
@@ -370,7 +370,7 @@ mod tests {
             p1: Point { x: 103.0, y: 20.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
 
         assert!(tiles.is_empty());
@@ -383,7 +383,7 @@ mod tests {
             p1: Point { x: 35.0, y: 105.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
 
         assert!(tiles.is_empty());
@@ -396,7 +396,7 @@ mod tests {
             p1: Point { x: 2.0, y: 1.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
 
         assert_eq!(tiles.tile_buf, [Tile::new_clamped(0, 0, 0, true)]);
@@ -409,7 +409,7 @@ mod tests {
             p1: Point { x: 8.5, y: 1.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
         tiles.sort_tiles();
 
@@ -430,7 +430,7 @@ mod tests {
             p1: Point { x: 1.0, y: 8.5 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
         tiles.sort_tiles();
 
@@ -451,7 +451,7 @@ mod tests {
             p1: Point { x: 11.0, y: 8.5 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
         tiles.sort_tiles();
 
@@ -474,7 +474,7 @@ mod tests {
             p1: Point { x: 1.0, y: 1.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
         tiles.sort_tiles();
 
@@ -497,7 +497,7 @@ mod tests {
             p1: Point { x: 14.0, y: 6.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
         tiles.sort_tiles();
 
@@ -520,7 +520,7 @@ mod tests {
             p1: Point { x: 2.0, y: 11.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 100, 100);
         tiles.sort_tiles();
 
@@ -548,7 +548,7 @@ mod tests {
             p1: Point { x: 0.0, y: 1.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line_1, line_2], 100, 100);
 
         assert_eq!(
@@ -568,7 +568,7 @@ mod tests {
             p1: Point { x: 224.0, y: 388.0 },
         };
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&[line], 600, 600);
     }
 
@@ -577,14 +577,14 @@ mod tests {
         let path = BezPath::from_svg("M261,0 L78848,0 L78848,4 L261,4 Z").unwrap();
         let mut line_buf = vec![];
         fill(
-            Level::try_detect().unwrap_or(Level::fallback()),
+            Level::try_detect().unwrap_or(Level::baseline()),
             &path,
             Affine::IDENTITY,
             &mut line_buf,
             &mut FlattenCtx::default(),
         );
 
-        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::fallback()));
+        let mut tiles = Tiles::new(Level::try_detect().unwrap_or(Level::baseline()));
         tiles.make_tiles(&line_buf, 10, 10);
         assert_eq!(tiles.tile_buf[0].x, 4);
         assert_eq!(tiles.tile_buf[1].x, 4);

sparse_strips/vello_cpu/src/render.rs

@@ -82,7 +82,7 @@ pub struct RenderSettings {
 impl Default for RenderSettings {
     fn default() -> Self {
         Self {
-            level: Level::try_detect().unwrap_or(Level::fallback()),
+            level: Level::try_detect().unwrap_or(Level::baseline()),
             #[cfg(feature = "multithreading")]
             num_threads: (std::thread::available_parallelism()
                 .unwrap()
@@ -1000,7 +1000,7 @@ mod tests {
 
         let mut pixmap = Pixmap::new(200, 200);
         let settings = RenderSettings {
-            level: Level::try_detect().unwrap_or(Level::fallback()),
+            level: Level::try_detect().unwrap_or(Level::baseline()),
             num_threads: 1,
             render_mode: RenderMode::OptimizeQuality,
         };

sparse_strips/vello_dev_macros/src/test.rs

@@ -249,9 +249,20 @@ pub(crate) fn vello_test_inner(attr: TokenStream, item: TokenStream) -> TokenStr
                 use crate::util::{
                     check_ref, get_ctx
                 };
+                use crate::renderer::CpuRenderArgs;
                 use vello_cpu::{RenderContext, RenderMode};
 
-                let mut ctx = get_ctx::<RenderContext>(#width, #height, #transparent, #num_threads, #level, #render_mode);
+                let mut ctx = get_ctx::<RenderContext>(
+                    #width,
+                    #height,
+                    #transparent,
+                    CpuRenderArgs {
+                        num_threads: #num_threads,
+                        level: #level,
+                        render_mode:
+                        #render_mode,
+                    }
+                );
                 #input_fn_name(&mut ctx);
                 ctx.flush();
                 if !#no_ref {
@@ -437,7 +448,7 @@ pub(crate) fn vello_test_inner(attr: TokenStream, item: TokenStream) -> TokenStr
             use crate::renderer::HybridRenderer;
             use vello_cpu::RenderMode;
 
-            let mut ctx = get_ctx::<HybridRenderer>(#width, #height, #transparent, 0, "fallback", RenderMode::OptimizeSpeed);
+            let mut ctx = get_ctx::<HybridRenderer>(#width, #height, #transparent, ());
             #input_fn_name(&mut ctx);
             ctx.flush();
             if !#no_ref {
@@ -455,7 +466,7 @@ pub(crate) fn vello_test_inner(attr: TokenStream, item: TokenStream) -> TokenStr
             use crate::renderer::HybridRenderer;
             use vello_cpu::RenderMode;
 
-            let mut ctx = get_ctx::<HybridRenderer>(#width, #height, #transparent, 0, "fallback", RenderMode::OptimizeSpeed);
+            let mut ctx = get_ctx::<HybridRenderer>(#width, #height, #transparent, ());
             #input_fn_name(&mut ctx);
             ctx.flush();
             if !#no_ref {

sparse_strips/vello_hybrid/Cargo.toml

@@ -41,6 +41,8 @@ web-sys = { version = "0.3.77", features = [
 ], optional = true }
 
 [dev-dependencies]
+# We use Level::fallback() in tests
+fearless_simd = { workspace = true, features = ["force_support_fallback"] }
 png = { workspace = true }
 pollster = { workspace = true }
 vello_common = { workspace = true, features = ["pico_svg"] }

sparse_strips/vello_hybrid/examples/wgpu_webgl/src/lib.rs

@@ -85,7 +85,7 @@ impl RendererWrapper {
                 height,
             },
             RenderSettings {
-                level: Level::try_detect().unwrap_or(Level::fallback()),
+                level: Level::try_detect().unwrap_or(Level::baseline()),
                 atlas_config: AtlasConfig {
                     atlas_size: (max_texture_dimension_2d, max_texture_dimension_2d),
                     ..AtlasConfig::default()

sparse_strips/vello_hybrid/src/scene.rs

@@ -46,7 +46,7 @@ pub struct RenderSettings {
 impl Default for RenderSettings {
     fn default() -> Self {
         Self {
-            level: Level::try_detect().unwrap_or(Level::fallback()),
+            level: Level::try_detect().unwrap_or(Level::baseline()),
             atlas_config: AtlasConfig::default(),
         }
     }

sparse_strips/vello_sparse_tests/Cargo.toml

@@ -27,6 +27,7 @@ oxipng = { workspace = true, features = ["freestanding", "parallel"] }
 image = { workspace = true, features = ["png"] }
 skrifa = { workspace = true }
 smallvec = { workspace = true }
+fearless_simd = { workspace = true, features = ["force_support_fallback"] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen-test = "0.3.50"

sparse_strips/vello_sparse_tests/tests/issues.rs

@@ -404,7 +404,7 @@ fn gradient_color_alpha_unmul(ctx: &mut impl Renderer) {
 #[test]
 fn multi_threading_oob_access() {
     let settings = RenderSettings {
-        level: Level::try_detect().unwrap_or(Level::fallback()),
+        level: Level::try_detect().unwrap_or(Level::baseline()),
         num_threads: 4,
         render_mode: RenderMode::OptimizeQuality,
     };