lpc_intrin* : Remove unused code.

Which in turn simplifies FLAC__lpc_restore_signal_16_intrin_sse2()
function.

Patch-from: lvqcl <lvqcl.mail@gmail.com>

4 files changed, 110 insertions, 1907 deletions

diff --git a/src/libFLAC/include/private/lpc.h b/src/libFLAC/include/private/lpc.h
index a8555a3f..5906d100 100644
--- a/src/libFLAC/include/private/lpc.h
+++ b/src/libFLAC/include/private/lpc.h
@@ -200,7 +200,6 @@ void FLAC__lpc_restore_signal_wide_asm_ia32(const FLAC__int32 residual[], unsign
 #  if (defined FLAC__CPU_IA32 || defined FLAC__CPU_X86_64) && defined FLAC__HAS_X86INTRIN
 #    ifdef FLAC__SSE2_SUPPORTED
 void FLAC__lpc_restore_signal_16_intrin_sse2(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
-void FLAC__lpc_restore_signal_intrin_sse2(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
 #    endif
 #    ifdef FLAC__SSE4_1_SUPPORTED
 void FLAC__lpc_restore_signal_wide_intrin_sse41(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[]);
diff --git a/src/libFLAC/lpc_intrin_sse2.c b/src/libFLAC/lpc_intrin_sse2.c
index 803c074b..d3092481 100644
--- a/src/libFLAC/lpc_intrin_sse2.c
+++ b/src/libFLAC/lpc_intrin_sse2.c
@@ -51,713 +51,6 @@
 #define RESIDUAL32_RESULT(xmmN) residual[i] = data[i] - (_mm_cvtsi128_si32(xmmN) >> lp_quantization);
 #define     DATA32_RESULT(xmmN) data[i] = residual[i] + (_mm_cvtsi128_si32(xmmN) >> lp_quantization);
 
-#if 0
-FLAC__SSE_TARGET("sse2")
-void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
-{
-	int i;
-	FLAC__int32 sum;
-
-	FLAC__ASSERT(order > 0);
-	FLAC__ASSERT(order <= 32);
-	FLAC__ASSERT(data_len > 0);
-
-	if(order <= 12) {
-		FLAC__int32 curr;
-		if(order > 8) { /* order == 9, 10, 11, 12 */
-#ifdef FLAC__CPU_IA32 /* 8 XMM registers available */
-			int r;
-			__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7;
-			xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-			xmm6 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-			xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+8)); /* read 0 to 3 uninitialized coeffs... */
-			switch(order)                                          /* ...and zero them out */
-			{
-			case 9:
-				xmm1 = _mm_slli_si128(xmm1, 12); xmm1 = _mm_srli_si128(xmm1, 12); break;
-			case 10:
-				xmm1 = _mm_slli_si128(xmm1, 8); xmm1 = _mm_srli_si128(xmm1, 8); break;
-			case 11:
-				xmm1 = _mm_slli_si128(xmm1, 4); xmm1 = _mm_srli_si128(xmm1, 4); break;
-			}
-			xmm2 = _mm_setzero_si128();
-			xmm0 = _mm_packs_epi32(xmm0, xmm6);
-			xmm1 = _mm_packs_epi32(xmm1, xmm2);
-
-			xmm4 = _mm_loadu_si128((const __m128i*)(data-12));
-			xmm5 = _mm_loadu_si128((const __m128i*)(data-8));
-			xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-			xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(0,1,2,3));
-			xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(0,1,2,3));
-			xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-			xmm4 = _mm_packs_epi32(xmm4, xmm2);
-			xmm3 = _mm_packs_epi32(xmm3, xmm5);
-
-			xmm7 = _mm_slli_si128(xmm1, 2);
-			xmm7 = _mm_or_si128(xmm7, _mm_srli_si128(xmm0, 14));
-			xmm2 = _mm_slli_si128(xmm0, 2);
-
-			/* xmm0, xmm1: qlp_coeff
-			   xmm2, xmm7: qlp_coeff << 16 bit
-			   xmm3, xmm4: data */
-
-			xmm6 = xmm4;
-			xmm6 = _mm_madd_epi16(xmm6, xmm1);
-			xmm5 = xmm3;
-			xmm5 = _mm_madd_epi16(xmm5, xmm0);
-			xmm6 = _mm_add_epi32(xmm6, xmm5);
-			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-			RESIDUAL16_RESULT(xmm6);
-
-			data_len--;
-			r = data_len % 2;
-
-			if(r) {
-				xmm4 = _mm_slli_si128(xmm4, 2);
-				xmm6 = xmm3;
-				xmm3 = _mm_slli_si128(xmm3, 2);
-				xmm4 = _mm_or_si128(xmm4, _mm_srli_si128(xmm6, 14));
-				xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm1);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm0);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				RESIDUAL16_RESULT(xmm6);
-
-				data_len--;
-			}
-
-			while(data_len) { /* data_len is a multiple of 2 */
-				/* 1 _mm_slli_si128 per data element less but we need shifted qlp_coeff in xmm2:xmm7 */
-				xmm4 = _mm_slli_si128(xmm4, 4);
-				xmm6 = xmm3;
-				xmm3 = _mm_slli_si128(xmm3, 4);
-				xmm4 = _mm_or_si128(xmm4, _mm_srli_si128(xmm6, 12));
-				xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm7);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm2);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				RESIDUAL16_RESULT(xmm6);
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm1);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm0);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				RESIDUAL16_RESULT(xmm6);
-
-				data_len-=2;
-			}
-#else /* 16 XMM registers available */
-			int r;
-			__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, xmmA, xmmB;
-			xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-			xmm6 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-			xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+8)); /* read 0 to 3 uninitialized coeffs... */
-			switch(order)                                          /* ...and zero them out */
-			{
-			case 9:
-				xmm1 = _mm_slli_si128(xmm1, 12); xmm1 = _mm_srli_si128(xmm1, 12); break;
-			case 10:
-				xmm1 = _mm_slli_si128(xmm1, 8); xmm1 = _mm_srli_si128(xmm1, 8); break;
-			case 11:
-				xmm1 = _mm_slli_si128(xmm1, 4); xmm1 = _mm_srli_si128(xmm1, 4); break;
-			}
-			xmm2 = _mm_setzero_si128();
-			xmm0 = _mm_packs_epi32(xmm0, xmm6);
-			xmm1 = _mm_packs_epi32(xmm1, xmm2);
-
-			xmm4 = _mm_loadu_si128((const __m128i*)(data-12));
-			xmm5 = _mm_loadu_si128((const __m128i*)(data-8));
-			xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-			xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(0,1,2,3));
-			xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(0,1,2,3));
-			xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-			xmm4 = _mm_packs_epi32(xmm4, xmm2);
-			xmm3 = _mm_packs_epi32(xmm3, xmm5);
-
-			xmm7 = _mm_slli_si128(xmm1, 2);
-			xmm7 = _mm_or_si128(xmm7, _mm_srli_si128(xmm0, 14));
-			xmm2 = _mm_slli_si128(xmm0, 2);
-
-			xmm9 = _mm_slli_si128(xmm1, 4);
-			xmm9 = _mm_or_si128(xmm9, _mm_srli_si128(xmm0, 12));
-			xmm8 = _mm_slli_si128(xmm0, 4);
-
-			xmmB = _mm_slli_si128(xmm1, 6);
-			xmmB = _mm_or_si128(xmmB, _mm_srli_si128(xmm0, 10));
-			xmmA = _mm_slli_si128(xmm0, 6);
-
-			/* xmm0, xmm1: qlp_coeff
-			   xmm2, xmm7: qlp_coeff << 16 bit
-			   xmm8, xmm9: qlp_coeff << 2*16 bit
-			   xmmA, xmmB: qlp_coeff << 3*16 bit
-			   xmm3, xmm4: data */
-
-			xmm6 = xmm4;
-			xmm6 = _mm_madd_epi16(xmm6, xmm1);
-			xmm5 = xmm3;
-			xmm5 = _mm_madd_epi16(xmm5, xmm0);
-			xmm6 = _mm_add_epi32(xmm6, xmm5);
-			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-			RESIDUAL16_RESULT(xmm6);
-
-			data_len--;
-			r = data_len % 4;
-
-			while(r) {
-				xmm4 = _mm_slli_si128(xmm4, 2);
-				xmm6 = xmm3;
-				xmm3 = _mm_slli_si128(xmm3, 2);
-				xmm4 = _mm_or_si128(xmm4, _mm_srli_si128(xmm6, 14));
-				xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm1);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm0);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				RESIDUAL16_RESULT(xmm6);
-
-				data_len--; r--;
-			}
-
-			while(data_len) { /* data_len is a multiple of 4 */
-				xmm4 = _mm_slli_si128(xmm4, 8);
-				xmm6 = xmm3;
-				xmm3 = _mm_slli_si128(xmm3, 8);
-				xmm4 = _mm_or_si128(xmm4, _mm_srli_si128(xmm6, 8));
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 3);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmmB);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmmA);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				RESIDUAL16_RESULT(xmm6);
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 2);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm9);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm8);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				RESIDUAL16_RESULT(xmm6);
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm7);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm2);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				RESIDUAL16_RESULT(xmm6);
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm1);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm0);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				RESIDUAL16_RESULT(xmm6);
-
-				data_len-=4;
-			}
-#endif
-		} /* endif(order > 8) */
-		else if(order > 4) { /* order == 5, 6, 7, 8 */
-			if(order > 6) { /* order == 7, 8 */
-				if(order == 8) {
-					__m128i xmm0, xmm1, xmm3, xmm6;
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-					xmm0 = _mm_packs_epi32(xmm0, xmm1);
-
-					xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm1);
-
-					/* xmm0: qlp_coeff
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					RESIDUAL16_RESULT(xmm6);
-
-					data_len--;
-
-					while(data_len) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len--;
-					}
-				}
-				else { /* order == 7 */
-					int r;
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm6;
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-					xmm1 = _mm_slli_si128(xmm1, 4); xmm1 = _mm_srli_si128(xmm1, 4);
-					xmm0 = _mm_packs_epi32(xmm0, xmm1);
-
-					xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm1);
-					xmm2 = _mm_slli_si128(xmm0, 2);
-
-					/* xmm0: qlp_coeff
-					   xmm2: qlp_coeff << 16 bit
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					RESIDUAL16_RESULT(xmm6);
-
-					data_len--;
-					r = data_len % 2;
-
-					if(r) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len--;
-					}
-
-					while(data_len) { /* data_len is a multiple of 2 */
-						xmm3 = _mm_slli_si128(xmm3, 4);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm2);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len-=2;
-					}
-				}
-			}
-			else { /* order == 5, 6 */
-				if(order == 6) {
-					int r;
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm6;
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-					xmm1 = _mm_slli_si128(xmm1, 8); xmm1 = _mm_srli_si128(xmm1, 8);
-					xmm0 = _mm_packs_epi32(xmm0, xmm1);
-
-					xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm1);
-					xmm2 = _mm_slli_si128(xmm0, 2);
-					xmm4 = _mm_slli_si128(xmm0, 4);
-
-					/* xmm0: qlp_coeff
-					   xmm2: qlp_coeff << 16 bit
-					   xmm4: qlp_coeff << 2*16 bit
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					RESIDUAL16_RESULT(xmm6);
-
-					data_len--;
-					r = data_len % 3;
-
-					while(r) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len--; r--;
-					}
-
-					while(data_len) { /* data_len is a multiple of 3 */
-						xmm3 = _mm_slli_si128(xmm3, 6);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 2);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm4);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm2);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len-=3;
-					}
-				}
-				else { /* order == 5 */
-					int r;
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6;
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-					xmm1 = _mm_slli_si128(xmm1, 12); xmm1 = _mm_srli_si128(xmm1, 12);
-					xmm0 = _mm_packs_epi32(xmm0, xmm1);
-
-					xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm1);
-					xmm2 = _mm_slli_si128(xmm0, 2);
-					xmm4 = _mm_slli_si128(xmm0, 4);
-					xmm5 = _mm_slli_si128(xmm0, 6);
-
-					/* xmm0: qlp_coeff
-					   xmm2: qlp_coeff << 16 bit
-					   xmm4: qlp_coeff << 2*16 bit
-					   xmm4: qlp_coeff << 3*16 bit
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					RESIDUAL16_RESULT(xmm6);
-
-					data_len--;
-					r = data_len % 4;
-
-					while(r) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len--; r--;
-					}
-
-					while(data_len) { /* data_len is a multiple of 4 */
-						xmm3 = _mm_slli_si128(xmm3, 8);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 3);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm5);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 2);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm4);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm2);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len-=4;
-					}
-				}
-			}
-		}
-		else { /* order == 1, 2, 3, 4 */
-			if(order > 2) {
-				if(order == 4) {
-					__m128i xmm0, xmm3, xmm6;
-					xmm6 = _mm_setzero_si128();
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm0 = _mm_packs_epi32(xmm0, xmm6);
-
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm6);
-
-					/* xmm0: qlp_coeff
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					RESIDUAL16_RESULT(xmm6);
-
-					data_len--;
-
-					while(data_len) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len--;
-					}
-				}
-				else { /* order == 3 */
-					int r;
-					__m128i xmm0, xmm1, xmm3, xmm6;
-					xmm6 = _mm_setzero_si128();
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm0 = _mm_slli_si128(xmm0, 4); xmm0 = _mm_srli_si128(xmm0, 4);
-					xmm0 = _mm_packs_epi32(xmm0, xmm6);
-
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm6);
-					xmm1 = _mm_slli_si128(xmm0, 2);
-
-					/* xmm0: qlp_coeff
-					   xmm1: qlp_coeff << 16 bit
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					RESIDUAL16_RESULT(xmm6);
-
-					data_len--;
-					r = data_len % 2;
-
-					if(r) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len--;
-					}
-
-					while(data_len) { /* data_len is a multiple of 2 */
-						xmm3 = _mm_slli_si128(xmm3, 4);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm1);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len-=2;
-					}
-				}
-			}
-			else {
-				if(order == 2) {
-					__m128i xmm0, xmm3, xmm6;
-					xmm6 = _mm_setzero_si128();
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm0 = _mm_slli_si128(xmm0, 8); xmm0 = _mm_srli_si128(xmm0, 8);
-					xmm0 = _mm_packs_epi32(xmm0, xmm6);
-
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm6);
-
-					/* xmm0: qlp_coeff
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-
-					RESIDUAL16_RESULT(xmm6);
-
-					data_len--;
-
-					while(data_len) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-
-						RESIDUAL16_RESULT(xmm6);
-
-						data_len--;
-					}
-				}
-				else { /* order == 1 */
-					for(i = 0; i < (int)data_len; i++)
-						residual[i] = data[i] - ((qlp_coeff[0] * data[i-1]) >> lp_quantization);
-				}
-			}
-		}
-	}
-	else { /* order > 12 */
-		for(i = 0; i < (int)data_len; i++) {
-			sum = 0;
-			switch(order) {
-				case 32: sum += qlp_coeff[31] * data[i-32];
-				case 31: sum += qlp_coeff[30] * data[i-31];
-				case 30: sum += qlp_coeff[29] * data[i-30];
-				case 29: sum += qlp_coeff[28] * data[i-29];
-				case 28: sum += qlp_coeff[27] * data[i-28];
-				case 27: sum += qlp_coeff[26] * data[i-27];
-				case 26: sum += qlp_coeff[25] * data[i-26];
-				case 25: sum += qlp_coeff[24] * data[i-25];
-				case 24: sum += qlp_coeff[23] * data[i-24];
-				case 23: sum += qlp_coeff[22] * data[i-23];
-				case 22: sum += qlp_coeff[21] * data[i-22];
-				case 21: sum += qlp_coeff[20] * data[i-21];
-				case 20: sum += qlp_coeff[19] * data[i-20];
-				case 19: sum += qlp_coeff[18] * data[i-19];
-				case 18: sum += qlp_coeff[17] * data[i-18];
-				case 17: sum += qlp_coeff[16] * data[i-17];
-				case 16: sum += qlp_coeff[15] * data[i-16];
-				case 15: sum += qlp_coeff[14] * data[i-15];
-				case 14: sum += qlp_coeff[13] * data[i-14];
-				case 13: sum += qlp_coeff[12] * data[i-13];
-				         sum += qlp_coeff[11] * data[i-12];
-				         sum += qlp_coeff[10] * data[i-11];
-				         sum += qlp_coeff[ 9] * data[i-10];
-				         sum += qlp_coeff[ 8] * data[i- 9];
-				         sum += qlp_coeff[ 7] * data[i- 8];
-				         sum += qlp_coeff[ 6] * data[i- 7];
-				         sum += qlp_coeff[ 5] * data[i- 6];
-				         sum += qlp_coeff[ 4] * data[i- 5];
-				         sum += qlp_coeff[ 3] * data[i- 4];
-				         sum += qlp_coeff[ 2] * data[i- 3];
-				         sum += qlp_coeff[ 1] * data[i- 2];
-				         sum += qlp_coeff[ 0] * data[i- 1];
-			}
-			residual[i] = data[i] - (sum >> lp_quantization);
-		}
-	}
-}
-#else
 FLAC__SSE_TARGET("sse2")
 void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
 {
@@ -1111,7 +404,6 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2(const FLAC_
 		}
 	}
 }
