From patchwork Mon Jul 1 13:39:31 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: 50254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1803956vqv; Mon, 1 Jul 2024 06:40:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUWQy2SSox17Gb6rKGdADzawJbmtXTTeAz98z2Q4Mai6fGwLhok1hXpC6kbOf8GgIO7hyDSbFGMlmSLdZH3zGUGW3xfPhkz6xeGsg== X-Google-Smtp-Source: AGHT+IELPHMqoW6v703bOx1K7dCY22lO2XSgWy03uSjon9/1Wg2etZq7ACpGl/qadbJ4AT6e4ZWN X-Received: by 2002:a50:d518:0:b0:57d:432a:582f with SMTP id 4fb4d7f45d1cf-588e4fdf8a4mr2697998a12.1.1719841199940; Mon, 01 Jul 2024 06:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719841199; cv=none; d=google.com; s=arc-20160816; b=GJyZ+5JbpQI2rbrtzS7UDYIIE2pvd/3c4K3IG1xCSsh+juVz1FLfAiREBYRXrHw1mQ sgT3uYpc8FHTJYskuonFflkq2xHXBqT/d5K5JCHKN8yZiSINtC0oNsTOTUctJzYPhqaP Ye1xTmaywBIbqhqUldh58nck4C0PAS7lzUsUP2aDhl5HUlFuE9oZiBK0g2/L6/BlommZ sQ363WkOo7cPnde08XCcwO35MtVwu5lrpYpj/XFgF3AVY8yfOI7pi2MlV3SpAy/GoU8J FosQqHJ1ns2PhVrFNTls1+zmyo+BQy/NRPTDLGiesxXruD2YbM0CNhlc+e8KzugdkS1v QQYg== 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=Q3/KEvR+w+62dYTX4RxVBIZGG6nwLqgCUrF3VF+7HZY=; fh=D0bFwGkf4X22/D/bfeDVrXKIx7S6kcXsNzy10j8ORbQ=; b=hT7zz169yersXLlStOrNQ1Uo889HM4pGqdg5CCEwi7z0LlkLS9CCBg3Fc/E7MovQYI khemOf2CGwlEyQEeIp1MPArjiQAhS5e24q9yY1ppJx+UL1gLTyUWKNRxQQ9D7+gCk7n9 zsYOQbnyd0rRmm9Zeh8Pxg2cnMmMNn/yG9PyUHiQVGlNDduGkgPirZLGPwvhNRoaFX7x Ejd1g0IcYq/nIA4QueKrKiCBVYb+wpDn83riISKpaS7sUVzuAtX/BET/7KnCXp+GSUKb yqWiyAkTTzwwJk/3DLzIzSJP1mS7MOvDCRHXWAfVx9w7OEU8EMqRBcy3O0c2ztgw2lYt Ncpg==; 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=VLCrfTyK; 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-586150337a1si3934604a12.313.2024.07.01.06.39.59; Mon, 01 Jul 2024 06:39:59 -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=VLCrfTyK; 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 1929568D7AA; Mon, 1 Jul 2024 16:39:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E507B68D7AA for ; Mon, 1 Jul 2024 16:39:46 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1719841176; bh=MFnzmieT8iD3SGoMCog+EkVKI068Nspxbv527WaqpYE=; h=From:To:Cc:Subject:Date; b=VLCrfTyKYApQKTomgiMSALVmBXu0RbUtmGRMQX+RoogdNna3H01/r6XemfTRl/Nv5 VNcNHApXOkYodicwpL7eC51s/x70LjKvlh3C5S0b89BFKv0crRjK73GbwvTVpZAvzw DPq1AjHgt5Gw8XloJfp2668WwzkkC3oF+O6kqLsg= Received: from localhost.localdomain ([113.231.71.69]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 9E2920F8; Mon, 01 Jul 2024 21:39:34 +0800 X-QQ-mid: xmsmtpt1719841174tjeji3lae Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uT+FxWOUm0LKjHa7CXcb7Xi5FadU+c0GDQKNPjq0T12ANOoq0fP2 5XcX5nlBbodCDJZcEeHISytzwFv3mLXjLvyMI2Scryh8L7kL7A/s625zFtGvlVHnbqBZ0ZlQu37l HEQ9H1eZvuHuQ7M1gi+I/XnkzVxqco7uxhu9J0L7ebI2byj2pyLDkmJFiJFASxjOdVIhWUr/X7R8 2COyOFzT4HR8Poq8uHkeggY1xwgsRVeGuabIcAwYwvGN8aGtDCgqh0Cqy7m7B+8kcZr1tfkIpNeb EQSDyR1eP5XrXsMDR3G3NuTellR8EDdDe7LIkdJrhfAIvfnPy1mfIk7eOIbC29bm1GGHEpi73bv4 2IpaRO8Czw32cH83LKEtv7sXt7hfAQlS2yVOLbrLD6WIb2qmH6cuqdzD8oDYKFWXMyfqJfwbKCrK DmoEYyu+9jkmdeDUJxRq1GNhnLCOKmA6oHYEJ1+JX6Eqw5cWRH12iy2NqogaFFysCesLWACmyaSK Svm7heSeQRN53olfUv3T/ZuHmIbeM4+/xMnELGgG2zFY4qvmZw5M0r5oFmJDpNeflcNhySfJEKui n6NlFMB+syRwpNgQpsWbJJc/Z1cZI+blk2/+geTfz80hB5Vjf/FboWKobNvBHd/WcnISG/0+Sx2W 3zKp0pkejgZ+FzF8mIjF/aqL7jQh4fWrOivfFjnNF+m+Ri9hp+9ZrhQP8TCM5eKOmXWWSh7dxxhQ Ib2fqbOXIP91TtdvkTXWLQQ9WAwpTIE8waEYM7mMVfGfxbH3f4DV+SMrGTXwHf/oyzqvLhk50aJ+ UQiQim++jBZAq5Fo3Q0h/UAyjuF6cDSKj5UOnpKUVFiHOnFroVDBKp+WFP9/PGYj/w1I+LALns1z 2oxC8WuCO2lbgPdxiEpjswLp/WKK/poWQ7uSUOzm9N X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: uk7b@foxmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 1 Jul 2024 21:39:31 +0800 X-OQ-MSGID: <20240701133931.565023-1-uk7b@foxmail.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5] lavc/vvc_mc: R-V V avg w_avg 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: IPf7GvuQfyyO From: sunyuechi C908 X60 avg_8_2x2_c : 1.2 1.0 avg_8_2x2_rvv_i32 : 1.0 1.0 avg_8_2x4_c : 2.0 2.0 avg_8_2x4_rvv_i32 : 1.5 1.2 avg_8_2x8_c : 3.7 4.0 avg_8_2x8_rvv_i32 : 2.0 2.0 avg_8_2x16_c : 7.2 7.7 avg_8_2x16_rvv_i32 : 3.2 3.0 avg_8_2x32_c : 14.5 15.2 avg_8_2x32_rvv_i32 : 5.7 5.0 avg_8_2x64_c : 50.0 45.2 avg_8_2x64_rvv_i32 : 41.5 32.5 avg_8_2x128_c : 101.5 84.2 avg_8_2x128_rvv_i32 : 89.5 73.2 avg_8_4x2_c : 2.0 2.0 avg_8_4x2_rvv_i32 : 1.0 1.0 avg_8_4x4_c : 3.5 3.5 avg_8_4x4_rvv_i32 : 1.5 1.2 avg_8_4x8_c : 6.7 7.0 avg_8_4x8_rvv_i32 : 2.0 1.7 avg_8_4x16_c : 13.2 14.0 avg_8_4x16_rvv_i32 : 3.2 3.0 avg_8_4x32_c : 26.2 27.7 avg_8_4x32_rvv_i32 : 5.7 5.0 avg_8_4x64_c : 75.0 66.0 avg_8_4x64_rvv_i32 : 40.2 33.0 avg_8_4x128_c : 144.5 128.0 avg_8_4x128_rvv_i32 : 89.5 78.7 avg_8_8x2_c : 3.2 3.5 avg_8_8x2_rvv_i32 : 1.2 1.0 avg_8_8x4_c : 6.5 6.7 avg_8_8x4_rvv_i32 : 1.5 1.5 avg_8_8x8_c : 12.7 13.2 avg_8_8x8_rvv_i32 : 2.2 1.7 avg_8_8x16_c : 25.2 26.5 avg_8_8x16_rvv_i32 : 3.7 2.7 avg_8_8x32_c : 50.2 52.7 avg_8_8x32_rvv_i32 : 6.5 5.0 avg_8_8x64_c : 120.2 117.7 avg_8_8x64_rvv_i32 : 45.2 39.2 avg_8_8x128_c : 223.0 233.5 avg_8_8x128_rvv_i32 : 80.0 73.2 avg_8_16x2_c : 6.2 6.5 avg_8_16x2_rvv_i32 : 1.5 1.0 avg_8_16x4_c : 12.5 12.7 avg_8_16x4_rvv_i32 : 2.0 1.2 avg_8_16x8_c : 24.7 26.0 avg_8_16x8_rvv_i32 : 3.2 2.0 avg_8_16x16_c : 49.0 51.2 avg_8_16x16_rvv_i32 : 5.7 3.2 avg_8_16x32_c : 97.7 102.5 avg_8_16x32_rvv_i32 : 10.7 5.7 avg_8_16x64_c : 220.5 214.2 avg_8_16x64_rvv_i32 : 48.2 39.5 avg_8_16x128_c : 436.2 428.0 avg_8_16x128_rvv_i32 : 97.2 77.0 avg_8_32x2_c : 12.2 12.7 avg_8_32x2_rvv_i32 : 2.0 1.2 avg_8_32x4_c : 24.5 25.5 avg_8_32x4_rvv_i32 : 3.2 1.7 avg_8_32x8_c : 48.5 50.7 avg_8_32x8_rvv_i32 : 5.7 2.7 avg_8_32x16_c : 96.5 101.2 avg_8_32x16_rvv_i32 : 10.2 5.0 avg_8_32x32_c : 192.5 202.2 avg_8_32x32_rvv_i32 : 20.0 9.5 avg_8_32x64_c : 405.7 404.5 avg_8_32x64_rvv_i32 : 72.5 40.2 avg_8_32x128_c : 821.0 832.2 avg_8_32x128_rvv_i32 : 136.2 75.7 avg_8_64x2_c : 24.0 25.2 avg_8_64x2_rvv_i32 : 3.2 1.7 avg_8_64x4_c : 48.5 51.0 avg_8_64x4_rvv_i32 : 5.5 2.7 avg_8_64x8_c : 97.0 101.5 avg_8_64x8_rvv_i32 : 10.2 5.0 avg_8_64x16_c : 193.5 202.7 avg_8_64x16_rvv_i32 : 19.2 9.2 avg_8_64x32_c : 404.2 405.7 avg_8_64x32_rvv_i32 : 38.0 17.7 avg_8_64x64_c : 834.0 840.7 avg_8_64x64_rvv_i32 : 75.0 36.2 avg_8_64x128_c : 1667.2 1685.7 avg_8_64x128_rvv_i32 : 336.0 181.5 avg_8_128x2_c : 49.0 50.7 avg_8_128x2_rvv_i32 : 5.2 2.7 avg_8_128x4_c : 96.7 101.0 avg_8_128x4_rvv_i32 : 9.7 4.7 avg_8_128x8_c : 193.0 201.7 avg_8_128x8_rvv_i32 : 19.0 8.5 avg_8_128x16_c : 386.2 402.7 avg_8_128x16_rvv_i32 : 37.2 79.0 avg_8_128x32_c : 789.2 805.0 avg_8_128x32_rvv_i32 : 73.5 32.7 avg_8_128x64_c : 1620.5 1651.2 avg_8_128x64_rvv_i32 : 185.2 69.7 avg_8_128x128_c : 3203.0 3236.7 avg_8_128x128_rvv_i32 : 457.2 280.5 w_avg_8_2x2_c : 1.5 1.5 w_avg_8_2x2_rvv_i32 : 1.7 1.5 w_avg_8_2x4_c : 2.7 2.7 w_avg_8_2x4_rvv_i32 : 2.7 2.5 w_avg_8_2x8_c : 5.0 4.7 w_avg_8_2x8_rvv_i32 : 4.5 4.0 w_avg_8_2x16_c : 9.7 9.5 w_avg_8_2x16_rvv_i32 : 8.0 7.0 w_avg_8_2x32_c : 18.7 18.5 w_avg_8_2x32_rvv_i32 : 15.0 13.2 w_avg_8_2x64_c : 57.7 49.0 w_avg_8_2x64_rvv_i32 : 42.7 35.2 w_avg_8_2x128_c : 127.5 94.5 w_avg_8_2x128_rvv_i32 : 99.2 78.2 w_avg_8_4x2_c : 2.5 2.5 w_avg_8_4x2_rvv_i32 : 2.0 1.7 w_avg_8_4x4_c : 4.7 4.5 w_avg_8_4x4_rvv_i32 : 2.7 2.2 w_avg_8_4x8_c : 9.0 9.0 w_avg_8_4x8_rvv_i32 : 4.5 4.0 w_avg_8_4x16_c : 17.7 17.7 w_avg_8_4x16_rvv_i32 : 8.0 7.0 w_avg_8_4x32_c : 35.0 35.0 w_avg_8_4x32_rvv_i32 : 32.7 13.2 w_avg_8_4x64_c : 117.5 79.5 w_avg_8_4x64_rvv_i32 : 47.2 39.0 w_avg_8_4x128_c : 235.7 159.0 w_avg_8_4x128_rvv_i32 : 101.0 80.0 w_avg_8_8x2_c : 4.5 4.5 w_avg_8_8x2_rvv_i32 : 1.7 1.7 w_avg_8_8x4_c : 8.7 8.7 w_avg_8_8x4_rvv_i32 : 2.7 2.5 w_avg_8_8x8_c : 17.2 17.0 w_avg_8_8x8_rvv_i32 : 4.7 4.0 w_avg_8_8x16_c : 34.0 34.2 w_avg_8_8x16_rvv_i32 : 8.5 7.0 w_avg_8_8x32_c : 67.5 67.7 w_avg_8_8x32_rvv_i32 : 16.0 13.2 w_avg_8_8x64_c : 184.0 147.7 w_avg_8_8x64_rvv_i32 : 53.7 35.0 w_avg_8_8x128_c : 350.0 320.5 w_avg_8_8x128_rvv_i32 : 98.5 74.7 w_avg_8_16x2_c : 8.7 8.5 w_avg_8_16x2_rvv_i32 : 2.5 1.7 w_avg_8_16x4_c : 17.0 17.0 w_avg_8_16x4_rvv_i32 : 3.7 2.5 w_avg_8_16x8_c : 49.7 33.5 w_avg_8_16x8_rvv_i32 : 6.5 4.2 w_avg_8_16x16_c : 66.5 66.5 w_avg_8_16x16_rvv_i32 : 12.2 7.5 w_avg_8_16x32_c : 132.2 134.0 w_avg_8_16x32_rvv_i32 : 23.2 14.2 w_avg_8_16x64_c : 298.2 283.5 w_avg_8_16x64_rvv_i32 : 65.7 40.2 w_avg_8_16x128_c : 755.5 593.2 w_avg_8_16x128_rvv_i32 : 132.0 76.0 w_avg_8_32x2_c : 16.7 16.7 w_avg_8_32x2_rvv_i32 : 3.5 2.0 w_avg_8_32x4_c : 33.2 33.2 w_avg_8_32x4_rvv_i32 : 6.0 3.2 w_avg_8_32x8_c : 65.7 66.0 w_avg_8_32x8_rvv_i32 : 11.2 6.5 w_avg_8_32x16_c : 148.2 132.0 w_avg_8_32x16_rvv_i32 : 21.5 10.7 w_avg_8_32x32_c : 266.2 267.0 w_avg_8_32x32_rvv_i32 : 60.7 20.7 w_avg_8_32x64_c : 683.5 559.7 w_avg_8_32x64_rvv_i32 : 83.7 65.0 w_avg_8_32x128_c : 1169.5 1140.2 w_avg_8_32x128_rvv_i32 : 191.2 96.7 w_avg_8_64x2_c : 33.0 33.2 w_avg_8_64x2_rvv_i32 : 6.0 3.2 w_avg_8_64x4_c : 65.5 65.7 w_avg_8_64x4_rvv_i32 : 11.2 5.2 w_avg_8_64x8_c : 149.7 132.0 w_avg_8_64x8_rvv_i32 : 21.7 9.7 w_avg_8_64x16_c : 279.2 262.7 w_avg_8_64x16_rvv_i32 : 42.2 18.5 w_avg_8_64x32_c : 538.7 542.2 w_avg_8_64x32_rvv_i32 : 83.7 36.5 w_avg_8_64x64_c : 1200.2 1074.2 w_avg_8_64x64_rvv_i32 : 204.5 73.7 w_avg_8_64x128_c : 2375.7 2482.0 w_avg_8_64x128_rvv_i32 : 390.5 205.2 w_avg_8_128x2_c : 66.2 66.5 w_avg_8_128x2_rvv_i32 : 11.0 5.2 w_avg_8_128x4_c : 133.2 133.2 w_avg_8_128x4_rvv_i32 : 21.7 10.0 w_avg_8_128x8_c : 303.5 268.5 w_avg_8_128x8_rvv_i32 : 42.2 18.5 w_avg_8_128x16_c : 544.0 545.5 w_avg_8_128x16_rvv_i32 : 83.5 36.5 w_avg_8_128x32_c : 1128.0 1090.7 w_avg_8_128x32_rvv_i32 : 166.5 72.2 w_avg_8_128x64_c : 2275.7 2167.5 w_avg_8_128x64_rvv_i32 : 391.7 146.7 w_avg_8_128x128_c : 4851.2 4310.5 w_avg_8_128x128_rvv_i32 : 742.0 341.2 --- libavcodec/riscv/vvc/Makefile | 2 + libavcodec/riscv/vvc/vvc_mc_rvv.S | 279 +++++++++++++++++++++++++++++ libavcodec/riscv/vvc/vvcdsp_init.c | 72 ++++++++ libavcodec/vvc/dsp.c | 4 +- libavcodec/vvc/dsp.h | 1 + 5 files changed, 357 insertions(+), 1 deletion(-) create mode 100644 libavcodec/riscv/vvc/Makefile create mode 100644 libavcodec/riscv/vvc/vvc_mc_rvv.S create mode 100644 libavcodec/riscv/vvc/vvcdsp_init.c diff --git a/libavcodec/riscv/vvc/Makefile b/libavcodec/riscv/vvc/Makefile new file mode 100644 index 0000000000..582b051579 --- /dev/null +++ b/libavcodec/riscv/vvc/Makefile @@ -0,0 +1,2 @@ +OBJS-$(CONFIG_VVC_DECODER) += riscv/vvc/vvcdsp_init.o +RVV-OBJS-$(CONFIG_VVC_DECODER) += riscv/vvc/vvc_mc_rvv.o diff --git a/libavcodec/riscv/vvc/vvc_mc_rvv.S b/libavcodec/riscv/vvc/vvc_mc_rvv.S new file mode 100644 index 0000000000..910ad6dd37 --- /dev/null +++ b/libavcodec/riscv/vvc/vvc_mc_rvv.S @@ -0,0 +1,279 @@ +/* + * Copyright (c) 2024 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" + +.macro vsetvlstatic8 w, vlen, is_w=0 + .if \w <= 2 + vsetivli zero, \w, e8, mf8, ta, ma + .elseif \w <= 4 && \vlen == 128 + vsetivli zero, \w, e8, mf4, ta, ma + .elseif \w <= 4 && \vlen >= 256 + vsetivli zero, \w, e8, mf8, ta, ma + .elseif \w <= 8 && \vlen == 128 + vsetivli zero, \w, e8, mf2, ta, ma + .elseif \w <= 8 && \vlen >= 256 + vsetivli zero, \w, e8, mf4, ta, ma + .elseif \w <= 16 && \vlen == 128 + vsetivli zero, \w, e8, m1, ta, ma + .elseif \w <= 16 && \vlen >= 256 + vsetivli zero, \w, e8, mf2, ta, ma + .elseif \w <= 32 && \vlen >= 256 + li t0, \w + vsetvli zero, t0, e8, m1, ta, ma + .elseif \w <= (\vlen / 4) || \is_w + li t0, 64 + vsetvli zero, t0, e8, m2, ta, ma + .else + li t0, \w + vsetvli zero, t0, e8, m4, ta, ma + .endif +.endm + +.macro vsetvlstatic16 w, vlen, is_w=0 + .if \w <= 2 + vsetivli zero, \w, e16, mf4, ta, ma + .elseif \w <= 4 && \vlen == 128 + vsetivli zero, \w, e16, mf2, ta, ma + .elseif \w <= 4 && \vlen >= 256 + vsetivli zero, \w, e16, mf4, ta, ma + .elseif \w <= 8 && \vlen == 128 + vsetivli zero, \w, e16, m1, ta, ma + .elseif \w <= 8 && \vlen >= 256 + vsetivli zero, \w, e16, mf2, ta, ma + .elseif \w <= 16 && \vlen == 128 + vsetivli zero, \w, e16, m2, ta, ma + .elseif \w <= 16 && \vlen >= 256 + vsetivli zero, \w, e16, m1, ta, ma + .elseif \w <= 32 && \vlen >= 256 + li t0, \w + vsetvli zero, t0, e16, m2, ta, ma + .elseif \w <= (\vlen / 4) || \is_w + li t0, 64 + vsetvli zero, t0, e16, m4, ta, ma + .else + li t0, \w + vsetvli zero, t0, e16, m8, ta, ma + .endif +.endm + +.macro vsetvlstatic32 w, vlen + .if \w <= 2 + vsetivli zero, \w, e32, mf2, ta, ma + .elseif \w <= 4 && \vlen == 128 + vsetivli zero, \w, e32, m1, ta, ma + .elseif \w <= 4 && \vlen >= 256 + vsetivli zero, \w, e32, mf2, ta, ma + .elseif \w <= 8 && \vlen == 128 + vsetivli zero, \w, e32, m2, ta, ma + .elseif \w <= 8 && \vlen >= 256 + vsetivli zero, \w, e32, m1, ta, ma + .elseif \w <= 16 && \vlen == 128 + vsetivli zero, \w, e32, m4, ta, ma + .elseif \w <= 16 && \vlen >= 256 + vsetivli zero, \w, e32, m2, ta, ma + .elseif \w <= 32 && \vlen >= 256 + li t0, \w + vsetvli zero, t0, e32, m4, ta, ma + .else + li t0, \w + vsetvli zero, t0, e32, m8, ta, ma + .endif +.endm + +.macro avg w, vlen, id +\id\w\vlen: +.if \w < 128 + vsetvlstatic16 \w, \vlen + addi t0, a2, 128*2 + addi t1, a3, 128*2 + add t2, a0, a1 + vle16.v v0, (a2) + vle16.v v8, (a3) + addi a5, a5, -2 + vle16.v v16, (t0) + vle16.v v24, (t1) + vadd.vv v8, v8, v0 + vadd.vv v24, v24, v16 + vmax.vx v8, v8, zero + vmax.vx v24, v24, zero + vsetvlstatic8 \w, \vlen + addi a2, a2, 128*4 + vnclipu.wi v8, v8, 7 + vnclipu.wi v24, v24, 7 + addi a3, a3, 128*4 + vse8.v v8, (a0) + vse8.v v24, (t2) + sh1add a0, a1, a0 +.else + addi a5, a5, -1 + mv t1, a0 + mv t2, a2 + mv t3, a3 + mv t4, a4 +1: + vsetvli t0, a4, e16, m8, ta, ma + sub a4, a4, t0 + vle16.v v0, (a2) + vle16.v v8, (a3) + vadd.vv v8, v8, v0 + vmax.vx v8, v8, zero + vsetvli zero, zero, e8, m4, ta, ma + vnclipu.wi v8, v8, 7 + vse8.v v8, (a0) + sh1add a2, t0, a2 + sh1add a3, t0, a3 + add a0, a0, t0 + bnez a4, 1b + add a0, t1, a1 + addi a2, t2, 128*2 + addi a3, t3, 128*2 + mv a4, t4 +.endif + bnez a5, \id\w\vlen\()b + ret +.endm + + +.macro AVG_JMP_TABLE id, vlen +const jmp_table_\id\vlen + .4byte \id\()2\vlen\()f - jmp_table_\id\vlen + .4byte \id\()4\vlen\()f - jmp_table_\id\vlen + .4byte \id\()8\vlen\()f - jmp_table_\id\vlen + .4byte \id\()16\vlen\()f - jmp_table_\id\vlen + .4byte \id\()32\vlen\()f - jmp_table_\id\vlen + .4byte \id\()64\vlen\()f - jmp_table_\id\vlen + .4byte \id\()128\vlen\()f - jmp_table_\id\vlen +endconst +.endm + +.macro AVG_J vlen, id + clz t0, a4 + neg t0, t0 + lla t5, jmp_table_\id\vlen + sh2add t0, t0, t5 + lw t0, ((__riscv_xlen-2)<<2)(t0) + add t0, t0, t5 + jr t0 +.endm + +.macro func_avg vlen +func ff_vvc_avg_8_rvv_\vlen\(), zve32x + AVG_JMP_TABLE 1, \vlen + csrwi vxrm, 0 + AVG_J \vlen, 1 + .irp w,2,4,8,16,32,64,128 + avg \w, \vlen, 1 + .endr +endfunc +.endm + +.macro w_avg w, vlen, id +\id\w\vlen: +.if \w < 32 + vsetvlstatic16 \w, \vlen, 1 + addi t0, a2, 128*2 + addi t1, a3, 128*2 + vle16.v v0, (a2) + vle16.v v8, (a3) + addi a5, a5, -2 + vle16.v v20, (t0) + vle16.v v24, (t1) + vwmul.vx v16, v0, a7 + vwmul.vx v28, v20, a7 + vwmacc.vx v16, t3, v8 + vwmacc.vx v28, t3, v24 + vsetvlstatic32 \w, \vlen + add t2, a0, a1 + vadd.vx v16, v16, t4 + vadd.vx v28, v28, t4 + vsetvlstatic16 \w, \vlen, 1 + vnsrl.wx v16, v16, t6 + vnsrl.wx v28, v28, t6 + vmax.vx v16, v16, zero + vmax.vx v28, v28, zero + vsetvlstatic8 \w, \vlen, 1 + addi a2, a2, 128*4 + vnclipu.wi v16, v16, 0 + vnclipu.wi v28, v28, 0 + vse8.v v16, (a0) + addi a3, a3, 128*4 + vse8.v v28, (t2) + sh1add a0, a1, a0 +.else + addi a5, a5, -1 + mv t1, a0 + mv t2, a2 + mv t5, a3 + mv a6, a4 +1: + vsetvli t0, a4, e16, m4, ta, ma + sub a4, a4, t0 + vle16.v v0, (a2) + vle16.v v8, (a3) + vwmul.vx v16, v0, a7 + vwmacc.vx v16, t3, v8 + vsetvli zero, zero, e32, m8, ta, ma + vadd.vx v16, v16, t4 + vsetvli zero, zero, e16, m4, ta, ma + vnsrl.wx v16, v16, t6 + vmax.vx v16, v16, zero + vsetvli zero, zero, e8, m2, ta, ma + vnclipu.wi v16, v16, 0 + vse8.v v16, (a0) + sh1add a2, t0, a2 + sh1add a3, t0, a3 + add a0, a0, t0 + bnez a4, 1b + add a0, t1, a1 + addi a2, t2, 128*2 + addi a3, t5, 128*2 + mv a4, a6 +.endif + bnez a5, \id\w\vlen\()b + ret +.endm + + +.macro func_w_avg vlen +func ff_vvc_w_avg_8_rvv_\vlen\(), zve32x + AVG_JMP_TABLE 2, \vlen + csrwi vxrm, 0 + addi t6, a6, 7 + ld t3, (sp) + ld t4, 8(sp) + ld t5, 16(sp) + addi t4, t4, 1 // o0 + o1 + 1 + add t4, t4, t5 + addi t5, t6, -1 // shift - 1 + sll t4, t4, t5 + AVG_J \vlen, 2 + .irp w,2,4,8,16,32,64,128 + w_avg \w, \vlen, 2 + .endr +endfunc +.endm + +func_avg 128 +func_avg 256 +#if (__riscv_xlen == 64) +func_w_avg 128 +func_w_avg 256 +#endif diff --git a/libavcodec/riscv/vvc/vvcdsp_init.c b/libavcodec/riscv/vvc/vvcdsp_init.c new file mode 100644 index 0000000000..9819a7c570 --- /dev/null +++ b/libavcodec/riscv/vvc/vvcdsp_init.c @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2024 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/cpu.h" +#include "libavutil/riscv/cpu.h" +#include "libavcodec/vvc/dsp.h" + +#define bf(fn, bd, opt) fn##_##bd##_##opt + +#define AVG_PROTOTYPES(bd, opt) \ +void bf(ff_vvc_avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride, \ + const int16_t *src0, const int16_t *src1, int width, int height); \ +void bf(ff_vvc_w_avg, bd, opt)(uint8_t *dst, ptrdiff_t dst_stride, \ + const int16_t *src0, const int16_t *src1, int width, int height, \ + int denom, int w0, int w1, int o0, int o1); + +AVG_PROTOTYPES(8, rvv_128) +AVG_PROTOTYPES(8, rvv_256) + +void ff_vvc_dsp_init_riscv(VVCDSPContext *const c, const int bd) +{ +#if HAVE_RVV + const int flags = av_get_cpu_flags(); + int vlenb = ff_get_rv_vlenb(); + + if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR) && + vlenb >= 32) { + switch (bd) { + case 8: + c->inter.avg = ff_vvc_avg_8_rvv_256; +# if (__riscv_xlen == 64) + c->inter.w_avg = ff_vvc_w_avg_8_rvv_256; +# endif + break; + default: + break; + } + } else if ((flags & AV_CPU_FLAG_RVV_I32) && (flags & AV_CPU_FLAG_RVB_ADDR) && + vlenb >= 16) { + switch (bd) { + case 8: + c->inter.avg = ff_vvc_avg_8_rvv_128; +# if (__riscv_xlen == 64) + c->inter.w_avg = ff_vvc_w_avg_8_rvv_128; +# endif + break; + default: + break; + } + } +#endif +} diff --git a/libavcodec/vvc/dsp.c b/libavcodec/vvc/dsp.c index 41e830a98a..c55a37d255 100644 --- a/libavcodec/vvc/dsp.c +++ b/libavcodec/vvc/dsp.c @@ -121,7 +121,9 @@ void ff_vvc_dsp_init(VVCDSPContext *vvcdsp, int bit_depth) break; } -#if ARCH_X86 +#if ARCH_RISCV + ff_vvc_dsp_init_riscv(vvcdsp, bit_depth); +#elif ARCH_X86 ff_vvc_dsp_init_x86(vvcdsp, bit_depth); #endif } diff --git a/libavcodec/vvc/dsp.h b/libavcodec/vvc/dsp.h index 1f14096c41..e03236dd76 100644 --- a/libavcodec/vvc/dsp.h +++ b/libavcodec/vvc/dsp.h @@ -180,6 +180,7 @@ typedef struct VVCDSPContext { void ff_vvc_dsp_init(VVCDSPContext *hpc, int bit_depth); +void ff_vvc_dsp_init_riscv(VVCDSPContext *hpc, const int bit_depth); void ff_vvc_dsp_init_x86(VVCDSPContext *hpc, const int bit_depth); #endif /* AVCODEC_VVC_DSP_H */