From patchwork Mon Oct 3 14:10:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Bernacki X-Patchwork-Id: 38538 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1345987pzh; Mon, 3 Oct 2022 07:11:49 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5aJutS1RLSUL1LWDtFbr1z45wtSpY0A1/fWA0pZ0tsABbr1YtFYQcNSLTSyYcjUhJQFt8N X-Received: by 2002:a05:6402:3584:b0:458:d3fa:fb89 with SMTP id y4-20020a056402358400b00458d3fafb89mr7581219edc.218.1664806308238; Mon, 03 Oct 2022 07:11:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664806308; cv=none; d=google.com; s=arc-20160816; b=k+6UJjrNKI/P7yMGSzJNYFwKWo8KPi8jTVO/X79B8s4uka6gWB0bX0s1y0ukFXWBoz vj5IzY+armddVU64yI46Y1ZWS4lMeb0C0dAdQF95dbVzJzCp11vzLXuwdeO2370xuuBk u2ZFd6Q8mhFylpZ26Mhi9QdyDFig5JcgdtaYrJ8HUB+JUIKU5I4+UNK7XCadhgc3Y0vK DxLscqZX/V0S51s2TCtKZkt9Zp5BpZwXzpvT2tRj4NO7aMdASA2LX0dTVzvX+kq0mCoU 38AtS3d1/8LjlihQzraCCE3Hl0esBkHKigNdd+xTX9hT/g2jJ1gTQRNPbCLsHbjXZqPk aPTA== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=2gRGmvh0JNVG8DCimR5RFSKaYIapmMqEIWQVSPjvLjQ=; b=oj0HmFH+OiXdUFQU3tvHVLzvDBL5zE9G0q7z3WcOPwDSdefQiK+cR4PKaNRu/YD9Y6 K2g5rlVlTfDx66d7w6hKPvrQPaGIVg3dpLEWi/FF7SR31KlZefBV031AwvQ+L+MuzENZ Tdr/O5vIJdEvgCeLFk9uFhfyC52IO2BXhICND+/UyGFalCKI4tUSzGFcfqgRiw1GB36i a4R0l5YOLzhxXuwNEYTvABCJQP8cvK6AnDKrnt1ts7twkZqDJ/EyPm7k0eT9KcXcG8m7 aluK9QppLOV4PVJru9KY3x1iy3/IVRrx8NaaHg1ptTfJCv26q3iGDQxmysL6aVT7PZ/T 69bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=XubfuMBO; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=semihalf.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id x2-20020a05640225c200b00447b0cc1501si8275918edb.99.2022.10.03.07.11.47; Mon, 03 Oct 2022 07:11:48 -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=@semihalf.com header.s=google header.b=XubfuMBO; 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=QUARANTINE sp=QUARANTINE dis=NONE) header.from=semihalf.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 875C268B20B; Mon, 3 Oct 2022 17:10:51 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C22D568BB93 for ; Mon, 3 Oct 2022 17:10:43 +0300 (EEST) Received: by mail-lj1-f180.google.com with SMTP id bs18so10325489ljb.1 for ; Mon, 03 Oct 2022 07:10:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=11GkLrbQO359cd9Y93C6AkPENDFEoWBAEWBEc16yUX0=; b=XubfuMBO/yiz2YuOxi6xNFF8nz0X4ZFi+GhaHU5WCFgXYdKG57Pq9H+Tp4mAvbVFcu YG5+4UBQtCSx9Uq/mXMIr3H1PkZBdZdnxTVzoMV/0Xof9wgRU79rYxaI8UzI2m2LJPbC L3Ake71N0j9hUfO/0tTlo4qZTBRKBlgJ63luqNdbHGZAlaTp9t7OL4gPtV5r1mWu9PIR ZeHzIU+C3bZ7RmPGePkHn9dg4JUaGzR6nIr90HUS/wua2+IoH9FhYMJYuRnNk0UU2MAk Ssq9jmPZxboFWhZL0NrutW2uoJ7yCcXOz3g1NCmWr/EIorxeogQMbAAIplQ1qccfwGzx A6Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=11GkLrbQO359cd9Y93C6AkPENDFEoWBAEWBEc16yUX0=; b=NmTltPhhB6lHGrKIZef0kSFDfinRUenL1V6HmIX4AuQJey/OpfKQZ9V4DYF1u0Cn/0 +DhrcYWnZkeZ/5X3sE1GREs4YVjEL41e6c4AOyPxTG9Fex3ZZLf1olqpi0Tab0d2gkqo 2hTXvj2whzfVRoJPaFZ/HrPs8U2jYgomYGkp+KEH7BpNtvOphZYtIU3XewAHeagBjao7 mCGltwvRot+xdRHzRX5dCHvLA6bj6WeljVNvdDAh+YBduaM9TahVE1WAkTaj860eVjb6 KCJ73ekmItselRIM6q45u0tQ/esPb/tBNetcf+3m42RTm55v+sjaRkYBxsMI76ZUoAss 0QbA== X-Gm-Message-State: ACrzQf3YF4nTQp0G5ZxYbchpgcNFzSfQ6SeDIQDVhKZ4BLU2QHlkB/22 bzZeNbMO9AV375heY+MSPnPrSvu7uRqPvQ== X-Received: by 2002:a2e:be9e:0:b0:26c:2d48:5c98 with SMTP id a30-20020a2ebe9e000000b0026c2d485c98mr6693240ljr.395.1664806242810; Mon, 03 Oct 2022 07:10:42 -0700 (PDT) Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id k15-20020a05651239cf00b00499b19f23e8sm1470610lfu.279.2022.10.03.07.10.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Oct 2022 07:10:42 -0700 (PDT) From: Grzegorz Bernacki To: ffmpeg-devel@ffmpeg.org Date: Mon, 3 Oct 2022 16:10:19 +0200 Message-Id: <20221003141020.3564715-7-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20221003141020.3564715-1-gjb@semihalf.com> References: <20221003141020.3564715-1-gjb@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 6/7] lavc/aarch64: Add neon implementation for vsse_intra8 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: gjb@semihalf.com, upstream@semihalf.com, jswinney@amazon.com, hum@semihalf.com, martin@martin.st, mw@semihalf.com, spop@amazon.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1ATncPw/bTaM Provide optimized implementation for vsse_intra8 for arm64. Performance tests are shown below. - vsse_5_c: 87.7 - vsse_5_neon: 26.2 Benchmarks and tests are run with checkasm tool on AWS Graviton 3. --- libavcodec/aarch64/me_cmp_init_aarch64.c | 4 ++ libavcodec/aarch64/me_cmp_neon.S | 53 ++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 1a0c3e90bb..1e0f1cf4f1 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -74,6 +74,9 @@ int nsse8_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, int vsse8_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int vsse_intra8_neon(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, + ptrdiff_t stride, int h); + av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); @@ -102,6 +105,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsse[1] = vsse8_neon; c->vsse[4] = vsse_intra16_neon; + c->vsse[5] = vsse_intra8_neon; c->nsse[0] = nsse16_neon_wrapper; c->nsse[1] = nsse8_neon_wrapper; diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 104e02f495..61e4f68335 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -1106,6 +1106,59 @@ function vsse_intra16_neon, export=1 ret endfunc +function vsse_intra8_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *dummy + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v0.8b}, [x1], x3 + movi v16.4s, #0 + + sub w4, w4, #1 // we need to make h-1 iterations + cmp w4, #3 + b.lt 2f + +1: + // v = abs( pix1[0] - pix1[0 + stride] ) + // score = sum( v * v ) + ld1 {v1.8b}, [x1], x3 + ld1 {v2.8b}, [x1], x3 + uabd v30.8b, v0.8b, v1.8b + ld1 {v3.8b}, [x1], x3 + umull v29.8h, v30.8b, v30.8b + uabd v27.8b, v1.8b, v2.8b + uadalp v16.4s, v29.8h + umull v26.8h, v27.8b, v27.8b + uabd v25.8b, v2.8b, v3.8b + uadalp v16.4s, v26.8h + umull v24.8h, v25.8b, v25.8b + sub w4, w4, #3 + uadalp v16.4s, v24.8h + cmp w4, #3 + mov v0.8b, v3.8b + + b.ge 1b + cbz w4, 3f + +// iterate by one +2: + ld1 {v1.8b}, [x1], x3 + subs w4, w4, #1 + uabd v30.8b, v0.8b, v1.8b + mov v0.8b, v1.8b + umull v29.8h, v30.8b, v30.8b + uadalp v16.4s, v29.8h + cbnz w4, 2b + +3: + uaddlv d17, v16.4s + fmov w0, s17 + + ret +endfunc + function nsse16_neon, export=1 // x0 multiplier // x1 uint8_t *pix1