-#endif
 
 FLAC__SSE_TARGET("sse2")
 void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse2(const FLAC__int32 *data, unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 residual[])
@@ -1640,63 +932,76 @@ void FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse2(const FLAC__in
 	}
 }
 
+#if defined FLAC__CPU_IA32 && !defined FLAC__HAS_NASM /* unused for x64; not better than MMX asm */
+
 FLAC__SSE_TARGET("sse2")
 void FLAC__lpc_restore_signal_16_intrin_sse2(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[])
 {
-	int i;
-	FLAC__int32 sum;
-	if (order < 8) {
+	if (order < 8 || order > 12) {
 		FLAC__lpc_restore_signal(residual, data_len, qlp_coeff, order, lp_quantization, data);
 		return;
 	}
+	if (data_len == 0)
+		return;
 
-	FLAC__ASSERT(order > 0);
-	FLAC__ASSERT(order <= 32);
-	FLAC__ASSERT(data_len > 0);
+	FLAC__ASSERT(order >= 8);
+	FLAC__ASSERT(order <= 12);
 
-	if(order <= 12) {
+	if(order > 8) { /* order == 9, 10, 11, 12 */
 		FLAC__int32 curr;
-		if(order > 8) { /* order == 9, 10, 11, 12 */
-#ifdef FLAC__CPU_IA32 /* 8 XMM registers available */
-			int r;
-			__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7;
-			xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-			xmm6 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-			xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+8)); /* read 0 to 3 uninitialized coeffs... */
-			switch(order)                                          /* ...and zero them out */
-			{
-			case 9:
-				xmm1 = _mm_slli_si128(xmm1, 12); xmm1 = _mm_srli_si128(xmm1, 12); break;
-			case 10:
-				xmm1 = _mm_slli_si128(xmm1, 8); xmm1 = _mm_srli_si128(xmm1, 8); break;
-			case 11:
-				xmm1 = _mm_slli_si128(xmm1, 4); xmm1 = _mm_srli_si128(xmm1, 4); break;
-			}
-			xmm2 = _mm_setzero_si128();
-			xmm0 = _mm_packs_epi32(xmm0, xmm6);
-			xmm1 = _mm_packs_epi32(xmm1, xmm2);
-
-			xmm4 = _mm_loadu_si128((const __m128i*)(data-12));
-			xmm5 = _mm_loadu_si128((const __m128i*)(data-8));
-			xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-			xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(0,1,2,3));
-			xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(0,1,2,3));
-			xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-			xmm4 = _mm_packs_epi32(xmm4, xmm2);
-			xmm3 = _mm_packs_epi32(xmm3, xmm5);
-
-			xmm7 = _mm_slli_si128(xmm1, 2);
-			xmm7 = _mm_or_si128(xmm7, _mm_srli_si128(xmm0, 14));
-			xmm2 = _mm_slli_si128(xmm0, 2);
-
-			/* xmm0, xmm1: qlp_coeff
-			   xmm2, xmm7: qlp_coeff << 16 bit
-			   xmm3, xmm4: data */
-
-			xmm6 = xmm4;
-			xmm6 = _mm_madd_epi16(xmm6, xmm1);
-			xmm5 = xmm3;
-			xmm5 = _mm_madd_epi16(xmm5, xmm0);
+		__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7;
+		xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
+		xmm6 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
+		xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+8)); /* read 0 to 3 uninitialized coeffs... */
+		switch(order)                                          /* ...and zero them out */
+		{
+		case 9:
+			xmm1 = _mm_slli_si128(xmm1, 12); xmm1 = _mm_srli_si128(xmm1, 12); break;
+		case 10:
+			xmm1 = _mm_slli_si128(xmm1, 8); xmm1 = _mm_srli_si128(xmm1, 8); break;
+		case 11:
+			xmm1 = _mm_slli_si128(xmm1, 4); xmm1 = _mm_srli_si128(xmm1, 4); break;
+		}
+		xmm2 = _mm_setzero_si128();
+		xmm0 = _mm_packs_epi32(xmm0, xmm6);
+		xmm1 = _mm_packs_epi32(xmm1, xmm2);
+
+		xmm4 = _mm_loadu_si128((const __m128i*)(data-12));
+		xmm5 = _mm_loadu_si128((const __m128i*)(data-8));
+		xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
+		xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(0,1,2,3));
+		xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(0,1,2,3));
+		xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
+		xmm4 = _mm_packs_epi32(xmm4, xmm2);
+		xmm3 = _mm_packs_epi32(xmm3, xmm5);
+
+		xmm7 = _mm_slli_si128(xmm1, 2);
+		xmm7 = _mm_or_si128(xmm7, _mm_srli_si128(xmm0, 14));
+		xmm2 = _mm_slli_si128(xmm0, 2);
+
+		/* xmm0, xmm1: qlp_coeff
+			xmm2, xmm7: qlp_coeff << 16 bit
+			xmm3, xmm4: data */
+
+		xmm5 = _mm_madd_epi16(xmm4, xmm1);
+		xmm6 = _mm_madd_epi16(xmm3, xmm0);
+		xmm6 = _mm_add_epi32(xmm6, xmm5);
+		xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
+		xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
+
+		DATA16_RESULT(xmm6);
+
+		data_len--;
+
+		if(data_len % 2) {
+			xmm6 = _mm_srli_si128(xmm3, 14);
+			xmm4 = _mm_slli_si128(xmm4, 2);
+			xmm3 = _mm_slli_si128(xmm3, 2);
+			xmm4 = _mm_or_si128(xmm4, xmm6);
+			xmm3 = _mm_insert_epi16(xmm3, curr, 0);
+
+			xmm5 = _mm_madd_epi16(xmm4, xmm1);
+			xmm6 = _mm_madd_epi16(xmm3, xmm0);
 			xmm6 = _mm_add_epi32(xmm6, xmm5);
 			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
 			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
@@ -1704,1178 +1009,78 @@ void FLAC__lpc_restore_signal_16_intrin_sse2(const FLAC__int32 residual[], unsig
 			DATA16_RESULT(xmm6);
 
 			data_len--;
-			r = data_len % 2;
-
-			if(r) {
-				xmm4 = _mm_slli_si128(xmm4, 2);
-				xmm6 = xmm3;
-				xmm3 = _mm_slli_si128(xmm3, 2);
-				xmm4 = _mm_or_si128(xmm4, _mm_srli_si128(xmm6, 14));
-				xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm1);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm0);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				DATA16_RESULT(xmm6);
-
-				data_len--;
-			}
+		}
 
