coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-06 16:56:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

scalerow avx2 bug fix. was using ymm2 instead of ymm3.

Browse Source 
R=harryjin@google.com
BUG=libyuv:462

Review URL: https://webrtc-codereview.appspot.com/56639004.
This commit is contained in:
Frank Barchard 2015-07-07 17:48:04 -07:00
parent 715a29195b
commit 0e83b64e88
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libyuv/scale_row.h
View File

@ -50,8 +50,7 @@ extern "C" {
// The following are available on VS2012: // The following are available on VS2012:
#if !defined(LIBYUV_DISABLE_X86) && defined(VISUALC_HAS_AVX2) #if !defined(LIBYUV_DISABLE_X86) && defined(VISUALC_HAS_AVX2)
// Some AVX2 versions disabled. See libyuv bug 462. #define HAS_SCALEADDROW_AVX2
// #define HAS_SCALEADDROW_AVX2
#define HAS_SCALEROWDOWN2_AVX2 #define HAS_SCALEROWDOWN2_AVX2
#define HAS_SCALEROWDOWN4_AVX2 #define HAS_SCALEROWDOWN4_AVX2
#endif #endif

10
source/scale_win.cc
View File

@ -838,17 +838,15 @@ void ScaleAddRow_AVX2(const uint8* src_ptr, uint16* dst_ptr, int src_width) {
// sum rows // sum rows
xloop: xloop:
vmovdqu ymm3, [eax] // read 32 bytes vmovdqu ymm3, [eax] // read 32 bytes
vpermq ymm3, ymm2, 0xd8 // unmutate for vpunpck
lea eax, [eax + 32] lea eax, [eax + 32]
vmovdqu ymm0, [edx] // read 32 words from destination vpermq ymm3, ymm3, 0xd8 // unmutate for vpunpck
vmovdqu ymm1, [edx + 32]
vpunpcklbw ymm2, ymm3, ymm5 vpunpcklbw ymm2, ymm3, ymm5
vpunpckhbw ymm3, ymm3, ymm5 vpunpckhbw ymm3, ymm3, ymm5
vpaddusw ymm0, ymm0, ymm2 // sum 16 words vpaddusw ymm0, ymm2, [edx] // sum 16 words
vpaddusw ymm1, ymm1, ymm3 vpaddusw ymm1, ymm3, [edx + 32]
vmovdqu [edx], ymm0 // write 32 words to destination vmovdqu [edx], ymm0 // write 32 words to destination
vmovdqu [edx + 32], ymm1 vmovdqu [edx + 32], ymm1
lea edx, [edx + 64] lea edx, [edx + 64]
sub ecx, 32 sub ecx, 32
jg xloop jg xloop