Skip to content

L
libyuv
Commit 030042a2 authored by Frank Barchard's avatar Frank Barchard Committed by Commit Bot
Browse files
Options

Remove VEXTOPMEM x64 NaCL macros 

VEXTOPMEM macros are deprecated in row.h

Usage examples
    VEXTOPMEM(vextractf128,1,ymm0,0x0,1,2,1) // vextractf128 $1,%%ymm0,(%1,%2,1)

Regular expressions to remove MEMACCESS macros:

VEXTOPMEM\((.*),(.*),(.*),(.*),(.*),(.*),(.*)\)(.*//.*)
"\1 $\2,%\3,\4(%\5,%\6,\7)        \\n"

Bug: libyuv:702
Test: try bots pass
Change-Id: I177edf9813128408e74816672dd25abb03a5e1ca
Reviewed-on: https://chromium-review.googlesource.com/865283Reviewed-by: 's avatarFrank Barchard <fbarchard@chromium.org>
Commit-Queue: Frank Barchard <fbarchard@chromium.org>
parent 5088f001
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 11 deletions
include/libyuv/row.h
View file @ 030042a2
...@@ -583,8 +583,6 @@ extern const struct YuvConstants SIMD_ALIGNED(kYvuH709Constants); // BT.709 ...@@ -583,8 +583,6 @@ extern const struct YuvConstants SIMD_ALIGNED(kYvuH709Constants); // BT.709
#define VMEMOPREG(opcode, offset, base, index, scale, reg1, reg2) \ #define VMEMOPREG(opcode, offset, base, index, scale, reg1, reg2) \
#opcode " " #offset "(%" #base ",%" #index "," #scale "),%%" #reg1 \ #opcode " " #offset "(%" #base ",%" #index "," #scale "),%%" #reg1 \
",%%" #reg2 "\n" ",%%" #reg2 "\n"
#define VEXTOPMEM(op, sel, reg, offset, base, index, scale) \
#op " $" #sel ",%%" #reg "," #offset "(%" #base ",%" #index "," #scale ")\n"
// Intel Code Analizer markers. Insert IACA_START IACA_END around code to be // Intel Code Analizer markers. Insert IACA_START IACA_END around code to be
// measured and then run with iaca -64 libyuv_unittest. // measured and then run with iaca -64 libyuv_unittest.
......
source/row_gcc.cc
View file @ 030042a2
...@@ -1087,7 +1087,7 @@ void ARGBToUVRow_AVX2(const uint8* src_argb0, ...@@ -1087,7 +1087,7 @@ void ARGBToUVRow_AVX2(const uint8* src_argb0,
"vpaddb %%ymm5,%%ymm0,%%ymm0 \n" "vpaddb %%ymm5,%%ymm0,%%ymm0 \n"
"vextractf128 $0x0,%%ymm0,(%1) \n" "vextractf128 $0x0,%%ymm0,(%1) \n"
VEXTOPMEM(vextractf128,1,ymm0,0x0,1,2,1) // vextractf128 $1,%%ymm0,(%1,%2,1) "vextractf128 $0x1,%%ymm0,0x0(%1,%2,1) \n"
"lea 0x10(%1),%1 \n" "lea 0x10(%1),%1 \n"
"sub $0x20,%3 \n" "sub $0x20,%3 \n"
"jg 1b \n" "jg 1b \n"
...@@ -1152,7 +1152,7 @@ void ARGBToUVJRow_AVX2(const uint8* src_argb0, ...@@ -1152,7 +1152,7 @@ void ARGBToUVJRow_AVX2(const uint8* src_argb0,
"vpshufb %8,%%ymm0,%%ymm0 \n" "vpshufb %8,%%ymm0,%%ymm0 \n"
"vextractf128 $0x0,%%ymm0,(%1) \n" "vextractf128 $0x0,%%ymm0,(%1) \n"
VEXTOPMEM(vextractf128,1,ymm0,0x0,1,2,1) // vextractf128 $1,%%ymm0,(%1,%2,1) "vextractf128 $0x1,%%ymm0,0x0(%1,%2,1) \n"
"lea 0x10(%1),%1 \n" "lea 0x10(%1),%1 \n"
"sub $0x20,%3 \n" "sub $0x20,%3 \n"
"jg 1b \n" "jg 1b \n"
...@@ -2907,9 +2907,9 @@ void MergeUVRow_AVX2(const uint8* src_u, ...@@ -2907,9 +2907,9 @@ void MergeUVRow_AVX2(const uint8* src_u,
"vpunpcklbw %%ymm1,%%ymm0,%%ymm2 \n" "vpunpcklbw %%ymm1,%%ymm0,%%ymm2 \n"
"vpunpckhbw %%ymm1,%%ymm0,%%ymm0 \n" "vpunpckhbw %%ymm1,%%ymm0,%%ymm0 \n"
"vextractf128 $0x0,%%ymm2,(%2) \n" "vextractf128 $0x0,%%ymm2,(%2) \n"
"vextractf128 $0x0,%%ymm0,0x10(%2) \n" "vextractf128 $0x0,%%ymm0,0x10(%2) \n"
"vextractf128 $0x1,%%ymm2,0x20(%2) \n" "vextractf128 $0x1,%%ymm2,0x20(%2) \n"
"vextractf128 $0x1,%%ymm0,0x30(%2) \n" "vextractf128 $0x1,%%ymm0,0x30(%2) \n"
"lea 0x40(%2),%2 \n" "lea 0x40(%2),%2 \n"
"sub $0x20,%3 \n" "sub $0x20,%3 \n"
"jg 1b \n" "jg 1b \n"
...@@ -3960,7 +3960,7 @@ void YUY2ToUVRow_AVX2(const uint8* src_yuy2, ...@@ -3960,7 +3960,7 @@ void YUY2ToUVRow_AVX2(const uint8* src_yuy2,
"vpermq $0xd8,%%ymm1,%%ymm1 \n" "vpermq $0xd8,%%ymm1,%%ymm1 \n"
"vpermq $0xd8,%%ymm0,%%ymm0 \n" "vpermq $0xd8,%%ymm0,%%ymm0 \n"
"vextractf128 $0x0,%%ymm1,(%1) \n" "vextractf128 $0x0,%%ymm1,(%1) \n"
VEXTOPMEM(vextractf128,0,ymm0,0x00,1,2,1) // vextractf128 $0x0,%%ymm0,(%1,%2,1) "vextractf128 $0x0,%%ymm0,0x00(%1,%2,1) \n"
"lea 0x10(%1),%1 \n" "lea 0x10(%1),%1 \n"
"sub $0x20,%3 \n" "sub $0x20,%3 \n"
"jg 1b \n" "jg 1b \n"
...@@ -4000,7 +4000,7 @@ void YUY2ToUV422Row_AVX2(const uint8* src_yuy2, ...@@ -4000,7 +4000,7 @@ void YUY2ToUV422Row_AVX2(const uint8* src_yuy2,
"vpermq $0xd8,%%ymm1,%%ymm1 \n" "vpermq $0xd8,%%ymm1,%%ymm1 \n"
"vpermq $0xd8,%%ymm0,%%ymm0 \n" "vpermq $0xd8,%%ymm0,%%ymm0 \n"
"vextractf128 $0x0,%%ymm1,(%1) \n" "vextractf128 $0x0,%%ymm1,(%1) \n"
VEXTOPMEM(vextractf128,0,ymm0,0x00,1,2,1) // vextractf128 $0x0,%%ymm0,(%1,%2,1) "vextractf128 $0x0,%%ymm0,0x00(%1,%2,1) \n"
"lea 0x10(%1),%1 \n" "lea 0x10(%1),%1 \n"
"sub $0x20,%3 \n" "sub $0x20,%3 \n"
"jg 1b \n" "jg 1b \n"
...@@ -4067,7 +4067,7 @@ void UYVYToUVRow_AVX2(const uint8* src_uyvy, ...@@ -4067,7 +4067,7 @@ void UYVYToUVRow_AVX2(const uint8* src_uyvy,
"vpermq $0xd8,%%ymm1,%%ymm1 \n" "vpermq $0xd8,%%ymm1,%%ymm1 \n"
"vpermq $0xd8,%%ymm0,%%ymm0 \n" "vpermq $0xd8,%%ymm0,%%ymm0 \n"
"vextractf128 $0x0,%%ymm1,(%1) \n" "vextractf128 $0x0,%%ymm1,(%1) \n"
VEXTOPMEM(vextractf128,0,ymm0,0x00,1,2,1) // vextractf128 $0x0,%%ymm0,(%1,%2,1) "vextractf128 $0x0,%%ymm0,0x00(%1,%2,1) \n"
"lea 0x10(%1),%1 \n" "lea 0x10(%1),%1 \n"
"sub $0x20,%3 \n" "sub $0x20,%3 \n"
"jg 1b \n" "jg 1b \n"
...@@ -4107,7 +4107,7 @@ void UYVYToUV422Row_AVX2(const uint8* src_uyvy, ...@@ -4107,7 +4107,7 @@ void UYVYToUV422Row_AVX2(const uint8* src_uyvy,
"vpermq $0xd8,%%ymm1,%%ymm1 \n" "vpermq $0xd8,%%ymm1,%%ymm1 \n"
"vpermq $0xd8,%%ymm0,%%ymm0 \n" "vpermq $0xd8,%%ymm0,%%ymm0 \n"
"vextractf128 $0x0,%%ymm1,(%1) \n" "vextractf128 $0x0,%%ymm1,(%1) \n"
VEXTOPMEM(vextractf128,0,ymm0,0x00,1,2,1) // vextractf128 $0x0,%%ymm0,(%1,%2,1) "vextractf128 $0x0,%%ymm0,0x00(%1,%2,1) \n"
"lea 0x10(%1),%1 \n" "lea 0x10(%1),%1 \n"
"sub $0x20,%3 \n" "sub $0x20,%3 \n"
"jg 1b \n" "jg 1b \n"
......
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