-			while(data_len) { /* data_len is a multiple of 2 */
-				/* 1 _mm_slli_si128 per data element less but we need shifted qlp_coeff in xmm2:xmm7 */
-				xmm4 = _mm_slli_si128(xmm4, 4);
-				xmm6 = xmm3;
-				xmm3 = _mm_slli_si128(xmm3, 4);
-				xmm4 = _mm_or_si128(xmm4, _mm_srli_si128(xmm6, 12));
-				xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm7);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm2);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				DATA16_RESULT(xmm6);
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm1);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm0);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				DATA16_RESULT(xmm6);
-
-				data_len-=2;
-			}
-#else /* 16 XMM registers available */
-			int r;
-			__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8, xmm9, xmmA, xmmB;
-			xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-			xmm6 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-			xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+8)); /* read 0 to 3 uninitialized coeffs... */
-			switch(order)                                          /* ...and zero them out */
-			{
-			case 9:
-				xmm1 = _mm_slli_si128(xmm1, 12); xmm1 = _mm_srli_si128(xmm1, 12); break;
-			case 10:
-				xmm1 = _mm_slli_si128(xmm1, 8); xmm1 = _mm_srli_si128(xmm1, 8); break;
-			case 11:
-				xmm1 = _mm_slli_si128(xmm1, 4); xmm1 = _mm_srli_si128(xmm1, 4); break;
-			}
-			xmm2 = _mm_setzero_si128();
-			xmm0 = _mm_packs_epi32(xmm0, xmm6);
-			xmm1 = _mm_packs_epi32(xmm1, xmm2);
-
-			xmm4 = _mm_loadu_si128((const __m128i*)(data-12));
-			xmm5 = _mm_loadu_si128((const __m128i*)(data-8));
-			xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-			xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(0,1,2,3));
-			xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(0,1,2,3));
-			xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-			xmm4 = _mm_packs_epi32(xmm4, xmm2);
-			xmm3 = _mm_packs_epi32(xmm3, xmm5);
-
-			xmm7 = _mm_slli_si128(xmm1, 2);
-			xmm7 = _mm_or_si128(xmm7, _mm_srli_si128(xmm0, 14));
-			xmm2 = _mm_slli_si128(xmm0, 2);
-
-			xmm9 = _mm_slli_si128(xmm1, 4);
-			xmm9 = _mm_or_si128(xmm9, _mm_srli_si128(xmm0, 12));
-			xmm8 = _mm_slli_si128(xmm0, 4);
-
-			xmmB = _mm_slli_si128(xmm1, 6);
-			xmmB = _mm_or_si128(xmmB, _mm_srli_si128(xmm0, 10));
-			xmmA = _mm_slli_si128(xmm0, 6);
-
-			/* xmm0, xmm1: qlp_coeff
-			   xmm2, xmm7: qlp_coeff << 16 bit
-			   xmm8, xmm9: qlp_coeff << 2*16 bit
-			   xmmA, xmmB: qlp_coeff << 3*16 bit
-			   xmm3, xmm4: data */
-
-			xmm6 = xmm4;
-			xmm6 = _mm_madd_epi16(xmm6, xmm1);
-			xmm5 = xmm3;
-			xmm5 = _mm_madd_epi16(xmm5, xmm0);
+		while(data_len) { /* data_len is a multiple of 2 */
+			/* 1 _mm_slli_si128 per data element less but we need shifted qlp_coeff in xmm2:xmm7 */
+			xmm6 = _mm_srli_si128(xmm3, 12);
+			xmm4 = _mm_slli_si128(xmm4, 4);
+			xmm3 = _mm_slli_si128(xmm3, 4);
+			xmm4 = _mm_or_si128(xmm4, xmm6);
+			xmm3 = _mm_insert_epi16(xmm3, curr, 1);
+
+			xmm5 = _mm_madd_epi16(xmm4, xmm7);
+			xmm6 = _mm_madd_epi16(xmm3, xmm2);
 			xmm6 = _mm_add_epi32(xmm6, xmm5);
 			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
 			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
 
 			DATA16_RESULT(xmm6);
 
-			data_len--;
-			r = data_len % 4;
-
-			while(r) {
-				xmm4 = _mm_slli_si128(xmm4, 2);
-				xmm6 = xmm3;
-				xmm3 = _mm_slli_si128(xmm3, 2);
-				xmm4 = _mm_or_si128(xmm4, _mm_srli_si128(xmm6, 14));
-				xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm1);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm0);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				DATA16_RESULT(xmm6);
-
-				data_len--; r--;
-			}
-
-			while(data_len) { /* data_len is a multiple of 4 */
-				xmm4 = _mm_slli_si128(xmm4, 8);
-				xmm6 = xmm3;
-				xmm3 = _mm_slli_si128(xmm3, 8);
-				xmm4 = _mm_or_si128(xmm4, _mm_srli_si128(xmm6, 8));
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 3);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmmB);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmmA);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				DATA16_RESULT(xmm6);
+			xmm3 = _mm_insert_epi16(xmm3, curr, 0);
 
