Commit d99e8bef authored by Yaowu Xu's avatar Yaowu Xu

Restore the use of "vpxor" instructions

previously "vpxor" instruction was mistakenly replaced by "aomor" as
port of vpx->aom renaming change. This commit revert that change for
where vpxor instruction should be used in asm code.

Change-Id: I411d95f5d8fa5ed380c8b0d6021118b6c1e9bfb9
parent 9662fde9
......@@ -67,8 +67,8 @@ uint32 SumSquareError_AVX2(const uint8* src_a, const uint8* src_b, int count) {
mov eax, [esp + 4] // src_a
mov edx, [esp + 8] // src_b
mov ecx, [esp + 12] // count
aomor ymm0, ymm0, ymm0 // sum
aomor ymm5, ymm5, ymm5 // constant 0 for unpck
vpxor ymm0, ymm0, ymm0 // sum
vpxor ymm5, ymm5, ymm5 // constant 0 for unpck
sub edx, eax
wloop:
......
......@@ -4855,7 +4855,7 @@ void ARGBMultiplyRow_AVX2(const uint8* src_argb0, const uint8* src_argb1,
mov esi, [esp + 4 + 8] // src_argb1
mov edx, [esp + 4 + 12] // dst_argb
mov ecx, [esp + 4 + 16] // width
aomor ymm5, ymm5, ymm5 // constant 0
vpxor ymm5, ymm5, ymm5 // constant 0
convertloop:
vmovdqu ymm1, [eax] // read 8 pixels from src_argb0
......@@ -5535,7 +5535,7 @@ void InterpolateRow_AVX2(uint8* dst_ptr, const uint8* src_ptr,
vmovd xmm5, eax // low fraction 128..1
vpunpcklbw xmm5, xmm5, xmm0
vpunpcklwd xmm5, xmm5, xmm5
aomor ymm0, ymm0, ymm0
vpxor ymm0, ymm0, ymm0
vpermd ymm5, ymm0, ymm5
xloop:
......
......@@ -240,7 +240,7 @@ void ScaleRowDown2Linear_AVX2(const uint8* src_ptr, ptrdiff_t src_stride,
vpcmpeqb ymm4, ymm4, ymm4 // '1' constant, 8b
vpsrlw ymm4, ymm4, 15
vpackuswb ymm4, ymm4, ymm4
aomor ymm5, ymm5, ymm5 // constant 0
vpxor ymm5, ymm5, ymm5 // constant 0
wloop:
vmovdqu ymm0, [eax]
......@@ -278,7 +278,7 @@ void ScaleRowDown2Box_AVX2(const uint8* src_ptr, ptrdiff_t src_stride,
vpcmpeqb ymm4, ymm4, ymm4 // '1' constant, 8b
vpsrlw ymm4, ymm4, 15
vpackuswb ymm4, ymm4, ymm4
aomor ymm5, ymm5, ymm5 // constant 0
vpxor ymm5, ymm5, ymm5 // constant 0
wloop:
vmovdqu ymm0, [eax] // average rows
......@@ -834,7 +834,7 @@ void ScaleAddRow_AVX2(const uint8* src_ptr, uint16* dst_ptr, int src_width) {
mov eax, [esp + 4] // src_ptr
mov edx, [esp + 8] // dst_ptr
mov ecx, [esp + 12] // src_width
aomor ymm5, ymm5, ymm5
vpxor ymm5, ymm5, ymm5
// sum rows
xloop:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment