Merge branch 'simd/box-blur' into simd/5.3.x

src/libImaging/BoxBlur.c

@@ -1,58 +1,78 @@
 #include "Python.h"
 #include "Imaging.h"
+#include <emmintrin.h>
+#include <mmintrin.h>
+#include <smmintrin.h>
 
 
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 
 
-typedef UINT8 pixel[4];
-
 void static inline
-ImagingLineBoxBlur32(pixel *lineOut, pixel *lineIn, int lastx, int radius, int edgeA,
+ImagingLineBoxBlur32(UINT32 *lineOut, UINT32 *lineIn, int lastx, int radius, int edgeA,
     int edgeB, UINT32 ww, UINT32 fw)
 {
     int x;
-    UINT32 acc[4];
+    __m128i acc;
-    UINT32 bulk[4];
+    __m128i bulk;
+    __m128i wws = _mm_set1_epi32(ww);
+    __m128i fws = _mm_set1_epi32(fw);
+    __m128i b23 = _mm_set1_epi32(1 << 23);
+    __m128i shiftmask = _mm_set_epi8(0,0,0,0,0,0,0,0,0,0,0,0,3,7,11,15);
+    
+
+    // #define MOVE_ACC(acc, subtract, add)
+    //     acc[0] += lineIn[add][0] - lineIn[subtract][0];
 
     #define MOVE_ACC(acc, subtract, add) \
-        acc[0] += lineIn[add][0] - lineIn[subtract][0]; \
+        { \
-        acc[1] += lineIn[add][1] - lineIn[subtract][1]; \
+        __m128i tmp1 = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[add])); \
-        acc[2] += lineIn[add][2] - lineIn[subtract][2]; \
+        __m128i tmp2 = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[subtract])); \
-        acc[3] += lineIn[add][3] - lineIn[subtract][3];
+        acc = _mm_sub_epi32(_mm_add_epi32(acc, tmp1), tmp2); \
+        }
+
+    // #define ADD_FAR(bulk, acc, left, right)
+    //     bulk[0] = (acc[0] * ww) + (lineIn[left][0] + lineIn[right][0]) * fw;
 
     #define ADD_FAR(bulk, acc, left, right) \
-        bulk[0] = (acc[0] * ww) + (lineIn[left][0] + lineIn[right][0]) * fw; \
+        { \
-        bulk[1] = (acc[1] * ww) + (lineIn[left][1] + lineIn[right][1]) * fw; \
+        __m128i tmp3 = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[left])); \
-        bulk[2] = (acc[2] * ww) + (lineIn[left][2] + lineIn[right][2]) * fw; \
+        __m128i tmp4 = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[right])); \
-        bulk[3] = (acc[3] * ww) + (lineIn[left][3] + lineIn[right][3]) * fw;
+        __m128i tmp5 = _mm_mullo_epi32(_mm_add_epi32(tmp3, tmp4), fws); \
+        __m128i tmp6 = _mm_mullo_epi32(acc, wws); \
+        bulk = _mm_add_epi32(tmp5, tmp6); \
+        }
+
+    // #define SAVE(x, bulk)
+    //    lineOut[x][0] = (UINT8)((bulk[0] + (1 << 23)) >> 24);
 
     #define SAVE(x, bulk) \
-        lineOut[x][0] = (UINT8)((bulk[0] + (1 << 23)) >> 24); \
+        lineOut[x] = _mm_cvtsi128_si32( \
-        lineOut[x][1] = (UINT8)((bulk[1] + (1 << 23)) >> 24); \
+            _mm_shuffle_epi8(_mm_add_epi32(bulk, b23), shiftmask) \
-        lineOut[x][2] = (UINT8)((bulk[2] + (1 << 23)) >> 24); \
+        )
-        lineOut[x][3] = (UINT8)((bulk[3] + (1 << 23)) >> 24);
 
     /* Compute acc for -1 pixel (outside of image):
        From "-radius-1" to "-1" get first pixel,
        then from "0" to "radius-1". */
-    acc[0] = lineIn[0][0] * (radius + 1);
+    // acc[0] = lineIn[0][0] * (radius + 1);
-    acc[1] = lineIn[0][1] * (radius + 1);
+    acc = _mm_mullo_epi32(
-    acc[2] = lineIn[0][2] * (radius + 1);
+        _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[0])),
-    acc[3] = lineIn[0][3] * (radius + 1);
+        _mm_set1_epi32(radius + 1)
+    );
+
     /* As radius can be bigger than xsize, iterate to edgeA -1. */
     for (x = 0; x < edgeA - 1; x++) {
-        acc[0] += lineIn[x][0];
+        // acc[0] += lineIn[x][0];
-        acc[1] += lineIn[x][1];
+        acc = _mm_add_epi32(acc, _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[x])));
-        acc[2] += lineIn[x][2];
-        acc[3] += lineIn[x][3];
     }
     /* Then multiply remainder to last x. */
-    acc[0] += lineIn[lastx][0] * (radius - edgeA + 1);
+    // acc[0] += lineIn[lastx][0] * (radius - edgeA + 1);
-    acc[1] += lineIn[lastx][1] * (radius - edgeA + 1);
+    acc = _mm_add_epi32(acc, _mm_mullo_epi32(
-    acc[2] += lineIn[lastx][2] * (radius - edgeA + 1);
+        _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[x])),
-    acc[3] += lineIn[lastx][3] * (radius - edgeA + 1);
+        _mm_set1_epi32(radius - edgeA + 1)
+    ));
+
 
     if (edgeA <= edgeB)
     {
@@ -103,6 +123,66 @@ ImagingLineBoxBlur32(pixel *lineOut, pixel *lineIn, int lastx, int radius, int e
 }
 
 
+void static inline
+ImagingLineBoxBlurZero32(UINT32 *lineOut, UINT32 *lineIn, int lastx, int edgeA,
+    int edgeB, UINT32 ww, UINT32 fw)
+{
+    int x;
+    __m128i acc;
+    __m128i bulk;
+    __m128i wws = _mm_set1_epi32(ww);
+    __m128i fws = _mm_set1_epi32(fw);
+    __m128i b23 = _mm_set1_epi32(1 << 23);
+    __m128i shiftmask = _mm_set_epi8(0,0,0,0,0,0,0,0,0,0,0,0,3,7,11,15);
+
+    // #define ADD_FAR(bulk, acc, left, right)
+    //     bulk[0] = (acc[0] * ww) + (lineIn[left][0] + lineIn[right][0]) * fw;
+
+    #define ADD_FAR(bulk, acc, left, right) \
+        { \
+        __m128i tmp3 = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[left])); \
+        __m128i tmp4 = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[right])); \
+        __m128i tmp5 = _mm_mullo_epi32(_mm_add_epi32(tmp3, tmp4), fws); \
+        __m128i tmp6 = _mm_mullo_epi32(acc, wws); \
+        bulk = _mm_add_epi32(tmp5, tmp6); \
+        }
+
+    // #define SAVE(x, bulk)
+    //    lineOut[x][0] = (UINT8)((bulk[0] + (1 << 23)) >> 24);
+
+    #define SAVE(x, bulk) \
+        lineOut[x] = _mm_cvtsi128_si32( \
+            _mm_shuffle_epi8(_mm_add_epi32(bulk, b23), shiftmask) \
+        )
+
+
+    /* Subtract pixel from left ("0").
+       Add pixels from radius. */
+    for (x = 0; x < edgeA; x++) {
+        acc = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[0]));
+        ADD_FAR(bulk, acc, 0, x + 1);
+        SAVE(x, bulk);
+    }
+    /* Subtract previous pixel from "-radius".
+       Add pixels from radius. */
+    for (x = edgeA; x < edgeB; x++) {
+        acc = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[x]));
+        ADD_FAR(bulk, acc, x - 1, x + 1);
+        SAVE(x, bulk);
+    }
+    /* Subtract previous pixel from "-radius".
+       Add last pixel. */
+    for (x = edgeB; x <= lastx; x++) {
+        acc = _mm_cvtepu8_epi32(_mm_cvtsi32_si128(lineIn[lastx]));
+        ADD_FAR(bulk, acc, x - 1, lastx);
+        SAVE(x, bulk);
+    }
+
+    #undef ADD_FAR
+    #undef SAVE
+}
+
+
 void static inline
 ImagingLineBoxBlur8(UINT8 *lineOut, UINT8 *lineIn, int lastx, int radius, int edgeA,
     int edgeB, UINT32 ww, UINT32 fw)
@@ -169,6 +249,45 @@ ImagingLineBoxBlur8(UINT8 *lineOut, UINT8 *lineIn, int lastx, int radius, int ed
 }
 
 
