From patchwork Tue Nov 28 16:59:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 44841 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp4326082pzb; Tue, 28 Nov 2023 09:00:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IEVIyXmPBT6cWo7czRitA12L0poiFTQbTKOnbjF1/cPIze+QKsouzo67zqWxm5wKSJr8f/S X-Received: by 2002:a19:c20f:0:b0:509:8e81:1aa4 with SMTP id l15-20020a19c20f000000b005098e811aa4mr9676301lfc.39.1701190802234; Tue, 28 Nov 2023 09:00:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701190802; cv=none; d=google.com; s=arc-20160816; b=uUe5j1opKAqp43+IRWTf2GF04JJPOf1OQsk6uaKQx2oZq6WgLi3rbAlwdIxXAVf9e3 PyJ15hhzMu9UUGMdG1VhobUGBT70e7PJOA/VBZTpv5Pg4eDNour8MTVcyHhdS33m1UIg J92j4n0mdxhCEw+j7iAc7LfpTkFxzb7lfG6nkPj+MLLziuEtaCI4rBvwsHUfkIDvDM9/ YtnRP9t40/ZNqQR0IP58/3Kv15LcXvvRGwSdlVBU3iPNyh091p/njF0qCebmqVzUnOu5 I85xl7bcSXwuY1cxEUj1SLEN1+xy0gd9Ivf59uJMhe9S/H4qKLovtfZqElGn/vJJpIY0 g1vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=fDzoC2GuvCULR5/hPvoABnpxtdRW6clFDmXK0lWZuvk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=QWdfOeJH2Cs17M/SIeLVXFqdTSDCL/jqVFTRdr/4PycSuDMdjymtmITm/FuW8JeQ6O XNDQ+dydaxImxz543thcCTgNUwA4+ojKHzqtUd41YGCyDdIVPylZM7BEC6fEkXf+Ygof OetjN0GRFeTwqOsheb7y/zHJ4QTY2ncXfgi40WIyJz/hSIeivgolpBJE2daE33xvzNxX +WOa4x8GDMWtnch+QigrWio/PVZXZ1BsmhLBx5Dmnx9dcEovCjfqsmg2gWVwICmisoEt 7Ym5LtdUOO6d5N4pGOOu9tYOHcraKRgHOELdjpCtKjjrGprnvhOOl8CljCsyPlmf6Zco l5xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jxtzVPl0; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f9-20020a50d549000000b0054afda9c3d7si4844453edj.425.2023.11.28.09.00.01; Tue, 28 Nov 2023 09:00:02 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=jxtzVPl0; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 275A868CF9C; Tue, 28 Nov 2023 18:59:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f46.google.com (mail-qv1-f46.google.com [209.85.219.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 127BE68CDC2 for ; Tue, 28 Nov 2023 18:59:51 +0200 (EET) Received: by mail-qv1-f46.google.com with SMTP id 6a1803df08f44-677fba00a49so46961576d6.1 for ; Tue, 28 Nov 2023 08:59:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701190789; x=1701795589; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=i2HT7h5Ty3LGUOE6Y4WPrGfq5A0o4BoAgc0RNTcaVck=; b=jxtzVPl0MCmm3p9XbtT+pvnHneTL7ZFfvoYUhj8sRSzejx/PxrL2JE9ATL8on1vQ1Z J0CrpjMATS9H/t5getul7gsSqF0iBnjMsY789ge1LPCFg0e955V7zbjRqG184ngkFdOx 70gtwYcGbq9PuT5MWR1rma7ThstRnM03J6NUk8dQxCp+bsMMJ+7SsBMx9cBqhdgjU9YB ZzRl99IDdZlourTKEwB+quldckWD+ea6US4nD6jIin2LNKSrFxg3KEbH8TrOjT8EjqYF zm3JAPtdXGq4eIakjJSeeU9DkVYe5mithFD41bgoBvl/jqcXxW6FUs+1SAQXKw8luabX lufA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701190789; x=1701795589; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=i2HT7h5Ty3LGUOE6Y4WPrGfq5A0o4BoAgc0RNTcaVck=; b=Qtewj3/VF/cYT6ka42NKZngi0ZhID6eSkAgXUpGuPyJ8aJntHbnh8HhKCS8apYUKSO FDYCe6v5JsTadEkV/4cV9s6uHGauFlck9b65PwSKMIjlufO6MEFpb+GSwDb9lUMXsmq9 P/I2rVZWmJCXTelIq0PRdbwQeNPvqG2Bb15s03GDqWcFs5cPzdBhNKNBkr0+86sChJIx zgeWk87zt7Z/80UPxN0rG3HGGZ2P9KxlWl1/EECdJ0q3v/nMDt6juBWrD7XXcaBXL62S BvzcIiZLpmrqp5fEgQPAT8ofpNjE4O9oed9VIx8EEyKrPJHxHsPQG+67A3Fznc+UJ2ct o4fg== X-Gm-Message-State: AOJu0YwFOmvh9HiOU0we0pYUtTtu+ybpQ00OyCpC/oqRNWOfT0z6HWGc tj8sUx6ICMMUlnsG8oSaOTI7INtN3ODhBwI8zU8RgnqLu1F37Q== X-Received: by 2002:ad4:5d4e:0:b0:67a:27ba:b228 with SMTP id jk14-20020ad45d4e000000b0067a27bab228mr18287805qvb.14.1701190789462; Tue, 28 Nov 2023 08:59:49 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Wed, 29 Nov 2023 00:59:38 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 1/2] checkasm: test for abs_pow34 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: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: i9kHB4el3MCr From 85e60d75554894964825f5718d14591294ec4e88 Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 28 Nov 2023 14:08:12 +0800 Subject: [PATCH 1/2] checkasm: test for abs_pow34 --- libavcodec/aacenc.c | 24 +++++++------ libavcodec/aacenc.h | 1 + tests/checkasm/Makefile | 1 + tests/checkasm/aacencdsp.c | 70 ++++++++++++++++++++++++++++++++++++++ tests/checkasm/checkasm.c | 3 ++ tests/checkasm/checkasm.h | 1 + tests/fate/checkasm.mak | 3 +- 7 files changed, 92 insertions(+), 11 deletions(-) create mode 100644 tests/checkasm/aacencdsp.c diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 5e6a255a8f..443b25e25a 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -1381,16 +1381,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) ff_lpc_init(&s->lpc, 2*avctx->frame_size, TNS_MAX_ORDER, FF_LPC_TYPE_LEVINSON); s->random_state = 0x1f2e3d4c; - s->abs_pow34 = abs_pow34_v; - s->quant_bands = quantize_bands; - -#if ARCH_X86 - ff_aac_dsp_init_x86(s); -#endif - -#if HAVE_MIPSDSP - ff_aac_coder_init_mips(s); -#endif + ff_aac_dsp_init(s); ff_af_queue_init(avctx, &s->afq); @@ -1444,3 +1435,16 @@ const FFCodec ff_aac_encoder = { AV_SAMPLE_FMT_NONE }, .p.priv_class = &aacenc_class, }; + +void ff_aac_dsp_init(AACEncContext *s){ + s->abs_pow34 = abs_pow34_v; + s->quant_bands = quantize_bands; + +#if ARCH_X86 + ff_aac_dsp_init_x86(s); +#endif + +#if HAVE_MIPSDSP + ff_aac_coder_init_mips(s); +#endif +} diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index b030c652ae..09dd8639be 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -154,6 +154,7 @@ typedef struct AACEncContext { } buffer; } AACEncContext; +void ff_aac_dsp_init(AACEncContext *s); void ff_aac_dsp_init_x86(AACEncContext *s); void ff_aac_coder_init_mips(AACEncContext *c); void ff_quantize_band_cost_cache_init(struct AACEncContext *s); diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 8bc241d29b..da209dd7ad 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -22,6 +22,7 @@ AVCODECOBJS-$(CONFIG_VIDEODSP) += videodsp.o # decoders/encoders AVCODECOBJS-$(CONFIG_AAC_DECODER) += aacpsdsp.o \ sbrdsp.o +AVCODECOBJS-$(CONFIG_AAC_ENCODER) += aacencdsp.o AVCODECOBJS-$(CONFIG_ALAC_DECODER) += alacdsp.o AVCODECOBJS-$(CONFIG_DCA_DECODER) += synth_filter.o AVCODECOBJS-$(CONFIG_EXR_DECODER) += exrdsp.o diff --git a/tests/checkasm/aacencdsp.c b/tests/checkasm/aacencdsp.c new file mode 100644 index 0000000000..684c775862 --- /dev/null +++ b/tests/checkasm/aacencdsp.c @@ -0,0 +1,70 @@ +/* + * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include + +#include "libavutil/mem.h" +#include "libavutil/mem_internal.h" + +#include "libavcodec/aacenc.h" + +#include "checkasm.h" + +#define randomize_float(buf, len) \ + do { \ + int i; \ + for (i = 0; i < len; i++) { \ + float f = (float)rnd() / (UINT_MAX >> 5) - 16.0f; \ + buf[i] = f; \ + } \ + } while (0) + +static void test_abs_pow34(AACEncContext *s) { +#define BUF_SIZE 1024 + LOCAL_ALIGNED_32(float, in, [BUF_SIZE]); + + declare_func(void, float *, const float *, int); + + randomize_float(in, BUF_SIZE); + + if (check_func(s->abs_pow34, "abs_pow34")) { + LOCAL_ALIGNED_32(float, out, [BUF_SIZE]); + LOCAL_ALIGNED_32(float, out2, [BUF_SIZE]); + + call_ref(out, in, BUF_SIZE); + call_new(out2, in, BUF_SIZE); + + if (memcmp(out, out2, BUF_SIZE * sizeof(float)) != 0) + fail(); + + bench_new(out, in, BUF_SIZE); + } + + report("abs_pow34"); +} + + +void checkasm_check_aacencdsp(void) +{ + AACEncContext s = { 0 }; + ff_aac_dsp_init(&s); + + test_abs_pow34(&s); +} diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index a15e801caf..a8d17ba740 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -77,6 +77,9 @@ static const struct { { "aacpsdsp", checkasm_check_aacpsdsp }, { "sbrdsp", checkasm_check_sbrdsp }, #endif + #if CONFIG_AAC_ENCODER + { "aacencdsp", checkasm_check_aacencdsp }, + #endif #if CONFIG_ALAC_DECODER { "alacdsp", checkasm_check_alacdsp }, #endif diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index 41093f2dca..df4dc5272e 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -43,6 +43,7 @@ #include "libavutil/lfg.h" #include "libavutil/timer.h" +void checkasm_check_aacencdsp(void); void checkasm_check_aacpsdsp(void); void checkasm_check_afir(void); void checkasm_check_alacdsp(void); diff --git a/tests/fate/checkasm.mak b/tests/fate/checkasm.mak index 57b0dff4f2..f23151aa6e 100644 --- a/tests/fate/checkasm.mak +++ b/tests/fate/checkasm.mak @@ -1,4 +1,5 @@ -FATE_CHECKASM = fate-checkasm-aacpsdsp \ +FATE_CHECKASM = fate-checkasm-aacencdsp \ + fate-checkasm-aacpsdsp \ fate-checkasm-af_afir \ fate-checkasm-alacdsp \ fate-checkasm-audiodsp \ -- 2.43.0 From patchwork Tue Nov 28 17:00:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 44842 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bca6:b0:181:818d:5e7f with SMTP id fx38csp4327278pzb; Tue, 28 Nov 2023 09:01:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7AMr9s2ocPlG9ZDpnG84RyeP1gPdSc71xw35BBUj7DJI5KJ8fdLmFSBkqiu0vx9gEahhU X-Received: by 2002:a05:6512:3612:b0:50b:a889:f3dd with SMTP id f18-20020a056512361200b0050ba889f3ddmr7149664lfs.54.1701190866644; Tue, 28 Nov 2023 09:01:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701190866; cv=none; d=google.com; s=arc-20160816; b=kRayh8nYVTt5P+cL9Oid1Fkm88YkQJJQs3TH5s69rNHuVSPRH+3TnP+628vjr7eKtM SNe6MdPhcQuJeHwSK56vE/9/8eH0R+O4V971Sw4lBYkvUn/d9itQ369I997dPV7S3SAh TT0uR+0ab1QQfrhtLpJHIO6WgfflLe9iEHFwcPugzG1Ptg1UaxAXESJkUHGTmhZSOktn JH21VKjt8ZiM0nwDzc0nrQaqu9qJrD+oYFuHecX5foRp5wJdE5SIRa310fwlYCHV0hAZ rh0Bw4P/dcBrg5FPxdfavbSxtjM7F36CAGkWTEMNOQNYKIjFCMPMBz/wQtzbVqxn4mTW fguQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=TjPFE/pfbYZYtP6ujv0li61cZ8FepM4OHdDQ6ixVDyI=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=Uou0CjmXX+cNQr3+I4Pkc17tU1aHcXp2QB8PCdsg/ix/w82N34o7uX4yh0zkKU3ySO 8Nb6AB7qlkpPl6JMrgsbBy8JbiKKcci4RCekcRcZVcz0MsG46iAKyPiVIbKG3KRadRxY fs7gJ7nc/1xZ47C4nK8801cQCRK+lj7lDQ0kGSRgZvNtPy7S9ZUgntG9IU1tlOth4oEK z41QrDPJ1tRUieQqwhNUDUO4JXEsdBDoqF5f3JpMlmzCEVyyHM9Fc+TrngNBuDFk/D3a 2ibxPqQkDMgZF31WO4ZCTxzCxIBLEITQ5FMzV15zef9U8IabjfFHZad5VQVfUFMSrlMP ej+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=d50N2r+1; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z10-20020a05640240ca00b0054b5c1d4ce0si2839189edb.213.2023.11.28.09.01.00; Tue, 28 Nov 2023 09:01:06 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=d50N2r+1; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 450BD68CFBF; Tue, 28 Nov 2023 19:00:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DB3A68CA1B for ; Tue, 28 Nov 2023 19:00:51 +0200 (EET) Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6d8029dae41so2765762a34.0 for ; Tue, 28 Nov 2023 09:00:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701190850; x=1701795650; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=iepTfguSccveyu7IHTAWMRC/+CDJWc49qrc9A8ahsoM=; b=d50N2r+1NM+UzhcEFSUz9I1/JA/X6OclC3JiVyrgXamyB0kQAGiSKm500bfQGDe/x/ cMf/qOHEBH23ruU91iVJubD0bonYjIx6GQqo5OQ7cqj9L9OjBq+e7ZjFOWfGVAbTkbFv rBoxTuf+o4Yf+o4zOpQ4hrjHT1oFvBnG7j3qPoHq+UGz5ohoAQJdr/X8dJBWtFE/eIKF l0jWYUiBiS4lW0J6ZzcT0Z8rEXOTqYy5mXtypW3QGYB97vsdXdmigtDWeEFTt8boGpy8 6aGZEk+VReig5BB4vG1YNYXAvYjCe6yPBSsIe2fEN/OBL6FTG1PdhQ+11gAevZkQVFcB gUpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701190850; x=1701795650; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=iepTfguSccveyu7IHTAWMRC/+CDJWc49qrc9A8ahsoM=; b=J29ianvZIbOFhPtQ4dG9Uet0b3Zu8hnNO2bcQ60r8towKhVDqXlvv7GeZJrkP/ZbrH DN6k5TEUbWlLljkMTyvFhq/ZF7zwZvqDXMFGbjQcmSkzKsnMxspSzhaNv6rg/TFzdQw5 sWsfOfqSe/qTj9GAvhfb42pZSBda454rlBQx+WLkReJ3FjPxw1syz1Mfleq0ncjzXB+S d/RqGVkzxi1ULHkT3MxjE6yls2yAfWeBXtHPGbjxGFDAJxL6tPnOM1eNkRDoQk1dRG9/ 832XPq/H8qICmxGDg4xbzbSqc51onEYJkUazRdAKbCudHYoD+hel7IrjT+FruZvP8lGx GT0A== X-Gm-Message-State: AOJu0YyzuTsw6aNc08uemJDLt4IXBNWZ5nR9NUpCgomZnx1giAeyZxmN WO5gdlsYwT6i3ySQfuBtfQ7Bsm/axGektJ9LehovgXGFnHz+OZ3o X-Received: by 2002:a05:6830:11:b0:6cd:a9d:bc57 with SMTP id c17-20020a056830001100b006cd0a9dbc57mr17349375otp.32.1701190848027; Tue, 28 Nov 2023 09:00:48 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Wed, 29 Nov 2023 01:00:37 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/aacencdsp: R-V V abs_pow34 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: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: jZxVID0kGU6H c910: abs_pow34_c: 24610.7 abs_pow34_rvv_f32: 6177.7 (need use "[FFmpeg-devel] [PATCH 1/2] checkasm: test for abs_pow34" first) From 86577c2d40d29422c4b769c854df99a88c7b3c77 Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 28 Nov 2023 20:14:14 +0800 Subject: [PATCH 2/2] lavc/aacencdsp: R-V V abs_pow34 c910: abs_pow34_c: 24610.7 abs_pow34_rvv_f32: 6177.7 --- libavcodec/aacenc.c | 4 +++ libavcodec/aacenc.h | 1 + libavcodec/riscv/Makefile | 1 + libavcodec/riscv/aacencdsp_init.c | 42 +++++++++++++++++++++++++++++++ libavcodec/riscv/aacencdsp_rvv.S | 38 ++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+) create mode 100644 libavcodec/riscv/aacencdsp_init.c create mode 100644 libavcodec/riscv/aacencdsp_rvv.S diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index 443b25e25a..55c4bf55ce 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -1440,6 +1440,10 @@ void ff_aac_dsp_init(AACEncContext *s){ s->abs_pow34 = abs_pow34_v; s->quant_bands = quantize_bands; +#if ARCH_RISCV + ff_aac_dsp_init_riscv(s); +#endif + #if ARCH_X86 ff_aac_dsp_init_x86(s); #endif diff --git a/libavcodec/aacenc.h b/libavcodec/aacenc.h index 09dd8639be..18b424736d 100644 --- a/libavcodec/aacenc.h +++ b/libavcodec/aacenc.h @@ -155,6 +155,7 @@ typedef struct AACEncContext { } AACEncContext; void ff_aac_dsp_init(AACEncContext *s); +void ff_aac_dsp_init_riscv(AACEncContext *s); void ff_aac_dsp_init_x86(AACEncContext *s); void ff_aac_coder_init_mips(AACEncContext *c); void ff_quantize_band_cost_cache_init(struct AACEncContext *s); diff --git a/libavcodec/riscv/Makefile b/libavcodec/riscv/Makefile index 2d0e6c19c8..6028f23b58 100644 --- a/libavcodec/riscv/Makefile +++ b/libavcodec/riscv/Makefile @@ -1,4 +1,5 @@ OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_init.o riscv/sbrdsp_init.o +OBJS-$(CONFIG_AAC_ENCODER) += riscv/aacencdsp_init.o riscv/aacencdsp_rvv.o RVV-OBJS-$(CONFIG_AAC_DECODER) += riscv/aacpsdsp_rvv.o riscv/sbrdsp_rvv.o OBJS-$(CONFIG_AC3DSP) += riscv/ac3dsp_init.o \ riscv/ac3dsp_rvb.o diff --git a/libavcodec/riscv/aacencdsp_init.c b/libavcodec/riscv/aacencdsp_init.c new file mode 100644 index 0000000000..83ae16f46b --- /dev/null +++ b/libavcodec/riscv/aacencdsp_init.c @@ -0,0 +1,42 @@ +/* + * AAC encoder assembly optimizations + * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "config.h" + +#include "libavutil/attributes.h" +#include "libavutil/float_dsp.h" +#include "libavutil/cpu.h" +#include "libavcodec/aacenc.h" + +void ff_abs_pow34_rvv(float *out, const float *in, const int size); + +av_cold void ff_aac_dsp_init_riscv(AACEncContext *s) +{ +#if HAVE_RVV + int flags = av_get_cpu_flags(); + + if (flags & AV_CPU_FLAG_RVV_F32) { + if (flags & AV_CPU_FLAG_RVB_ADDR) { + s->abs_pow34 = ff_abs_pow34_rvv; + } + } +#endif +} diff --git a/libavcodec/riscv/aacencdsp_rvv.S b/libavcodec/riscv/aacencdsp_rvv.S new file mode 100644 index 0000000000..07f9e7228d --- /dev/null +++ b/libavcodec/riscv/aacencdsp_rvv.S @@ -0,0 +1,38 @@ +/* + * Copyright (c) 2023 Institue of Software Chinese Academy of Sciences (ISCAS). + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/riscv/asm.S" + +func ff_abs_pow34_rvv, zve32f +1: + vsetvli t0, a2, e32, m4, ta, ma + sub a2, a2, t0 + vle32.v v0, (a1) + sh2add a1, t0, a1 + vfabs.v v0, v0 + vfsqrt.v v4, v0 + vfmul.vv v4, v4, v0 + vfsqrt.v v4, v4 + vse32.v v4, (a0) + sh2add a0, t0, a0 + bnez a2, 1b + + ret +endfunc -- 2.43.0