From patchwork Thu Oct 3 13:40:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 51997 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp369123vqn; Thu, 3 Oct 2024 06:40:46 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCX3SYOQD1CnUGDJYY9/EHM75lTGtp81QzD6GqhdiuLG81VV9hwoy0MyxzSrYrzM6zQmgJepyrtrnHFU9yW9GbMl@gmail.com X-Google-Smtp-Source: AGHT+IHJGL3+baWzvizF83Qi7l0ubln5Ve3fqkExzjixS1av1egXt4zky2mDld+ZO9m7l/X2xOkt X-Received: by 2002:a17:906:fd83:b0:a77:ab9e:9202 with SMTP id a640c23a62f3a-a990a03463cmr371087966b.4.1727962846284; Thu, 03 Oct 2024 06:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727962846; cv=none; d=google.com; s=arc-20240605; b=bnMyTJtF39uDZFmGahUEWfF+vKPAtnlLxPKPFf9+SevRUKbOSxE6aHrM/iWERejH3+ 0ZdxC9uYqdIwWu1aDSI6FMxImxNq5x+aygUxoOp9VbXIvWj+iZxrtVr0rjn+0P8/nWO1 0uuF7ifxbXwISvOmdc4hBOUjnd9jzZQkD/cZF/JtuQ5bFIOsuG4Ws2iKRrdxigdFv1sF EVMyENxYSp+9RKh35G7PjD57dAC8BLu/n3LFTbNaJ12t4NfgGE/YuNHB7wi/a7r5O3yJ aqjQ61MhVJdt6zuGG5YZCdVmVH0wotHa2uOHUaUrbrHq6te0Sdlh/SX/eA/g/S1qF3RW 62ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to :delivered-to; bh=mSKBMT2fX/uCkfJxLxIoSvQKV+U47taLzTpbejatp4k=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=XamacnS15SuPTyiy275oDyLqRdNL+C0fgto4kX3E8yZPclEniGDQ4omI5eOeqoTRuU TNDyhUNpaXTp/0fXDP9GxOqGIkoz8AT241mc31Xl/hncWQVy+P7Be+vNWQk2w9ZL9r4b nxoN24rtYdKlZQm8p9uhLX5pnwlhsbEi18ZPF8gebrwWIq1jH1177YcGFKTnw5RoDyQt Y7wHYHNTyL/tPTUmvcvRfYtxCGDZ4Gcx6OeiFz6GeYoDOZYyx0C6DpV7eDsRStRv2S5F 8RqTwuXruVNxQi8oURPZ/HLmBIotBf3R6CnJDe6juEyDXDZLkl8Y8DqXUq855DhlcOY/ OxWw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a991100c5ffsi73755066b.524.2024.10.03.06.40.45; Thu, 03 Oct 2024 06:40:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A17A568D691; Thu, 3 Oct 2024 16:40:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26BA368B57B for ; Thu, 3 Oct 2024 16:40:35 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 15:40:16 +0200 Message-ID: <20241003134026.544919-1-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/5] configure: drop yasm support X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: IUiLACRvLKKA We started defauling to nasm 8 years ago. We are still compatible with yasm 0.8.0, released in 2009. **15 years ago**. The time has more than come to remove support for it. Maintaining compatibility started cutting into writing new code long ago. We still can't have 2-argument instructions, preprocessor booleans, and all AVX2 code must still be wrapped in ifdefs. Newly added code often breaks this. --- Changelog | 1 + configure | 20 ++------------------ doc/developer.texi | 2 +- doc/optimization.txt | 4 ++-- doc/platform.texi | 4 ++-- 5 files changed, 8 insertions(+), 23 deletions(-) diff --git a/Changelog b/Changelog index b82b948074..7963e093dd 100644 --- a/Changelog +++ b/Changelog @@ -2,6 +2,7 @@ Entries are sorted chronologically from oldest to youngest within each release, releases are sorted from youngest to oldest. version : +- yasm support dropped, users need to use nasm version 7.1: - Raw Captions with Time (RCWT) closed caption demuxer diff --git a/configure b/configure index 0247ea08d6..79ce2ba083 100755 --- a/configure +++ b/configure @@ -4415,16 +4415,6 @@ for opt do test $action = enable && warn_if_gets_disabled $list $action $list ;; - --enable-yasm|--disable-yasm) - warn "The ${opt} option is only provided for compatibility and will be\n"\ - "removed in the future. Use --enable-x86asm / --disable-x86asm instead." - test $opt = --enable-yasm && x86asm=yes || x86asm=no - ;; - --yasmexe=*) - warn "The --yasmexe option is only provided for compatibility and will be\n"\ - "removed in the future. Use --x86asmexe instead." - x86asmexe="$optval" - ;; --enable-?*|--disable-?*) eval $(echo "$opt" | sed 's/--/action=/;s/-/ option=/;s/-/_/g') if is_in $option $COMPONENT_LIST; then @@ -6449,22 +6439,16 @@ EOF x86asm_debug="-g -F dwarf" X86ASMDEP= X86ASM_DEPFLAGS='-MD $(@:.o=.d)' - elif test_cmd $x86asmexe_probe --version; then - x86asmexe=$x86asmexe_probe - x86asm_type=yasm - x86asm_debug="-g dwarf2" - X86ASMDEP='$(DEPX86ASM) $(X86ASMFLAGS) -M $(X86ASM_O) $< > $(@:.o=.d)' - X86ASM_DEPFLAGS= fi check_x86asm x86asm "movbe ecx, [5]" } if ! disabled_any asm mmx x86asm; then disable x86asm - for program in $x86asmexe nasm yasm; do + for program in $x86asmexe nasm; do probe_x86asm $program && break done - disabled x86asm && die "nasm/yasm not found or too old. Use --disable-x86asm for a crippled build." + disabled x86asm && die "nasm not found or too old. Use --disable-x86asm for a crippled build." X86ASMFLAGS="-f $objformat" test -n "$extern_prefix" && append X86ASMFLAGS "-DPREFIX" case "$objformat" in diff --git a/doc/developer.texi b/doc/developer.texi index 41b21938ef..16e8f9d6e4 100644 --- a/doc/developer.texi +++ b/doc/developer.texi @@ -825,7 +825,7 @@ filters, bitstream filters, parsers. If its not possible to do that, add an explanation why to your patchset, its ok to not test if theres a reason. @item -If you added YASM code please check that things still work with --disable-yasm. +If you added NASM code please check that things still work with --disable-nasm. @item Test your code with valgrind and or Address Sanitizer to ensure it's free diff --git a/doc/optimization.txt b/doc/optimization.txt index 3ed29fe38c..40480e4fa9 100644 --- a/doc/optimization.txt +++ b/doc/optimization.txt @@ -188,7 +188,7 @@ Code that depends on data in registries being untouched, should be written as a single __asm__() statement. Ideally, a single function contains only one __asm__() block. -Use external asm (nasm/yasm) or inline asm (__asm__()), do not use intrinsics. +Use external asm (nasm) or inline asm (__asm__()), do not use intrinsics. The latter requires a good optimizing compiler which gcc is not. When debugging a x86 external asm compilation issue, if lost in the macro @@ -199,7 +199,7 @@ actual lines causing issues. Inline asm vs. external asm --------------------------- Both inline asm (__asm__("..") in a .c file, handled by a compiler such as gcc) -and external asm (.s or .asm files, handled by an assembler such as nasm/yasm) +and external asm (.s or .asm files, handled by an assembler such as nasm) are accepted in FFmpeg. Which one to use differs per specific case. - if your code is intended to be inlined in a C function, inline asm is always diff --git a/doc/platform.texi b/doc/platform.texi index 764911d230..d9ee436a9f 100644 --- a/doc/platform.texi +++ b/doc/platform.texi @@ -158,7 +158,7 @@ You will need the following prerequisites: To set up a proper environment in MSYS2, you need to run @code{msys_shell.bat} from the Visual Studio or Intel Compiler command prompt. -Place @code{yasm.exe} somewhere in your @code{PATH}. +Place @code{nasm.exe} somewhere in your @code{PATH}. Next, make sure any other headers and libs you want to use, such as zlib, are located in a spot that the compiler can see. Do so by modifying the @code{LIB} @@ -301,7 +301,7 @@ These library packages are only available from @uref{http://sourceware.org/cygwinports/, Cygwin Ports}: @example -yasm, libSDL-devel, libgsm-devel, libmp3lame-devel, +libSDL-devel, libgsm-devel, libmp3lame-devel, speex-devel, libtheora-devel, libxvidcore-devel @end example From patchwork Thu Oct 3 13:40:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 52000 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp374429vqn; Thu, 3 Oct 2024 06:49:03 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVCbHFA/bL+g6kpmATY/FpxGreyrIrjH84b3ONrwmOHYe/jvetCQt8QwTbV0enIqDdvpAKUpSwMmUi92xdQ1nwx@gmail.com X-Google-Smtp-Source: AGHT+IEkP6jrBNzu8B7SN08YOsUNSl+uXdyxjuh2BAMVMuJTlJqhkCeQpsbqFc8nEy12lhzqEzFU X-Received: by 2002:a05:6512:39c5:b0:539:9f21:35dc with SMTP id 2adb3069b0e04-539a07a8c7dmr3986666e87.57.1727963343483; Thu, 03 Oct 2024 06:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727963343; cv=none; d=google.com; s=arc-20240605; b=ELwo70yeJkLtsmFSOfNhpToS4eCJaQ0APiEugDrotUYXGA4RbXx5Iir03sr2NmdvLQ 1ZkXg7oI5ShCEd7l7c3jrf22tw6e5AU7Xyoj5a+Cyx9Y5tdNtLDpKjg6RCDIu0GjOVGv YoPVEZv7zXLxmEqVbuSYA4LMDL97dMrYRqT2KHJAAva/d1j3OjcxF+z1fLvSkYP3Rc6p sEi9jZd1MAM8Xl+tQf7sGISo/bUeFfzHXOTsLMHEse+6coYrn8yY+o11NeutC+uBfita 19uIfA7+EqXaOWlb1rhYXftKlIfE9A9DDCzxzpdK6KE62bfZQi7U8R0hJPVl++vkJWIV 7O+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=BAnQnMHI/LWinS2mXCDmrghO+J3mgVVssjip2fZJfms=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=aZMbz/aPYSRN93QTyv4a/cchVBa0KrytEsV9mouyqjBcIMeTfsVRZW3xBupXYocAzh ovF7havIqZXvQVxLGwuii++NMMG3cdY5gDhjRfc3zU9BE/c6ou6DqFt2UYaV8MiaedjE UFTt8i3Zy9Ez6yAyzp6C+m1oZqeF/SDGjaf3pJvwdtKSgO1bLi9QRM0DgnKpQo6xBseT 2X1gSoCVVLB9hzjQ31Hws82b15aiFLLV+YHNXfWG+Op8Sgs5cuhzgofUJYCsEYLXBJLk Y1ZjtK9rZz6AFHHh6/CUuyZFlRhel5hWVYFw75uzF3lNI7ClhU0SfYveWIvccDsrcM3q RD9g==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-539a82acfe6si470257e87.613.2024.10.03.06.49.03; Thu, 03 Oct 2024 06:49:03 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B82F668DA4D; Thu, 3 Oct 2024 16:40:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 291A468CAAD for ; Thu, 3 Oct 2024 16:40:35 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 15:40:17 +0200 Message-ID: <20241003134026.544919-2-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241003134026.544919-1-dev@lynne.ee> References: <20241003134026.544919-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] Revert "x86/tx_float: change a condition in a preprocessor check" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0fC7kN/47+YJ This reverts commit 0d8f43c74d0b1039ba70aacb4c9c7768e8bebf9f. --- libavutil/x86/tx_float.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm index 42006848f1..16165580a6 100644 --- a/libavutil/x86/tx_float.asm +++ b/libavutil/x86/tx_float.asm @@ -1796,7 +1796,7 @@ cglobal fft_pfa_15xM_float, 4, 14, 16, 320, ctx, out, in, stride, len, lut, buf, mov btmpq, outq mov outq, [ctxq + AVTXContext.tmp] -%if %2 == 0 +%if !%2 movsxd lenq, dword [ctxq + AVTXContext.len] mov lutq, [ctxq + AVTXContext.map] %endif From patchwork Thu Oct 3 13:40:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 52001 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp374457vqn; Thu, 3 Oct 2024 06:49:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXyNnAEvp/tSveuOFSIVTM/Bl4Db9OAN5ZwQTde/MoO1NsLOuEaEgtJtTaPeJOZRpqY+n6n6lqw6vVuWysqN4vG@gmail.com X-Google-Smtp-Source: AGHT+IFJQTejB2lzRQ4hlwc7ddVDGT7TKsM8f8cCbiK2rFPEpsYvwPP4rDYjnV61K3iPmpqLJdu7 X-Received: by 2002:a05:6512:1595:b0:52c:e05e:849b with SMTP id 2adb3069b0e04-539a0793c43mr4298010e87.39.1727963345224; Thu, 03 Oct 2024 06:49:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727963345; cv=none; d=google.com; s=arc-20240605; b=RyXx7U/ORGsKcgTbCvkdWyrb1UUqwmnf6fq685f4uzNMbEq1YOsYiDQa5/LDvYPz9D Aw0kIMWhq7At+LCeNGPeeq1KNWBIlFOszkY5IAvFUbxnd1s6mYJSXX7qTIsjY0inaMOD PLgi27dJPR7E6+tFhQdFmLMkeFr4Vo5gG8XZo3BMU4c8+PEfqcURIzkBapil1wODY2FI 6JzySqPO+Arv4KLaXzDTKWaRwsr/qUcKE6rceGTiRc//DTFjT1XnFwTEjRb86cToO1lu oo1n1kYKN5YDBhPVO15ncjKxSuvUQA+uhYOhfHHukLIVEQl0SUn/twASvIgJLLALnF96 yItQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=Ma0UHeCtLu+ZTfuh+q9oCtoYJJplE8V0Ztvzr3k2SSc=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=ev5yn8sDyzZMLY7jA33gAKOaoF3/SsPP8HIFF2TkMDtlsJ5jGOuKaiirHf4Op8MOfu ocp2ctlR3CentcdIRUAUf/RSXXFVco8YRvoCSGDd/sOxeGCy1Vge7Ub6ImFhB0mq9Z6l 0q1f0jQpmKqSR0sBorHNSdAyarX9+e+sMBLJGzzIGyrIuk038LVAWpKrxfPAnaSvwfD/ QYtsrZlp+BaAF1MGxVr/2oCS3csHAzGsKQrYusihCwFEvCjZ5m0+SJRbh4/ZbFKfDcZy aPnLugj5OEd9m80SxEtcVDV73y0Roega/rPa5hDoPRxRokRr8guc3C9yHZEdnPephAJv EmTA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-539a824e9dfsi500078e87.72.2024.10.03.06.49.04; Thu, 03 Oct 2024 06:49:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CDAB468DA63; Thu, 3 Oct 2024 16:40:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2BAB968D691 for ; Thu, 3 Oct 2024 16:40:35 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 15:40:18 +0200 Message-ID: <20241003134026.544919-3-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241003134026.544919-1-dev@lynne.ee> References: <20241003134026.544919-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] Revert "x86/tx_float: add missing preprocessor wrapper for AVX2 functions" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1++2hFJhNM24 This reverts commit 750f378becf15c0552c45a66a66aca7cc506d490. --- libavutil/x86/tx_float.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm index 16165580a6..570dcb4c9c 100644 --- a/libavutil/x86/tx_float.asm +++ b/libavutil/x86/tx_float.asm @@ -1934,7 +1934,7 @@ cglobal fft_pfa_15xM_ns_float, 4, 14, 16, 320, ctx, out, in, stride, len, lut, b %endif %endmacro -%if ARCH_X86_64 && HAVE_AVX2_EXTERNAL +%if ARCH_X86_64 PFA_15_FN avx2, 0 PFA_15_FN avx2, 1 %endif From patchwork Thu Oct 3 13:40:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 51998 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp369493vqn; Thu, 3 Oct 2024 06:41:21 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV+iJZ4v7Uxbul66fP5pCbC1NqFv6sug8541nRVqVJxubKWr+/SOejfZqrhvW3XBbbdORBH5rx2Ga1sU5z1a21u@gmail.com X-Google-Smtp-Source: AGHT+IHj5fdoIqnD4+ARyG6+9DNhCRa6S+ma8fgyzGD5A7WDDPbuZ97ROe4Ua2UNfKnM97m+6TW2 X-Received: by 2002:a05:6512:3e0b:b0:535:3dfb:a51a with SMTP id 2adb3069b0e04-539a0673800mr1116563e87.5.1727962881021; Thu, 03 Oct 2024 06:41:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727962881; cv=none; d=google.com; s=arc-20240605; b=Vcrst4Cg0/AGcsCS9WUJviv8taxIdtVfvSlezBZ/bHc3Ta01ctfgBuPDEFFdWMHpnL W2es/IXy87UedSTSBWJxzLWHTFVlxJI/qo6Wf/wA/uP3UGBVBstebNgEcrLadYvwIOdo l9ifFWcSEIlM7XYTaPr6TL+Gj01rZj46tGgTPU2F8/REp4/6TB06XYgCKwRQdyOv1In/ FSTGCn27JBJUc5iP0spX+WYySF1mNUc5lg3XKQ30gBA2op1IMVJg6svpkxYP+tL3H+Ep c9OVEkvCVk7yOqj5XYZhICozOCRnZXM0y7qXOuNm/edRti65Lh116QbMDzAuQKo9Qk3Q UZeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=mziFTnmw3G2ey1kEAlNEidLqcQF8RH9lI8dLt86bzs0=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=jy78wQstPvKj0FFT5p6VKiijAqPc5twWI2J/xn7rNfZ/+PGl3tDr6+PSVrdT/TLMiY 5ip6OXyeSf2DNtcxkTczmmrAJUZwOZ+suQoAoWA8Zbv7yqBrU+uNyWL+PHwAK2DnhCKL aXEe1b0iMwpIHsvGFNNN0zc3yyKRjCf4+eJmp6NY4CV4TUM66o4kGpjhIKdHfTQ6PVNy LsYqnk2H6426w3rgCzfgu795s9iMKfyyvXO3aZz44fGrw6LegRYUNCKnnNmZpft3OCUM JBvQUlQEvY6X70dYjiAfeznfGFB0EMDDosrE37kWRn1Y+4yLb9gCjAqdYLCZm2w072/J iMXw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-539a8254052si448841e87.148.2024.10.03.06.41.20; Thu, 03 Oct 2024 06:41:21 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF39468DA96; Thu, 3 Oct 2024 16:40:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 390F168D9DF for ; Thu, 3 Oct 2024 16:40:35 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 15:40:19 +0200 Message-ID: <20241003134026.544919-4-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241003134026.544919-1-dev@lynne.ee> References: <20241003134026.544919-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/5] Revert "x86/tx_float: add missing check for AVX2" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: MqapnTA59XGV This reverts commit f4097e4c1f1bb244cae78c363a69d5e84495b616. --- libavutil/x86/tx_float.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm index 570dcb4c9c..cec7465d6e 100644 --- a/libavutil/x86/tx_float.asm +++ b/libavutil/x86/tx_float.asm @@ -1769,7 +1769,7 @@ cglobal mdct_inv_float, 4, 14, 16, 320, ctx, out, in, stride, len, lut, exp, t1, RET %endmacro -%if ARCH_X86_64 && HAVE_AVX2_EXTERNAL +%if ARCH_X86_64 IMDCT_FN avx2 %endif From patchwork Thu Oct 3 13:40:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 51999 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:b18c:0:b0:48e:c0f8:d0de with SMTP id q12csp369585vqn; Thu, 3 Oct 2024 06:41:30 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW1IUn5/YnbzCUWqR/uRSIfiVDWgFHqhKpFYWZ37+WYjdy5kVeG49baj5VZdKC9fqmSF0nE6Gj9fDWbEPQnEO7z@gmail.com X-Google-Smtp-Source: AGHT+IF8ctIaHHIUMfqlpnhue7M2u6aIGX6TpBrqVtoJe8CA83TGKxhr3TLqFbE/Bxu9WOkVgSYP X-Received: by 2002:a17:907:97d1:b0:a8a:6db7:665d with SMTP id a640c23a62f3a-a990a0692admr362174366b.17.1727962890193; Thu, 03 Oct 2024 06:41:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727962890; cv=none; d=google.com; s=arc-20240605; b=M6jOCylzuv+yKyZcrre9Gkn0Jl+Pw6a8L5iGEvg5Y/45YjhpqG+8cvcZnWLHjpfrdp K7i2GceWVRp3dqKjnGYQUcgnFd3kwH2aNLgnhzU+rrRjGmLhn2sMVP6fCnKeMmqe9nyA AaWlbr7tbZsIYlAh9ViUSNmKtGZMby4ZygGA6ghXiQF8CjJShDvgBnnrTMc4xl7ZthM8 rsEx7VerhCn6mlNrB4KTpBvNcW0eCKsEHU88mMRu4M4MV0xvk8acREIDBC7rWbhHNrV6 EiZgVOiNyV6Kqqg1Pk7MFbntxBKWnMyD20wk3OG9cIQVkCqILBBet0rqVSbU4Cf7iGMF h9/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:delivered-to; bh=01x1Jz8L8KSEUTIXUu2y8UZYGaeemVys5kP37nISkog=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=hI7FApHx34votbtu/TRc81bhDUCL4micCARTOf/ZZ2t2PfTnX8ju7fzLH4WgXqN3MN dzsI2dSc16NIi2W5psG27hQv0Rg7kSzvYzvXlwIMHKiSHj00xn1Q06qUm4pTx8b0wvWP 4mj7vzirPFZ4OfB/jQVIurMoGTcSS5psTd2+gVGDkxOzAcUVWc4/aB4gKf+dcGziieiV XC8QUucNSN2PFG2Ao3mQJWiuzgY+w4lf932a3SXu2loW85icl0L9xXl/45ed7FjTppkt 6SdlkzkTeZ/lfHhYo1ovwtnectbB/igpoZNcUkc5uE8G+wl/mn0kCrtJNJu1wXyVSbxV 5Tug==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a9911104c4csi75649866b.968.2024.10.03.06.41.29; Thu, 03 Oct 2024 06:41:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA10C68DAAB; Thu, 3 Oct 2024 16:40:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 678B868D691 for ; Thu, 3 Oct 2024 16:40:35 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 Oct 2024 15:40:20 +0200 Message-ID: <20241003134026.544919-5-dev@lynne.ee> X-Mailer: git-send-email 2.45.2.753.g447d99e1c3b In-Reply-To: <20241003134026.544919-1-dev@lynne.ee> References: <20241003134026.544919-1-dev@lynne.ee> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/5] Revert "x86/tx_float: set all operands for shufps" X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: wcKwiRxQl6tE This reverts commit 74f5fb6db899dbc4fde9ccf77f37256ddcaaaab9. --- libavutil/x86/tx_float.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm index cec7465d6e..434ca60aae 100644 --- a/libavutil/x86/tx_float.asm +++ b/libavutil/x86/tx_float.asm @@ -1636,8 +1636,8 @@ cglobal mdct_inv_float, 4, 14, 16, 320, ctx, out, in, stride, len, lut, exp, t1, mulps m10, m2 ; 1 reim * imim mulps m11, m3 ; 2 reim * imim - shufps m10, m10, m10, q2301 - shufps m11, m11, m11, q2301 + shufps m10, m10, q2301 + shufps m11, m11, q2301 fmaddsubps m10, m12, m2, m10 fmaddsubps m11, m13, m3, m11