-				xmm3 = _mm_insert_epi16(xmm3, curr, 2);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm9);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm8);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				DATA16_RESULT(xmm6);
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm7);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm2);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				DATA16_RESULT(xmm6);
-
-				xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-				xmm6 = xmm4;
-				xmm6 = _mm_madd_epi16(xmm6, xmm1);
-				xmm5 = xmm3;
-				xmm5 = _mm_madd_epi16(xmm5, xmm0);
-				xmm6 = _mm_add_epi32(xmm6, xmm5);
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-				xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-				DATA16_RESULT(xmm6);
-
-				data_len-=4;
-			}
-#endif
-		} /* endif(order > 8) */
-		else if(order > 4) { /* order == 5, 6, 7, 8 */
-			if(order > 6) { /* order == 7, 8 */
-				if(order == 8) {
-					__m128i xmm0, xmm1, xmm3, xmm6;
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-					xmm0 = _mm_packs_epi32(xmm0, xmm1);
-
-					xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm1);
-
-					/* xmm0: qlp_coeff
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					DATA16_RESULT(xmm6);
-
-					data_len--;
-
-					while(data_len) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len--;
-					}
-				}
-				else { /* order == 7 */
-					int r;
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm6;
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-					xmm1 = _mm_slli_si128(xmm1, 4); xmm1 = _mm_srli_si128(xmm1, 4);
-					xmm0 = _mm_packs_epi32(xmm0, xmm1);
-
-					xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm1);
-					xmm2 = _mm_slli_si128(xmm0, 2);
-
-					/* xmm0: qlp_coeff
-					   xmm2: qlp_coeff << 16 bit
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					DATA16_RESULT(xmm6);
-
-					data_len--;
-					r = data_len % 2;
-
-					if(r) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len--;
-					}
-
-					while(data_len) { /* data_len is a multiple of 2 */
-						xmm3 = _mm_slli_si128(xmm3, 4);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm2);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len-=2;
-					}
-				}
-			}
-			else { /* order == 5, 6 */
-				if(order == 6) {
-					int r;
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm6;
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-					xmm1 = _mm_slli_si128(xmm1, 8); xmm1 = _mm_srli_si128(xmm1, 8);
-					xmm0 = _mm_packs_epi32(xmm0, xmm1);
-
-					xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm1);
-					xmm2 = _mm_slli_si128(xmm0, 2);
-					xmm4 = _mm_slli_si128(xmm0, 4);
-
-					/* xmm0: qlp_coeff
-					   xmm2: qlp_coeff << 16 bit
-					   xmm4: qlp_coeff << 2*16 bit
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					DATA16_RESULT(xmm6);
-
-					data_len--;
-					r = data_len % 3;
-
-					while(r) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len--; r--;
-					}
-
-					while(data_len) { /* data_len is a multiple of 3 */
-						xmm3 = _mm_slli_si128(xmm3, 6);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 2);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm4);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm2);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len-=3;
-					}
-				}
-				else { /* order == 5 */
-					int r;
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6;
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
-					xmm1 = _mm_slli_si128(xmm1, 12); xmm1 = _mm_srli_si128(xmm1, 12);
-					xmm0 = _mm_packs_epi32(xmm0, xmm1);
-
-					xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm1);
-					xmm2 = _mm_slli_si128(xmm0, 2);
-					xmm4 = _mm_slli_si128(xmm0, 4);
-					xmm5 = _mm_slli_si128(xmm0, 6);
-
-					/* xmm0: qlp_coeff
-					   xmm2: qlp_coeff << 16 bit
-					   xmm4: qlp_coeff << 2*16 bit
-					   xmm4: qlp_coeff << 3*16 bit
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					DATA16_RESULT(xmm6);
-
-					data_len--;
-					r = data_len % 4;
-
-					while(r) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len--; r--;
-					}
-
-					while(data_len) { /* data_len is a multiple of 4 */
-						xmm3 = _mm_slli_si128(xmm3, 8);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 3);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm5);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 2);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm4);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm2);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
+			xmm5 = _mm_madd_epi16(xmm4, xmm1);
+			xmm6 = _mm_madd_epi16(xmm3, xmm0);
+			xmm6 = _mm_add_epi32(xmm6, xmm5);
+			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
+			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
 
