From patchwork Mon Jul 25 11:12:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 36956 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1970388pzb; Mon, 25 Jul 2022 04:12:53 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tnAUiGrSbF/7mud5UByB9nUVijYjb1r3/tH7fOKByIyvA63we+cRrtT3GWyrIxAnKwa31Q X-Received: by 2002:a17:906:4785:b0:72e:dd6c:1ba1 with SMTP id cw5-20020a170906478500b0072edd6c1ba1mr9729897ejc.712.1658747573397; Mon, 25 Jul 2022 04:12:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658747573; cv=none; d=google.com; s=arc-20160816; b=PCVQ7wQ1wPBHbGBSBH6D7x7BVWItABH/yFo+jRhHtl4QYIluAsb9JQW+2WqvkxS1Lw hm4qeAO8L2MBXGCt9vtNnVln22IW7bAWnKp9A0QoSkdikkxd1NdxVRFRCAxEuyiIFmdU tD5srDCp29LDcqsOgR9pWWcu5Ng9V1LvSyHl18Oq7kYbaw7tBT3w6vUMysvGqnHLI5n8 /1TKfS/tOw0l3/00H0YXnySKA6S7/ILtPDYdNg+55EDC/8XoiSV0RMwvDMPB46s/XKe6 yuNN3ilDQ2OtjtnOSmE7N7o9EzT5zGmi2y838e3hJyL0/T6d1CEcnu+wO0/C5UaKSYN1 mQOw== 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=ZH58m8LRRl/ZkCFx2rRLI7rElw+yExiAfE63tA/5/yo=; b=Cjqme0WTKFBHvii3y5Hlop5ubVg4Y8QGWa7t7FYoH3R7reI/oC8dsYHPEUepeyPRBw rFBDuJ2fdyrRmt2ryyPTNQXDv57THRaxtuZGYq62Nd74xNv0Tmid4dbb8OLkUwQHPZGw YNa5UA3Kwk1eT66z78GENuRG+xQG943rx+p0hs6Sta1sZBqVxZkVh1MZBywEG6vdNx3y ODEkdG1O3QAToyZQfJB018U2/XBo3k+DTZOJ0XPgx2VwMDtf0JOtZBx7bEoV8alVlQX0 aqiy/kWBgu7tgIhWXThQntdSujdBeWlnBXAQSyJkAYm+ZPPmpzlKYRzZGE3KYsHzsc5I pXbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=b1zVbMs5; 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 qf8-20020a1709077f0800b0072ab4b5ffdcsi8589869ejc.96.2022.07.25.04.12.52; Mon, 25 Jul 2022 04:12:53 -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=b1zVbMs5; 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 E01F668B73D; Mon, 25 Jul 2022 14:12:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2FEEA68B5C4 for ; Mon, 25 Jul 2022 14:12:42 +0300 (EEST) Received: by mail-lf1-f53.google.com with SMTP id y11so17408243lfs.6 for ; Mon, 25 Jul 2022 04:12:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KLcdweDS4UXzZiWCke4CumrTouGNuLOXlEXtUYmrUis=; b=b1zVbMs52gLLiS0EeG3+Nkn6ePCEGe+xPy+6dO7sZ9gjLCF8XE1xCZoz661BbGFKV8 B7gy/O8cFfmuv77U+a+Hc/Be9/sV/SWe545mVfCUjYxRLn5ze8uvUxmVHQYd+Us5FTgQ DlHv5dEdHaI9VqjOsgOjyrcnMxW9rYjPIWkTQD4MNam+dOxokZLEm1LEmajJi4Yk7TYR zvZfPzgA+d2WVs0uM6XgiScssW1u5wSOPC1h3lVGKmuJGX5NQm3CM/YAhIDcrikDz3HZ rEpilHqfP8IqE7u0lOPyjNUAWFg0lo+q5iYwLRBFpxMJrg6QxxA86VL2zP+aNz9AjSkV V1Og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KLcdweDS4UXzZiWCke4CumrTouGNuLOXlEXtUYmrUis=; b=j3h4KkLPeADw0DeghPW+Sfvh+oS+OBBQbFE6cANZMs6MIwxm+5wurHU+GSPMm7850a MKjKz1OskrbUfvFOTXvMVN163w1/gLPK39E5TSeLmPU8Y+YeAlP64EttpT8dTEUibTzX tw60utqQgKpFLvQgiCD9N/MuECGL+qGqNui3Z9ftNwVeioYkGOJXZwAtDxYuZ/k4hmID aICnpTP1e11rhdYP71nzRsG+16vewP6prA9LXGQPBANxeULjcjldG4EfW0HIQfM9wpI+ 9UmAjOuWjWcat8XmPOlgM3375gLkDaZ9KUFH+CFedhYcWr5p7pWzgoFt6p8dMIdXfkNA 1sZg== X-Gm-Message-State: AJIora8zGDMrkLhnVP4DN+uPGB0tMTb3hpRo5fUdBJ/sG+lPb9gir3jI 3hOcOGHvtJMw7DuPBogAkO7t3UbyavfcOw== X-Received: by 2002:a05:6512:401e:b0:48a:7508:8421 with SMTP id br30-20020a056512401e00b0048a75088421mr4571347lfb.135.1658747560756; Mon, 25 Jul 2022 04:12:40 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.wifi.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id w10-20020ac2442a000000b0048a44bb99c8sm2604571lfl.157.2022.07.25.04.12.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 04:12:40 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jul 2022 13:12:08 +0200 Message-Id: <20220725111208.43542-1-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220715080228.686736-2-hum@semihalf.com> References: <20220715080228.686736-2-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/aarch64: Add neon implementation for sse16 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: Xywm7nW9v1dx Provide neon implementation for sse16 function. Performance comparison tests are shown below. - sse_0_c: 273.0 - sse_0_neon: 48.2 Benchmarks and tests 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 | 82 ++++++++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 136b008eb7..3ff5767bd0 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -30,6 +30,9 @@ int ff_pix_abs16_xy2_neon(MpegEncContext *s, uint8_t *blk1, uint8_t *blk2, int ff_pix_abs16_x2_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); +int sse16_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, + ptrdiff_t stride, int h); + av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); @@ -40,5 +43,6 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->pix_abs[0][3] = ff_pix_abs16_xy2_neon; c->sad[0] = ff_pix_abs16_neon; + c->sse[0] = sse16_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index cda7ce0408..98c912b608 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -270,3 +270,85 @@ function ff_pix_abs16_x2_neon, export=1 ret endfunc + +function sse16_neon, export=1 + // x0 - unused + // x1 - pix1 + // x2 - pix2 + // x3 - stride + // w4 - h + + cmp w4, #4 + movi d18, #0 + b.lt 2f + +// Make 4 iterations at once +1: + + // res = abs(pix1[0] - pix2[0]) + // res * res + + ld1 {v0.16b}, [x1], x3 // Load pix1 vector for first iteration + ld1 {v1.16b}, [x2], x3 // Load pix2 vector for first iteration + uabd v30.16b, v0.16b, v1.16b // Absolute difference, first iteration + ld1 {v2.16b}, [x1], x3 // Load pix1 vector for second iteration + umull v29.8h, v30.8b, v30.8b // Multiply lower half of vectors, first iteration + ld1 {v3.16b}, [x2], x3 // Load pix2 vector for second iteration + umull2 v28.8h, v30.16b, v30.16b // Multiply upper half of vectors, first iteration + uabd v27.16b, v2.16b, v3.16b // Absolute difference, second iteration + uaddlp v17.4s, v29.8h // Pairwise add, first iteration + umull v26.8h, v27.8b, v27.8b // Mulitply lower half, second iteration + umull2 v25.8h, v27.16b, v27.16b // Multiply upper half, second iteration + ld1 {v4.16b}, [x1], x3 // Load pix1 for third iteration + uadalp v17.4s, v26.8h // Pairwise add and accumulate, second iteration + ld1 {v5.16b}, [x2], x3 // Load pix2 for third iteration + uadalp v17.4s, v25.8h // Pairwise add andd accumulate, second iteration + uabd v24.16b, v4.16b, v5.16b // Absolute difference, third iteration + ld1 {v6.16b}, [x1], x3 // Load pix1 for fourth iteration + umull v23.8h, v24.8b, v24.8b // Multiply lower half, third iteration + umull2 v22.8h, v24.16b, v24.16b // Multiply upper half, third iteration + uadalp v17.4s, v23.8h // Pairwise add and accumulate, third iteration + uadalp v17.4s, v22.8h // Pairwise add and accumulate, third iteration + ld1 {v7.16b}, [x2], x3 // Load pix2 for fouth iteration + uadalp v17.4s, v28.8h // Pairwise add and accumulate, first iteration + uabd v21.16b, v6.16b, v7.16b // Absolute difference, fourth iteration + umull v20.8h, v21.8b, v21.8b // Multiply lower half, fourth iteration + uadalp v17.4s, v20.8h // Pairwise add and accumulate, fourth iteration + umull2 v19.8h, v21.16b, v21.16b // Multiply upper half, fourth iteration + uadalp v17.4s, v19.8h // Pairwise add and accumulate, fourth iteration + + sub w4, w4, #4 // h -= 4 + uaddlv d16, v17.4s // add up accumulator vector + cmp w4, #4 + add d18, d18, d16 + + b.ge 1b + + cbnz w4, 2f + fmov w0, s18 + + ret + +// iterate by one +2: + + ld1 {v0.16b}, [x1], x3 // Load pix1 + ld1 {v1.16b}, [x2], x3 // Load pix2 + + uabd v30.16b, v0.16b, v1.16b + umull v29.8h, v0.8b, v1.8b + umull2 v28.8h, v0.16b, v1.16b + uaddlp v17.4s, v29.8h + uadalp v17.4s, v28.8h + + + subs w4, w4, #1 + uaddlv d16, v17.4s + add d18, d18, d16 + + b.ne 2b + fmov w0, s18 + + ret + +endfunc