* [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
@ 2022-01-18 22:06 Alexander Kanavin
2022-01-18 22:31 ` Lynne
2022-01-26 11:42 ` Alexander Kanavin
0 siblings, 2 replies; 9+ messages in thread
From: Alexander Kanavin @ 2022-01-18 22:06 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Alexander Kanavin
From: Alexander Kanavin <alex.kanavin@gmail.com>
Otherwise nasm writes the full host-specific paths into .o
output, which breaks binary reproducibility.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
libavutil/x86/cpuid.asm | 2 +-
libavutil/x86/emms.asm | 2 +-
libavutil/x86/fixed_dsp.asm | 2 +-
libavutil/x86/float_dsp.asm | 2 +-
libavutil/x86/lls.asm | 2 +-
libavutil/x86/pixelutils.asm | 2 +-
libavutil/x86/tx_float.asm | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm
index c3f7866ec7..766f77fcdf 100644
--- a/libavutil/x86/cpuid.asm
+++ b/libavutil/x86/cpuid.asm
@@ -21,7 +21,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
index 8611762d73..df84f2221b 100644
--- a/libavutil/x86/emms.asm
+++ b/libavutil/x86/emms.asm
@@ -18,7 +18,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
diff --git a/libavutil/x86/fixed_dsp.asm b/libavutil/x86/fixed_dsp.asm
index 979dd5c334..2f411850f4 100644
--- a/libavutil/x86/fixed_dsp.asm
+++ b/libavutil/x86/fixed_dsp.asm
@@ -20,7 +20,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
index 517fd63638..b773e61a64 100644
--- a/libavutil/x86/float_dsp.asm
+++ b/libavutil/x86/float_dsp.asm
@@ -20,7 +20,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION_RODATA 32
pd_reverse: dd 7, 6, 5, 4, 3, 2, 1, 0
diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
index 317fba6fca..d2526d1ff4 100644
--- a/libavutil/x86/lls.asm
+++ b/libavutil/x86/lls.asm
@@ -20,7 +20,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm
index 36c57c5f7f..8b45ead78b 100644
--- a/libavutil/x86/pixelutils.asm
+++ b/libavutil/x86/pixelutils.asm
@@ -21,7 +21,7 @@
;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
;******************************************************************************
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
SECTION .text
diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm
index 4d2283fae1..ea39f2172a 100644
--- a/libavutil/x86/tx_float.asm
+++ b/libavutil/x86/tx_float.asm
@@ -29,7 +29,7 @@
; replace some shuffles with vblends?
; avx512 split-radix
-%include "x86util.asm"
+%include "libavutil/x86/x86util.asm"
%if ARCH_X86_64
%define ptr resq
--
2.20.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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
2022-01-18 22:06 [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root Alexander Kanavin
@ 2022-01-18 22:31 ` Lynne
2022-01-18 22:38 ` Alexander Kanavin
2022-01-26 11:42 ` Alexander Kanavin
1 sibling, 1 reply; 9+ messages in thread
From: Lynne @ 2022-01-18 22:31 UTC (permalink / raw)
To: FFmpeg development discussions and patches
18 Jan 2022, 23:06 by alex.kanavin@gmail.com:
> From: Alexander Kanavin <alex.kanavin@gmail.com>
>
> Otherwise nasm writes the full host-specific paths into .o
> output, which breaks binary reproducibility.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> libavutil/x86/cpuid.asm | 2 +-
> libavutil/x86/emms.asm | 2 +-
> libavutil/x86/fixed_dsp.asm | 2 +-
> libavutil/x86/float_dsp.asm | 2 +-
> libavutil/x86/lls.asm | 2 +-
> libavutil/x86/pixelutils.asm | 2 +-
> libavutil/x86/tx_float.asm | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
Not what I'm seeing here in the binaries: "libavutil/x86/tx_float.asm",
rather than a full path.
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
2022-01-18 22:31 ` Lynne
@ 2022-01-18 22:38 ` Alexander Kanavin
2022-01-31 12:51 ` Anton Khirnov
0 siblings, 1 reply; 9+ messages in thread
From: Alexander Kanavin @ 2022-01-18 22:38 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Tue, 18 Jan 2022 at 23:32, Lynne <dev@lynne.ee> wrote:
>
> Not what I'm seeing here in the binaries: "libavutil/x86/tx_float.asm",
> rather than a full path.
>
Are you using a separate build directory? This is a sample reproducibility
failure we've observed:
https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20220118-y69m0ean/packages/diff-html/
Alex
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
2022-01-18 22:38 ` Alexander Kanavin
@ 2022-01-31 12:51 ` Anton Khirnov
2022-01-31 13:05 ` Alexander Kanavin
2022-01-31 13:29 ` Alexander Kanavin
0 siblings, 2 replies; 9+ messages in thread
From: Anton Khirnov @ 2022-01-31 12:51 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Quoting Alexander Kanavin (2022-01-18 23:38:59)
> On Tue, 18 Jan 2022 at 23:32, Lynne <dev@lynne.ee> wrote:
>
> >
> > Not what I'm seeing here in the binaries: "libavutil/x86/tx_float.asm",
> > rather than a full path.
> >
>
> Are you using a separate build directory? This is a sample reproducibility
> failure we've observed:
> https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20220118-y69m0ean/packages/diff-html/
With a separate build directory, I'm getting
$ strings libavutil/x86/tx_float.o |grep asm
src/libavutil/x86/tx_float.asm
--
Anton Khirnov
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
2022-01-31 12:51 ` Anton Khirnov
@ 2022-01-31 13:05 ` Alexander Kanavin
2022-01-31 13:29 ` Alexander Kanavin
1 sibling, 0 replies; 9+ messages in thread
From: Alexander Kanavin @ 2022-01-31 13:05 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Mon, 31 Jan 2022 at 13:52, Anton Khirnov <anton@khirnov.net> wrote:
> > Are you using a separate build directory? This is a sample
> reproducibility
> > failure we've observed:
> >
> https://autobuilder.yocto.io/pub/repro-fail/oe-reproducible-20220118-y69m0ean/packages/diff-html/
>
> With a separate build directory, I'm getting
> $ strings libavutil/x86/tx_float.o |grep asm
> src/libavutil/x86/tx_float.asm
>
Thanks, I'm trying to get it to reproduce outside of yocto - there's
something in that build environment that does cause .asm include filenames
to be written into the .o. Will write back when I have a reproducer.
Alex
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
2022-01-31 12:51 ` Anton Khirnov
2022-01-31 13:05 ` Alexander Kanavin
@ 2022-01-31 13:29 ` Alexander Kanavin
2022-02-07 11:24 ` Alexander Kanavin
1 sibling, 1 reply; 9+ messages in thread
From: Alexander Kanavin @ 2022-01-31 13:29 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Mon, 31 Jan 2022 at 13:52, Anton Khirnov <anton@khirnov.net> wrote:
> With a separate build directory, I'm getting
> $ strings libavutil/x86/tx_float.o |grep asm
> src/libavutil/x86/tx_float.asm
>
The key piece is
../configure --disable-stripping
With stripping disabled and without the patch, you should see:
alex@alex-lx-laptop:~/development/ffmpeg/build$ strings
libavutil/x86/tx_float.o |grep asm
src/libavutil/x86/tx_float.asm
src/libavutil/x86/tx_float.asm
/home/alex/development/ffmpeg/libavutil/x86/x86util.asm
src/libavutil/x86/tx_float.asm
Alex
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
2022-01-31 13:29 ` Alexander Kanavin
@ 2022-02-07 11:24 ` Alexander Kanavin
2022-02-08 9:52 ` Anton Khirnov
0 siblings, 1 reply; 9+ messages in thread
From: Alexander Kanavin @ 2022-02-07 11:24 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Mon, 31 Jan 2022 at 14:29, Alexander Kanavin <alex.kanavin@gmail.com>
wrote:
> On Mon, 31 Jan 2022 at 13:52, Anton Khirnov <anton@khirnov.net> wrote:
>
>> With a separate build directory, I'm getting
>> $ strings libavutil/x86/tx_float.o |grep asm
>> src/libavutil/x86/tx_float.asm
>>
>
> The key piece is
> ../configure --disable-stripping
>
> With stripping disabled and without the patch, you should see:
>
> alex@alex-lx-laptop:~/development/ffmpeg/build$ strings
> libavutil/x86/tx_float.o |grep asm
> src/libavutil/x86/tx_float.asm
> src/libavutil/x86/tx_float.asm
> /home/alex/development/ffmpeg/libavutil/x86/x86util.asm
> src/libavutil/x86/tx_float.asm
>
Ping, please :)
Alex
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
2022-02-07 11:24 ` Alexander Kanavin
@ 2022-02-08 9:52 ` Anton Khirnov
0 siblings, 0 replies; 9+ messages in thread
From: Anton Khirnov @ 2022-02-08 9:52 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Quoting Alexander Kanavin (2022-02-07 12:24:58)
> On Mon, 31 Jan 2022 at 14:29, Alexander Kanavin <alex.kanavin@gmail.com>
> wrote:
>
> > On Mon, 31 Jan 2022 at 13:52, Anton Khirnov <anton@khirnov.net> wrote:
> >
> >> With a separate build directory, I'm getting
> >> $ strings libavutil/x86/tx_float.o |grep asm
> >> src/libavutil/x86/tx_float.asm
> >>
> >
> > The key piece is
> > ../configure --disable-stripping
> >
> > With stripping disabled and without the patch, you should see:
> >
> > alex@alex-lx-laptop:~/development/ffmpeg/build$ strings
> > libavutil/x86/tx_float.o |grep asm
> > src/libavutil/x86/tx_float.asm
> > src/libavutil/x86/tx_float.asm
> > /home/alex/development/ffmpeg/libavutil/x86/x86util.asm
> > src/libavutil/x86/tx_float.asm
> >
>
> Ping, please :)
pushed.
sorry for the delay
--
Anton Khirnov
_______________________________________________
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] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root
2022-01-18 22:06 [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root Alexander Kanavin
2022-01-18 22:31 ` Lynne
@ 2022-01-26 11:42 ` Alexander Kanavin
1 sibling, 0 replies; 9+ messages in thread
From: Alexander Kanavin @ 2022-01-26 11:42 UTC (permalink / raw)
To: FFmpeg development discussions and patches
Ping :-)
Alex
On Tue, 18 Jan 2022 at 23:06, Alexander Kanavin <alex.kanavin@gmail.com>
wrote:
> From: Alexander Kanavin <alex.kanavin@gmail.com>
>
> Otherwise nasm writes the full host-specific paths into .o
> output, which breaks binary reproducibility.
>
> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
> ---
> libavutil/x86/cpuid.asm | 2 +-
> libavutil/x86/emms.asm | 2 +-
> libavutil/x86/fixed_dsp.asm | 2 +-
> libavutil/x86/float_dsp.asm | 2 +-
> libavutil/x86/lls.asm | 2 +-
> libavutil/x86/pixelutils.asm | 2 +-
> libavutil/x86/tx_float.asm | 2 +-
> 7 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/libavutil/x86/cpuid.asm b/libavutil/x86/cpuid.asm
> index c3f7866ec7..766f77fcdf 100644
> --- a/libavutil/x86/cpuid.asm
> +++ b/libavutil/x86/cpuid.asm
> @@ -21,7 +21,7 @@
> ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
> ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
> SECTION .text
>
> diff --git a/libavutil/x86/emms.asm b/libavutil/x86/emms.asm
> index 8611762d73..df84f2221b 100644
> --- a/libavutil/x86/emms.asm
> +++ b/libavutil/x86/emms.asm
> @@ -18,7 +18,7 @@
> ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
> ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
> SECTION .text
>
> diff --git a/libavutil/x86/fixed_dsp.asm b/libavutil/x86/fixed_dsp.asm
> index 979dd5c334..2f411850f4 100644
> --- a/libavutil/x86/fixed_dsp.asm
> +++ b/libavutil/x86/fixed_dsp.asm
> @@ -20,7 +20,7 @@
> ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
> ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
> SECTION .text
>
> diff --git a/libavutil/x86/float_dsp.asm b/libavutil/x86/float_dsp.asm
> index 517fd63638..b773e61a64 100644
> --- a/libavutil/x86/float_dsp.asm
> +++ b/libavutil/x86/float_dsp.asm
> @@ -20,7 +20,7 @@
> ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
> ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
> SECTION_RODATA 32
> pd_reverse: dd 7, 6, 5, 4, 3, 2, 1, 0
> diff --git a/libavutil/x86/lls.asm b/libavutil/x86/lls.asm
> index 317fba6fca..d2526d1ff4 100644
> --- a/libavutil/x86/lls.asm
> +++ b/libavutil/x86/lls.asm
> @@ -20,7 +20,7 @@
> ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
> ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
> SECTION .text
>
> diff --git a/libavutil/x86/pixelutils.asm b/libavutil/x86/pixelutils.asm
> index 36c57c5f7f..8b45ead78b 100644
> --- a/libavutil/x86/pixelutils.asm
> +++ b/libavutil/x86/pixelutils.asm
> @@ -21,7 +21,7 @@
> ;* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
> 02110-1301 USA
>
> ;******************************************************************************
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
> SECTION .text
>
> diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm
> index 4d2283fae1..ea39f2172a 100644
> --- a/libavutil/x86/tx_float.asm
> +++ b/libavutil/x86/tx_float.asm
> @@ -29,7 +29,7 @@
> ; replace some shuffles with vblends?
> ; avx512 split-radix
>
> -%include "x86util.asm"
> +%include "libavutil/x86/x86util.asm"
>
> %if ARCH_X86_64
> %define ptr resq
> --
> 2.20.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] 9+ messages in thread
end of thread, other threads:[~2022-02-08 9:52 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-18 22:06 [FFmpeg-devel] [PATCH] libavutil: include assembly with full path from source root Alexander Kanavin
2022-01-18 22:31 ` Lynne
2022-01-18 22:38 ` Alexander Kanavin
2022-01-31 12:51 ` Anton Khirnov
2022-01-31 13:05 ` Alexander Kanavin
2022-01-31 13:29 ` Alexander Kanavin
2022-02-07 11:24 ` Alexander Kanavin
2022-02-08 9:52 ` Anton Khirnov
2022-01-26 11:42 ` Alexander Kanavin
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