-						DATA16_RESULT(xmm6);
+			DATA16_RESULT(xmm6);
 
-						data_len-=4;
-					}
-				}
-			}
+			data_len-=2;
 		}
-		else { /* order == 1, 2, 3, 4 */
-			if(order > 2) {
-				if(order == 4) {
-					__m128i xmm0, xmm3, xmm6;
-					xmm6 = _mm_setzero_si128();
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm0 = _mm_packs_epi32(xmm0, xmm6);
-
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm6);
-
-					/* xmm0: qlp_coeff
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					DATA16_RESULT(xmm6);
-
-					data_len--;
-
-					while(data_len) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len--;
-					}
-				}
-				else { /* order == 3 */
-					int r;
-					__m128i xmm0, xmm1, xmm3, xmm6;
-					xmm6 = _mm_setzero_si128();
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm0 = _mm_slli_si128(xmm0, 4); xmm0 = _mm_srli_si128(xmm0, 4);
-					xmm0 = _mm_packs_epi32(xmm0, xmm6);
-
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm6);
-					xmm1 = _mm_slli_si128(xmm0, 2);
-
-					/* xmm0: qlp_coeff
-					   xmm1: qlp_coeff << 16 bit
-					   xmm3: data */
-
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
-					xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-					DATA16_RESULT(xmm6);
-
-					data_len--;
-					r = data_len % 2;
-
-					if(r) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len--;
-					}
-
-					while(data_len) { /* data_len is a multiple of 2 */
-						xmm3 = _mm_slli_si128(xmm3, 4);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 1);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm1);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
-
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
-						xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
-
-						DATA16_RESULT(xmm6);
-
-						data_len-=2;
-					}
-				}
-			}
-			else {
-				if(order == 2) {
-					__m128i xmm0, xmm3, xmm6;
-					xmm6 = _mm_setzero_si128();
-					xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
-					xmm0 = _mm_slli_si128(xmm0, 8); xmm0 = _mm_srli_si128(xmm0, 8);
-					xmm0 = _mm_packs_epi32(xmm0, xmm6);
+	} /* endif(order > 8) */
+	else
+	{
+		FLAC__int32 curr;
+		__m128i xmm0, xmm1, xmm3, xmm6;
+		xmm0 = _mm_loadu_si128((const __m128i*)(qlp_coeff+0));
+		xmm1 = _mm_loadu_si128((const __m128i*)(qlp_coeff+4));
+		xmm0 = _mm_packs_epi32(xmm0, xmm1);
 
-					xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
-					xmm3 = _mm_packs_epi32(xmm3, xmm6);
+		xmm1 = _mm_loadu_si128((const __m128i*)(data-8));
+		xmm3 = _mm_loadu_si128((const __m128i*)(data-4));
+		xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(0,1,2,3));
+		xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(0,1,2,3));
+		xmm3 = _mm_packs_epi32(xmm3, xmm1);
 
