sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #369 from lovell/shrinkh-loop-vector 

Allow compiler to use vector unit with vips_shrinkh for ~25% boost
This commit is contained in:
John Cupitt 2016-01-22 08:50:02 +00:00
parent 16b76b2cfd 572354b793
commit d29710db66
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libvips/resample/shrinkh.c
View File

@ -111,18 +111,15 @@ vips_shrinkh_start( VipsImage *out, void *a, void *b )
TYPE * restrict q = (TYPE *) out; \ TYPE * restrict q = (TYPE *) out; \
\ \
for( x = 0; x < width; x++ ) { \ for( x = 0; x < width; x++ ) { \
for( b = 0; b < bands; b++ ) \ for( b = 0; b < bands; b++ ) { \
sum[b] = 0; \ sum[b] = 0; \
\
for( b = 0; b < bands; b++ ) \
for( x1 = b; x1 < ne; x1 += bands ) \ for( x1 = b; x1 < ne; x1 += bands ) \
sum[b] += p[x1]; \ sum[b] += p[x1]; \
p += ne; \
\
for( b = 0; b < bands; b++ ) \
q[b] = (sum[b] + shrink->xshrink / 2) / \ q[b] = (sum[b] + shrink->xshrink / 2) / \
shrink->xshrink; \ shrink->xshrink; \
q += b; \ } \
p += ne; \
q += bands; \
} \ } \
} }
@ -134,17 +131,14 @@ vips_shrinkh_start( VipsImage *out, void *a, void *b )
TYPE * restrict q = (TYPE *) out; \ TYPE * restrict q = (TYPE *) out; \
\ \
for( x = 0; x < width; x++ ) { \ for( x = 0; x < width; x++ ) { \
for( b = 0; b < bands; b++ ) \ for( b = 0; b < bands; b++ ) { \
sum[b] = 0.0; \ sum[b] = 0.0; \
\
for( b = 0; b < bands; b++ ) \
for( x1 = b; x1 < ne; x1 += bands ) \ for( x1 = b; x1 < ne; x1 += bands ) \
sum[b] += p[x1]; \ sum[b] += p[x1]; \
p += ne; \
\
for( b = 0; b < bands; b++ ) \
q[b] = sum[b] / shrink->xshrink; \ q[b] = sum[b] / shrink->xshrink; \
q += b; \ } \
p += ne; \
q += bands; \
} \ } \
} }
@ -227,7 +221,7 @@ vips_shrinkh_gen( VipsRegion *or, void *vseq,
s.left = r->left * shrink->xshrink; s.left = r->left * shrink->xshrink;
s.top = r->top + y; s.top = r->top + y;
s.width = ceil( r->width * shrink->xshrink ); s.width = r->width * shrink->xshrink;
s.height = 1; s.height = 1;
#ifdef DEBUG #ifdef DEBUG
printf( "shrinkh_gen: requesting line %d\n", s.top ); printf( "shrinkh_gen: requesting line %d\n", s.top );