Improve performance of inverse DWT 5x3 (#953)

* Use single-pass lifting inverse wavelet transform.
* For vertical pass, use SSE2 when available so as to process 8 columns
  in parallel. This is the most beneficial improvement, since the
  vertical pass involves a lot of cache trashing.

With the bench_dwt utility with default arguments (16383x16383 image),
time goes from 4.064 s to 1.212 s.
This commit is contained in:
Even Rouault 2017-06-20 17:56:25 +02:00
parent 919ed5f8b8
commit fa55b52d19
1 changed files with 604 additions and 51 deletions

View File

@ -13,6 +13,7 @@
* Copyright (c) 2005, Herve Drolon, FreeImage Team * Copyright (c) 2005, Herve Drolon, FreeImage Team
* Copyright (c) 2007, Jonathan Ballard <dzonatas@dzonux.net> * Copyright (c) 2007, Jonathan Ballard <dzonatas@dzonux.net>
* Copyright (c) 2007, Callum Lerwick <seg@haxxed.com> * Copyright (c) 2007, Callum Lerwick <seg@haxxed.com>
* Copyright (c) 2017, IntoPIX SA <support@intopix.com>
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -40,6 +41,11 @@
#ifdef __SSE__ #ifdef __SSE__
#include <xmmintrin.h> #include <xmmintrin.h>
#endif #endif
#ifdef __SSE2__
#include <emmintrin.h>
#endif
#include <assert.h>
#include "opj_includes.h" #include "opj_includes.h"
@ -49,6 +55,8 @@
#define OPJ_WS(i) v->mem[(i)*2] #define OPJ_WS(i) v->mem[(i)*2]
#define OPJ_WD(i) v->mem[(1+(i)*2)] #define OPJ_WD(i) v->mem[(1+(i)*2)]
#define PARALLEL_COLS_53 8
/** @name Local data structures */ /** @name Local data structures */
/*@{*/ /*@{*/
@ -83,7 +91,7 @@ static const OPJ_FLOAT32 opj_c13318 = 1.625732422f;
/** /**
Virtual function type for wavelet transform in 1-D Virtual function type for wavelet transform in 1-D
*/ */
typedef void (*DWT1DFN)(opj_dwt_t* v); typedef void (*DWT1DFN)(const opj_dwt_t* v);
/** @name Local static functions */ /** @name Local static functions */
/*@{*/ /*@{*/
@ -99,25 +107,11 @@ Forward lazy transform (vertical)
static void opj_dwt_deinterleave_v(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn, static void opj_dwt_deinterleave_v(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn,
OPJ_INT32 sn, OPJ_INT32 x, OPJ_INT32 cas); OPJ_INT32 sn, OPJ_INT32 x, OPJ_INT32 cas);
/** /**
Inverse lazy transform (horizontal)
*/
static void opj_dwt_interleave_h(opj_dwt_t* h, OPJ_INT32 *a);
/**
Inverse lazy transform (vertical)
*/
static void opj_dwt_interleave_v(opj_dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x);
/**
Forward 5-3 wavelet transform in 1-D Forward 5-3 wavelet transform in 1-D
*/ */
static void opj_dwt_encode_1(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, static void opj_dwt_encode_1(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn,
OPJ_INT32 cas); OPJ_INT32 cas);
/** /**
Inverse 5-3 wavelet transform in 1-D
*/
static void opj_dwt_decode_1(opj_dwt_t *v);
static void opj_dwt_decode_1_(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn,
OPJ_INT32 cas);
/**
Forward 9-7 wavelet transform in 1-D Forward 9-7 wavelet transform in 1-D
*/ */
static void opj_dwt_encode_1_real(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn, static void opj_dwt_encode_1_real(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn,
@ -131,7 +125,7 @@ static void opj_dwt_encode_stepsize(OPJ_INT32 stepsize, OPJ_INT32 numbps,
Inverse wavelet transform in 2-D. Inverse wavelet transform in 2-D.
*/ */
static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp, static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
opj_tcd_tilecomp_t* tilec, OPJ_UINT32 i, DWT1DFN fn); opj_tcd_tilecomp_t* tilec, OPJ_UINT32 i);
static OPJ_BOOL opj_dwt_encode_procedure(opj_tcd_tilecomp_t * tilec, static OPJ_BOOL opj_dwt_encode_procedure(opj_tcd_tilecomp_t * tilec,
void (*p_function)(OPJ_INT32 *, OPJ_INT32, OPJ_INT32, OPJ_INT32)); void (*p_function)(OPJ_INT32 *, OPJ_INT32, OPJ_INT32, OPJ_INT32));
@ -255,10 +249,11 @@ static void opj_dwt_deinterleave_v(OPJ_INT32 *a, OPJ_INT32 *b, OPJ_INT32 dn,
} /*b[(sn+i)*x]=a[(2*i+1-cas)];*/ } /*b[(sn+i)*x]=a[(2*i+1-cas)];*/
} }
#ifdef STANDARD_SLOW_VERSION
/* <summary> */ /* <summary> */
/* Inverse lazy transform (horizontal). */ /* Inverse lazy transform (horizontal). */
/* </summary> */ /* </summary> */
static void opj_dwt_interleave_h(opj_dwt_t* h, OPJ_INT32 *a) static void opj_dwt_interleave_h(const opj_dwt_t* h, OPJ_INT32 *a)
{ {
OPJ_INT32 *ai = a; OPJ_INT32 *ai = a;
OPJ_INT32 *bi = h->mem + h->cas; OPJ_INT32 *bi = h->mem + h->cas;
@ -279,7 +274,7 @@ static void opj_dwt_interleave_h(opj_dwt_t* h, OPJ_INT32 *a)
/* <summary> */ /* <summary> */
/* Inverse lazy transform (vertical). */ /* Inverse lazy transform (vertical). */
/* </summary> */ /* </summary> */
static void opj_dwt_interleave_v(opj_dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x) static void opj_dwt_interleave_v(const opj_dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x)
{ {
OPJ_INT32 *ai = a; OPJ_INT32 *ai = a;
OPJ_INT32 *bi = v->mem + v->cas; OPJ_INT32 *bi = v->mem + v->cas;
@ -299,6 +294,7 @@ static void opj_dwt_interleave_v(opj_dwt_t* v, OPJ_INT32 *a, OPJ_INT32 x)
} }
} }
#endif /* STANDARD_SLOW_VERSION */
/* <summary> */ /* <summary> */
/* Forward 5-3 wavelet transform in 1-D. */ /* Forward 5-3 wavelet transform in 1-D. */
@ -331,6 +327,7 @@ static void opj_dwt_encode_1(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn,
} }
} }
#ifdef STANDARD_SLOW_VERSION
/* <summary> */ /* <summary> */
/* Inverse 5-3 wavelet transform in 1-D. */ /* Inverse 5-3 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
@ -362,14 +359,577 @@ static void opj_dwt_decode_1_(OPJ_INT32 *a, OPJ_INT32 dn, OPJ_INT32 sn,
} }
} }
/* <summary> */ static void opj_dwt_decode_1(const opj_dwt_t *v)
/* Inverse 5-3 wavelet transform in 1-D. */
/* </summary> */
static void opj_dwt_decode_1(opj_dwt_t *v)
{ {
opj_dwt_decode_1_(v->mem, v->dn, v->sn, v->cas); opj_dwt_decode_1_(v->mem, v->dn, v->sn, v->cas);
} }
#endif /* STANDARD_SLOW_VERSION */
#if !defined(STANDARD_SLOW_VERSION)
static void opj_idwt53_h_cas0(OPJ_INT32* tmp,
const OPJ_INT32 sn,
const OPJ_INT32 len,
OPJ_INT32* tiledp)
{
OPJ_INT32 i, j;
const OPJ_INT32* in_even = &tiledp[0];
const OPJ_INT32* in_odd = &tiledp[sn];
#ifdef TWO_PASS_VERSION
/* For documentation purpose: performs lifting in two iterations, */
/* but withtmp explicit interleaving */
assert(len > 1);
/* Even */
tmp[0] = in_even[0] - ((in_odd[0] + 1) >> 1);
for (i = 2, j = 0; i <= len - 2; i += 2, j++) {
tmp[i] = in_even[j + 1] - ((in_odd[j] + in_odd[j + 1] + 2) >> 2);
}
if (len & 1) { /* if len is odd */
tmp[len - 1] = in_even[(len - 1) / 2] - ((in_odd[(len - 2) / 2] + 1) >> 1);
}
/* Odd */
for (i = 1, j = 0; i < len - 1; i += 2, j++) {
tmp[i] = in_odd[j] + ((tmp[i - 1] + tmp[i + 1]) >> 1);
}
if (!(len & 1)) { /* if len is even */
tmp[len - 1] = in_odd[(len - 1) / 2] + tmp[len - 2];
}
#else
OPJ_INT32 d1c, d1n, s1n, s0c, s0n;
assert(len > 1);
/* Improved version of the TWO_PASS_VERSION: */
/* Performs lifting in one single iteration. Saves memory */
/* accesses and explicit interleaving. */
s1n = in_even[0];
d1n = in_odd[0];
s0n = s1n - ((d1n + 1) >> 1);
for (i = 0, j = 1; i < (len - 3); i += 2, j++) {
d1c = d1n;
s0c = s0n;
s1n = in_even[j];
d1n = in_odd[j];
s0n = s1n - ((d1c + d1n + 2) >> 2);
tmp[i ] = s0c;
tmp[i + 1] = d1c + ((s0c + s0n) >> 1);
}
tmp[i] = s0n;
if (len & 1) {
tmp[len - 1] = in_even[(len - 1) / 2] - ((d1n + 1) >> 1);
tmp[len - 2] = d1n + ((s0n + tmp[len - 1]) >> 1);
} else {
tmp[len - 1] = d1n + s0n;
}
#endif
memcpy(tiledp, tmp, (OPJ_UINT32)len * sizeof(OPJ_INT32));
}
static void opj_idwt53_h_cas1(OPJ_INT32* tmp,
const OPJ_INT32 sn,
const OPJ_INT32 len,
OPJ_INT32* tiledp)
{
OPJ_INT32 i, j;
const OPJ_INT32* in_even = &tiledp[sn];
const OPJ_INT32* in_odd = &tiledp[0];
#ifdef TWO_PASS_VERSION
/* For documentation purpose: performs lifting in two iterations, */
/* but withtmp explicit interleaving */
assert(len > 2);
/* Odd */
for (i = 1, j = 0; i < len - 1; i += 2, j++) {
tmp[i] = in_odd[j] - ((in_even[j] + in_even[j + 1] + 2) >> 2);
}
if (!(len & 1)) {
tmp[len - 1] = in_odd[len / 2 - 1] - ((in_even[len / 2 - 1] + 1) >> 1);
}
/* Even */
tmp[0] = in_even[0] + tmp[1];
for (i = 2, j = 1; i < len - 1; i += 2, j++) {
tmp[i] = in_even[j] + ((tmp[i + 1] + tmp[i - 1]) >> 1);
}
if (len & 1) {
tmp[len - 1] = in_even[len / 2] + tmp[len - 2];
}
#else
OPJ_INT32 s1, s2, dc, dn;
assert(len > 2);
/* Improved version of the TWO_PASS_VERSION: */
/* Performs lifting in one single iteration. Saves memory */
/* accesses and explicit interleaving. */
s1 = in_even[1];
dc = in_odd[0] - ((in_even[0] + s1 + 2) >> 2);
tmp[0] = in_even[0] + dc;
for (i = 1, j = 1; i < (len - 2 - !(len & 1)); i += 2, j++) {
s2 = in_even[j + 1];
dn = in_odd[j] - ((s1 + s2 + 2) >> 2);
tmp[i ] = dc;
tmp[i + 1] = s1 + ((dn + dc) >> 1);
dc = dn;
s1 = s2;
}
tmp[i] = dc;
if (!(len & 1)) {
dn = in_odd[len / 2 - 1] - ((s1 + 1) >> 1);
tmp[len - 2] = s1 + ((dn + dc) >> 1);
tmp[len - 1] = dn;
} else {
tmp[len - 1] = s1 + dc;
}
#endif
memcpy(tiledp, tmp, (OPJ_UINT32)len * sizeof(OPJ_INT32));
}
#endif /* !defined(STANDARD_SLOW_VERSION) */
/* <summary> */
/* Inverse 5-3 wavelet transform in 1-D for one row. */
/* </summary> */
/* Performs interleave, inverse wavelet transform and copy back to buffer */
static void opj_idwt53_h(const opj_dwt_t *dwt,
OPJ_INT32* tiledp)
{
#ifdef STANDARD_SLOW_VERSION
/* For documentation purpose */
opj_dwt_interleave_h(dwt, tiledp);
opj_dwt_decode_1(dwt);
memcpy(tiledp, dwt->mem, (OPJ_UINT32)(dwt->sn + dwt->dn) * sizeof(OPJ_INT32));
#else
const OPJ_INT32 sn = dwt->sn;
const OPJ_INT32 len = sn + dwt->dn;
if (dwt->cas == 0) { /* Left-most sample is on even coordinate */
if (len > 1) {
opj_idwt53_h_cas0(dwt->mem, sn, len, tiledp);
} else {
/* Unmodified value */
}
} else { /* Left-most sample is on odd coordinate */
if (len == 1) {
tiledp[0] /= 2;
} else if (len == 2) {
OPJ_INT32* out = dwt->mem;
const OPJ_INT32* in_even = &tiledp[sn];
const OPJ_INT32* in_odd = &tiledp[0];
out[1] = in_odd[0] - ((in_even[0] + 1) >> 1);
out[0] = in_even[0] + out[1];
memcpy(tiledp, dwt->mem, (OPJ_UINT32)len * sizeof(OPJ_INT32));
} else if (len > 2) {
opj_idwt53_h_cas1(dwt->mem, sn, len, tiledp);
}
}
#endif
}
#if defined(__SSE2__) && !defined(STANDARD_SLOW_VERSION)
/* Conveniency macros to improve the readabilty of the formulas */
#define LOADU(x) _mm_loadu_si128((const __m128i*)(x))
#define STORE(x,y) _mm_store_si128((__m128i*)(x),(y))
#define ADD(x,y) _mm_add_epi32((x),(y))
#define ADD3(x,y,z) ADD(ADD(x,y),z)
#define SUB(x,y) _mm_sub_epi32((x),(y))
#define SAR(x,y) _mm_srai_epi32((x),(y))
/** Vertical inverse 5x3 wavelet transform for 8 columns, when top-most
* pixel is on even coordinate */
static void opj_idwt53_v_cas0_8cols_SSE2(
OPJ_INT32* tmp,
const OPJ_INT32 sn,
const OPJ_INT32 len,
OPJ_INT32* tiledp_col,
const OPJ_INT32 stride)
{
const OPJ_INT32* in_even = &tiledp_col[0];
const OPJ_INT32* in_odd = &tiledp_col[sn * stride];
OPJ_INT32 i, j;
__m128i d1c_0, d1n_0, s1n_0, s0c_0, s0n_0;
__m128i d1c_1, d1n_1, s1n_1, s0c_1, s0n_1;
const __m128i two = _mm_set1_epi32(2);
assert(len > 1);
assert(PARALLEL_COLS_53 == 8);
s1n_0 = LOADU(in_even + 0);
s1n_1 = LOADU(in_even + 4);
d1n_0 = LOADU(in_odd);
d1n_1 = LOADU(in_odd + 4);
/* s0n = s1n - ((d1n + 1) >> 1); <==> */
/* s0n = s1n - ((d1n + d1n + 2) >> 2); */
s0n_0 = SUB(s1n_0, SAR(ADD3(d1n_0, d1n_0, two), 2));
s0n_1 = SUB(s1n_1, SAR(ADD3(d1n_1, d1n_1, two), 2));
for (i = 0, j = 1; i < (len - 3); i += 2, j++) {
d1c_0 = d1n_0;
s0c_0 = s0n_0;
d1c_1 = d1n_1;
s0c_1 = s0n_1;
s1n_0 = LOADU(in_even + j * stride);
s1n_1 = LOADU(in_even + j * stride + 4);
d1n_0 = LOADU(in_odd + j * stride);
d1n_1 = LOADU(in_odd + j * stride + 4);
/*s0n = s1n - ((d1c + d1n + 2) >> 2);*/
s0n_0 = SUB(s1n_0, SAR(ADD3(d1c_0, d1n_0, two), 2));
s0n_1 = SUB(s1n_1, SAR(ADD3(d1c_1, d1n_1, two), 2));
STORE(tmp + PARALLEL_COLS_53 * (i + 0), s0c_0);
STORE(tmp + PARALLEL_COLS_53 * (i + 0) + 4, s0c_1);
/* d1c + ((s0c + s0n) >> 1) */
STORE(tmp + PARALLEL_COLS_53 * (i + 1) + 0,
ADD(d1c_0, SAR(ADD(s0c_0, s0n_0), 1)));
STORE(tmp + PARALLEL_COLS_53 * (i + 1) + 4,
ADD(d1c_1, SAR(ADD(s0c_1, s0n_1), 1)));
}
STORE(tmp + PARALLEL_COLS_53 * (i + 0) + 0, s0n_0);
STORE(tmp + PARALLEL_COLS_53 * (i + 0) + 4, s0n_1);
if (len & 1) {
__m128i tmp_len_minus_1;
s1n_0 = LOADU(in_even + ((len - 1) / 2) * stride);
/* tmp_len_minus_1 = s1n - ((d1n + 1) >> 1); */
tmp_len_minus_1 = SUB(s1n_0, SAR(ADD3(d1n_0, d1n_0, two), 2));
STORE(tmp + 8 * (len - 1), tmp_len_minus_1);
/* d1n + ((s0n + tmp_len_minus_1) >> 1) */
STORE(tmp + 8 * (len - 2),
ADD(d1n_0, SAR(ADD(s0n_0, tmp_len_minus_1), 1)));
s1n_1 = LOADU(in_even + ((len - 1) / 2) * stride + 4);
/* tmp_len_minus_1 = s1n - ((d1n + 1) >> 1); */
tmp_len_minus_1 = SUB(s1n_1, SAR(ADD3(d1n_1, d1n_1, two), 2));
STORE(tmp + PARALLEL_COLS_53 * (len - 1) + 4, tmp_len_minus_1);
/* d1n + ((s0n + tmp_len_minus_1) >> 1) */
STORE(tmp + PARALLEL_COLS_53 * (len - 2) + 4,
ADD(d1n_1, SAR(ADD(s0n_1, tmp_len_minus_1), 1)));
} else {
STORE(tmp + PARALLEL_COLS_53 * (len - 1) + 0, ADD(d1n_0, s0n_0));
STORE(tmp + PARALLEL_COLS_53 * (len - 1) + 4, ADD(d1n_1, s0n_1));
}
for (i = 0; i < len; ++i) {
memcpy(&tiledp_col[i * stride],
&tmp[PARALLEL_COLS_53 * i],
PARALLEL_COLS_53 * sizeof(OPJ_INT32));
}
}
/** Vertical inverse 5x3 wavelet transform for 8 columns, when top-most
* pixel is on odd coordinate */
static void opj_idwt53_v_cas1_8cols_SSE2(
OPJ_INT32* tmp,
const OPJ_INT32 sn,
const OPJ_INT32 len,
OPJ_INT32* tiledp_col,
const OPJ_INT32 stride)
{
OPJ_INT32 i, j;
__m128i s1_0, s2_0, dc_0, dn_0;
__m128i s1_1, s2_1, dc_1, dn_1;
const __m128i two = _mm_set1_epi32(2);
const OPJ_INT32* in_even = &tiledp_col[sn * stride];
const OPJ_INT32* in_odd = &tiledp_col[0];
assert(len > 2);
assert(PARALLEL_COLS_53 == 8);
s1_0 = LOADU(in_even + stride);
/* in_odd[0] - ((in_even[0] + s1 + 2) >> 2); */
dc_0 = _mm_sub_epi32(
LOADU(in_odd + 0),
SAR(ADD3(LOADU(in_even + 0), s1_0, two), 2));
STORE(tmp + PARALLEL_COLS_53 * 0, ADD(LOADU(in_even + 0), dc_0));
s1_1 = LOADU(in_even + stride + 4);
/* in_odd[0] - ((in_even[0] + s1 + 2) >> 2); */
dc_1 = _mm_sub_epi32(
LOADU(in_odd + 4),
SAR(ADD3(LOADU(in_even + 4), s1_1, two), 2));
STORE(tmp + PARALLEL_COLS_53 * 0 + 4, ADD(LOADU(in_even + 4), dc_1));
for (i = 1, j = 1; i < (len - 2 - !(len & 1)); i += 2, j++) {
s2_0 = LOADU(in_even + (j + 1) * stride);
s2_1 = LOADU(in_even + (j + 1) * stride + 4);
/* dn = in_odd[j * stride] - ((s1 + s2 + 2) >> 2); */
dn_0 = SUB(LOADU(in_odd + j * stride),
SAR(ADD3(s1_0, s2_0, two), 2));
dn_1 = SUB(LOADU(in_odd + j * stride + 4),
SAR(ADD3(s1_1, s2_1, two), 2));
STORE(tmp + PARALLEL_COLS_53 * i, dc_0);
STORE(tmp + PARALLEL_COLS_53 * i + 4, dc_1);
/* tmp[i + 1] = s1 + ((dn + dc) >> 1); */
STORE(tmp + PARALLEL_COLS_53 * (i + 1) + 0,
ADD(s1_0, SAR(ADD(dn_0, dc_0), 1)));
STORE(tmp + PARALLEL_COLS_53 * (i + 1) + 4,
ADD(s1_1, SAR(ADD(dn_1, dc_1), 1)));
dc_0 = dn_0;
s1_0 = s2_0;
dc_1 = dn_1;
s1_1 = s2_1;
}
STORE(tmp + PARALLEL_COLS_53 * i, dc_0);
STORE(tmp + PARALLEL_COLS_53 * i + 4, dc_1);
if (!(len & 1)) {
/*dn = in_odd[(len / 2 - 1) * stride] - ((s1 + 1) >> 1); */
dn_0 = SUB(LOADU(in_odd + (len / 2 - 1) * stride),
SAR(ADD3(s1_0, s1_0, two), 2));
dn_1 = SUB(LOADU(in_odd + (len / 2 - 1) * stride + 4),
SAR(ADD3(s1_1, s1_1, two), 2));
/* tmp[len - 2] = s1 + ((dn + dc) >> 1); */
STORE(tmp + PARALLEL_COLS_53 * (len - 2) + 0,
ADD(s1_0, SAR(ADD(dn_0, dc_0), 1)));
STORE(tmp + PARALLEL_COLS_53 * (len - 2) + 4,
ADD(s1_1, SAR(ADD(dn_1, dc_1), 1)));
STORE(tmp + PARALLEL_COLS_53 * (len - 1) + 0, dn_0);
STORE(tmp + PARALLEL_COLS_53 * (len - 1) + 4, dn_1);
} else {
STORE(tmp + PARALLEL_COLS_53 * (len - 1) + 0, ADD(s1_0, dc_0));
STORE(tmp + PARALLEL_COLS_53 * (len - 1) + 4, ADD(s1_1, dc_1));
}
for (i = 0; i < len; ++i) {
memcpy(&tiledp_col[i * stride],
&tmp[PARALLEL_COLS_53 * i],
PARALLEL_COLS_53 * sizeof(OPJ_INT32));
}
}
#undef LOADU
#undef STORE
#undef ADD
#undef ADD3
#undef SUB
#undef SAR
#endif /* defined(__SSE2__) && !defined(STANDARD_SLOW_VERSION) */
#if !defined(STANDARD_SLOW_VERSION)
/** Vertical inverse 5x3 wavelet transform for one column, when top-most
* pixel is on even coordinate */
static void opj_idwt3_v_cas0(OPJ_INT32* tmp,
const OPJ_INT32 sn,
const OPJ_INT32 len,
OPJ_INT32* tiledp_col,
const OPJ_INT32 stride)
{
OPJ_INT32 i, j;
OPJ_INT32 d1c, d1n, s1n, s0c, s0n;
assert(len > 1);
/* Performs lifting in one single iteration. Saves memory */
/* accesses and explicit interleaving. */
s1n = tiledp_col[0];
d1n = tiledp_col[sn * stride];
s0n = s1n - ((d1n + 1) >> 1);
for (i = 0, j = 0; i < (len - 3); i += 2, j++) {
d1c = d1n;
s0c = s0n;
s1n = tiledp_col[(j + 1) * stride];
d1n = tiledp_col[(sn + j + 1) * stride];
s0n = s1n - ((d1c + d1n + 2) >> 2);
tmp[i ] = s0c;
tmp[i + 1] = d1c + ((s0c + s0n) >> 1);
}
tmp[i] = s0n;
if (len & 1) {
tmp[len - 1] =
tiledp_col[((len - 1) / 2) * stride] -
((d1n + 1) >> 1);
tmp[len - 2] = d1n + ((s0n + tmp[len - 1]) >> 1);
} else {
tmp[len - 1] = d1n + s0n;
}
for (i = 0; i < len; ++i) {
tiledp_col[i * stride] = tmp[i];
}
}
/** Vertical inverse 5x3 wavelet transform for one column, when top-most
* pixel is on odd coordinate */
static void opj_idwt3_v_cas1(OPJ_INT32* tmp,
const OPJ_INT32 sn,
const OPJ_INT32 len,
OPJ_INT32* tiledp_col,
const OPJ_INT32 stride)
{
OPJ_INT32 i, j;
OPJ_INT32 s1, s2, dc, dn;
const OPJ_INT32* in_even = &tiledp_col[sn * stride];
const OPJ_INT32* in_odd = &tiledp_col[0];
assert(len > 2);
/* Performs lifting in one single iteration. Saves memory */
/* accesses and explicit interleaving. */
s1 = in_even[stride];
dc = in_odd[0] - ((in_even[0] + s1 + 2) >> 2);
tmp[0] = in_even[0] + dc;
for (i = 1, j = 1; i < (len - 2 - !(len & 1)); i += 2, j++) {
s2 = in_even[(j + 1) * stride];
dn = in_odd[j * stride] - ((s1 + s2 + 2) >> 2);
tmp[i ] = dc;
tmp[i + 1] = s1 + ((dn + dc) >> 1);
dc = dn;
s1 = s2;
}
tmp[i] = dc;
if (!(len & 1)) {
dn = in_odd[(len / 2 - 1) * stride] - ((s1 + 1) >> 1);
tmp[len - 2] = s1 + ((dn + dc) >> 1);
tmp[len - 1] = dn;
} else {
tmp[len - 1] = s1 + dc;
}
for (i = 0; i < len; ++i) {
tiledp_col[i * stride] = tmp[i];
}
}
#endif /* !defined(STANDARD_SLOW_VERSION) */
/* <summary> */
/* Inverse vertical 5-3 wavelet transform in 1-D for several columns. */
/* </summary> */
/* Performs interleave, inverse wavelet transform and copy back to buffer */
static void opj_idwt53_v(const opj_dwt_t *dwt,
OPJ_INT32* tiledp_col,
OPJ_INT32 stride,
OPJ_INT32 nb_cols)
{
#ifdef STANDARD_SLOW_VERSION
/* For documentation purpose */
OPJ_INT32 k, c;
for (c = 0; c < nb_cols; c ++) {
opj_dwt_interleave_v(dwt, tiledp_col + c, stride);
opj_dwt_decode_1(dwt);
for (k = 0; k < dwt->sn + dwt->dn; ++k) {
tiledp_col[c + k * stride] = dwt->mem[k];
}
}
#else
const OPJ_INT32 sn = dwt->sn;
const OPJ_INT32 len = sn + dwt->dn;
if (dwt->cas == 0) {
/* If len == 1, unmodified value */
#if __SSE2__
if (len > 1 && nb_cols == PARALLEL_COLS_53) {
/* Same as below general case, except that thanks to SSE2 */
/* we can efficently process 8 columns in parallel */
opj_idwt53_v_cas0_8cols_SSE2(dwt->mem, sn, len, tiledp_col, stride);
return;
}
#endif
if (len > 1) {
OPJ_INT32 c;
for (c = 0; c < nb_cols; c++, tiledp_col++) {
opj_idwt3_v_cas0(dwt->mem, sn, len, tiledp_col, stride);
}
return;
}
} else {
if (len == 1) {
OPJ_INT32 c;
for (c = 0; c < nb_cols; c++, tiledp_col++) {
tiledp_col[0] /= 2;
}
return;
}
if (len == 2) {
OPJ_INT32 c;
OPJ_INT32* out = dwt->mem;
for (c = 0; c < nb_cols; c++, tiledp_col++) {
OPJ_INT32 i;
const OPJ_INT32* in_even = &tiledp_col[sn * stride];
const OPJ_INT32* in_odd = &tiledp_col[0];
out[1] = in_odd[0] - ((in_even[0] + 1) >> 1);
out[0] = in_even[0] + out[1];
for (i = 0; i < len; ++i) {
tiledp_col[i * stride] = out[i];
}
}
return;
}
#ifdef __SSE2__
if (len > 2 && nb_cols == PARALLEL_COLS_53) {
/* Same as below general case, except that thanks to SSE2 */
/* we can efficently process 8 columns in parallel */
opj_idwt53_v_cas1_8cols_SSE2(dwt->mem, sn, len, tiledp_col, stride);
return;
}
#endif
if (len > 2) {
OPJ_INT32 c;
for (c = 0; c < nb_cols; c++, tiledp_col++) {
opj_idwt3_v_cas1(dwt->mem, sn, len, tiledp_col, stride);
}
return;
}
}
#endif
}
/* <summary> */ /* <summary> */
/* Forward 9-7 wavelet transform in 1-D. */ /* Forward 9-7 wavelet transform in 1-D. */
/* </summary> */ /* </summary> */
@ -542,7 +1102,7 @@ OPJ_BOOL opj_dwt_encode(opj_tcd_tilecomp_t * tilec)
OPJ_BOOL opj_dwt_decode(opj_thread_pool_t* tp, opj_tcd_tilecomp_t* tilec, OPJ_BOOL opj_dwt_decode(opj_thread_pool_t* tp, opj_tcd_tilecomp_t* tilec,
OPJ_UINT32 numres) OPJ_UINT32 numres)
{ {
return opj_dwt_decode_tile(tp, tilec, numres, &opj_dwt_decode_1); return opj_dwt_decode_tile(tp, tilec, numres);
} }
@ -639,7 +1199,6 @@ static OPJ_UINT32 opj_dwt_max_resolution(opj_tcd_resolution_t* OPJ_RESTRICT r,
typedef struct { typedef struct {
opj_dwt_t h; opj_dwt_t h;
DWT1DFN dwt_1D;
OPJ_UINT32 rw; OPJ_UINT32 rw;
OPJ_UINT32 w; OPJ_UINT32 w;
OPJ_INT32 * OPJ_RESTRICT tiledp; OPJ_INT32 * OPJ_RESTRICT tiledp;
@ -655,9 +1214,7 @@ static void opj_dwt_decode_h_func(void* user_data, opj_tls_t* tls)
job = (opj_dwd_decode_h_job_t*)user_data; job = (opj_dwd_decode_h_job_t*)user_data;
for (j = job->min_j; j < job->max_j; j++) { for (j = job->min_j; j < job->max_j; j++) {
opj_dwt_interleave_h(&job->h, &job->tiledp[j * job->w]); opj_idwt53_h(&job->h, &job->tiledp[j * job->w]);
(job->dwt_1D)(&job->h);
memcpy(&job->tiledp[j * job->w], job->h.mem, job->rw * sizeof(OPJ_INT32));
} }
opj_aligned_free(job->h.mem); opj_aligned_free(job->h.mem);
@ -666,7 +1223,6 @@ static void opj_dwt_decode_h_func(void* user_data, opj_tls_t* tls)
typedef struct { typedef struct {
opj_dwt_t v; opj_dwt_t v;
DWT1DFN dwt_1D;
OPJ_UINT32 rh; OPJ_UINT32 rh;
OPJ_UINT32 w; OPJ_UINT32 w;
OPJ_INT32 * OPJ_RESTRICT tiledp; OPJ_INT32 * OPJ_RESTRICT tiledp;
@ -681,14 +1237,14 @@ static void opj_dwt_decode_v_func(void* user_data, opj_tls_t* tls)
(void)tls; (void)tls;
job = (opj_dwd_decode_v_job_t*)user_data; job = (opj_dwd_decode_v_job_t*)user_data;
for (j = job->min_j; j < job->max_j; j++) { for (j = job->min_j; j + PARALLEL_COLS_53 <= job->max_j;
OPJ_UINT32 k; j += PARALLEL_COLS_53) {
opj_dwt_interleave_v(&job->v, &job->tiledp[j], (OPJ_INT32)job->w); opj_idwt53_v(&job->v, &job->tiledp[j], (OPJ_INT32)job->w,
(job->dwt_1D)(&job->v); PARALLEL_COLS_53);
for (k = 0; k < job->rh; ++k) {
job->tiledp[k * job->w + j] = job->v.mem[k];
}
} }
if (j < job->max_j)
opj_idwt53_v(&job->v, &job->tiledp[j], (OPJ_INT32)job->w,
(OPJ_INT32)(job->max_j - j));
opj_aligned_free(job->v.mem); opj_aligned_free(job->v.mem);
opj_free(job); opj_free(job);
@ -699,7 +1255,7 @@ static void opj_dwt_decode_v_func(void* user_data, opj_tls_t* tls)
/* Inverse wavelet transform in 2-D. */ /* Inverse wavelet transform in 2-D. */
/* </summary> */ /* </summary> */
static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp, static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres, DWT1DFN dwt_1D) opj_tcd_tilecomp_t* tilec, OPJ_UINT32 numres)
{ {
opj_dwt_t h; opj_dwt_t h;
opj_dwt_t v; opj_dwt_t v;
@ -721,11 +1277,14 @@ static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
num_threads = opj_thread_pool_get_thread_count(tp); num_threads = opj_thread_pool_get_thread_count(tp);
h_mem_size = opj_dwt_max_resolution(tr, numres); h_mem_size = opj_dwt_max_resolution(tr, numres);
/* overflow check */ /* overflow check */
if (h_mem_size > (SIZE_MAX / sizeof(OPJ_INT32))) { if (h_mem_size > (SIZE_MAX / PARALLEL_COLS_53 / sizeof(OPJ_INT32))) {
/* FIXME event manager error callback */ /* FIXME event manager error callback */
return OPJ_FALSE; return OPJ_FALSE;
} }
h_mem_size *= sizeof(OPJ_INT32); /* We need PARALLEL_COLS_53 times the height of the array, */
/* since for the vertical pass */
/* we process PARALLEL_COLS_53 columns at a time */
h_mem_size *= PARALLEL_COLS_53 * sizeof(OPJ_INT32);
h.mem = (OPJ_INT32*)opj_aligned_malloc(h_mem_size); h.mem = (OPJ_INT32*)opj_aligned_malloc(h_mem_size);
if (! h.mem) { if (! h.mem) {
/* FIXME event manager error callback */ /* FIXME event manager error callback */
@ -750,9 +1309,7 @@ static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
if (num_threads <= 1 || rh <= 1) { if (num_threads <= 1 || rh <= 1) {
for (j = 0; j < rh; ++j) { for (j = 0; j < rh; ++j) {
opj_dwt_interleave_h(&h, &tiledp[j * w]); opj_idwt53_h(&h, &tiledp[j * w]);
(dwt_1D)(&h);
memcpy(&tiledp[j * w], h.mem, rw * sizeof(OPJ_INT32));
} }
} else { } else {
OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads; OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads;
@ -777,7 +1334,6 @@ static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
return OPJ_FALSE; return OPJ_FALSE;
} }
job->h = h; job->h = h;
job->dwt_1D = dwt_1D;
job->rw = rw; job->rw = rw;
job->w = w; job->w = w;
job->tiledp = tiledp; job->tiledp = tiledp;
@ -803,14 +1359,12 @@ static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
v.cas = tr->y0 % 2; v.cas = tr->y0 % 2;
if (num_threads <= 1 || rw <= 1) { if (num_threads <= 1 || rw <= 1) {
for (j = 0; j < rw; ++j) { for (j = 0; j + PARALLEL_COLS_53 <= rw;
OPJ_UINT32 k; j += PARALLEL_COLS_53) {
opj_idwt53_v(&v, &tiledp[j], (OPJ_INT32)w, PARALLEL_COLS_53);
opj_dwt_interleave_v(&v, &tiledp[j], (OPJ_INT32)w);
(dwt_1D)(&v);
for (k = 0; k < rh; ++k) {
tiledp[k * w + j] = v.mem[k];
} }
if (j < rw) {
opj_idwt53_v(&v, &tiledp[j], (OPJ_INT32)w, (OPJ_INT32)(rw - j));
} }
} else { } else {
OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads; OPJ_UINT32 num_jobs = (OPJ_UINT32)num_threads;
@ -835,7 +1389,6 @@ static OPJ_BOOL opj_dwt_decode_tile(opj_thread_pool_t* tp,
return OPJ_FALSE; return OPJ_FALSE;
} }
job->v = v; job->v = v;
job->dwt_1D = dwt_1D;
job->rh = rh; job->rh = rh;
job->w = w; job->w = w;
job->tiledp = tiledp; job->tiledp = tiledp;