-					/* xmm0: qlp_coeff
-					   xmm3: data */
+		/* xmm0: qlp_coeff
+			xmm3: data */
 
-					xmm6 = xmm3;
-					xmm6 = _mm_madd_epi16(xmm6, xmm0);
+		xmm6 = _mm_madd_epi16(xmm3, xmm0);
+		xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
+		xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
 
-					DATA16_RESULT(xmm6);
+		DATA16_RESULT(xmm6);
 
-					data_len--;
+		data_len--;
 
-					while(data_len) {
-						xmm3 = _mm_slli_si128(xmm3, 2);
-						xmm3 = _mm_insert_epi16(xmm3, curr, 0);
+		while(data_len) {
+			xmm3 = _mm_slli_si128(xmm3, 2);
+			xmm3 = _mm_insert_epi16(xmm3, curr, 0);
 
-						xmm6 = xmm3;
-						xmm6 = _mm_madd_epi16(xmm6, xmm0);
+			xmm6 = _mm_madd_epi16(xmm3, xmm0);
+			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 8));
+			xmm6 = _mm_add_epi32(xmm6, _mm_srli_si128(xmm6, 4));
 
-						DATA16_RESULT(xmm6);
+			DATA16_RESULT(xmm6);
 
-						data_len--;
-					}
-				}
-				else { /* order == 1 */
-					for(i = 0; i < (int)data_len; i++)
-						data[i] = residual[i] + ((qlp_coeff[0] * data[i-1]) >> lp_quantization);
-				}
-			}
-		}
-	}
-	else { /* order > 12 */
-		for(i = 0; i < (int)data_len; i++) {
-			sum = 0;
-			switch(order) {
-				case 32: sum += qlp_coeff[31] * data[i-32];
-				case 31: sum += qlp_coeff[30] * data[i-31];
-				case 30: sum += qlp_coeff[29] * data[i-30];
-				case 29: sum += qlp_coeff[28] * data[i-29];
-				case 28: sum += qlp_coeff[27] * data[i-28];
-				case 27: sum += qlp_coeff[26] * data[i-27];
-				case 26: sum += qlp_coeff[25] * data[i-26];
-				case 25: sum += qlp_coeff[24] * data[i-25];
-				case 24: sum += qlp_coeff[23] * data[i-24];
-				case 23: sum += qlp_coeff[22] * data[i-23];
-				case 22: sum += qlp_coeff[21] * data[i-22];
-				case 21: sum += qlp_coeff[20] * data[i-21];
-				case 20: sum += qlp_coeff[19] * data[i-20];
-				case 19: sum += qlp_coeff[18] * data[i-19];
-				case 18: sum += qlp_coeff[17] * data[i-18];
-				case 17: sum += qlp_coeff[16] * data[i-17];
-				case 16: sum += qlp_coeff[15] * data[i-16];
-				case 15: sum += qlp_coeff[14] * data[i-15];
-				case 14: sum += qlp_coeff[13] * data[i-14];
-				case 13: sum += qlp_coeff[12] * data[i-13];
-				         sum += qlp_coeff[11] * data[i-12];
-				         sum += qlp_coeff[10] * data[i-11];
-				         sum += qlp_coeff[ 9] * data[i-10];
-				         sum += qlp_coeff[ 8] * data[i- 9];
-				         sum += qlp_coeff[ 7] * data[i- 8];
-				         sum += qlp_coeff[ 6] * data[i- 7];
-				         sum += qlp_coeff[ 5] * data[i- 6];
-				         sum += qlp_coeff[ 4] * data[i- 5];
-				         sum += qlp_coeff[ 3] * data[i- 4];
-				         sum += qlp_coeff[ 2] * data[i- 3];
-				         sum += qlp_coeff[ 1] * data[i- 2];
-				         sum += qlp_coeff[ 0] * data[i- 1];
-			}
-			data[i] = residual[i] + (sum >> lp_quantization);
+			data_len--;
 		}
 	}
 }
 
