From patchwork Mon Jul 25 11:15:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 36957 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1649:b0:8b:613a:194d with SMTP id no9csp1971925pzb; Mon, 25 Jul 2022 04:16:01 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sf7HFYQD55f1WFi9Bj7cpf12TezMtqHthV8allM45XpHggaiUlPPDksJqXiaLzkOtNfkJK X-Received: by 2002:a17:907:8a1d:b0:72b:9e7b:802a with SMTP id sc29-20020a1709078a1d00b0072b9e7b802amr9957520ejc.189.1658747761254; Mon, 25 Jul 2022 04:16:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658747761; cv=none; d=google.com; s=arc-20160816; b=UagsE/z/XistrMrJBvsvtEtv8ZkVVoMbf0nlwkzoDGXgs3D0b3ZKPGG9pXyV7EKjgy SzEzaXKCMWS/BRWZkvwDsmqLzlzkBpLe3IsBJSdHe7aZDzCtaGL4R+/itjSAL5Qu41HI dVCLsezJ6D9DThp4bD5g6bFKaAqA8vM453PMzy7DTwSzJQqLeEQoOL6+qvOZ2yfcxg9O y96il8tpecEWK575RpEBdYialCiI8tHUGJ0hCdA3Z3mCeKBfsGiyqWyS9RB7fM87vsb+ iL6GHV1TLXoRxfMDL7kz2iSWAhuA9tNWgVDsqdFpmsm4fmxhG0Q+lw7emh5TKzVGxFcJ pVbA== 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=Z4o0RcgNGpBU+StpD9miqhUsdHvQxHYrztOFg0AoObY=; b=npJbPa5YniLVHH8IGVf1ALZ1OeEejj4tYFSlx53A3V7R6UjeS5+K/4b59b0/LfGxU2 1f45O1SSFPblhaPsav/paZIQoTfvHQLxFUSz/ZPTBY0RtnUSNuewRUYJ4Y118gFhuKld iAcUb9KBn/mHNp1lNgMz4DZwKFTwjkqEzLu0ozwzVzm5WjahPzKvK1HsWIlOpqwG5Wa8 6qcWun0rNufd2EM7Wf/7xTajRnhXBnkpc2CwuLEOgIJE3MxSEJ5+74TjIy05ufafC2aO d0GS9dkXFQ8lw4ueNc8PDwK+GNizK0Q4ae1Uzw00bdw6vO/f4tnhdrvHjYKwhlSCbQHv CURQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=OkeIHBQE; 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 f23-20020a056402161700b0043b5419f8c1si11151618edv.177.2022.07.25.04.16.00; Mon, 25 Jul 2022 04:16:01 -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=OkeIHBQE; 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 4A9AF68B761; Mon, 25 Jul 2022 14:15:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f41.google.com (mail-lf1-f41.google.com [209.85.167.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 822B868B741 for ; Mon, 25 Jul 2022 14:15:51 +0300 (EEST) Received: by mail-lf1-f41.google.com with SMTP id b16so5059062lfb.7 for ; Mon, 25 Jul 2022 04:15:51 -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=v+/kc9myDuF/InNf+7NBGNsZLVHqrQ3FfZhWeorzHqU=; b=OkeIHBQEO2vX4e96lDtFPn0tIuZiY/KPXWnot6OHDtoSfc+RB7ES0JbSvAaXx4TnVc jX6aRGGZcnM9AMHR8Rb9c3WEgLa/9eD5lomI05jbifPQ2iyiZzDLfwDCw1G7QI9y2Q32 Umchbc4jnoNSLyx+aomA9HmTL+digRO/FzPcsIlG7aW2is0GKF1qbe8b9M71Q80fv8YV fCp8Jd+6r4Vo1+Ah5bDAhSSGAjbkpOQ4er0OHLXByner7t5XDulgfYpYZtM54H0V7Zkk 13zWMGY5oyFa8YCWkzLUeQqlx5VrskkkOLdL4aft2wahT+mv7syU+mQuCgR7VJCK8LwF Sf9A== 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=v+/kc9myDuF/InNf+7NBGNsZLVHqrQ3FfZhWeorzHqU=; b=BdfLddR3MnMAzYt1+og58THZLo6pX/NO9F5Wj737YKENhPEy+Lg1Bg9a95mPAXrCEw 3UH7sybGmPE4QzYIA8uo0ntmotZ6RRsfgDpuLkMvF/SfyZ5tupt6vUGvJjlKmTNoj7av B5xkDXfHBc+hiABuggzF35eOaD2QgzRgarkNXY0chcnlvgCVy4s+iOISPBZfrUiYmG7W M09jLdeatoC5doeK5tYEGxzYzNcynd2kzDzylpIrvd+vvN+h36gk6aEo3W2oZYOnjbFf M2pqTq5ZEQqXD+ocrr8d9VzlSCm8P1gZellEmz/Dnh+EcT344HybnGZeUe83kueXSjTD uZ7w== X-Gm-Message-State: AJIora/S26J3LwKRomLCEcUaMG/hBEAn/uUUxHOKaMZttmvI8S98eqIW VgsQTTVQHFoXHQWK9vmLdtlsjvXt7rAiKw== X-Received: by 2002:a05:6512:22c4:b0:48a:9104:de91 with SMTP id g4-20020a05651222c400b0048a9104de91mr1414052lfu.359.1658747750603; Mon, 25 Jul 2022 04:15:50 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.wifi.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id g4-20020a056512118400b00482bdd14fdfsm2659934lfr.32.2022.07.25.04.15.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 04:15:50 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jul 2022 13:15:41 +0200 Message-Id: <20220725111541.44618-1-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220715080228.686736-3-hum@semihalf.com> References: <20220715080228.686736-3-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavc/aarch64: Add neon implementation for sse4 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: D/iXcFdoVIyO Provide neon implementation for sse4 function. Performance comparison tests are shown below. - sse_2_c: 74.0 - sse_2_neon: 24.0 Benchmarks and tests are run with checkasm tool on AWS Graviton 3. Signed-off-by: Hubert Mazur --- libavcodec/aarch64/me_cmp_init_aarch64.c | 3 ++ libavcodec/aarch64/me_cmp_neon.S | 65 ++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 3ff5767bd0..72a2062e7e 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -32,6 +32,8 @@ int ff_pix_abs16_x2_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, int sse16_neon(MpegEncContext *v, uint8_t *pix1, uint8_t *pix2, ptrdiff_t stride, int h); +int sse4_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) { @@ -44,5 +46,6 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->sad[0] = ff_pix_abs16_neon; c->sse[0] = sse16_neon; + c->sse[2] = sse4_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 98c912b608..3336d88848 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -352,3 +352,68 @@ function sse16_neon, export=1 ret endfunc + +function sse4_neon, export=1 + // x0 - unused + // x1 - pix1 + // x2 - pix2 + // x3 - stride + // w4 - h + + movi d18, #0 + movi d17, #0 + cmp w4, #4 + b.le 2f + +// make 4 iterations at once +1: + + // res = abs(pix1[0] - pix2[0]) + // res * res + + ld1 {v0.s}[0], [x1], x3 // Load pix1, first iteration + ld1 {v1.s}[0], [x2], x3 // Load pix2, first iteration + uabdl v30.8h, v0.8b, v1.8b // Absolute difference, first iteration + ld1 {v2.s}[0], [x1], x3 // Load pix1, second iteration + ld1 {v3.s}[0], [x2], x3 // Load pix2, second iteration + umull v16.4s, v30.4h, v30.4h // Multiply vectors, first iteration + uabdl v29.8h, v2.8b, v3.8b // Absolute difference, second iteration + ld1 {v4.s}[0], [x1], x3 // Load pix1, third iteration + ld1 {v5.s}[0], [x2], x3 // Load pix2, third iteration + umlal v16.4s, v29.4h, v29.4h // Multiply and accumulate, second iteration + uabdl v28.8h, v4.8b, v5.8b // Absolute difference, third iteration + ld1 {v6.s}[0], [x1], x3 // Load pix1, fourth iteration + ld1 {v7.s}[0], [x2], x3 // Load pix2, fourth iteration + umlal v16.4s, v28.4h, v28.4h // Multiply and accumulate, third iteration + uabdl v27.8h, v6.8b, v7.8b // Absolue difference, fourth iteration + umlal v16.4s, v27.4h, v27.4h // Multiply and accumulate, fourth iteration + + uaddlv d17, v16.4s // Add vector + add d18, d18, d17 + + sub w4, w4, #4 + cmp w4, #4 + b.ge 1b + + cbnz w4, 2f + fmov w0, s18 + + ret + +// iterate by one +2: + ld1 {v0.s}[0], [x1], x3 // Load pix1 + ld1 {v1.s}[0], [x2], x3 // Load pix2 + uabdl v30.8h, v0.8b, v1.8b + umull v16.4s, v30.4h, v30.4h + + uaddlv d17, v16.4s + add d18, d18, d17 + + subs w4, w4, #1 + b.ne 2b + fmov w0, s18 + + ret + +endfunc