+void static inline
+ImagingLineBoxBlurZero8(UINT8 *lineOut, UINT8 *lineIn, int lastx, int edgeA,
+    int edgeB, UINT32 ww, UINT32 fw)
+{
+    int x;
+    UINT32 acc;
+    UINT32 bulk;
+
+    #define MOVE_ACC(acc, subtract, add) \
+        acc += lineIn[add] - lineIn[subtract];
+
+    #define ADD_FAR(bulk, acc, left, right) \
+        bulk = (acc * ww) + (lineIn[left] + lineIn[right]) * fw;
+
+    #define SAVE(x, bulk) \
+        lineOut[x] = (UINT8)((bulk + (1 << 23)) >> 24)
+
+    for (x = 0; x < edgeA; x++) {
+        acc = lineIn[0];
+        ADD_FAR(bulk, acc, 0, x + 1);
+        SAVE(x, bulk);
+    }
+    for (x = edgeA; x < edgeB; x++) {
+        acc = lineIn[x];
+        ADD_FAR(bulk, acc, x - 1, x + 1);
+        SAVE(x, bulk);
+    }
+    for (x = edgeB; x <= lastx; x++) {
+        acc = lineIn[lastx];
+        ADD_FAR(bulk, acc, x - 1, lastx);
+        SAVE(x, bulk);
+    }
+
+    #undef MOVE_ACC
+    #undef ADD_FAR
+    #undef SAVE
+}
+
+
 
 Imaging
 ImagingHorizontalBoxBlur(Imaging imOut, Imaging imIn, float floatRadius)
@@ -188,39 +307,72 @@ ImagingHorizontalBoxBlur(Imaging imOut, Imaging imIn, float floatRadius)
     if (lineOut == NULL)
         return ImagingError_MemoryError();
 
-    // printf(">>> %d %d %d\n", radius, ww, fw);
+    // printf(">>> radius: %d edges: %d %d, weights: %d %d\n",
+    //     radius, edgeA, edgeB, ww, fw);
 
     ImagingSectionEnter(&cookie);
 
     if (imIn->image8)
     {
-        for (y = 0; y < imIn->ysize; y++) {
+        if (radius) {
-            ImagingLineBoxBlur8(
+            for (y = 0; y < imIn->ysize; y++) {
-                (imIn == imOut ? (UINT8 *) lineOut : imOut->image8[y]),
+                ImagingLineBoxBlur8(
-                imIn->image8[y],
+                    (imIn == imOut ? (UINT8 *) lineOut : imOut->image8[y]),
-                imIn->xsize - 1,
+                    imIn->image8[y],
-                radius, edgeA, edgeB,
+                    imIn->xsize - 1,
-                ww, fw
+                    radius, edgeA, edgeB,
-            );
+                    ww, fw
-            if (imIn == imOut) {
+                );
-                // Commit.
+                if (imIn == imOut) {
-                memcpy(imOut->image8[y], lineOut, imIn->xsize);
+                    // Commit.
+                    memcpy(imOut->image8[y], lineOut, imIn->xsize);
+                }
+            }
+        } else {
+            for (y = 0; y < imIn->ysize; y++) {
+                ImagingLineBoxBlurZero8(
+                    (imIn == imOut ? (UINT8 *) lineOut : imOut->image8[y]),
+                    imIn->image8[y],
+                    imIn->xsize - 1,
+                    edgeA, edgeB,
+                    ww, fw
+                );
+                if (imIn == imOut) {
+                    // Commit.
+                    memcpy(imOut->image8[y], lineOut, imIn->xsize);
+                }
             }
         }
     }
     else
     {
-        for (y = 0; y < imIn->ysize; y++) {
+        if (radius) {
-            ImagingLineBoxBlur32(
+            for (y = 0; y < imIn->ysize; y++) {
-                imIn == imOut ? (pixel *) lineOut : (pixel *) imOut->image32[y],
+                ImagingLineBoxBlur32(
-                (pixel *) imIn->image32[y],
+                    imIn == imOut ? (UINT32 *) lineOut : (UINT32 *) imOut->image32[y],
-                imIn->xsize - 1,
+                    (UINT32 *) imIn->image32[y],
-                radius, edgeA, edgeB,
+                    imIn->xsize - 1,
-                ww, fw
+                    radius, edgeA, edgeB,
-            );
+                    ww, fw
-            if (imIn == imOut) {
+                );
-                // Commit.
+                if (imIn == imOut) {
-                memcpy(imOut->image32[y], lineOut, imIn->xsize * 4);
+                    // Commit.
+                    memcpy(imOut->image32[y], lineOut, imIn->xsize * 4);
+                }
+            }
+        } else{
+            for (y = 0; y < imIn->ysize; y++) {
+                ImagingLineBoxBlurZero32(
+                    imIn == imOut ? (UINT32 *) lineOut : (UINT32 *) imOut->image32[y],
+                    (UINT32 *) imIn->image32[y],
+                    imIn->xsize - 1,
+                    edgeA, edgeB,
+                    ww, fw
+                );
+                if (imIn == imOut) {
+                    // Commit.
+                    memcpy(imOut->image32[y], lineOut, imIn->xsize * 4);
+                }
             }
         }
     }