-FLAC__SSE_TARGET("sse2")
-void FLAC__lpc_restore_signal_intrin_sse2(const FLAC__int32 residual[], unsigned data_len, const FLAC__int32 qlp_coeff[], unsigned order, int lp_quantization, FLAC__int32 data[])
-{
-	int i;
-
-	FLAC__ASSERT(order > 0);
-	FLAC__ASSERT(order <= 32);
-
-	if(order <= 12) {
-		if(order > 8) { /* order == 9, 10, 11, 12 */
-			if(order > 10) { /* order == 11, 12 */
-				if(order == 12) {
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));  // 0  0  q[1]  q[0]
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));  // 0  0  q[3]  q[2]
-					xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4));  // 0  0  q[5]  q[4]
-					xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6));  // 0  0  q[7]  q[6]
-					xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8));  // 0  0  q[9]  q[8]
-					xmm5 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+10)); // 0  0  q[11] q[10]
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0)); // 0  q[1]  0  q[0]
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0)); // 0  q[3]  0  q[2]
-					xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0)); // 0  q[5]  0  q[4]
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0)); // 0  q[7]  0  q[6]
-					xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0)); // 0  q[9]  0  q[8]
-					xmm5 = _mm_shuffle_epi32(xmm5, _MM_SHUFFLE(3,1,2,0)); // 0  q[11] 0  q[10]
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum += qlp_coeff[11] * data[i-12];
-						//sum += qlp_coeff[10] * data[i-11];
-						xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-12));  // 0   0        d[i-11]  d[i-12]
-						xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1)); // 0  d[i-12]   0        d[i-11]
-						xmm7 = _mm_mul_epu32(xmm7, xmm5); /* we use _unsigned_ multiplication and discard high dword of the result values */
-
-						//sum += qlp_coeff[9] * data[i-10];
-						//sum += qlp_coeff[8] * data[i-9];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-10));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm4);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[7] * data[i-8];
-						//sum += qlp_coeff[6] * data[i-7];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm3);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[5] * data[i-6];
-						//sum += qlp_coeff[4] * data[i-5];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm2);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm1);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-				else { /* order == 11 */
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));
-					xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4));
-					xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6));
-					xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8));
-					xmm5 = _mm_cvtsi32_si128(qlp_coeff[10]);
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0));
-					xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0));
-					xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum  = qlp_coeff[10] * data[i-11];
-						xmm7 = _mm_cvtsi32_si128(data[i-11]);
-						xmm7 = _mm_mul_epu32(xmm7, xmm5);
-
-						//sum += qlp_coeff[9] * data[i-10];
-						//sum += qlp_coeff[8] * data[i-9];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-10));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm4);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[7] * data[i-8];
-						//sum += qlp_coeff[6] * data[i-7];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm3);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[5] * data[i-6];
-						//sum += qlp_coeff[4] * data[i-5];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm2);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm1);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-			}
-			else { /* order == 9, 10 */
-				if(order == 10) {
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));
-					xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4));
-					xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6));
-					xmm4 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+8));
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0));
-					xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0));
-					xmm4 = _mm_shuffle_epi32(xmm4, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum += qlp_coeff[9] * data[i-10];
-						//sum += qlp_coeff[8] * data[i-9];
-						xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-10));
-						xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1));
-						xmm7 = _mm_mul_epu32(xmm7, xmm4);
-
-						//sum += qlp_coeff[7] * data[i-8];
-						//sum += qlp_coeff[6] * data[i-7];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm3);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[5] * data[i-6];
-						//sum += qlp_coeff[4] * data[i-5];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm2);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm1);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-				else { /* order == 9 */
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));
-					xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4));
-					xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6));
-					xmm4 = _mm_cvtsi32_si128(qlp_coeff[8]);
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0));
-					xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum  = qlp_coeff[8] * data[i-9];
-						xmm7 = _mm_cvtsi32_si128(data[i-9]);
-						xmm7 = _mm_mul_epu32(xmm7, xmm4);
-
-						//sum += qlp_coeff[7] * data[i-8];
-						//sum += qlp_coeff[6] * data[i-7];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-8));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm3);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[5] * data[i-6];
-						//sum += qlp_coeff[4] * data[i-5];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm2);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm1);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-			}
-		}
-		else if(order > 4) { /* order == 5, 6, 7, 8 */
-			if(order > 6) { /* order == 7, 8 */
-				if(order == 8) {
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));
-					xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4));
-					xmm3 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+6));
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0));
-					xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0));
-					xmm3 = _mm_shuffle_epi32(xmm3, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum += qlp_coeff[7] * data[i-8];
-						//sum += qlp_coeff[6] * data[i-7];
-						xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-8));
-						xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1));
-						xmm7 = _mm_mul_epu32(xmm7, xmm3);
-
-						//sum += qlp_coeff[5] * data[i-6];
-						//sum += qlp_coeff[4] * data[i-5];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm2);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm1);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-				else { /* order == 7 */
-					__m128i xmm0, xmm1, xmm2, xmm3, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));
-					xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4));
-					xmm3 = _mm_cvtsi32_si128(qlp_coeff[6]);
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0));
-					xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum  = qlp_coeff[6] * data[i-7];
-						xmm7 = _mm_cvtsi32_si128(data[i-7]);
-						xmm7 = _mm_mul_epu32(xmm7, xmm3);
-
-						//sum += qlp_coeff[5] * data[i-6];
-						//sum += qlp_coeff[4] * data[i-5];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-6));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm2);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm1);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-			}
-			else { /* order == 5, 6 */
-				if(order == 6) {
-					__m128i xmm0, xmm1, xmm2, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));
-					xmm2 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+4));
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0));
-					xmm2 = _mm_shuffle_epi32(xmm2, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum += qlp_coeff[5] * data[i-6];
-						//sum += qlp_coeff[4] * data[i-5];
-						xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-6));
-						xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1));
-						xmm7 = _mm_mul_epu32(xmm7, xmm2);
-
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm1);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-				else { /* order == 5 */
-					__m128i xmm0, xmm1, xmm2, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));
-					xmm2 = _mm_cvtsi32_si128(qlp_coeff[4]);
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum  = qlp_coeff[4] * data[i-5];
-						xmm7 = _mm_cvtsi32_si128(data[i-5]);
-						xmm7 = _mm_mul_epu32(xmm7, xmm2);
-
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm1);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-			}
-		}
-		else { /* order == 1, 2, 3, 4 */
-			if(order > 2) { /* order == 3, 4 */
-				if(order == 4) {
-					__m128i xmm0, xmm1, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+2));
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-					xmm1 = _mm_shuffle_epi32(xmm1, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum += qlp_coeff[3] * data[i-4];
-						//sum += qlp_coeff[2] * data[i-3];
-						xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-4));
-						xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1));
-						xmm7 = _mm_mul_epu32(xmm7, xmm1);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-				else { /* order == 3 */
-					__m128i xmm0, xmm1, xmm6, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm1 = _mm_cvtsi32_si128(qlp_coeff[2]);
-
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum  = qlp_coeff[2] * data[i-3];
-						xmm7 = _mm_cvtsi32_si128(data[i-3]);
-						xmm7 = _mm_mul_epu32(xmm7, xmm1);
-
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm6 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm6 = _mm_shuffle_epi32(xmm6, _MM_SHUFFLE(2,0,3,1));
-						xmm6 = _mm_mul_epu32(xmm6, xmm0);
-						xmm7 = _mm_add_epi32(xmm7, xmm6);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-			}
-			else { /* order == 1, 2 */
-				if(order == 2) {
-					__m128i xmm0, xmm7;
-					xmm0 = _mm_loadl_epi64((const __m128i*)(qlp_coeff+0));
-					xmm0 = _mm_shuffle_epi32(xmm0, _MM_SHUFFLE(3,1,2,0));
-
-					for(i = 0; i < (int)data_len; i++) {
-						//sum = 0;
-						//sum += qlp_coeff[1] * data[i-2];
-						//sum += qlp_coeff[0] * data[i-1];
-						xmm7 = _mm_loadl_epi64((const __m128i*)(data+i-2));
-						xmm7 = _mm_shuffle_epi32(xmm7, _MM_SHUFFLE(2,0,3,1));
-						xmm7 = _mm_mul_epu32(xmm7, xmm0);
-
-						xmm7 = _mm_add_epi32(xmm7, _mm_srli_si128(xmm7, 8));
-						DATA32_RESULT(xmm7);
-					}
-				}
-				else { /* order == 1 */
-					for(i = 0; i < (int)data_len; i++)
-						data[i] = residual[i] + ((qlp_coeff[0] * data[i-1]) >> lp_quantization);
-				}
-			}
-		}
-	}
-	else { /* order > 12 */
-		FLAC__int32 sum;
-		for(i = 0; i < (int)data_len; i++) {
-			sum = 0;
-			switch(order) {
-				case 32: sum += qlp_coeff[31] * data[i-32];
-				case 31: sum += qlp_coeff[30] * data[i-31];
-				case 30: sum += qlp_coeff[29] * data[i-30];
-				case 29: sum += qlp_coeff[28] * data[i-29];
-				case 28: sum += qlp_coeff[27] * data[i-28];
-				case 27: sum += qlp_coeff[26] * data[i-27];
-				case 26: sum += qlp_coeff[25] * data[i-26];
-				case 25: sum += qlp_coeff[24] * data[i-25];
-				case 24: sum += qlp_coeff[23] * data[i-24];
-				case 23: sum += qlp_coeff[22] * data[i-23];
-				case 22: sum += qlp_coeff[21] * data[i-22];
-				case 21: sum += qlp_coeff[20] * data[i-21];
-				case 20: sum += qlp_coeff[19] * data[i-20];
-				case 19: sum += qlp_coeff[18] * data[i-19];
-				case 18: sum += qlp_coeff[17] * data[i-18];
-				case 17: sum += qlp_coeff[16] * data[i-17];
-				case 16: sum += qlp_coeff[15] * data[i-16];
-				case 15: sum += qlp_coeff[14] * data[i-15];
-				case 14: sum += qlp_coeff[13] * data[i-14];
-				case 13: sum += qlp_coeff[12] * data[i-13];
-				         sum += qlp_coeff[11] * data[i-12];
-				         sum += qlp_coeff[10] * data[i-11];
-				         sum += qlp_coeff[ 9] * data[i-10];
-				         sum += qlp_coeff[ 8] * data[i- 9];
-				         sum += qlp_coeff[ 7] * data[i- 8];
-				         sum += qlp_coeff[ 6] * data[i- 7];
-				         sum += qlp_coeff[ 5] * data[i- 6];
-				         sum += qlp_coeff[ 4] * data[i- 5];
-				         sum += qlp_coeff[ 3] * data[i- 4];
-				         sum += qlp_coeff[ 2] * data[i- 3];
-				         sum += qlp_coeff[ 1] * data[i- 2];
-				         sum += qlp_coeff[ 0] * data[i- 1];
-			}
-			data[i] = residual[i] + (sum >> lp_quantization);
-		}
-	}
-}
+#endif /* defined FLAC__CPU_IA32 && !defined FLAC__HAS_NASM */
 
 #endif /* FLAC__SSE2_SUPPORTED */
 #endif /* (FLAC__CPU_IA32 || FLAC__CPU_X86_64) && FLAC__HAS_X86INTRIN */
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index 0a03c1e1..c4264816 100644
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -406,7 +406,7 @@ static FLAC__StreamDecoderInitStatus init_stream_internal_(
 		}
 #endif
 #ifdef FLAC__HAS_X86INTRIN
