From patchwork Tue Sep 6 10:27:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp3164609pzh; Tue, 6 Sep 2022 03:28:27 -0700 (PDT) X-Google-Smtp-Source: AA6agR6fBjBdZiAq47MrIKULWgTeo/H3H7/fWzjprcyjFXFA3tKPDR1kzIUotv47QTUB7qfbWPYu X-Received: by 2002:a17:907:7f21:b0:73d:6b7b:3e0 with SMTP id qf33-20020a1709077f2100b0073d6b7b03e0mr37632466ejc.680.1662460107209; Tue, 06 Sep 2022 03:28:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662460107; cv=none; d=google.com; s=arc-20160816; b=fiLrqtwKjCRdWFcgtXqj23hr6hXuyRubS/7G7yihmRBtnHMjGnexX6CkaS/zDTqr6m 6oHNa5VZ+8zUP3zgYHUlri7GkgvHB+X/4sBq7F33D1Nlcvd3IYTE87wpYhS+1GxsrRx6 +6h98ZpJepF2lHH5iHNuvVeZqO5sDy+QWMOIjAsU6bGtPzulDHShRTLongcCbSt2Y6o/ yA7xC+PHjpAOA12bTncFHIOuvxB7aW4OTO5IhIA6mY3m1soar/np3TrqgtVKntlCnvlt 7LVGV5Y85U5DSyHgF3ONgA18ArHiVY+dSJL72n6T2ZNtT91jKbOTnTrTzH4deMEBh/iQ HNCA== 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=PB6QRnmLuS2I2+Xx1m9GYgIVbXmClb8X2J+j/Sj+ldM=; b=R4CNER+PZyTSCy5B5+1rOEcBLwXDsAaKXtdUda4j192uLNvnG0m1zM9KzS1F21m9ls n9X1hWMMBxBCtITJDaFqUM09BSmx0oNfmdWMPI1G2b6xGIkBOexyN6bJBwfUEBStYZtR GzCPVIRvV+ZNA3E9SxSbr+r0R//3wWMq+LaoQWNFFos7irWPpVHggfFmhEDFjJoPjTXH w6YNNaLfyQ5wLZkVSPQingSMT/HfPdTNvPzqHvsvc19nykCy29PMxiN8Es9nAOtGBiRF +0vQNitB5wy0TID+ENufjYjJ5F7+7FLWdN9C3HC6vhRlzi1qBpis2O6rk/t2fnAuaIRC WgDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=l7y2HbRS; 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 sg19-20020a170907a41300b0073d693a64c3si7711224ejc.370.2022.09.06.03.28.26; Tue, 06 Sep 2022 03:28:27 -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=l7y2HbRS; 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 7E6B468BAFD; Tue, 6 Sep 2022 13:28:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f45.google.com (mail-lf1-f45.google.com [209.85.167.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 258E868BAC0 for ; Tue, 6 Sep 2022 13:28:01 +0300 (EEST) Received: by mail-lf1-f45.google.com with SMTP id u18so4346312lfo.8 for ; Tue, 06 Sep 2022 03:28:01 -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=zb6DFBASB0B/mvxrERJNyWxSs/4QHIcvLrpHolC81hw=; b=l7y2HbRSnk9f1xU1IlTK14NJqfs3rdcsF2a+Zl9mYpAA/7r5IUhn3AXppstu8ncKKt 6bg52IjS9EPKo9L29JoluFDa3FfzlBXipt3A/sVzM7sbPxa70haLAMBxeq7RWmQxkKlQ o0AntpX8EnkUXIkMW26xc35hvWeQ+80iPKrAU30MOMufRNtWHMfYbKFGRawoV7Ld3PrE NVqp8yy43cX3r26H/h73ls4NM5oiH3iFcgYKSyaVMBJwge6i2YetEYmXKAqLCMX2HXPF z3gnG13GsnETfIMhUqs/teLvUW6nnRoIKTEUFV7oh3m+2WM5XGWCnYsaDyppeCh/bV/H t6SQ== 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=zb6DFBASB0B/mvxrERJNyWxSs/4QHIcvLrpHolC81hw=; b=qf0KvV5ozn4kzNAfn04DN3tK6Z2pH6SOQ8f+0b0d1RDEGD+UZWBTGWj9c0u6whhVkB xk3AdvSUgqvckqI6YHw6+ZQu6R3jiIkVFKBVmZKTGvnAoYjOwO1TJ9p31wi2RdBIXecV jUlWquGtvB21O05dsFS7M77pnDe1L2OU2WvxTo4nfkaCmbJotI4EZZE6h/Wl+5UxZCTi Xir1hmfg3GckV1cNLAbNeVyV4nkpCgOAgl81/xXczWsbwy+HC8RgKg7fsYTpohEPvIiX zLxRbgTOCa6/F1Rc5+wCwRKfxgGll30za3f/tDDfBIOCHxj7YbPWpZD1aeUbZq1dLB7i NuKw== X-Gm-Message-State: ACgBeo2Hw0vGOWOo2TOSZdqhQ+8e3ueOMDKfeWk61JQepX+uwp/VO3aM 7KL4lkxnOS+sIFNTV94f6DRKVDl9o066LQ== X-Received: by 2002:a05:6512:c11:b0:494:7108:3936 with SMTP id z17-20020a0565120c1100b0049471083936mr12010209lfu.150.1662460080203; Tue, 06 Sep 2022 03:28:00 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.wifi.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id q5-20020a2eb4a5000000b0025e59f125fbsm1822751ljm.53.2022.09.06.03.27.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 03:27:59 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Sep 2022 12:27:19 +0200 Message-Id: <20220906102722.53266-3-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220906102722.53266-1-hum@semihalf.com> References: <20220906102722.53266-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/5] lavc/aarch64: Add neon implementation of vsse16 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, Hubert Mazur , martin@martin.st, mw@semihalf.com, spop@amazon.com Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: xbp5b4+XqSTM Provide optimized implementation of vsse16 for arm64. Performance comparison tests are shown below. - vsse_0_c: 254.4 - vsse_0_neon: 64.7 Benchmarks and tests are run with checkasm tool on AWS Graviton 3. Signed-off-by: Hubert Mazur --- libavcodec/aarch64/me_cmp_init_aarch64.c | 4 ++ libavcodec/aarch64/me_cmp_neon.S | 87 ++++++++++++++++++++++++ 2 files changed, 91 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index ddc5d05611..7b81e48d16 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -43,6 +43,8 @@ int sse4_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, int vsad16_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int vsse16_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, + ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) { @@ -62,5 +64,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->sse[2] = sse4_neon; c->vsad[0] = vsad16_neon; + + c->vsse[0] = vsse16_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 1d0b166d69..b3f376aa60 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -649,3 +649,90 @@ function vsad16_neon, export=1 ret endfunc + +function vsse16_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v0.16b}, [x1], x3 // Load pix1[0], first iteration + ld1 {v1.16b}, [x2], x3 // Load pix2[0], first iteration + + sub w4, w4, #1 // we need to make h-1 iterations + movi v16.4s, #0 + movi v17.4s, #0 + + cmp w4, #3 // check if we can make 3 iterations at once + usubl v31.8h, v0.8b, v1.8b // Signed difference of pix1[0] - pix2[0], first iteration + usubl2 v30.8h, v0.16b, v1.16b // Signed difference of pix1[0] - pix2[0], first iteration + b.le 2f + + +1: + // x = abs(pix1[0] - pix2[0] - pix1[0 + stride] + pix2[0 + stride]) + // res = (x) * (x) + ld1 {v0.16b}, [x1], x3 // Load pix1[0 + stride], first iteration + ld1 {v1.16b}, [x2], x3 // Load pix2[0 + stride], first iteration + ld1 {v2.16b}, [x1], x3 // Load pix1[0 + stride], second iteration + ld1 {v3.16b}, [x2], x3 // Load pix2[0 + stride], second iteration + usubl v29.8h, v0.8b, v1.8b + usubl2 v28.8h, v0.16b, v1.16b + ld1 {v4.16b}, [x1], x3 // Load pix1[0 + stride], third iteration + ld1 {v5.16b}, [x2], x3 // Load pix1[0 + stride], third iteration + sabd v31.8h, v31.8h, v29.8h + sabd v30.8h, v30.8h, v28.8h + usubl v27.8h, v2.8b, v3.8b + usubl2 v26.8h, v2.16b, v3.16b + usubl v25.8h, v4.8b, v5.8b + usubl2 v24.8h, v4.16b, v5.16b + sabd v29.8h, v29.8h, v27.8h + sabd v27.8h, v27.8h, v25.8h + umlal v16.4s, v31.4h, v31.4h + umlal2 v17.4s, v31.8h, v31.8h + sabd v28.8h, v28.8h, v26.8h + sabd v26.8h, v26.8h, v24.8h + umlal v16.4s, v30.4h, v30.4h + umlal2 v17.4s, v30.8h, v30.8h + mov v31.16b, v25.16b + umlal v16.4s, v29.4h, v29.4h + umlal2 v17.4s, v29.8h, v29.8h + mov v30.16b, v24.16b + umlal v16.4s, v28.4h, v28.4h + umlal2 v17.4s, v28.8h, v28.8h + sub w4, w4, #3 + umlal v16.4s, v27.4h, v27.4h + umlal2 v17.4s, v27.8h, v27.8h + cmp w4, #3 + umlal v16.4s, v26.4h, v26.4h + umlal2 v17.4s, v26.8h, v26.8h + + b.ge 1b + + cbz w4, 3f + +// iterate by once +2: + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x2], x3 + subs w4, w4, #1 + usubl v29.8h, v0.8b, v1.8b + usubl2 v28.8h, v0.16b, v1.16b + sabd v31.8h, v31.8h, v29.8h + sabd v30.8h, v30.8h, v28.8h + umlal v16.4s, v31.4h, v31.4h + umlal2 v17.4s, v31.8h, v31.8h + mov v31.16b, v29.16b + umlal v16.4s, v30.4h, v30.4h + umlal2 v17.4s, v30.8h, v30.8h + mov v30.16b, v28.16b + b.ne 2b + +3: + add v16.4s, v16.4s, v17.4s + uaddlv d17, v16.4s + fmov w0, s17 + + ret +endfunc