From patchwork Tue Feb 6 15:55:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: flow gg X-Patchwork-Id: 46080 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:7b08:b0:19e:8a94:b663 with SMTP id s8csp1493131pzh; Tue, 6 Feb 2024 07:56:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHHvUaUDRMyS6ldbYKCnpMRhgwT6HCz45C3JNTHZ2GfpJpVRsOIc5P/T2R//FZSFs8Pkmzl X-Received: by 2002:a17:906:1b4f:b0:a36:fc15:d724 with SMTP id p15-20020a1709061b4f00b00a36fc15d724mr2207926ejg.18.1707234968789; Tue, 06 Feb 2024 07:56:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707234968; cv=none; d=google.com; s=arc-20160816; b=Ugra2+canJss1HLJ8bL8eKJwZjZFEAjOQ0BG9kVi9VJGycqbdOl/rXtQNP0gnTyX0B cJCrd/5TX/zip5GClc+RCpD9K8iwCopWiKRoNHFhwLlMwyJUmVw9CWWYKCtMaUNj65e+ hLN3LhEpAtAn+cliWU6ADSksJ+lS5lwks2EicKH209SaQFjhGWnGKWT0Y8WETXCuKWah qci+cd8Ry/2lC5DCQ3jw/Z72twieDmbQixPDEW8s7LgBE8nHos28Ipd9kDRo3bO8zMWE MzPb6a3PWkA2hGWtoxkOlWTM++LFE87cxODMeZBG/Rk7kabkIBgcqqARiZN4FZXsdDRy znng== 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=c1H4g9N3UwM9bq//kSvqMPZO5lVKxNGB67dr4ItAbL0=; fh=TpNHkrt+ydmexK17lv/hoyfn6c1uDDjkp4KMZbOnjv4=; b=FilRCN87r8KmhikfP5UizbUPKHwMGqixQmSzqSYkDzy+W63lz+a9O7pYJeEVf3ljC5 QaEkeRdRCVWpelLv+LjlBWEOnAPmbAvTR0S4B8egpkXrZEW51RiTbi/iAeTQ/TUaK1DJ cjsu2PsLmyxqAn6rq6Xh+tWXoQ3g6zXCBmJy7WUvNGBQfKz1Iw6Bz1mzpprmYo3PrRJ6 crwUD3xp4l09udLRaeuspieJgsdFdq8rRH9hLhHwUfL5Ga1Wlt1bvdw2YBGk+YlPZf3c Ph4Vvmf7sgsBKmQn8aUewRh80b4Iq8Juym+nD8zgXpNRlAucfrRS8b7+FX1wwsd0w+5e x+pA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=idG5ynzG; 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 X-Forwarded-Encrypted: i=0; AJvYcCXHdE3fgMtk2SqLnx6Fhf4XADH31m7mvVaJRhL+VYfdwXDw4NcFayEQtXjAl2/i+amCr2hPWm6CTXxn9DLt1DQyyaTFNIS5Sg5/Qx9k0gAW+aLWPwaYuvzkoi3iN55ppzL8jmqOHNmiAc2ZbAF4U/V7VHDeKmTXqGYm9oLHFv1pxARdRFh/Q1+t2aDeLyduyEK6+GGlFkP1dfUQh5tmDzuNbze03fZctNFGeqdEI8ifmppDHAD663FwvHDkU8iv2X7H9T0iktQARivcB0M8X9tVLQSRDwmHhK+hYM70FpwjnNE4TFZujOHNH8tfeDsuRNveSMXxA1Lh+DPOgQdtFmHEH1TThp84Mwwp5dGLoPQNeLRfLATYEYiHZAcY2MW6+PHE0LD2pCyCavfbm2ZQApSbytIKFCuooxh4kiaKPXGC0xzucaWQQxrIj2PG0W2swHl0B4FWjzLozwE+ylysTFrPmVr2Gf0AgDDq41UtzYmZkjudMgxrwLgzvbKHOMbVHuo3KaVs+63a219GC7YG2hRxPIjBnInt+88bHtwoVxNp+3ZoLX20+L25Ad/gdQJ82VW78FfVU6Bxgx/u1nfFfLNC62A9UxYjSRyFBtCgy9pfsCm3zeTNu4onNG+A2EgS3R/xz1VoTaCPba9xVh7DlP/RFqJ4UZZb+w8DjDSAH3DCfm7+1ypLfDiLB9AY+jJ28/v7/qlSPZ9+PnsEb5EbWpAChwt0NTyWtU99qTo+95pueJM8GfjfpJC8qNXrtt+7tA9BocJ/HFSu6lVHU0KeR3oaLdGYoDPRyDq8+iaK91E8iMer7EDqa65JI/GXsvCoTSvuVSRlH5lNp8KTHl3MIZjQsGRTgbFOBIkbaSSVFqM+gSR3fATJmHK7U/34E44COaDa2UPD6+K6NfkQxkkMF16AMLtg41JYewVIHz1+whaH2VIOgy/N8zJXO2GrvnOJOOL97n sy9MH18aHb6VXi2mjMW12Bnzdxf6hkT7oaQWqd6b5g3PuWQGt9R3Ci9PRzdRRbJ4lW6U+yX/8nPhqpW6pqJ5DDuNhiK02unbMw/JOpXjtR7GyhNnW5dIvrK5LNe5N2XZlisOD3i4m89dV8WY58dH1QKKrjzn3W+nEjwDJQfJ3BORpLawJT/hBcR9/mooVJ41drF/kr1G4KuB2zM7OUksnYrs8a+JRj3zgtqkYP1o/dTsl7juMIrkLmzSeo44V1SX0pQ/qG+pmtBWXeMvmsqDOVR7FX/H5Yr9AgH0cxwIMON0Ls68d9gNcB3IevB4j654aAIYkF2mdxIuqVSGSY6I+WL+MMZlEmtkc/Ng9ukHZTvzpt8/ha51VqV1YfkhuzueNZ9bkud1k92Lrsb2fY85eCJin/HOJbUM1bxni0VVNlmcgTryaBkGiTLKEKUu047QVZlpKDqRaMAfliaNy2d2lljVZNfnzQEqmp0beMgATgs2CGSvIbdrt4gOaNdwHYzSoXKsTAguPUT1Mwzj2GD6cQNY1nnl4zBKv7uS9DC/3POq8A7gzIdoucXlOF/uha2Tr4gS1sa/acImuiJrxgAM+VQXGm3M6H845LZM0LeJBJ8VIp3UNWt5/oEiiksbHgQPBr Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bq23-20020a170906d0d700b00a3828bc6d74si819400ejb.572.2024.02.06.07.56.08; Tue, 06 Feb 2024 07:56:08 -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=idG5ynzG; 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 3FF3468CC2B; Tue, 6 Feb 2024 17:56:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 41B2968CC2B for ; Tue, 6 Feb 2024 17:56:00 +0200 (EET) Received: by mail-qv1-f43.google.com with SMTP id 6a1803df08f44-68c4fb9e7ccso24210076d6.3 for ; Tue, 06 Feb 2024 07:56:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707234959; x=1707839759; darn=ffmpeg.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=b+rw21ypWQUAzsenZRkm4mQGDTu4Z47CuaACXni92IM=; b=idG5ynzGW5StXj/fQOAgOY1mMfCNomFTOHH1EYfiYm1YGU5oMruf92kS9FJRhHLJMs Ml9QaPVkNV78ombiX019ba4eIXJZdgMbztlyZvwuvB8DQETM8iUqtcTb2whxiH9B3e01 vhcA6CPwuK6AgYnCQrZo5suTCmaSbK/Py0h44SzifUdDtR423alyKl4SqEioNKOAcTOQ +qFz8YocchUvnPq8dQ4CZMxwtMG7wUaDUH5LpQyXIXtFT8LOlbpylVZ9jbWnZKFPNy+J lz+aybu4tMTVHFXMov3EEUgcjhYIwjbbZ1kLdDBN+3FVBlR5ig1eMqqSOVYBKHsNu9jd XM/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707234959; x=1707839759; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=b+rw21ypWQUAzsenZRkm4mQGDTu4Z47CuaACXni92IM=; b=Ab0zJtyKY1Jjcbjld0CMNldX7ryT16StikyerGZHAF1A8SfKTi7ICrSUBmtOXDemTq CtP8X/ppsephFZS9tsqI54HP4mFLhzfVQpnYDY5AXGaIpMvmbWP90sD7kYHQrw/GqzGN tHel77UU+CWU01F2h4377slrG991wSRr2ZGD4O8Tyr+nrcc45Rl6cudUHnmRnXQDO/JH EE70hvK2FUBqO3/O3AMHE0d1fdinxrx+2Jz55iEauO3shORt6uWRwbiA8xW5vi5whFK0 r0FD9QIvAFT1R5C49d3c7aGPIq/sG5L50F1Yn3WE2UDPsudK3ddj7L4R73KEFm5E2DO1 lU1A== X-Gm-Message-State: AOJu0YxvDflQrmRpfchrmfviRdETSd+tKVhGqLaXWbTW5Iou4tTYz/Zp mz9ar/ldfJ381eyC3Hu3Y8sRB4FjwmaksXIXDTnZELCcI0bIl0NTovPFfKwcHuysOKtaZRudpvd YFnGY3QccCfZYJtHzqJMu3dNy3J4stGDz X-Received: by 2002:a05:6214:f01:b0:68c:a6ad:10cc with SMTP id gw1-20020a0562140f0100b0068ca6ad10ccmr4035885qvb.41.1707234958808; Tue, 06 Feb 2024 07:55:58 -0800 (PST) MIME-Version: 1.0 From: flow gg Date: Tue, 6 Feb 2024 23:55:47 +0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [FFmpeg-devel] [PATCH 2/7] lavc/me_cmp: R-V V pix_abs_x2 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: tNBy+GfrG1Ny From ea0cf15e43c9a3e1b56c1a43d50f0701d42c7e9f Mon Sep 17 00:00:00 2001 From: sunyuechi Date: Tue, 6 Feb 2024 21:41:35 +0800 Subject: [PATCH 2/7] lavc/me_cmp: R-V V pix_abs_x2 C908: pix_abs_0_1_c: 767.0 pix_abs_0_1_rvv_i32: 196.2 pix_abs_1_1_c: 388.0 pix_abs_1_1_rvv_i32: 185.2 --- libavcodec/riscv/me_cmp_init.c | 6 ++++ libavcodec/riscv/me_cmp_rvv.S | 50 ++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/libavcodec/riscv/me_cmp_init.c b/libavcodec/riscv/me_cmp_init.c index 9228f74cfd..e46fb09c11 100644 --- a/libavcodec/riscv/me_cmp_init.c +++ b/libavcodec/riscv/me_cmp_init.c @@ -30,6 +30,10 @@ int ff_pix_abs16_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2 ptrdiff_t stride, int h); int ff_pix_abs8_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int ff_pix_abs16_x2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); +int ff_pix_abs8_x2_rvv(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) { @@ -41,6 +45,8 @@ av_cold void ff_me_cmp_init_riscv(MECmpContext *c, AVCodecContext *avctx) c->sad[0] = ff_pix_abs16_rvv; c->pix_abs[1][0] = ff_pix_abs8_rvv; c->sad[1] = ff_pix_abs8_rvv; + c->pix_abs[0][1] = ff_pix_abs16_x2_rvv; + c->pix_abs[1][1] = ff_pix_abs8_x2_rvv; } #endif } diff --git a/libavcodec/riscv/me_cmp_rvv.S b/libavcodec/riscv/me_cmp_rvv.S index 8dadf39bc7..cc60219466 100644 --- a/libavcodec/riscv/me_cmp_rvv.S +++ b/libavcodec/riscv/me_cmp_rvv.S @@ -65,3 +65,53 @@ func ff_pix_abs8_rvv, zve32x pix_abs_ret endfunc + +func ff_pix_abs16_x2_rvv, zve32x + csrwi vxrm, 0 + vsetivli zero, 1, e32, m1, ta, ma + li t5, 1 + vmv.s.x v0, zero +1: + vsetivli zero, 17, e8, m2, tu, ma + vle8.v v12, (a2) + addi a4, a4, -1 + vslide1down.vx v24, v12, t5 + vsetivli zero, 16, e8, m1, tu, ma + vle8.v v4, (a1) + vaaddu.vv v12, v12, v24 + vwsubu.vv v16, v4, v12 + add a1, a1, a3 + vwsubu.vv v20, v12, v4 + vsetvli zero, zero, e16, m2, tu, ma + vmax.vv v16, v16, v20 + add a2, a2, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc + +func ff_pix_abs8_x2_rvv, zve32x + csrwi vxrm, 0 + vsetivli zero, 1, e32, m1, ta, ma + li t5, 1 + vmv.s.x v0, zero +1: + vsetivli zero, 9, e8, m1, tu, ma + vle8.v v12, (a2) + addi a4, a4, -1 + vslide1down.vx v24, v12, t5 + vsetivli zero, 8, e8, mf2, tu, ma + vle8.v v4, (a1) + vaaddu.vv v12, v12, v24 + vwsubu.vv v16, v4, v12 + add a1, a1, a3 + vwsubu.vv v20, v12, v4 + vsetvli zero, zero, e16, m1, tu, ma + vmax.vv v16, v16, v20 + add a2, a2, a3 + vwredsum.vs v0, v16, v0 + bnez a4, 1b + + pix_abs_ret +endfunc -- 2.43.0