[2/3] aarch64: vp9mc: Use movrel macro with separate offset parameter

Message ID 1478685650-22827-2-git-send-email-martin@martin.st
State Committed
Headers show

Commit Message

Martin Storsjö Nov. 9, 2016, 10 a.m.
---
This goes on top of the latest version of the main aarch64 vp9 mc patch.
---
 libavcodec/aarch64/vp9mc_neon.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Janne Grunau Nov. 10, 2016, 8:38 a.m. | #1
On 2016-11-09 12:00:49 +0200, Martin Storsjö wrote:
> ---
> This goes on top of the latest version of the main aarch64 vp9 mc patch.
> ---
>  libavcodec/aarch64/vp9mc_neon.S | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/aarch64/vp9mc_neon.S b/libavcodec/aarch64/vp9mc_neon.S
> index 6346878..720273b 100644
> --- a/libavcodec/aarch64/vp9mc_neon.S
> +++ b/libavcodec/aarch64/vp9mc_neon.S
> @@ -373,7 +373,7 @@ do_8tap_h_size 16
>  
>  .macro do_8tap_h_func type, filter, offset, size
>  function ff_vp9_\type\()_\filter\()\size\()_h_neon, export=1
> -        movrel          x6,  X(ff_vp9_subpel_filters) + 120*\offset - 8
> +        movrel          x6,  X(ff_vp9_subpel_filters), 120*\offset - 8
>          cmp             w5,  #8
>          add             x9,  x6,  w5, uxtw #3
>          mov             x5,  #\size
> @@ -649,7 +649,7 @@ do_8tap_4v avg, 4, 3
>  .macro do_8tap_v_func type, filter, offset, size
>  function ff_vp9_\type\()_\filter\()\size\()_v_neon, export=1
>          uxtw            x4,  w4
> -        movrel          x5,  X(ff_vp9_subpel_filters) + 120*\offset - 8
> +        movrel          x5,  X(ff_vp9_subpel_filters), 120*\offset - 8
>          cmp             w6,  #8
>          add             x6,  x5,  w6, uxtw #3
>          mov             x5,  #\size

ok

Janne

Patch

diff --git a/libavcodec/aarch64/vp9mc_neon.S b/libavcodec/aarch64/vp9mc_neon.S
index 6346878..720273b 100644
--- a/libavcodec/aarch64/vp9mc_neon.S
+++ b/libavcodec/aarch64/vp9mc_neon.S
@@ -373,7 +373,7 @@  do_8tap_h_size 16
 
 .macro do_8tap_h_func type, filter, offset, size
 function ff_vp9_\type\()_\filter\()\size\()_h_neon, export=1
-        movrel          x6,  X(ff_vp9_subpel_filters) + 120*\offset - 8
+        movrel          x6,  X(ff_vp9_subpel_filters), 120*\offset - 8
         cmp             w5,  #8
         add             x9,  x6,  w5, uxtw #3
         mov             x5,  #\size
@@ -649,7 +649,7 @@  do_8tap_4v avg, 4, 3
 .macro do_8tap_v_func type, filter, offset, size
 function ff_vp9_\type\()_\filter\()\size\()_v_neon, export=1
         uxtw            x4,  w4
-        movrel          x5,  X(ff_vp9_subpel_filters) + 120*\offset - 8
+        movrel          x5,  X(ff_vp9_subpel_filters), 120*\offset - 8
         cmp             w6,  #8
         add             x6,  x5,  w6, uxtw #3
         mov             x5,  #\size