From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 424A54C431 for ; Sat, 13 Dec 2025 07:32:39 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'gnaOwEgRNPc+Itjz4DKZ1frqIavkr4W6t9vP4APS8BM=', expected b'd3G+r9YH9tbN2fAVo1Nj9LawKKcOEA+RPqAaZ6XpGoE=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765611139; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=gnaOwEgRNPc+Itjz4DKZ1frqIavkr4W6t9vP4APS8BM=; b=k2bXXksxi4FAhjHcorIZg4CPeDVfGAKsojOmsiFoNln8M91rEcLos/s5b5+iDmCuYMsac WPbJQtz63D3ogD5g9E8/2afuX22KjLOE9pqOYAyuqddzv+xTXCtGJHpT43Xr81FTzuSVnjo BZTTHkFZ/BB84vEr4lhbfwYClPNTnibnbz+WB6iLbJYEHLeYKCstFp6gSmqsDdoEngIFIsQ ogqgpGTaeHaDG85YNGipAUSHDiMpNpcRP+RE3rw4iIJ1/HqXKISq5uzyq/bFAC9dI+FTvBq uXiswXiDAe7dS/313MNRlrdOzcEsiHSRYPdlQrw6tajmX2f3fgVEiSulC3CA== Received: from [172.19.0.3] (unknown [172.19.0.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id B88E6690854; Sat, 13 Dec 2025 09:32:19 +0200 (EET) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1765611116; b=GjKEObEQPcKlAEW7rxoGmu9cuXw3F2L20W3iyzqXhs6UTE3GwpuszhxwOtiWJVNATE7HY AzkI0/VFSeFx+JCIQp480D7a8jyG/kMvbR7laZt/fGLbtCZcD6JiZ8NRrmA6vmbf9nX3KVq UNL/oCgW7Rm/XtCHfHzsDQrrhnOmJ0MIT5haPYMiDZGp4WLvtcX1Ao1bl4BFDSBmSIYhWSO 1sOE+ZLrA7oE6jJSyf7m1V1FSvnUsO3V7y2XJ9LP4h/K55lMWVEerdsBmzVGwlG5Pgeisty xl9tkxTNvo76dIi++N8LCae7T1ApJRbtHFjUY/uf0XxsYOTZYFQnicaM6FbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1765611116; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=oL5KbNIAo89nb50TF735DD51GCXN4JZyW7mX+D4gNNQ=; b=CIh3zzZyHn4u2jIpEhhKYFYqpXlkfS1dZgk+NgyTvLpi0pemvOEnRj66lv118MXq28Zw5 myCTUsj4F+3um5d051uxZJC1QD+pyxTV/un95C+NyxrUqptDi3HH9F9jZyFiKA5X4hLBWXJ FGz37gN4w4kAZgPrpLLrDB4N9FIB4jUfNwioaktU5ohSl8uaLSUnziKXLho8Sdhyz9WeULn BMp0uPjNz13tURP9Fsgn9DQvRGZlyxGvUvhGp8RC7qcebc0h8nHEy4Akiz1Vi2Q7hWsjlap 5sRv1k1p9hGbs1m+yt8BCxBm333U0PT/z6BfJr0Vr/jq8ZkQK/4tL5JQKzEA== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=pass header.from=ffmpeg.org policy.dmarc=quarantine Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=ffmpeg.org policy.dmarc=quarantine DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1765611105; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=d3G+r9YH9tbN2fAVo1Nj9LawKKcOEA+RPqAaZ6XpGoE=; b=IrDOIqBahSsZIpimLscTZwc6xA/fdoO+9OUlolBid/u/ZWjsLKLBQEVRYNFxqLN3w0Fg1 8WLlquR78u3yfspbEdJ4zsKBlrHMM+RvCPpkypauVFDSCyfcO6cfZPG1wCeaFCK8+Ba72Ua pjCFLrkWm/9Sop2hhMeIO4K15zz6/boH8SIG04jrjfiApzN1wuDFwL69FNSpH7A7LFGTROh ufu15adLAoTUDVOIgLrTG7K4piMzDxNlcFRgx+G5/WnUbPVJN+zBQoUmB8YM+mXHPhc+m2g BI9LKQi0gVPf2gQkeWchjxIqdQZTOFYaOvEqAjXvq6aBnC8BazKG5qxcTxMQ== Received: from 55ca25703178 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 1892C69075F for ; Sat, 13 Dec 2025 09:31:45 +0200 (EET) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Dec 2025 07:31:44 -0000 Message-ID: <176561110531.39.13409242451093418272@2cb04c0e5124> Message-ID-Hash: G3HFVYZNCKKUWI6CZD3S44OJSIAK2HY4 X-Message-ID-Hash: G3HFVYZNCKKUWI6CZD3S44OJSIAK2HY4 X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Hits: nonmember-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] Revert "avutil/tx_template: extend to 2M" (PR #21184) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Zhao Zhili via ffmpeg-devel Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #21184 opened by Zhao Zhili (quink) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21184 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21184.patch This reverts commit 8f48a62, 9af8782, and bd3e71b. Commit 8f48a62 extends tx to 2M, resulting in the tx_float bss section reaching a size of 4M. This isn't a issue on devices with normal memory sizes and OS supporting virtual memory. But it's a real issue for embedded devices with realtime OS, which may not support virtual memory, e.g., Nuttx. This 4M of bss section map to physical memory directly, which is a scarce resource on embedded devices. >>From 07b26f98e9eb3a2429a439a72e90ac29f28c1658 Mon Sep 17 00:00:00 2001 From: Zhao Zhili Date: Sat, 13 Dec 2025 12:53:58 +0800 Subject: [PATCH] Revert "avutil/tx_template: extend to 2M" This reverts commit 8f48a62, 9af8782, and bd3e71b. Commit 8f48a62 extends tx to 2M, resulting in the tx_float bss section reaching a size of 4M. This isn't a issue on devices with normal memory sizes and OS supporting virtual memory. But it's a real issue for embedded devices with realtime OS, which may not support virtual memory, e.g., Nuttx. This 4M of bss section map to physical memory directly, which is a scarce resource on embedded devices. --- libavutil/tx_template.c | 12 ------------ libavutil/x86/tx_float.asm | 8 ++------ libavutil/x86/tx_float_init.c | 18 +++++++++--------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/libavutil/tx_template.c b/libavutil/tx_template.c index ec630954b8..ecee572e40 100644 --- a/libavutil/tx_template.c +++ b/libavutil/tx_template.c @@ -45,10 +45,6 @@ SR_TABLE(32768) \ SR_TABLE(65536) \ SR_TABLE(131072) \ - SR_TABLE(262144) \ - SR_TABLE(524288) \ - SR_TABLE(1048576) \ - SR_TABLE(2097152) \ #define SR_TABLE(len) \ TABLE_DEF(len, len/4 + 1); @@ -724,10 +720,6 @@ DECL_SR_CODELET(16384,8192,4096) DECL_SR_CODELET(32768,16384,8192) DECL_SR_CODELET(65536,32768,16384) DECL_SR_CODELET(131072,65536,32768) -DECL_SR_CODELET(262144,131072,65536) -DECL_SR_CODELET(524288,262144,131072) -DECL_SR_CODELET(1048576,524288,262144) -DECL_SR_CODELET(2097152,1048576,524288) static av_cold int TX_NAME(ff_tx_fft_init)(AVTXContext *s, const FFTXCodelet *cd, @@ -2160,10 +2152,6 @@ const FFTXCodelet * const TX_NAME(ff_tx_codelet_list)[] = { &TX_NAME(ff_tx_fft32768_ns_def), &TX_NAME(ff_tx_fft65536_ns_def), &TX_NAME(ff_tx_fft131072_ns_def), - &TX_NAME(ff_tx_fft262144_ns_def), - &TX_NAME(ff_tx_fft524288_ns_def), - &TX_NAME(ff_tx_fft1048576_ns_def), - &TX_NAME(ff_tx_fft2097152_ns_def), /* Prime factor codelets */ &TX_NAME(ff_tx_fft3_ns_def), diff --git a/libavutil/x86/tx_float.asm b/libavutil/x86/tx_float.asm index c030147ce8..87be21c2d6 100644 --- a/libavutil/x86/tx_float.asm +++ b/libavutil/x86/tx_float.asm @@ -46,7 +46,7 @@ %endif %assign i 16 -%rep 18 +%rep 14 cextern tab_ %+ i %+ _float ; ff_tab_i_float... %assign i (i << 1) %endrep @@ -1385,11 +1385,7 @@ FFT_SPLIT_RADIX_DEF 8192, .16384pt FFT_SPLIT_RADIX_DEF 16384, .32768pt FFT_SPLIT_RADIX_DEF 32768, .65536pt FFT_SPLIT_RADIX_DEF 65536, .131072pt -FFT_SPLIT_RADIX_DEF 131072, .262144pt -FFT_SPLIT_RADIX_DEF 262144, .524288pt -FFT_SPLIT_RADIX_DEF 524288, .1048576pt -FFT_SPLIT_RADIX_DEF 1048576, .2097152pt -FFT_SPLIT_RADIX_DEF 2097152 +FFT_SPLIT_RADIX_DEF 131072 ;=============================================================================== ; Final synthesis + deinterleaving code diff --git a/libavutil/x86/tx_float_init.c b/libavutil/x86/tx_float_init.c index 3e99c21eac..f69a5a6d77 100644 --- a/libavutil/x86/tx_float_init.c +++ b/libavutil/x86/tx_float_init.c @@ -271,15 +271,15 @@ const FFTXCodelet * const ff_tx_codelet_list_float_x86[] = { AV_TX_INPLACE | FF_TX_PRESHUFFLE | FF_TX_ASM_CALL, AV_CPU_FLAG_AVXSLOW), TX_DEF(fft32_ns, FFT, 32, 32, 2, 0, 352, b8_i2, fma3, FMA3, AV_TX_INPLACE | FF_TX_PRESHUFFLE, AV_CPU_FLAG_AVXSLOW), - TX_DEF(fft_sr, FFT, 64, 2097152, 2, 0, 256, b8_i2, avx, AVX, 0, AV_CPU_FLAG_AVXSLOW), - TX_DEF(fft_sr_asm, FFT, 64, 2097152, 2, 0, 320, b8_i2, avx, AVX, + TX_DEF(fft_sr, FFT, 64, 131072, 2, 0, 256, b8_i2, avx, AVX, 0, AV_CPU_FLAG_AVXSLOW), + TX_DEF(fft_sr_asm, FFT, 64, 131072, 2, 0, 320, b8_i2, avx, AVX, AV_TX_INPLACE | FF_TX_PRESHUFFLE | FF_TX_ASM_CALL, AV_CPU_FLAG_AVXSLOW), - TX_DEF(fft_sr_ns, FFT, 64, 2097152, 2, 0, 320, b8_i2, avx, AVX, AV_TX_INPLACE | FF_TX_PRESHUFFLE, + TX_DEF(fft_sr_ns, FFT, 64, 131072, 2, 0, 320, b8_i2, avx, AVX, AV_TX_INPLACE | FF_TX_PRESHUFFLE, AV_CPU_FLAG_AVXSLOW), - TX_DEF(fft_sr, FFT, 64, 2097152, 2, 0, 288, b8_i2, fma3, FMA3, 0, AV_CPU_FLAG_AVXSLOW), - TX_DEF(fft_sr_asm, FFT, 64, 2097152, 2, 0, 352, b8_i2, fma3, FMA3, + TX_DEF(fft_sr, FFT, 64, 131072, 2, 0, 288, b8_i2, fma3, FMA3, 0, AV_CPU_FLAG_AVXSLOW), + TX_DEF(fft_sr_asm, FFT, 64, 131072, 2, 0, 352, b8_i2, fma3, FMA3, AV_TX_INPLACE | FF_TX_PRESHUFFLE | FF_TX_ASM_CALL, AV_CPU_FLAG_AVXSLOW), - TX_DEF(fft_sr_ns, FFT, 64, 2097152, 2, 0, 352, b8_i2, fma3, FMA3, AV_TX_INPLACE | FF_TX_PRESHUFFLE, + TX_DEF(fft_sr_ns, FFT, 64, 131072, 2, 0, 352, b8_i2, fma3, FMA3, AV_TX_INPLACE | FF_TX_PRESHUFFLE, AV_CPU_FLAG_AVXSLOW), TX_DEF(fft15, FFT, 15, 15, 15, 0, 320, factor_init, avx2, AVX2, @@ -287,11 +287,11 @@ const FFTXCodelet * const ff_tx_codelet_list_float_x86[] = { TX_DEF(fft15_ns, FFT, 15, 15, 15, 0, 384, factor_init, avx2, AVX2, AV_TX_INPLACE | FF_TX_PRESHUFFLE, AV_CPU_FLAG_AVXSLOW), - TX_DEF(fft_sr, FFT, 64, 2097152, 2, 0, 320, b8_i2, avx2, AVX2, 0, + TX_DEF(fft_sr, FFT, 64, 131072, 2, 0, 320, b8_i2, avx2, AVX2, 0, AV_CPU_FLAG_AVXSLOW | AV_CPU_FLAG_SLOW_GATHER), - TX_DEF(fft_sr_asm, FFT, 64, 2097152, 2, 0, 384, b8_i2, avx2, AVX2, + TX_DEF(fft_sr_asm, FFT, 64, 131072, 2, 0, 384, b8_i2, avx2, AVX2, AV_TX_INPLACE | FF_TX_PRESHUFFLE | FF_TX_ASM_CALL, AV_CPU_FLAG_AVXSLOW | AV_CPU_FLAG_SLOW_GATHER), - TX_DEF(fft_sr_ns, FFT, 64, 2097152, 2, 0, 384, b8_i2, avx2, AVX2, AV_TX_INPLACE | FF_TX_PRESHUFFLE, + TX_DEF(fft_sr_ns, FFT, 64, 131072, 2, 0, 384, b8_i2, avx2, AVX2, AV_TX_INPLACE | FF_TX_PRESHUFFLE, AV_CPU_FLAG_AVXSLOW | AV_CPU_FLAG_SLOW_GATHER), TX_DEF(fft_pfa_15xM, FFT, 60, TX_LEN_UNLIMITED, 15, 2, 320, fft_pfa_init, avx2, AVX2, -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org