From patchwork Sat Jun 22 15:58:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 50086 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1137852vqz; Sat, 22 Jun 2024 08:58:56 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8+GTD1GXzauayfJMpIUUkgDMSrgGYoaKQGFHiApj7eqfmVihDb6iYYQpg/fX+WcatFHDTRdJeb7B7sP81CCJ4OoeHhfiK6TRCzA== X-Google-Smtp-Source: AGHT+IF1iMBuvLcdO2+2Goh+3GGR5mkYKloAcGIDbKYyhl6qhhD+Op09yYTjKMS+C3damL4vv+/v X-Received: by 2002:a17:906:8315:b0:a6f:e2a0:b5df with SMTP id a640c23a62f3a-a6fe2a0b6fbmr127392466b.7.1719071936234; Sat, 22 Jun 2024 08:58:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719071936; cv=none; d=google.com; s=arc-20160816; b=IYEds8SJIHDp07RIoGMBJqeKXXZQsxcIPnnSpAZFhNNhPhHrOVxTwOdN7qJsDdIsS4 7wrBNo/HwaHwfGbilRSM/8enm/73bNZMxjUdwI0vwJASfRNTYr7iZZxOsKkoxSKiCMCS KsKPLrPYcF8Zdw2fp9DUJzoD51mDzBAHIRvI/zt3ujtC4gZ5dkkPt5sxYVSjSG2fUaqd kMdoIxephhz0ZsSxYeCwmip+K1DEO9LZwKKyoCd6b3izglbHgZ/niszaGZtzGgQwKraD CbHM69lWgARtMiXYAj+4D5xvL9iXGKXMFyK0Or3oa2JFmDhyWopW2X2g4x0ryiQPA7TN V+0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=snV3x0KMCWqqeJgnsWBZogrWL8XLHA+PafW9UWmyXSs=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=sJbqrJKyPOYMxSc9mDrZVahSSQ1pFe5ay/a+0KhswGf2WCFRkeQTtfdrgaL7qgs6L7 laBZ6L0u8TtFHtWxQVOE4YgmFG76kQMcJ+lIgX/xwoLHVOLCph4jePy5g5lEOVcmhAOX nicAEev9hTJf9X6tUT/GUB4pm9KBarT8gg8JOyNUdpWDj1RWNIT6DHxPKAV55pT0RDtc Qf+eHsrd6RPUZspzvNpv2cGBoXZ9hJzRXU2C9HORs9zzK/8qohuAaDi1quAJo2hAoJWn ueRXPoTwu9C3RfHryjc3/LRr9aLuPeBkDSuesDySiAL2qRK06jBA4U7yyLK9IGeBidkn s0WQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="OGDG/gua"; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6fcf5795d2si196019866b.850.2024.06.22.08.58.55; Sat, 22 Jun 2024 08:58:56 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="OGDG/gua"; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 221F368D5BA; Sat, 22 Jun 2024 18:58:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D19FE68D2F4 for ; Sat, 22 Jun 2024 18:58:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719071891; bh=mYNqGAb6kDU85VjjgX2brTjXcCLSEdNue60kkrzmu0o=; h=From:To:Cc:Subject:Date; b=OGDG/guaxE44c4yZ3Bb6vQbSdVhZnhnZgN0bCfUhgSbx+YQPMAKMSWVlWMuAsQoyW l2WevoGqkfiVG4XdUpbtEH6WCbyerMW9EQnmBV58ve1DxUrjbqLgRhsA/FXf5CY1oH jxxVrd3QFAm+ued4MgRpsB7JmGTKphJei72ZiXtg= Received: from localhost.localdomain ([116.139.97.96]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id E8A868C7; Sat, 22 Jun 2024 23:58:10 +0800 X-QQ-mid: xmsmtpt1719071890tfx1jqw5u Message-ID: X-QQ-XMAILINFO: NafziRg7Bx69fnc4QBAGEEkHv6YVrUkICUhjeXwRNlX5jSsGXb8aw7ufidbXsx Cq9ad9uojiwZbsyfeSd9r8Jty/a3a25M4FBSqKcOU37nWw1LbFTCKC3A/1iHBG/tr7KNCG0+UoOv UngQlc1ACaEjJzMHGoL+IRYV7nAVNpJPqpt1GnMzoZoGIVr4h5I8sXF3gF8HZc6sbzAjvzKuP3Ut L8XAj9ZOhdftNLGP5weKGAXc2l9VyJAkePK6T41PKPuGmcIskrqyMM/AQaFWlfBMe69pQAN1dG4W lEwe+Ynwwve5KOTdsFSjqNyZCliOPYsiDHAv0bPzvA2wDUfqh3rw1MOO4ZSJFT5rvpL0FfqoA45S sCjP15ixnLAStqOb3UOLqxB/Ppf7v72dgfgb0VTvz9tTLFwAwaQwSn5hGaA5sFMQNGmy68YeWhO/ L8etif/0cg+hyvs0FT+//VuKzSjvO9rO06wq1lCpHsUY6HwKNL4CN4y+Ty9rGgK/vp5215/B43Pd YSdEjD6X+0ienjCHV6qV29rVRx04EhhgLp6uRoATanvaRgFfdooszzMDGQFqt+sq7KTlHzF9e19o eZk9JI4HNBtqbQtfPSCqeYNcSdmV3Fi+h9izxSLdb5SltbDjVCxWlS+aWzM6yQ1PDKNh1xaFT5Ci X1Qf4WoK63/spmzwVV0N2w5nW8cq4qCGhZYlFRbF7tLtwN9q1yfQRVrJ+7j431QvNKIf3dajugIM ixuktHseElPCKSQfkbBV1G3a3YVlpoNf2M4VELzybyK5gPcuMK/pAG38DfKeDygOrUVsoTESR/RA dGAo0pCb0huC6pSz8/91KcDSCa3lSRg/XlTCmVZJpiNWTCcaqMyjvvLeUO8VQfRbYs/lAOdwr+nk gSIUIrUZpuHDzwJDdqXccK2mLcmbF+W9taBtrxO1gJ X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 23:58:03 +0800 X-OQ-MSGID: <20240622155806.3191984-1-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavc/vp8dsp: R-V V 256 bilin,epel 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 Cc: sunyuechi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: EEDdUrYTdIuF From: sunyuechi X60 new vp8_put_bilin16_h_c : 42.5 42.5 vp8_put_bilin16_h_rvv_i32 : 4.7 3.2 vp8_put_bilin16_hv_c : 71.5 71.7 vp8_put_bilin16_hv_rvv_i32 : 8.5 7.5 vp8_put_bilin16_v_c : 43.0 42.7 vp8_put_bilin16_v_rvv_i32 : 4.2 3.0 vp8_put_epel16_h4_c : 82.0 82.0 vp8_put_epel16_h4_rvv_i32 : 12.2 9.7 vp8_put_epel16_h6v6_c : 196.2 196.2 vp8_put_epel16_h6v6_rvv_i32 : 31.2 26.2 vp8_put_epel16_v4_c : 82.2 82.2 vp8_put_epel16_v4_rvv_i32 : 12.0 10.0 ... --- libavcodec/riscv/vp8dsp_init.c | 136 +++++++++++++++++++-------------- libavcodec/riscv/vp8dsp_rvv.S | 133 +++++++++++++++++++------------- 2 files changed, 162 insertions(+), 107 deletions(-) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index d9e2beb237..dcb6307d5b 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -35,13 +35,19 @@ void ff_vp8_idct_dc_add4uv_rvv(uint8_t *dst, int16_t block[4][16], ptrdiff_t str VP8_EPEL(16, rvi); VP8_EPEL(8, rvi); VP8_EPEL(4, rvi); -VP8_EPEL(16, rvv); -VP8_EPEL(8, rvv); -VP8_EPEL(4, rvv); +VP8_EPEL(16, rvv128); +VP8_EPEL(8, rvv128); +VP8_EPEL(4, rvv128); +VP8_EPEL(16, rvv256); +VP8_EPEL(8, rvv256); +VP8_EPEL(4, rvv256); -VP8_BILIN(16, rvv); -VP8_BILIN(8, rvv); -VP8_BILIN(4, rvv); +VP8_BILIN(16, rvv128); +VP8_BILIN(8, rvv128); +VP8_BILIN(4, rvv128); +VP8_BILIN(16, rvv256); +VP8_BILIN(8, rvv256); +VP8_BILIN(4, rvv256); av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) { @@ -58,64 +64,82 @@ av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) c->put_vp8_bilinear_pixels_tab[2][0][0] = ff_put_vp8_pixels4_rvi; } #if HAVE_RVV - if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) { - c->put_vp8_bilinear_pixels_tab[0][0][1] = ff_put_vp8_bilin16_h_rvv; - c->put_vp8_bilinear_pixels_tab[0][0][2] = ff_put_vp8_bilin16_h_rvv; - c->put_vp8_bilinear_pixels_tab[1][0][1] = ff_put_vp8_bilin8_h_rvv; - c->put_vp8_bilinear_pixels_tab[1][0][2] = ff_put_vp8_bilin8_h_rvv; - c->put_vp8_bilinear_pixels_tab[2][0][1] = ff_put_vp8_bilin4_h_rvv; - c->put_vp8_bilinear_pixels_tab[2][0][2] = ff_put_vp8_bilin4_h_rvv; +#define init_bilin(vlen) \ + c->put_vp8_bilinear_pixels_tab[0][0][1] = ff_put_vp8_bilin16_h_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[0][0][2] = ff_put_vp8_bilin16_h_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[1][0][1] = ff_put_vp8_bilin8_h_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[1][0][2] = ff_put_vp8_bilin8_h_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[2][0][1] = ff_put_vp8_bilin4_h_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[2][0][2] = ff_put_vp8_bilin4_h_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[0][1][0] = ff_put_vp8_bilin16_v_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[0][2][0] = ff_put_vp8_bilin16_v_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[1][1][0] = ff_put_vp8_bilin8_v_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[1][2][0] = ff_put_vp8_bilin8_v_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[2][1][0] = ff_put_vp8_bilin4_v_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[2][2][0] = ff_put_vp8_bilin4_v_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[0][1][1] = ff_put_vp8_bilin16_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[0][1][2] = ff_put_vp8_bilin16_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[0][2][1] = ff_put_vp8_bilin16_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[0][2][2] = ff_put_vp8_bilin16_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[1][1][1] = ff_put_vp8_bilin8_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[1][1][2] = ff_put_vp8_bilin8_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[1][2][1] = ff_put_vp8_bilin8_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[1][2][2] = ff_put_vp8_bilin8_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[2][1][1] = ff_put_vp8_bilin4_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[2][1][2] = ff_put_vp8_bilin4_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[2][2][1] = ff_put_vp8_bilin4_hv_rvv##vlen; \ + c->put_vp8_bilinear_pixels_tab[2][2][2] = ff_put_vp8_bilin4_hv_rvv##vlen; - c->put_vp8_bilinear_pixels_tab[0][1][0] = ff_put_vp8_bilin16_v_rvv; - c->put_vp8_bilinear_pixels_tab[0][2][0] = ff_put_vp8_bilin16_v_rvv; - c->put_vp8_bilinear_pixels_tab[1][1][0] = ff_put_vp8_bilin8_v_rvv; - c->put_vp8_bilinear_pixels_tab[1][2][0] = ff_put_vp8_bilin8_v_rvv; - c->put_vp8_bilinear_pixels_tab[2][1][0] = ff_put_vp8_bilin4_v_rvv; - c->put_vp8_bilinear_pixels_tab[2][2][0] = ff_put_vp8_bilin4_v_rvv; +#define init_epel_h_v(vlen) \ + c->put_vp8_epel_pixels_tab[0][0][2] = ff_put_vp8_epel16_h6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[1][0][2] = ff_put_vp8_epel8_h6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[2][0][2] = ff_put_vp8_epel4_h6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[0][0][1] = ff_put_vp8_epel16_h4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[1][0][1] = ff_put_vp8_epel8_h4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[2][0][1] = ff_put_vp8_epel4_h4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[0][2][0] = ff_put_vp8_epel16_v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[1][2][0] = ff_put_vp8_epel8_v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[2][2][0] = ff_put_vp8_epel4_v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[0][1][0] = ff_put_vp8_epel16_v4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[1][1][0] = ff_put_vp8_epel8_v4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[2][1][0] = ff_put_vp8_epel4_v4_rvv##vlen; - c->put_vp8_bilinear_pixels_tab[0][1][1] = ff_put_vp8_bilin16_hv_rvv; - c->put_vp8_bilinear_pixels_tab[0][1][2] = ff_put_vp8_bilin16_hv_rvv; - c->put_vp8_bilinear_pixels_tab[0][2][1] = ff_put_vp8_bilin16_hv_rvv; - c->put_vp8_bilinear_pixels_tab[0][2][2] = ff_put_vp8_bilin16_hv_rvv; - c->put_vp8_bilinear_pixels_tab[1][1][1] = ff_put_vp8_bilin8_hv_rvv; - c->put_vp8_bilinear_pixels_tab[1][1][2] = ff_put_vp8_bilin8_hv_rvv; - c->put_vp8_bilinear_pixels_tab[1][2][1] = ff_put_vp8_bilin8_hv_rvv; - c->put_vp8_bilinear_pixels_tab[1][2][2] = ff_put_vp8_bilin8_hv_rvv; - c->put_vp8_bilinear_pixels_tab[2][1][1] = ff_put_vp8_bilin4_hv_rvv; - c->put_vp8_bilinear_pixels_tab[2][1][2] = ff_put_vp8_bilin4_hv_rvv; - c->put_vp8_bilinear_pixels_tab[2][2][1] = ff_put_vp8_bilin4_hv_rvv; - c->put_vp8_bilinear_pixels_tab[2][2][2] = ff_put_vp8_bilin4_hv_rvv; +#define init_epel_hv(vlen) \ + c->put_vp8_epel_pixels_tab[0][2][2] = ff_put_vp8_epel16_h6v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[2][2][2] = ff_put_vp8_epel4_h6v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[0][2][1] = ff_put_vp8_epel16_h4v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[1][2][1] = ff_put_vp8_epel8_h4v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[2][2][1] = ff_put_vp8_epel4_h4v6_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[0][1][1] = ff_put_vp8_epel16_h4v4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[1][1][1] = ff_put_vp8_epel8_h4v4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[2][1][1] = ff_put_vp8_epel4_h4v4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[0][1][2] = ff_put_vp8_epel16_h6v4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_rvv##vlen; \ + c->put_vp8_epel_pixels_tab[2][1][2] = ff_put_vp8_epel4_h6v4_rvv##vlen; - if (flags & AV_CPU_FLAG_RVB_ADDR) { - c->put_vp8_epel_pixels_tab[0][0][2] = ff_put_vp8_epel16_h6_rvv; - c->put_vp8_epel_pixels_tab[1][0][2] = ff_put_vp8_epel8_h6_rvv; - c->put_vp8_epel_pixels_tab[2][0][2] = ff_put_vp8_epel4_h6_rvv; - c->put_vp8_epel_pixels_tab[0][0][1] = ff_put_vp8_epel16_h4_rvv; - c->put_vp8_epel_pixels_tab[1][0][1] = ff_put_vp8_epel8_h4_rvv; - c->put_vp8_epel_pixels_tab[2][0][1] = ff_put_vp8_epel4_h4_rvv; + int vlenb = ff_get_rv_vlenb(); - c->put_vp8_epel_pixels_tab[0][2][0] = ff_put_vp8_epel16_v6_rvv; - c->put_vp8_epel_pixels_tab[1][2][0] = ff_put_vp8_epel8_v6_rvv; - c->put_vp8_epel_pixels_tab[2][2][0] = ff_put_vp8_epel4_v6_rvv; - c->put_vp8_epel_pixels_tab[0][1][0] = ff_put_vp8_epel16_v4_rvv; - c->put_vp8_epel_pixels_tab[1][1][0] = ff_put_vp8_epel8_v4_rvv; - c->put_vp8_epel_pixels_tab[2][1][0] = ff_put_vp8_epel4_v4_rvv; + if (flags & AV_CPU_FLAG_RVV_I32 && vlenb >= 32) { + init_bilin(256); + if (flags & AV_CPU_FLAG_RVB_ADDR) { + init_epel_h_v(256); +#if __riscv_xlen <= 64 + init_epel_hv(256); +#endif + } + } else if (flags & AV_CPU_FLAG_RVV_I32 && vlenb >= 16) { + init_bilin(128); + if (flags & AV_CPU_FLAG_RVB_ADDR) { + init_epel_h_v(128); #if __riscv_xlen <= 64 - c->put_vp8_epel_pixels_tab[0][2][2] = ff_put_vp8_epel16_h6v6_rvv; - c->put_vp8_epel_pixels_tab[1][2][2] = ff_put_vp8_epel8_h6v6_rvv; - c->put_vp8_epel_pixels_tab[2][2][2] = ff_put_vp8_epel4_h6v6_rvv; - c->put_vp8_epel_pixels_tab[0][2][1] = ff_put_vp8_epel16_h4v6_rvv; - c->put_vp8_epel_pixels_tab[1][2][1] = ff_put_vp8_epel8_h4v6_rvv; - c->put_vp8_epel_pixels_tab[2][2][1] = ff_put_vp8_epel4_h4v6_rvv; - c->put_vp8_epel_pixels_tab[0][1][1] = ff_put_vp8_epel16_h4v4_rvv; - c->put_vp8_epel_pixels_tab[1][1][1] = ff_put_vp8_epel8_h4v4_rvv; - c->put_vp8_epel_pixels_tab[2][1][1] = ff_put_vp8_epel4_h4v4_rvv; - c->put_vp8_epel_pixels_tab[0][1][2] = ff_put_vp8_epel16_h6v4_rvv; - c->put_vp8_epel_pixels_tab[1][1][2] = ff_put_vp8_epel8_h6v4_rvv; - c->put_vp8_epel_pixels_tab[2][1][2] = ff_put_vp8_epel4_h6v4_rvv; + init_epel_hv(128); #endif } } +#undef init_bilin +#undef init_epel_h_v +#undef init_epel_hv #endif #endif } diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index d366748a0a..0cbf1672f7 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -21,7 +21,8 @@ #include "libavutil/riscv/asm.S" -.macro vsetvlstatic8 len +.macro vsetvlstatic8 len, vlen +.if \vlen == 128 .if \len <= 4 vsetivli zero, \len, e8, mf4, ta, ma .elseif \len <= 8 @@ -31,9 +32,21 @@ .elseif \len <= 31 vsetivli zero, \len, e8, m2, ta, ma .endif +.else +.if \len <= 4 + vsetivli zero, \len, e8, mf8, ta, ma +.elseif \len <= 8 + vsetivli zero, \len, e8, mf4, ta, ma +.elseif \len <= 16 + vsetivli zero, \len, e8, mf2, ta, ma +.elseif \len <= 31 + vsetivli zero, \len, e8, m1, ta, ma +.endif +.endif .endm -.macro vsetvlstatic16 len +.macro vsetvlstatic16 len, vlen +.if \vlen == 128 .if \len <= 4 vsetivli zero, \len, e16, mf2, ta, ma .elseif \len <= 8 @@ -41,6 +54,15 @@ .elseif \len <= 16 vsetivli zero, \len, e16, m2, ta, ma .endif +.else +.if \len <= 4 + vsetivli zero, \len, e16, mf4, ta, ma +.elseif \len <= 8 + vsetivli zero, \len, e16, mf2, ta, ma +.elseif \len <= 16 + vsetivli zero, \len, e16, m1, ta, ma +.endif +.endif .endm #if __riscv_xlen >= 64 @@ -263,10 +285,10 @@ endfunc vnsra.wi \dst, v24, 3 .endm -.macro put_vp8_bilin_h_v type mn -func ff_put_vp8_bilin4_\type\()_rvv, zve32x - vsetvlstatic8 4 -.Lbilin_\type: +.macro put_vp8_bilin_h_v vlen, type, mn +func ff_put_vp8_bilin4_\type\()_rvv\vlen, zve32x + vsetvlstatic8 4, \vlen +.Lbilin_\type\vlen: li t1, 8 li t4, 4 sub t1, t1, \mn @@ -306,12 +328,10 @@ func ff_put_vp8_bilin4_\type\()_rvv, zve32x endfunc .endm -put_vp8_bilin_h_v h a5 -put_vp8_bilin_h_v v a6 - -func ff_put_vp8_bilin4_hv_rvv, zve32x - vsetvlstatic8 4 -.Lbilin_hv: +.macro put_vp8_bilin_hv vlen +func ff_put_vp8_bilin4_hv_rvv\vlen, zve32x + vsetvlstatic8 4, \vlen +.Lbilin_hv\vlen: li t3, 8 sub t1, t3, a5 sub t2, t3, a6 @@ -332,23 +352,32 @@ func ff_put_vp8_bilin4_hv_rvv, zve32x ret endfunc +.endm + +.irp vlen,256,128 +put_vp8_bilin_h_v \vlen, h, a5 +put_vp8_bilin_h_v \vlen, v, a6 +put_vp8_bilin_hv \vlen +.endr .irp len,16,8 -func ff_put_vp8_bilin\len\()_h_rvv, zve32x - vsetvlstatic8 \len - j .Lbilin_h +.irp vlen,256,128 +func ff_put_vp8_bilin\len\()_h_rvv\vlen, zve32x + vsetvlstatic8 \len, \vlen + j .Lbilin_h\vlen endfunc -func ff_put_vp8_bilin\len\()_v_rvv, zve32x - vsetvlstatic8 \len - j .Lbilin_v +func ff_put_vp8_bilin\len\()_v_rvv\vlen, zve32x + vsetvlstatic8 \len, \vlen + j .Lbilin_v\vlen endfunc -func ff_put_vp8_bilin\len\()_hv_rvv, zve32x - vsetvlstatic8 \len - j .Lbilin_hv +func ff_put_vp8_bilin\len\()_hv_rvv\vlen, zve32x + vsetvlstatic8 \len, \vlen + j .Lbilin_hv\vlen endfunc .endr +.endr const subpel_filters .byte 0, -6, 123, 12, -1, 0 @@ -378,7 +407,7 @@ endconst .endif .endm -.macro epel_load dst len size type from_mem regtype +.macro epel_load dst, len, vlen, size, type, from_mem, regtype .ifc \type,v sub t6, a2, a3 add a7, a2, a3 @@ -426,26 +455,26 @@ endconst .endif li t6, 64 vwadd.wx v16, v16, t6 - vsetvlstatic16 \len + vsetvlstatic16 \len, \vlen vwadd.vv v24, v16, v20 vnsra.wi v24, v24, 7 vmax.vx v24, v24, zero - vsetvlstatic8 \len + vsetvlstatic8 \len, \vlen vnclipu.wi \dst, v24, 0 .endm -.macro epel_load_inc dst len size type from_mem regtype - epel_load \dst \len \size \type \from_mem \regtype +.macro epel_load_inc dst, len, vlen, size, type, from_mem, regtype + epel_load \dst, \len, \vlen, \size, \type, \from_mem, \regtype add a2, a2, a3 .endm -.macro epel len size type -func ff_put_vp8_epel\len\()_\type\()\size\()_rvv, zve32x +.macro epel len, vlen, size, type +func ff_put_vp8_epel\len\()_\type\()\size\()_rvv\vlen, zve32x epel_filter \size \type t - vsetvlstatic8 \len + vsetvlstatic8 \len, \vlen 1: addi a4, a4, -1 - epel_load_inc v30 \len \size \type 1 t + epel_load_inc v30, \len, \vlen, \size, \type, 1, t vse8.v v30, (a0) add a0, a0, a1 bnez a4, 1b @@ -454,8 +483,8 @@ func ff_put_vp8_epel\len\()_\type\()\size\()_rvv, zve32x endfunc .endm -.macro epel_hv len hsize vsize -func ff_put_vp8_epel\len\()_h\hsize\()v\vsize\()_rvv, zve32x +.macro epel_hv len, vlen, hsize, vsize +func ff_put_vp8_epel\len\()_h\hsize\()v\vsize\()_rvv\vlen, zve32x #if __riscv_xlen == 64 addi sp, sp, -48 .irp n,0,1,2,3,4,5 @@ -470,22 +499,22 @@ func ff_put_vp8_epel\len\()_h\hsize\()v\vsize\()_rvv, zve32x sub a2, a2, a3 epel_filter \hsize h t epel_filter \vsize v s - vsetvlstatic8 \len + vsetvlstatic8 \len, \vlen .if \hsize == 6 || \vsize == 6 sub a2, a2, a3 - epel_load_inc v0 \len \hsize h 1 t + epel_load_inc v0, \len, \vlen, \hsize, h, 1, t .endif - epel_load_inc v2 \len \hsize h 1 t - epel_load_inc v4 \len \hsize h 1 t - epel_load_inc v6 \len \hsize h 1 t - epel_load_inc v8 \len \hsize h 1 t + epel_load_inc v2, \len, \vlen, \hsize, h, 1, t + epel_load_inc v4, \len, \vlen, \hsize, h, 1, t + epel_load_inc v6, \len, \vlen, \hsize, h, 1, t + epel_load_inc v8, \len, \vlen, \hsize, h, 1, t .if \hsize == 6 || \vsize == 6 - epel_load_inc v10 \len \hsize h 1 t + epel_load_inc v10, \len, \vlen, \hsize, h, 1, t .endif addi a4, a4, -1 1: addi a4, a4, -1 - epel_load v30 \len \vsize v 0 s + epel_load v30, \len, \vlen, \vsize, v, 0, s vse8.v v30, (a0) .if \hsize == 6 || \vsize == 6 vmv.v.v v0, v2 @@ -495,13 +524,13 @@ func ff_put_vp8_epel\len\()_h\hsize\()v\vsize\()_rvv, zve32x vmv.v.v v6, v8 .if \hsize == 6 || \vsize == 6 vmv.v.v v8, v10 - epel_load_inc v10 \len \hsize h 1 t + epel_load_inc v10, \len, \vlen, \hsize, h, 1, t .else - epel_load_inc v8 \len 4 h 1 t + epel_load_inc v8, \len, \vlen, 4, h, 1, t .endif add a0, a0, a1 bnez a4, 1b - epel_load v30 \len \vsize v 0 s + epel_load v30, \len, \vlen, \vsize, v, 0, s vse8.v v30, (a0) #if __riscv_xlen == 64 @@ -521,14 +550,16 @@ endfunc .endm .irp len,16,8,4 -epel \len 6 h -epel \len 4 h -epel \len 6 v -epel \len 4 v +.irp vlen,256,128 +epel \len, \vlen, 6, h +epel \len, \vlen, 4, h +epel \len, \vlen, 6, v +epel \len, \vlen, 4, v #if __riscv_xlen <= 64 -epel_hv \len 6 6 -epel_hv \len 4 4 -epel_hv \len 6 4 -epel_hv \len 4 6 +epel_hv \len, \vlen, 6, 6 +epel_hv \len, \vlen, 4, 4 +epel_hv \len, \vlen, 6, 4 +epel_hv \len, \vlen, 4, 6 #endif .endr +.endr From patchwork Sat Jun 22 15:58:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 50085 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1137800vqz; Sat, 22 Jun 2024 08:58:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUhWvtLy9BqapvQ3POGwXjCfXhak2sNn5q/rw7tX9aPQl6lamTFRt4euA3MmlwUvmEHjTnLdpJxSGnERBwpdQPH4G64XpAdn1C79w== X-Google-Smtp-Source: AGHT+IGsY7cG/gp9+bBxLixlZSVfuzTtdPoScoUBHTkYyVmuobQz0t/Fif6+AjblABjTTHENY8DD X-Received: by 2002:a05:6512:3b8e:b0:52c:80f6:d384 with SMTP id 2adb3069b0e04-52cdf7e66c4mr1257872e87.3.1719071927365; Sat, 22 Jun 2024 08:58:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719071927; cv=none; d=google.com; s=arc-20160816; b=j/Ss5e7f0u7G5S+Jvp6grq62RWQAwCVWY9R8wzJUIOgXaCM4jftY0DqbJj3ZZMLQE5 0JREJiSt/pSj5Da4OAlblm2xeZi2KcOc1TGcDT7uaUe5eBzKgiEemViWwvYhCPMCZf1f 1DVHbVYzN+Ed0W4cZ7QfkgKg4Vm79BmE4rln36KeXR/aVKTe5H5wuxxprtyUQ/Y1cXCB JYhgVA//3z8pWxfBIaLFtdbGbRFIxQ9Sib3uLHD3vvit8BI3nIorlkU+zbLoEHi90hfE 78bvp+26HgAWY2cxm+peDBpW2KcucyETWkScM1kW8JFtT2uajNOyiAgYUWMGuj1cLNTb Ll1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=R6nsFeyUtGD9ntMkKVrnL/aXJbxy4rryD3etvPqitJ4=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=rd6IdnFsiiDmuov1FSHpiPUqaJ10iSJkSSKuRrTnT65w99XcdbFHRqXkdw5jDIdlI6 AaRCVT77s9y0esFQgpRqMuliWJtRHI449S5/CTkbqONClsMoja1guKxSyhinmUtr3szf EzsgO0RxeBx9VQ7RWEpQ2e99MDbCo2wS8lJXRPvK47IUVVVZMSnYuUn/5elr8uucMd9/ fCXm+xzYnP3prJc5VXJDDPc3jLIhx4sRjE5PFTdeYuex4YPe4AXjrqCSp/wGbzHYjSD1 s5V266Yje10J3B9omoj4xnrRIEWRt0RGenuQoLfs7ZDM2YOznRGmwWIBYmOAIjbgF0se Fc5w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=MP14KIRc; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52cd641cf6bsi1120223e87.303.2024.06.22.08.58.47; Sat, 22 Jun 2024 08:58:47 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=MP14KIRc; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FFE868D128; Sat, 22 Jun 2024 18:58:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-27.mail.qq.com (out203-205-251-27.mail.qq.com [203.205.251.27]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF4E368D283 for ; Sat, 22 Jun 2024 18:58:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719071892; bh=ysciBxj3c/xr3BsiYo9Chx+PqspppN3J6vFACdVZwWE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=MP14KIRc2K9CC3ZsZEEoAHlGPHTC+xC1dRpryS54+zlHW6e7DH0RGjsjbT8CIT7yp eqS5KGYFfvOa/6k820WPXMhIXLpkd3Z9qYxDr1q26KNm7Ou2Hm8rQ01JHLiVe9/r6p YZLScGATcqxOls1MSLkGsMIBy377DpJUe6Np8XvM= Received: from localhost.localdomain ([116.139.97.96]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id E8A868C7; Sat, 22 Jun 2024 23:58:10 +0800 X-QQ-mid: xmsmtpt1719071891tkpfz76mz Message-ID: X-QQ-XMAILINFO: MmPNY57tR1XnkZQ7BBmorJlLGtn39wzSri/8GN3EshvSXQdVU+Kq7w1PT9FwJf p2DGp8vup1MonCljjfUImEbyHZg//sdMWTX2N4ncRSD5Fx6PLnzGPLAHeAwigzxjcCLkdQUHFYIV T2yrVenX1EM8CFQjeEcKVEq+gmgG5Tvr7Xmkk3+B+iOaLsphgf7XswTt6wSyePHT8I/03xw0UbWa 7AO4sCGGYzrJccHy4hG1W1vDyIFbB9zPX0tULA+ZqXRiIdyhb7//29KsUp6y0Imk73wRyr0jkbts RggwUc41yqzH1wm2PIHTPiDLtOtqJgvuUSp46fWGbSBKDgJnZiDCsd7NsX6YmXtT51wBkuJlQO0g 8SrilLtMpBd2a6UpD3+Xteor+1V+yEYj0acR/T6snyjAz7I/w1roY5fVIWr1gegcvmLGkBipnziH /DPchR/bL3pEC0TUob/j4K8SGrzU9rXnRYnCOqHHX2wn+C2i9vVQ6zjv2SaRAOgfcIhLcAcKbYWc 1lsWdgXXts8g/2lx5u14AdBe4JhE8DLEMv37DrupUNY+wPhR7yMShd9nmPOkavipzCWdD+LQiZKT tJcNwRxnwPBum2ld9BwkgOnPl62+CCDE6fPYQCjM9QBDmeEI3zULysHNkK0npKeExXABeNn4cHNt lrOOYuEZ/p77aDSv1QzsVGI7SnjVLcAtiiVSbcxqmXVLFW42s6X2LvNRtbj/ubXNrTipBNQdRiIP 6qmywLGkPbym6S17DtXqcuSyIbgjCiXts9yoHfBCg3lrsQs7qzo69piwVopQsot9Cq7ywPPBmNS+ sHOmO4+48eOCs8TcdomJL0s9RP/nx4agKrfYzBJ/auoMxUIxiQZ/QU3APLeE0Lt8tb3ieNc6pOLT zGiTJ2yEswMT1UMNdwnA28YL2y9F+zeuZSodusc2KZq3PzVRMLjaW4ZAYyn8wpUYCR8eMN/z5t X-QQ-XMRINFO: MSVp+SPm3vtS1Vd6Y4Mggwc= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 23:58:04 +0800 X-OQ-MSGID: <20240622155806.3191984-2-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622155806.3191984-1-uk7b@foxmail.com> References: <20240622155806.3191984-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavc/vp8dsp: R-V V loop_filter_simple 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 Cc: sunyuechi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: e2EmYksufVZb From: sunyuechi C908 X60 vp8_loop_filter_simple_h_c : 7.0 6.0 vp8_loop_filter_simple_h_rvv_i32 : 3.2 2.7 vp8_loop_filter_simple_v_c : 7.2 6.5 vp8_loop_filter_simple_v_rvv_i32 : 1.7 1.2 --- libavcodec/riscv/vp8dsp_init.c | 18 ++++++- libavcodec/riscv/vp8dsp_rvv.S | 87 ++++++++++++++++++++++++++++++++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index dcb6307d5b..8c5b2c8b04 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -49,6 +49,9 @@ VP8_BILIN(16, rvv256); VP8_BILIN(8, rvv256); VP8_BILIN(4, rvv256); +VP8_LF(rvv128); +VP8_LF(rvv256); + av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) { #if HAVE_RV @@ -147,9 +150,15 @@ av_cold void ff_vp78dsp_init_riscv(VP8DSPContext *c) av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) { #if HAVE_RVV + int vlenb = ff_get_rv_vlenb(); + +#define init_loop_filter(vlen) \ + c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_rvv##vlen; \ + c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_rvv##vlen; + int flags = av_get_cpu_flags(); - if (flags & AV_CPU_FLAG_RVV_I32 && ff_rv_vlen_least(128)) { + if (flags & AV_CPU_FLAG_RVV_I32 && vlenb >= 16) { #if __riscv_xlen >= 64 if (flags & AV_CPU_FLAG_RVV_I64) c->vp8_luma_dc_wht = ff_vp8_luma_dc_wht_rvv; @@ -159,6 +168,13 @@ av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) c->vp8_idct_dc_add4y = ff_vp8_idct_dc_add4y_rvv; if (flags & AV_CPU_FLAG_RVV_I64) c->vp8_idct_dc_add4uv = ff_vp8_idct_dc_add4uv_rvv; + + if (vlenb >= 32) { + init_loop_filter(256); + } else { + init_loop_filter(128); + } } +#undef init_loop_filter #endif } diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index 0cbf1672f7..b5f8bb31b4 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -275,6 +275,93 @@ func ff_vp78_idct_dc_add4uv_rvv, zve64x ret endfunc +.macro filter_fmin len, vlen, a, f1, p0f2, q0f1 + vsetvlstatic16 \len, \vlen + vsext.vf2 \q0f1, \a + vmin.vx \p0f2, \q0f1, a7 + vmin.vx \q0f1, \q0f1, t3 + vadd.vi \p0f2, \p0f2, 3 + vadd.vi \q0f1, \q0f1, 4 + vsra.vi \p0f2, \p0f2, 3 + vsra.vi \f1, \q0f1, 3 + vadd.vv \p0f2, \p0f2, v8 + vsub.vv \q0f1, v16, \f1 + vmax.vx \p0f2, \p0f2, zero + vmax.vx \q0f1, \q0f1, zero +.endm + +.macro filter len, vlen, type, normal, inner, dst, stride, fE, fI, thresh +.ifc \type,v + slli a6, \stride, 1 + sub t2, \dst, a6 + add t4, \dst, \stride + sub t1, \dst, \stride + vle8.v v1, (t2) + vle8.v v11, (t4) + vle8.v v17, (t1) + vle8.v v22, (\dst) +.else + addi t1, \dst, -1 + addi a6, \dst, -2 + addi t4, \dst, 1 + vlse8.v v1, (a6), \stride + vlse8.v v11, (t4), \stride + vlse8.v v17, (t1), \stride + vlse8.v v22, (\dst), \stride +.endif + vwsubu.vv v12, v1, v11 // p1-q1 + vwsubu.vv v24, v22, v17 // q0-p0 + vnclip.wi v23, v12, 0 + vsetvlstatic16 \len, \vlen + // vp8_simple_limit(dst + i, stride, flim) + li a7, 2 + vneg.v v18, v12 + vmax.vv v18, v18, v12 + vneg.v v8, v24 + vmax.vv v8, v8, v24 + vsrl.vi v18, v18, 1 + vmacc.vx v18, a7, v8 + vmsleu.vx v0, v18, \fE + + li t5, 3 + li a7, 124 + li t3, 123 + vmul.vx v30, v24, t5 + vsext.vf2 v4, v23 + vzext.vf2 v8, v17 // p0 + vzext.vf2 v16, v22 // q0 + vadd.vv v12, v30, v4 + vsetvlstatic8 \len, \vlen + vnclip.wi v11, v12, 0 + filter_fmin \len, \vlen, v11, v24, v4, v6 + vsetvlstatic8 \len, \vlen + vnclipu.wi v4, v4, 0 + vnclipu.wi v6, v6, 0 + +.ifc \type,v + vse8.v v4, (t1), v0.t + vse8.v v6, (\dst), v0.t +.else + vsse8.v v4, (t1), \stride, v0.t + vsse8.v v6, (\dst), \stride, v0.t +.endif + +.endm + +.irp vlen,256,128 +func ff_vp8_v_loop_filter16_simple_rvv\vlen, zve32x + vsetvlstatic8 16, \vlen + filter 16, \vlen, v, 0, 0, a0, a1, a2, a3, a4 + ret +endfunc + +func ff_vp8_h_loop_filter16_simple_rvv\vlen, zve32x + vsetvlstatic8 16, \vlen + filter 16, \vlen, h, 0, 0, a0, a1, a2, a3, a4 + ret +endfunc +.endr + .macro bilin_load_h dst mn addi t5, a2, 1 vle8.v \dst, (a2) From patchwork Sat Jun 22 15:58:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 50087 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1137888vqz; Sat, 22 Jun 2024 08:59:05 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWBKYW6BIzLFAjSJKGRnPW69WMsM3uEpAYymlRoBYfasIKZYTGTBGT/su+j6YF2z9TA7mRRkTBLeKojghvFP0FWoYNts4dArA0KAw== X-Google-Smtp-Source: AGHT+IHyyXFIAIz4AW4jxzqEKBQSWFy/iDhZjjMZqn9Ut5Dv146pHQiyCpmhvbK7WUt7iVFSYDdE X-Received: by 2002:aa7:dcd5:0:b0:57d:3df:ba2d with SMTP id 4fb4d7f45d1cf-57d447aa7c4mr1033069a12.2.1719071945647; Sat, 22 Jun 2024 08:59:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719071945; cv=none; d=google.com; s=arc-20160816; b=RHHevrdYdljA1/IbAFfhw3pDZ4EwssGfxnd1g15wYXAz5e1OEXhszdLVWtQ5UTAKHs DTmzb7uqZ7n0K42BWUhxB4FGL+9fqg4XJLncDpm5RnRR/IAaaifW7EbSHe5WGedCFKP4 AQ0LZY43V+C2abtFwGkraEpbOFccYDWeB6OTTczZmI7Qt+ndS5gpVjjjShm8zDJjnnpx Bdzv5sQ7cAg5F7jYfZSF3NOH8/UjLtMA6Cj5RiR6lG+HWonTX2eUbxGav9zSWIr3Nfuk HTBeypNYgNTO1w3X2jd/psXinAKm8ssHUyP4l1KjFDnf1/jmjuYLrclfxXSDcCOB15SB q2ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=Wr8s16B4xaovX2y40hdtLo0zF/s1mQMUATG/zHXiCyg=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=MGK3AyEW33/5tfmhjXUCqtNxqXkcDNcCDw/vffTu1jG5I7TAMFmtKqm82aq4gecYni DKF/acR6ppvclXwLPnuYqBvvJt7zpDXXRViQvRDwZE7YHPyLgIkvGBPJyyMixELtPHRt SO5OM+oYR6Rs/TzsdlNaN/PvVpo0BAjoes1+1n9GcRuqmnq1DazcM7Xijul0lHTjuFtC LR7MJkbUzw6/paU0FCexPdHx31eFLue4Lozpq2fc8hKMwTwjLRhcjzDU+SQB/F7mm7Mc guvJyUmD+iFPt53LKmVME/I3/2YivMsKLcgStmxGIp0oKEKzMY3f7bKtSxGK73kh4eKo 8YLg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=hQYIzH6q; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57d306b6b08si1822343a12.308.2024.06.22.08.59.05; Sat, 22 Jun 2024 08:59: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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=hQYIzH6q; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5B8B668D5FB; Sat, 22 Jun 2024 18:58:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-59.mail.qq.com (out203-205-251-59.mail.qq.com [203.205.251.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 47E4968D406 for ; Sat, 22 Jun 2024 18:58:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719071893; bh=j8etcHNgcIfslvth63LHCcU9EPd2yE0T1d21QB/CgPM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hQYIzH6qEyAtHfv9KZ7mOzkZj6N/3vbSOZuynuhJ8mqxk1b857DW9ZNJypd0A1gaQ ZeQyuQuUjtwZcfMQqJiLCcdV+/ARShejpa9KZ/KYW3b4MRvw/mrzEcpY5TKygkl25A RkH3eANYcvV8EAYkfczuWsfW4XmACwkLNFKEb6ao= Received: from localhost.localdomain ([116.139.97.96]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id E8A868C7; Sat, 22 Jun 2024 23:58:10 +0800 X-QQ-mid: xmsmtpt1719071892tqmluuyac Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uT+FxWOUm0LKjHa7CXcb7Xi3LgF56Vs9Q+Lgo11S6Akw8J4i1MCi RjeCMgMcBhDiaiPW/zRWupPgu9+PrHTGsjGK+glx7UXOOWspq+faVDGfhFNzoLiWvwB86Ah9LU56 Ck7IEYR5pqnWZ14Rluq8UIlcuxnOPT3OxcN3W3brFpIcyIk+Iad5aO1p2tiaavloHQ6d1xx7lU7R zUC6wsmNIlKxRY0/50Ku0p9HPADS3MqJNIwAbJ+mGXs5rbKArXSpTXYGy+Gl2sx+c4n1mvqxh/E0 DUMAlbtm2Q/CIbboANpol9bn7tUrHnQfgqDsGHFIo/3ZCEjpUxW9NlaUBzKrpJgmbmKwQmKxYQpR IXWvmPdkWztL4W0wguU1I6AH4sO6Aq1DaB7oqXqHkKZqiM1CMXVIji0iaFSCB57rJQn0mo793vms 0fHMDhqX1JbaKVYcjsJYNCjM3URzK1M/WWQUXA/EpBwauIQC4g2UivEj35pa+H0wNRcmoIUu4vup ca/2nhZfSM50Um5ptj6OFvirRypcSJoBAXTIdcjXXASsmiJahphdrI1hPWPLOTLcQWrnK6Pa6Pw9 k9B9kHTVLpVl9V/N3Bm/bCJmYX0qjxizqTDd/zXRpdoVfl18XdODatfiTfQaeXm08KszNAugLV0X qoy0R/nMnI/0nedQPMkWnARwcmW3RwVIDSv7NdQ7gEsgRyYRH17cIH1LVFKvCGnNO8/4JsuFFzRV 1wFOfcUBpQ08oxXvK/8RTpryCaKZfvMI2uVNCRPjCYV6kd8E35CAoJZi/tktwZOvUjxKWXLxqp1m 5zyXAJn+rW4Me0flXUYPNrrvjqZLALR8dS5cpYHDWNWEIA5W1ddf0hQt/phpsY0RpELKldww0AxM hlB7M2bjzMnvvHsiPTb8GsrMFZWDUgORV/u7GN/X1+s/mzu0cAR0PBYSYBgBrFSg== X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 23:58:05 +0800 X-OQ-MSGID: <20240622155806.3191984-3-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622155806.3191984-1-uk7b@foxmail.com> References: <20240622155806.3191984-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavc/vp8dsp: R-V V loop_filter_inner 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 Cc: sunyuechi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eN+qhNfAMfca From: sunyuechi C908 X60 vp8_loop_filter8uv_inner_v_c : 12.5 11.0 vp8_loop_filter8uv_inner_v_rvv_i32 : 7.7 6.2 vp8_loop_filter16y_inner_h_c : 11.7 10.2 vp8_loop_filter16y_inner_h_rvv_i32 : 8.5 6.5 vp8_loop_filter16y_inner_v_c : 11.5 10.7 vp8_loop_filter16y_inner_v_rvv_i32 : 5.0 3.5 --- libavcodec/riscv/vp8dsp_init.c | 5 +- libavcodec/riscv/vp8dsp_rvv.S | 104 +++++++++++++++++++++++++++++++++ 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index 8c5b2c8b04..94f78cd84b 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -154,7 +154,10 @@ av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) #define init_loop_filter(vlen) \ c->vp8_v_loop_filter_simple = ff_vp8_v_loop_filter16_simple_rvv##vlen; \ - c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_rvv##vlen; + c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_rvv##vlen; \ + c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_rvv##vlen; \ + c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_rvv##vlen; \ + c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_rvv##vlen; int flags = av_get_cpu_flags(); diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index b5f8bb31b4..ed789ec4fd 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -275,6 +275,13 @@ func ff_vp78_idct_dc_add4uv_rvv, zve64x ret endfunc +.macro filter_abs dst, diff, fI + vneg.v v8, \diff + vmax.vv \dst, v8, \diff + vmsleu.vx v8, \dst, \fI + vmand.mm v27, v27, v8 +.endm + .macro filter_fmin len, vlen, a, f1, p0f2, q0f1 vsetvlstatic16 \len, \vlen vsext.vf2 \q0f1, \a @@ -300,6 +307,16 @@ endfunc vle8.v v11, (t4) vle8.v v17, (t1) vle8.v v22, (\dst) + .if \normal + sub t3, t2, a6 + sub t0, t1, a6 + add t6, \dst, a6 + add a7, t4, a6 + vle8.v v2, (t3) + vle8.v v15, (t0) + vle8.v v10, (t6) + vle8.v v14, (a7) + .endif .else addi t1, \dst, -1 addi a6, \dst, -2 @@ -308,9 +325,27 @@ endfunc vlse8.v v11, (t4), \stride vlse8.v v17, (t1), \stride vlse8.v v22, (\dst), \stride + .if \normal + addi t5, \dst, -4 + addi t0, \dst, -3 + addi t6, \dst, 2 + addi a7, \dst, 3 + vlse8.v v2, (t5), \stride + vlse8.v v15, (t0), \stride + vlse8.v v10, (t6), \stride + vlse8.v v14, (a7), \stride + .endif .endif vwsubu.vv v12, v1, v11 // p1-q1 vwsubu.vv v24, v22, v17 // q0-p0 +.if \normal + vwsubu.vv v30, v1, v17 + vwsubu.vv v20, v11, v22 + vwsubu.vv v28, v1, v15 + vwsubu.vv v4, v2, v15 + vwsubu.vv v6, v10, v11 + vwsubu.vv v2, v14, v10 +.endif vnclip.wi v23, v12, 0 vsetvlstatic16 \len, \vlen // vp8_simple_limit(dst + i, stride, flim) @@ -322,6 +357,25 @@ endfunc vsrl.vi v18, v18, 1 vmacc.vx v18, a7, v8 vmsleu.vx v0, v18, \fE +.if \normal + vneg.v v18, v30 + vmax.vv v30, v18, v30 + vmsleu.vx v27, v30, \fI + filter_abs v18, v28, \fI + filter_abs v18, v4, \fI + filter_abs v18, v6, \fI + filter_abs v18, v2, \fI + filter_abs v20, v20, \fI + vmand.mm v27, v0, v27 // vp8_simple_limit && normal + + vmsgtu.vx v20, v20, \thresh // hev + vmsgtu.vx v3, v30, \thresh + vmor.mm v3, v3, v20 // v3 = hev: > thresh + vzext.vf2 v18, v1 // v18 = p1 + vmand.mm v0, v27, v3 // v0 = normal && hev + vzext.vf2 v20, v11 // v12 = q1 + vmnot.m v3, v3 // v3 = !hv +.endif li t5, 3 li a7, 124 @@ -346,6 +400,37 @@ endfunc vsse8.v v6, (\dst), \stride, v0.t .endif +.if \normal + vmand.mm v0, v27, v3 // vp8_normal_limit & !hv + + .if \inner + vnclip.wi v30, v30, 0 + filter_fmin \len, \vlen, v30, v24, v4, v6 + vadd.vi v24, v24, 1 + vsra.vi v24, v24, 1 // (f1 + 1) >> 1; + vadd.vv v8, v18, v24 + vsub.vv v10, v20, v24 + .endif + + vmax.vx v8, v8, zero + vmax.vx v10, v10, zero + vsetvlstatic8 \len, \vlen + vnclipu.wi v4, v4, 0 + vnclipu.wi v5, v6, 0 + vnclipu.wi v6, v8, 0 + vnclipu.wi v7, v10, 0 + .ifc \type,v + vse8.v v4, (t1), v0.t + vse8.v v5, (\dst), v0.t + vse8.v v6, (t2), v0.t + vse8.v v7, (t4), v0.t + .else + vsse8.v v4, (t1), \stride, v0.t + vsse8.v v5, (\dst), \stride, v0.t + vsse8.v v6, (a6), \stride, v0.t + vsse8.v v7, (t4), \stride, v0.t + .endif +.endif .endm .irp vlen,256,128 @@ -360,6 +445,25 @@ func ff_vp8_h_loop_filter16_simple_rvv\vlen, zve32x filter 16, \vlen, h, 0, 0, a0, a1, a2, a3, a4 ret endfunc + +func ff_vp8_h_loop_filter16_inner_rvv\vlen, zve32x + vsetvlstatic8 16, \vlen + filter 16, \vlen, h, 1, 1, a0, a1, a2, a3, a4 + ret +endfunc + +func ff_vp8_v_loop_filter16_inner_rvv\vlen, zve32x + vsetvlstatic8 16, \vlen + filter 16, \vlen, v, 1, 1, a0, a1, a2, a3, a4 + ret +endfunc + +func ff_vp8_v_loop_filter8uv_inner_rvv\vlen, zve32x + vsetvlstatic8 8, \vlen + filter 8, \vlen, v, 1, 1, a0, a2, a3, a4, a5 + filter 8, \vlen, v, 1, 1, a1, a2, a3, a4, a5 + ret +endfunc .endr .macro bilin_load_h dst mn From patchwork Sat Jun 22 15:58:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: uk7b@foxmail.com X-Patchwork-Id: 50084 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:ae71:0:b0:482:c625:d099 with SMTP id w17csp1137731vqz; Sat, 22 Jun 2024 08:58:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXIyz+C4DVqco6WUKgpU9oUYXvxFGrDO73fbmxypXtyUf+xI4tlNQju5Z55fqkAkRSPR/WZCyjMzom9dva/hc+i1m/66RFCYKHL/Q== X-Google-Smtp-Source: AGHT+IHNbPv13hsglZ4iH1CJm+50i2V8TBxauPAcZ/LDmgLDX96CQezUIbPx/d39L5Q4vnVsJ7CE X-Received: by 2002:a17:906:5957:b0:a6f:dffc:54b6 with SMTP id a640c23a62f3a-a7242e142d8mr39550966b.73.1719071915937; Sat, 22 Jun 2024 08:58:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719071915; cv=none; d=google.com; s=arc-20160816; b=Urc1gXtlLfwTVto56TJkmoacYY5M437ophp+UcfwF1yj9U8fP1tJhG8rrI58zL7XNc raB9ONqYG/bCt9YLPEijYJBAPUQhk8mj8F2WyZRT1bDuCQDDRGgvgdfT/O7EKFEcFslJ X4ZitBtY4t86w5PMQxg2QPnthWsAmp/wR1g4f0LCnxI1XnUnbQDAbOstkzsNKDwdG2LX +ONnquI0po2jruLAg7IRGRK6hQqNklX1+iFUYI2rfCuKmVR8smPqJyK12gEHirChmpdS byDYrGiWXo3chqiNnpaVLok0ADR2vRQaaJY77I5IsPAr7BVIvJZU4xKhOe1XNlMD+S4A uiqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=YklpZcwOUkIRa5kAZWZ4bawquj8CeHwcsOKRnmv3ei0=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=PcaQkAmUwlM4lq0AZwtbdsK0RXPZgSZRx/vyHcXBqDoNGFgJlCrGaPqsztcvXOcbka 91CnsU0SEGsKn4FRAEI0iQZEIGW4lI2fwnHGt1yoKEfg4Ekk6wXQ1ozYDkmNcBEw+GhC a9opsQjcpra0C7++GoJJR8bNxUqTPyuHFdqP3GN7F0ROqN1ONc2n0kfMGPfvpBMBTNAz FHyk89QkCT/2T3TkPuHPrqqWDSb5yJ79eLevQFIXBsmPSpiBeIM3iieCBcylC/C91osw YJDqdBr3c8RZRpayo2cNfniV8C+SGNPplkHvgq2FeINhx3uhVHCeUGGnlBJgwvp+29MD 7AOQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=LsjpPgG3; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6fcf5953f7si196190766b.890.2024.06.22.08.58.35; Sat, 22 Jun 2024 08:58:35 -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; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=LsjpPgG3; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A96B68D406; Sat, 22 Jun 2024 18:58:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CA74568D128 for ; Sat, 22 Jun 2024 18:58:22 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719071894; bh=AVJeVJHkXdfbFIdqYlxmSDctI++1FXd0dwd70TifB3U=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LsjpPgG3FNvD607cOHAKoNldOaJysPdh3piLnp7i/M+cOr5ohPyL6Vmdjrikanuw+ pQK+s3844CNVnmgi2c8MbbwA0CIhThHwRxdVKNk4Yye2ccdk7YkOVUnnU48PSY2NQe +EBDoUo2x169KovwVusgTRnU5+IStJFc1zVLAdo4= Received: from localhost.localdomain ([116.139.97.96]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id E8A868C7; Sat, 22 Jun 2024 23:58:10 +0800 X-QQ-mid: xmsmtpt1719071893trg7hmy9c Message-ID: X-QQ-XMAILINFO: NhpLzBn2I3Xwy8hCfkUzzj5jKtoinMIxIT90bbZYZLsZ8Cry9io+9XI4QXQxJR b42GbLOSOX0viIPdRrJZ1KXi+TYFxoQiA2oBiPepl6iGmFX3Rwt5hVRJtUzNEQpJdFZ3bIMHMdAK n+S0HcIDRO8/N88UjN5bPmvPyGFeji0h2f8qR42mqaKFIElWEkeKuzB7xOje/4ja3iRNO5vyHx2q tCvqPdks1NvO2leiCI76kkFLv1ncppUgiZQUv+bhzEDy46rV/8ujL8vF5AI3Rk3Et9LVr2pjJrST tcGgObFeDfafj8zvIkiRMYML4OaCAipr89xU4Feli3o24zJFfa3ychG5u6XUfo05m6GSmcP8uAeY 1UUU6wxDbT1OVRPh5oBkbVdv9dHuS5pfLDR4EMcLQ4IDXSrSxJIT3ADxEpLFyUZczCykQovh7Xxe TISRZw2+H3K1zQ0IfwhUX00SGlv2asbKPr19j8ftk4uQ8r2y+CFBrHztw7xTjgWxLtTLxJOce/3N e5JmxeMYvfheO9alzX4zxnJ6Csg+2lVMUAKkI/8aNW4GO37wSLm4u+ut3/LU7G2edwg5K4QFWN9E ngFgbQXdpaZSlzxE0U8VqNEoV8OnV933WoWGFv98h8dKOdM6S65G7jtuF5wdH+K1vm4E35yp9o8+ 9rN6Xbxq7//EXXRob2Ir9C1bnyscojHUM24WOG1Spx9BMLV1ntyX1JceKC+87Vk6XQVlQ9V82xdX WX2R+uuSVhhmcldpwg430RXqL23OSrW8awYcX3uZM3GG0ewpCH5nCgf4V996a3WjxCGZJIhfb/N3 ih8DrZmErRzcYS+9eIPpQcYQkwq0L/YzIbG06A8KMB25x799YkGmqlgI1QH0AMcH+MxXHlksJXA/ LzdEZDOKE6r2eKFo4tCI6SuLhSqvIUmCsy1f716YdX X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Jun 2024 23:58:06 +0800 X-OQ-MSGID: <20240622155806.3191984-4-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240622155806.3191984-1-uk7b@foxmail.com> References: <20240622155806.3191984-1-uk7b@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavc/vp8dsp: R-V V loop_filter 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 Cc: sunyuechi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 0wnF9nW3ZfpR From: sunyuechi C908 X60 vp8_loop_filter8uv_v_c : 13.7 11.7 vp8_loop_filter8uv_v_rvv_i32 : 7.7 6.2 vp8_loop_filter16y_h_c : 12.2 11.2 vp8_loop_filter16y_h_rvv_i32 : 9.5 7.2 vp8_loop_filter16y_v_c : 13.2 12.0 vp8_loop_filter16y_v_rvv_i32 : 5.5 3.7 --- libavcodec/riscv/vp8dsp_init.c | 5 ++- libavcodec/riscv/vp8dsp_rvv.S | 57 ++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/libavcodec/riscv/vp8dsp_init.c b/libavcodec/riscv/vp8dsp_init.c index 94f78cd84b..72191f558b 100644 --- a/libavcodec/riscv/vp8dsp_init.c +++ b/libavcodec/riscv/vp8dsp_init.c @@ -157,7 +157,10 @@ av_cold void ff_vp8dsp_init_riscv(VP8DSPContext *c) c->vp8_h_loop_filter_simple = ff_vp8_h_loop_filter16_simple_rvv##vlen; \ c->vp8_v_loop_filter16y_inner = ff_vp8_v_loop_filter16_inner_rvv##vlen; \ c->vp8_h_loop_filter16y_inner = ff_vp8_h_loop_filter16_inner_rvv##vlen; \ - c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_rvv##vlen; + c->vp8_v_loop_filter8uv_inner = ff_vp8_v_loop_filter8uv_inner_rvv##vlen; \ + c->vp8_v_loop_filter16y = ff_vp8_v_loop_filter16_rvv##vlen; \ + c->vp8_h_loop_filter16y = ff_vp8_h_loop_filter16_rvv##vlen; \ + c->vp8_v_loop_filter8uv = ff_vp8_v_loop_filter8uv_rvv##vlen; int flags = av_get_cpu_flags(); diff --git a/libavcodec/riscv/vp8dsp_rvv.S b/libavcodec/riscv/vp8dsp_rvv.S index ed789ec4fd..98ff389b9a 100644 --- a/libavcodec/riscv/vp8dsp_rvv.S +++ b/libavcodec/riscv/vp8dsp_rvv.S @@ -410,6 +410,33 @@ endfunc vsra.vi v24, v24, 1 // (f1 + 1) >> 1; vadd.vv v8, v18, v24 vsub.vv v10, v20, v24 + .else + li t5, 27 + li t3, 9 + li a7, 18 + vwmul.vx v2, v11, t5 + vwmul.vx v6, v11, t3 + vwmul.vx v4, v11, a7 + vsetvlstatic16 \len, \vlen + li a7, 63 + vzext.vf2 v14, v15 // p2 + vzext.vf2 v24, v10 // q2 + vadd.vx v2, v2, a7 + vadd.vx v4, v4, a7 + vadd.vx v6, v6, a7 + vsra.vi v2, v2, 7 // a0 + vsra.vi v12, v4, 7 // a1 + vsra.vi v6, v6, 7 // a2 + vadd.vv v14, v14, v6 // p2 + a2 + vsub.vv v22, v24, v6 // q2 - a2 + vsub.vv v10, v20, v12 // q1 - a1 + vadd.vv v4, v8, v2 // p0 + a0 + vsub.vv v6, v16, v2 // q0 - a0 + vadd.vv v8, v12, v18 // a1 + p1 + vmax.vx v4, v4, zero + vmax.vx v6, v6, zero + vmax.vx v14, v14, zero + vmax.vx v16, v22, zero .endif vmax.vx v8, v8, zero @@ -430,6 +457,17 @@ endfunc vsse8.v v6, (a6), \stride, v0.t vsse8.v v7, (t4), \stride, v0.t .endif + .if !\inner + vnclipu.wi v14, v14, 0 + vnclipu.wi v16, v16, 0 + .ifc \type,v + vse8.v v14, (t0), v0.t + vse8.v v16, (t6), v0.t + .else + vsse8.v v14, (t0), \stride, v0.t + vsse8.v v16, (t6), \stride, v0.t + .endif + .endif .endif .endm @@ -464,6 +502,25 @@ func ff_vp8_v_loop_filter8uv_inner_rvv\vlen, zve32x filter 8, \vlen, v, 1, 1, a1, a2, a3, a4, a5 ret endfunc + +func ff_vp8_v_loop_filter16_rvv\vlen, zve32x + vsetvlstatic8 16, \vlen + filter 16, \vlen, v, 1, 0, a0, a1, a2, a3, a4 + ret +endfunc + +func ff_vp8_h_loop_filter16_rvv\vlen, zve32x + vsetvlstatic8 16, \vlen + filter 16, \vlen, h, 1, 0, a0, a1, a2, a3, a4 + ret +endfunc + +func ff_vp8_v_loop_filter8uv_rvv\vlen, zve32x + vsetvlstatic8 8, \vlen + filter 8, \vlen, v, 1, 0, a0, a2, a3, a4, a5 + filter 8, \vlen, v, 1, 0, a1, a2, a3, a4, a5 + ret +endfunc .endr .macro bilin_load_h dst mn