* [FFmpeg-devel] [PATCH 1/2] aarch64: vvc: Fix compilation of alf.S with MSVC 2022 17.7 and older
@ 2024-07-23 11:28 Martin Storsjö
2024-07-23 11:28 ` [FFmpeg-devel] [PATCH 2/2] aarch64: vvc: Consistently use # for immediate constants Martin Storsjö
0 siblings, 1 reply; 3+ messages in thread
From: Martin Storsjö @ 2024-07-23 11:28 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
Use the "ldur" instruction explicitly, instead of having the
assembler implicitly convert "ldr" instructions to "ldur".
This fixes build errors like these:
libavcodec\aarch64\vvc\alf.o.asm(1023) : error A2518: operand 2: Memory offset must be aligned
ldr q22, [x3, #24]
libavcodec\aarch64\vvc\alf.o.asm(1024) : error A2518: operand 2: Memory offset must be aligned
ldr q24, [x2, #24]
libavcodec\aarch64\vvc\alf.o.asm(1393) : error A2518: operand 2: Memory offset must be aligned
ldr q22, [x3, #24]
libavcodec\aarch64\vvc\alf.o.asm(1394) : error A2518: operand 2: Memory offset must be aligned
ldr q24, [x2, #24]
---
libavcodec/aarch64/vvc/alf.S | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libavcodec/aarch64/vvc/alf.S b/libavcodec/aarch64/vvc/alf.S
index beb36ac66b..828031cb90 100644
--- a/libavcodec/aarch64/vvc/alf.S
+++ b/libavcodec/aarch64/vvc/alf.S
@@ -81,8 +81,8 @@
.endif
ldr q0, [clip] // clip
ldr q1, [filter] // filter
- ldr q22, [clip, #24] // clip
- ldr q24, [filter, #24] // filter
+ ldur q22, [clip, #24] // clip
+ ldur q24, [filter, #24] // filter
ldr x5, [pp] // x5: p0
ldr x6, [pp, #(5*8)] // x6: p5
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] aarch64: vvc: Consistently use # for immediate constants
2024-07-23 11:28 [FFmpeg-devel] [PATCH 1/2] aarch64: vvc: Fix compilation of alf.S with MSVC 2022 17.7 and older Martin Storsjö
@ 2024-07-23 11:28 ` Martin Storsjö
2024-07-23 11:48 ` Zhao Zhili
0 siblings, 1 reply; 3+ messages in thread
From: Martin Storsjö @ 2024-07-23 11:28 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Zhao Zhili
---
libavcodec/aarch64/vvc/alf.S | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/libavcodec/aarch64/vvc/alf.S b/libavcodec/aarch64/vvc/alf.S
index 828031cb90..eec193302a 100644
--- a/libavcodec/aarch64/vvc/alf.S
+++ b/libavcodec/aarch64/vvc/alf.S
@@ -95,7 +95,7 @@
.else
ldr q5, [x5] // curr
.endif
- movi v20.4s, 64
+ movi v20.4s, #64
cbz is_near_vb, 1f
shl v20.4s, v20.4s, #3
1:
@@ -220,7 +220,7 @@
.else
ldr d5, [x5] // curr
.endif
- movi v20.4s, 64
+ movi v20.4s, #64
cbz is_near_vb, 1f
shl v20.4s, v20.4s, #3
1:
@@ -267,12 +267,12 @@ function ff_alf_filter_luma_kernel_8_neon, export=1
endfunc
function ff_alf_filter_luma_kernel_12_neon, export=1
- mov w5, 4095
+ mov w5, #4095
b 1f
endfunc
function ff_alf_filter_luma_kernel_10_neon, export=1
- mov w5, 1023
+ mov w5, #1023
1:
alf_filter_luma_kernel 2
endfunc
@@ -282,12 +282,12 @@ function ff_alf_filter_chroma_kernel_8_neon, export=1
endfunc
function ff_alf_filter_chroma_kernel_12_neon, export=1
- mov w5, 4095
+ mov w5, #4095
b 1f
endfunc
function ff_alf_filter_chroma_kernel_10_neon, export=1
- mov w5, 1023
+ mov w5, #1023
1:
alf_filter_chroma_kernel 2
endfunc
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] aarch64: vvc: Consistently use # for immediate constants
2024-07-23 11:28 ` [FFmpeg-devel] [PATCH 2/2] aarch64: vvc: Consistently use # for immediate constants Martin Storsjö
@ 2024-07-23 11:48 ` Zhao Zhili
0 siblings, 0 replies; 3+ messages in thread
From: Zhao Zhili @ 2024-07-23 11:48 UTC (permalink / raw)
To: FFmpeg development discussions and patches
> On Jul 23, 2024, at 19:28, Martin Storsjö <martin@martin.st> wrote:
>
> ---
> libavcodec/aarch64/vvc/alf.S | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/libavcodec/aarch64/vvc/alf.S b/libavcodec/aarch64/vvc/alf.S
> index 828031cb90..eec193302a 100644
> --- a/libavcodec/aarch64/vvc/alf.S
> +++ b/libavcodec/aarch64/vvc/alf.S
> @@ -95,7 +95,7 @@
> .else
> ldr q5, [x5] // curr
> .endif
> - movi v20.4s, 64
> + movi v20.4s, #64
> cbz is_near_vb, 1f
> shl v20.4s, v20.4s, #3
> 1:
> @@ -220,7 +220,7 @@
> .else
> ldr d5, [x5] // curr
> .endif
> - movi v20.4s, 64
> + movi v20.4s, #64
> cbz is_near_vb, 1f
> shl v20.4s, v20.4s, #3
> 1:
> @@ -267,12 +267,12 @@ function ff_alf_filter_luma_kernel_8_neon, export=1
> endfunc
>
> function ff_alf_filter_luma_kernel_12_neon, export=1
> - mov w5, 4095
> + mov w5, #4095
> b 1f
> endfunc
>
> function ff_alf_filter_luma_kernel_10_neon, export=1
> - mov w5, 1023
> + mov w5, #1023
> 1:
> alf_filter_luma_kernel 2
> endfunc
> @@ -282,12 +282,12 @@ function ff_alf_filter_chroma_kernel_8_neon, export=1
> endfunc
>
> function ff_alf_filter_chroma_kernel_12_neon, export=1
> - mov w5, 4095
> + mov w5, #4095
> b 1f
> endfunc
>
> function ff_alf_filter_chroma_kernel_10_neon, export=1
> - mov w5, 1023
> + mov w5, #1023
> 1:
> alf_filter_chroma_kernel 2
> endfunc
> --
> 2.34.1
LGTM for the patch set. Thanks for the quick fix.
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-07-23 11:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-07-23 11:28 [FFmpeg-devel] [PATCH 1/2] aarch64: vvc: Fix compilation of alf.S with MSVC 2022 17.7 and older Martin Storsjö
2024-07-23 11:28 ` [FFmpeg-devel] [PATCH 2/2] aarch64: vvc: Consistently use # for immediate constants Martin Storsjö
2024-07-23 11:48 ` Zhao Zhili
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git