From patchwork Mon Sep 26 09:15:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Grzegorz Bernacki X-Patchwork-Id: 38329 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2122724pzh; Mon, 26 Sep 2022 02:16:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6M+ssPKcFkuNC8LdShjj+vQyE+dH7zjufMT5VOSI88072kF9QiE263lxNl4DMmQkxegmdJ X-Received: by 2002:a17:907:a40e:b0:783:4d41:a159 with SMTP id sg14-20020a170907a40e00b007834d41a159mr4932093ejc.212.1664183778149; Mon, 26 Sep 2022 02:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664183778; cv=none; d=google.com; s=arc-20160816; b=vJMAoWtpgLgHv+o6oyswP/tK6hdIcFK5Sm9wdvRGiQxvEy9hG6qjbGnS88ubpH+goA ENtIaaJWcBtL2HkGeSxa7zeaeZUEMf+KvzeHe5z87x8BniCRXt+vcG5Vtj91D/EfoKX0 +lnKHeJn9S/dPyQ9XxPbUyDNAdq5qeorwoUHgCTZZHQWcQWpu6skhpCYGHhJ35QgOJND tFe+U7rSrDyegwej1ulyZy5UJHor/tuw1xK4YcZtg7j+M07PQYirlhT9wAmlZ4dMNRLP 2TY/Y/pCHXo4tQboqdhUecfk1LxslX2ulrWQuj5+yFKmk4an8WOgg9p0Dam2OgY9mdBB a5jQ== 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=PCXMVji4ilyGbtj1Mv+aQLT7f3CR51OmEUPqjGPKDY4=; b=elaQZmTH43dUI2XrBgLjc4ZzvzDN02l/HzH/bQtceBkR4z7n9hf6h0ogkLWbQwXWPW uTSapJJSXquaUaGB0l8niF6s7Nbn6/8Y9ZMVsDWNvK1EPJ62rPvImnhHPUdmmL6Z7t4h Tb+CWuvDSj6XxGefjkzp2kJ0kCwrGwznH22TuV0UydEkxkA0rtvAC6ZOcO0NYEg9Wnlx xYW/eY2xQOLqzUQTewvazttcfUp/VWuHKLXuuW9MKFJx67kCcs+S9/94qAvr7Jl+Q52G mwoYJHqf7mu2yK5CqVqqDCp9F9FlSHX2S0zBFzJA+FvRMg58IPGAz2E9zNWUhUqQN2qS FDyA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=eEAWY1Nl; 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 dn8-20020a17090794c800b0078358970513si3386430ejc.367.2022.09.26.02.15.55; Mon, 26 Sep 2022 02:16:18 -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=eEAWY1Nl; 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 2A58368BA62; Mon, 26 Sep 2022 12:15:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E2B168BA0C for ; Mon, 26 Sep 2022 12:15:28 +0300 (EEST) Received: by mail-lj1-f169.google.com with SMTP id c7so6648827ljm.12 for ; Mon, 26 Sep 2022 02:15:28 -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=Jrx+pHOh5VlywFbdDD67DyRM2lg4D99yezbr1/V1bOM=; b=eEAWY1NlYRn1unUvgsB1C2SWDWD4KoMnJqil5QYp2leNZR8QzsgeDfcg519GuNdoVT 7jLibvMhM7zHNBu+B86UKZNkVJ/C1zErkthIH/M5LH/QOOlpiN6f5R8J9x58ntxmWwjv aix9DphJT6TVU6SPQib51Sj3QHEMNEoK9KrLHpWRtCLFhe1CnqQiEZ55Hqm8UbQf6KzK 2ORa+9TvSJPBUcbOkFZaqflq1kSFz+9ccNoXUFoY/ADFGvq2nDYkQePiK8hf9SBJkBZF Owu5wpIukph2AzO1TevRaL4QsHMyjlzx5SVXrA257X8Yx5OdO/m/C97/cbkXtq/fAMsL UgKw== 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=Jrx+pHOh5VlywFbdDD67DyRM2lg4D99yezbr1/V1bOM=; b=M/EJgk2Z9zWVE5nsySYZ8zM4qDCwBZ47ImSGKs09CF4dTU4rtwgZv8fZQPO6hdHvHq tutf9gHsTeQXop0I2zsDkXwGT5EjN8VcUrbRaiSxVdjWWje1j1KjjNnrKEo9Y9Tc4s8V NzMPUccqPjPHsJSxWBFmYVwMOwpyRLdry165gXG0L2AZ5nWpB01hiWSoN6t/U7zFcz04 WnYxKAp++1SKwMcDJ0HYeoKTc6X0rZkdwL46aSjE6kwjsnWb3mVpkn/StAwBEIyuALEQ m2OXBsGOhu4KcvoADUrxhLIj7RXINAmBLFHuKH/gDISW6rKpw7QKL6xwHbm/RDgPA9mA lj6A== X-Gm-Message-State: ACrzQf0QXNdJGA+FAWYTuaciJLVJs+sgVQ3RHPDi99WbjUoSGGHOjHi0 qD1HAuPu5o6XAW1sNLn2rQqYLUk8Nwn4gQ== X-Received: by 2002:a2e:8904:0:b0:26b:e97e:d85b with SMTP id d4-20020a2e8904000000b0026be97ed85bmr7209400lji.7.1664183727520; Mon, 26 Sep 2022 02:15:27 -0700 (PDT) Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id b14-20020a056512070e00b004949f7cbb6esm2472942lfs.79.2022.09.26.02.15.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Sep 2022 02:15:27 -0700 (PDT) From: Grzegorz Bernacki To: ffmpeg-devel@ffmpeg.org Date: Mon, 26 Sep 2022 11:15:03 +0200 Message-Id: <20220926091504.3459110-3-gjb@semihalf.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20220926091504.3459110-1-gjb@semihalf.com> References: <20220926091504.3459110-1-gjb@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavc/aarch64: Provide optimized implementation of vsse8 for arm64. 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: +t9NWOE5C7Ad Provide optimized implementation of vsse8 for arm64. Performance comparison tests are shown below. - vsse_1_c: 141.5 - vsse_1_neon: 32.5 Benchmarks and tests are run with checkasm tool on AWS Graviton 3. Signed-off-by: Grzegorz Bernacki --- libavcodec/aarch64/me_cmp_init_aarch64.c | 5 ++ libavcodec/aarch64/me_cmp_neon.S | 70 ++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 2c61cfcf63..f247372c94 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -71,6 +71,9 @@ int nsse8_neon(int multiplier, const uint8_t *s, const uint8_t *s2, int nsse8_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int vsse8_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) { int cpu_flags = av_get_cpu_flags(); @@ -96,6 +99,8 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsad[5] = vsad_intra8_neon; c->vsse[0] = vsse16_neon; + c->vsse[1] = vsse8_neon; + c->vsse[4] = vsse_intra16_neon; c->nsse[0] = nsse16_neon_wrapper; diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 6f7c7c1690..386d2de0c5 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -843,6 +843,76 @@ function vsad16_neon, export=1 ret endfunc +function vsse8_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v0.8b}, [x1], x3 // Load pix1[0], first iteration + ld1 {v1.8b}, [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 + b.le 2f + + +1: + // x = abs(pix1[0] - pix2[0] - pix1[0 + stride] + pix2[0 + stride]) + // res = (x) * (x) + ld1 {v0.8b}, [x1], x3 // Load pix1[0 + stride], first iteration + ld1 {v1.8b}, [x2], x3 // Load pix2[0 + stride], first iteration + ld1 {v2.8b}, [x1], x3 // Load pix1[0 + stride], second iteration + ld1 {v3.8b}, [x2], x3 // Load pix2[0 + stride], second iteration + usubl v29.8h, v0.8b, v1.8b + usubl2 v28.8h, v0.16b, v1.16b + ld1 {v4.8b}, [x1], x3 // Load pix1[0 + stride], third iteration + ld1 {v5.8b}, [x2], x3 // Load pix1[0 + stride], third iteration + sabd v31.8h, v31.8h, v29.8h + usubl v27.8h, v2.8b, v3.8b + usubl v25.8h, v4.8b, v5.8b + 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 + mov v31.16b, v25.16b + umlal v16.4s, v29.4h, v29.4h + umlal2 v17.4s, v29.8h, v29.8h + sub w4, w4, #3 + umlal v16.4s, v27.4h, v27.4h + umlal2 v17.4s, v27.8h, v27.8h + cmp w4, #3 + + b.ge 1b + + cbz w4, 3f + +// iterate by once +2: + ld1 {v0.8b}, [x1], x3 + ld1 {v1.8b}, [x2], x3 + subs w4, w4, #1 + usubl v29.8h, v0.8b, v1.8b + sabd v31.8h, v31.8h, v29.8h + umlal v16.4s, v31.4h, v31.4h + umlal2 v17.4s, v31.8h, v31.8h + mov v31.16b, v29.16b + b.ne 2b + +3: + add v16.4s, v16.4s, v17.4s + uaddlv d17, v16.4s + fmov w0, s17 + + ret +endfunc + + function vsse16_neon, export=1 // x0 unused // x1 uint8_t *pix1