-# if defined FLAC__SSE2_SUPPORTED && !defined FLAC__HAS_NASM /* OPT_SSE: not faster than ASM/MMX code */
+# if defined FLAC__SSE2_SUPPORTED && !defined FLAC__HAS_NASM /* OPT_SSE: not better than MMX asm */
 		if(decoder->private_->cpuinfo.ia32.sse2) {
 			decoder->private_->local_lpc_restore_signal_16bit = FLAC__lpc_restore_signal_16_intrin_sse2;
 		}
diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c
index 8d4cfcca..3e33336d 100644
--- a/src/libFLAC/stream_encoder.c
+++ b/src/libFLAC/stream_encoder.c
@@ -978,7 +978,6 @@ static FLAC__StreamEncoderInitStatus init_stream_internal_(
 			encoder->private_->local_lpc_compute_autocorrelation = FLAC__lpc_compute_autocorrelation_intrin_sse_lag_16;
 #    endif
 #    ifdef FLAC__SSE2_SUPPORTED
-		/* encoder->private_->local_lpc_compute_residual_from_qlp_coefficients = FLAC__lpc_compute_residual_from_qlp_coefficients_intrin_sse2; // OPT_SSE: not faster than C; TODO: more tests on different CPUs */
 		encoder->private_->local_lpc_compute_residual_from_qlp_coefficients_16bit = FLAC__lpc_compute_residual_from_qlp_coefficients_16_intrin_sse2;
 #     ifdef FLAC__SSE4_1_SUPPORTED
 		if(encoder->private_->cpuinfo.x86_64.sse41) {