[WiP] Allow crossing of 128-bit block boundaries on RVV/SVE

This should be safe after Highway >= 1.1.0.
kleisauke · Apr 2, 2024 · 7f6278d · 7f6278d
1 parent f1c47c6
commit 7f6278d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/libvips/convolution/convi_hwy.cpp b/libvips/convolution/convi_hwy.cpp
@@ -77,7 +77,8 @@ vips_convi_uchar_hwy(VipsRegion *out_region, VipsRegion *ir, VipsRect *r,
 #if HWY_TARGET != HWY_SCALAR
 	int32_t bo = VIPS_RECT_BOTTOM(r);
 
-#if HWY_ARCH_RVV || (HWY_ARCH_ARM_A64 && HWY_TARGET <= HWY_SVE)
+#if !defined(HAVE_HWY_1_1_0) && \
+	(HWY_ARCH_RVV || (HWY_ARCH_ARM_A64 && HWY_TARGET <= HWY_SVE))
 	/* Ensure we do not cross 128-bit block boundaries on RVV/SVE.
 	 */
 	const int32_t N = 16;

diff --git a/libvips/resample/reducev_hwy.cpp b/libvips/resample/reducev_hwy.cpp
@@ -76,7 +76,8 @@ vips_reducev_uchar_hwy(VipsPel *pout, VipsPel *pin,
 #if HWY_TARGET != HWY_SCALAR
 	const auto l1 = lskip / sizeof(uint8_t);
 
-#if HWY_ARCH_RVV || (HWY_ARCH_ARM_A64 && HWY_TARGET <= HWY_SVE)
+#if !defined(HAVE_HWY_1_1_0) && \
+	(HWY_ARCH_RVV || (HWY_ARCH_ARM_A64 && HWY_TARGET <= HWY_SVE))
 	/* Ensure we do not cross 128-bit block boundaries on RVV/SVE.
 	 */
 	const int32_t N = 16;