From patchwork Tue Sep 20 11:01:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 38071 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1849191pzh; Tue, 20 Sep 2022 04:02:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6KsHN4wZYXIAXzvgJ6lpmVT90JOAKJI3xlIhe50gDNfFkSDzojlxKWezQRMH9H/uAZ26Kp X-Received: by 2002:a05:6402:42d4:b0:443:4b8:8cba with SMTP id i20-20020a05640242d400b0044304b88cbamr19572269edc.3.1663671750468; Tue, 20 Sep 2022 04:02:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663671750; cv=none; d=google.com; s=arc-20160816; b=PBnUgCukULFN4SiwSE4bOVgVwpLpqjAx61/1pX78+Yu4fddKliHiNFplRQkjCRCdtB So3AO9xKjFIFTp2AtTlrxz4UTexc12WAEuM46uH43Q0TXMvmFwLsdTrx0Eztbss1Rire GXefisdmeZh7DXEjQIwE96eoQjLfBZhW6pPECIIVB4GEhg3OvrAyL4i/NF4GAJW4Ce4m Xw4h0Yy31zmMrBwpuo+CnfrnmqeuVm78S9LpOBvah3yjjrU0Thm3iLIpK1cBgx9bRGBi L6dLvtzzavQupMbgLWm0QX1L1WPvB+gbK4T78eQT5nasBoyhcLacINFXj1wrykU6NsDy 8FzQ== 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=3BtYT9XSSl7OKvLdM1A7Q6lvSW0hf+Thq0NuFFqF7cc=; b=npWPmDP5iopmFiVNAL8hYTeB4hZ9qNZI5jYbO8q4x2No+3EGDFdM/P0cNg6+M9NOJo 4baHwqKdfefeEAV0inDmw8TBoEGox8nvrfN8fNR6fNGD0Urvx1yl7P8DfJ99FY+zyOed BB7JnUAA0c2ML/MC4RFww3Ik7QbKMO7IFt2T9/Tg+2PUWsHTOJF+e0S+7kO1hExiGAf1 Y0U63D/2rGj8NSKThCiPSgjNl2b3sOyDxYpBU7+i99BKJa3LcrKVMXMq5/W3caxqKmSI QWVyZ5ua4Qu5kwhlcXkcZjElLmlo6ruXBUI/HmuY3L7R3vxDCKvFQIj8vmW5mCKrKhWi yeiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=jWDWwQ9v; 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 p11-20020a170906604b00b0077ce17dac95si869171ejj.120.2022.09.20.04.02.30; Tue, 20 Sep 2022 04:02:30 -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=jWDWwQ9v; 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 346C068B9B4; Tue, 20 Sep 2022 14:02:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DDB5068B872 for ; Tue, 20 Sep 2022 14:02:14 +0300 (EEST) Received: by mail-lf1-f49.google.com with SMTP id o2so3099800lfc.10 for ; Tue, 20 Sep 2022 04:02:14 -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=dOJb3hvskaeaLNDoOXi+r9/dUBBXUOE1rbu4SRnrx5s=; b=jWDWwQ9v44xQiorCajFmjB0F6kdIECVaX2llcg8u2Onofs3dbp8p5GDXPWbdbKvLwD rrRKMpt28L/4gGdjWOFfVNvtNQ+L+yNzEHoJ7m5AmS5D6SiA7OCrFbhlap+6XNvNQVvS Vf3HvFP0bwjPWR0TxiB+zgWBgxVbTnn5p+UKVR4s8v7+SbpBTsDO8Y5b2cpqUDGhXx34 eK2bm/nlzbNdkv2s6EvzRxmqZpNOBc34CrsE80vkvu+ImVRALlRzP0IW1rPOH4Jq45Gj u5bgp05AT5JxlOf5/mWk8cUfDQ+bHU20BgffTFZSN352ydE7UOPC4uCxZk5RkIG5+W94 OFkA== 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=dOJb3hvskaeaLNDoOXi+r9/dUBBXUOE1rbu4SRnrx5s=; b=xwiZ048mlJmgkyZfyC2cDgpzdlajf1kmUip77y3j8Un5QRf79VqqJ67CQnW94GZQ6J s3T+nXBlagnBMys6Y+J/QYNuWDZEklvYU5WpR/nH4WnWkwRHBm521g4hS2T+cj81H2Tw QrD2R8OID15plnFf0PZlw61cLjMPngZUH/k5IEHprEw4Mvm2ZaWuQVR2WAEzHnFmzR1D n6AGNr3+8PqkgRc6saOE6yFKw+SQ85hfBgpAANSmvWnqvOPyzSVXV9zcFYDL64FyHujP PaJM2yQKbnDqeNJW/wDrKttyTViYzWghBlhnN5Snz7tUNMcjjDG9JFxQ0aG7X2vk70Db 5qdA== X-Gm-Message-State: ACrzQf0wDe4a9jYTeZx3NKD5ADfZ9eeib1KAD9p3309PVyz3UACDVCli +UZtZG2ryfheAfL8NXNE93nEBbLq8mZ7wA== X-Received: by 2002:a05:6512:118b:b0:492:e3c4:a164 with SMTP id g11-20020a056512118b00b00492e3c4a164mr8615295lfr.598.1663671733807; Tue, 20 Sep 2022 04:02:13 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id d3-20020a19f243000000b00492f5ad0ae7sm265220lfk.43.2022.09.20.04.02.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 04:02:13 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 13:01:56 +0200 Message-Id: <20220920110158.15384-2-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920110158.15384-1-hum@semihalf.com> References: <20220920110158.15384-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] lavc/aarch64: Add neon implementation for pix_median_abs16 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: BgX9ViV9Mh4X Provide optimized implementation for pix_median_abs16 function. Performance comparison tests are shown below. - median_sad_0_c: 720.5 - median_sad_0_neon: 127.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 | 78 ++++++++++++++++++++++++ libavcodec/me_cmp.c | 5 +- 3 files changed, 85 insertions(+), 2 deletions(-) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index ade3e9a4c1..fb51a833be 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -53,6 +53,8 @@ int nsse16_neon(int multiplier, const uint8_t *s, const uint8_t *s2, ptrdiff_t stride, int h); int nsse16_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); +int pix_median_abs16_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) { @@ -78,6 +80,8 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsse[4] = vsse_intra16_neon; c->nsse[0] = nsse16_neon_wrapper; + + c->median_sad[0] = pix_median_abs16_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index f8998749a5..1e08d04869 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -969,3 +969,81 @@ function nsse16_neon, export=1 ret endfunc + +function pix_median_abs16_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v2.16b}, [x1], x3 + ld1 {v3.16b}, [x2], x3 + movi v31.8h, #0 + movi v16.8h, #0 + ext v0.16b, v2.16b, v2.16b, #1 + ext v1.16b, v3.16b, v3.16b, #1 + usubl v28.8h, v2.8b, v3.8b + usubl2 v27.8h, v2.16b, v3.16b + usubl v26.8h, v0.8b, v1.8b + usubl2 v25.8h, v0.16b, v1.16b + sub w4, w4, #1 // we need to make h-1 iterations + saba v31.8h, v26.8h, v28.8h + saba v16.8h, v25.8h, v27.8h + mov h18, v28.h[0] + cmp w4, #1 + sqabs h18, h18 + movi v0.8h, #0 + + b.lt 2f +1: + + ld1 {v6.16b}, [x1], x3 // pix1 vector for V(j-1) + ld1 {v7.16b}, [x2], x3 // pix2 vector for V(j-1) + subs w4, w4, #1 + ext v4.16b, v6.16b, v6.16b, #1 // pix1 vector for V(j) + ext v5.16b, v7.16b, v7.16b, #1 // pix2 vector for V(j) + + // protected registers: v30, v29, v28, v27, v26, v25, v24, v23 + // scratch registers: v22, v21, v20, v19, v17 + + // To find median of three values, calculate sum of them + // and subtract max and min value from it. + usubl v30.8h, v6.8b, v7.8b // V(j-1) + usubl2 v29.8h, v6.16b, v7.16b // V(j-1) + usubl v24.8h, v4.8b, v5.8b // V(j) + usubl2 v23.8h, v4.16b, v5.16b // V(j) + saba v0.8h, v30.8h, v28.8h + add v22.8h, v26.8h, v30.8h + smin v20.8h, v26.8h, v30.8h + add v21.8h, v25.8h, v29.8h + smax v19.8h, v26.8h, v30.8h + sub v22.8h, v22.8h, v28.8h + sub v21.8h, v21.8h, v27.8h + smin v17.8h, v19.8h, v22.8h + smin v22.8h, v25.8h, v29.8h + mov v28.16b, v30.16b + smax v20.8h, v20.8h, v17.8h // median values lower half + smax v19.8h, v25.8h, v29.8h + saba v31.8h, v24.8h, v20.8h + mov v27.16b, v29.16b + smin v19.8h, v19.8h, v21.8h + mov v26.16b, v24.16b + smax v17.8h, v22.8h, v19.8h // median values upper half + mov v25.16b, v23.16b + saba v16.8h, v23.8h, v17.8h + + b.ne 1b + +2: + mov h17, v0.h[0] + ins v16.h[7], wzr + add d18, d18, d17 + add v31.8h, v31.8h, v16.8h + uaddlv s17, v31.8h + add d18, d18, d17 + fmov w0, s18 + + ret + +endfunc diff --git a/libavcodec/me_cmp.c b/libavcodec/me_cmp.c index 4242fbc6e4..e2f9f84b05 100644 --- a/libavcodec/me_cmp.c +++ b/libavcodec/me_cmp.c @@ -1048,6 +1048,9 @@ av_cold void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx) ff_dsputil_init_dwt(c); #endif + c->median_sad[0] = pix_median_abs16_c; + c->median_sad[1] = pix_median_abs8_c; + #if ARCH_AARCH64 ff_me_cmp_init_aarch64(c, avctx); #elif ARCH_ALPHA @@ -1062,6 +1065,4 @@ av_cold void ff_me_cmp_init(MECmpContext *c, AVCodecContext *avctx) ff_me_cmp_init_mips(c, avctx); #endif - c->median_sad[0] = pix_median_abs16_c; - c->median_sad[1] = pix_median_abs8_c; } From patchwork Tue Sep 20 11:01:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 38072 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1849428pzh; Tue, 20 Sep 2022 04:02:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5NVtfc+HgPHuJDJylG/ZupZDEWkcC+NjzOhGmQp52bKT4s+uiihh0FBf0psn70qq9KABWA X-Received: by 2002:a05:6402:5188:b0:452:5395:a271 with SMTP id q8-20020a056402518800b004525395a271mr19629714edd.383.1663671768081; Tue, 20 Sep 2022 04:02:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663671768; cv=none; d=google.com; s=arc-20160816; b=Zh7B8s3yEDCLTCe2fHt2mPwemCnYte2zxaS7hzfkTcWoMSMd1eFb8kWg1xjk+/bDsm fUmLhdRsVI2pLvdcxDuBS6oIgTzJiVOr6qB9TH+pF+WGNCxIB3KGcs2ISPITyMpRpE/A 0glJ4U0BoalTeaVHFPoRt03giqoFRloUT37fNK/ySs8zP4YgJXDj8PZM4fWrUnBCFFzN kTveQVfQcHJkhhq+h3kiCoIKUuGr/9EBCNua+i7cjqLOITPPjqQvJQcLlOWe+pZPZq21 c8ktHDhlcO5Y0GrToJq2BQ/sI+sIoTq3eQ6Q+Rd0WavediK4nM8xgDUikIQ6G/3Ytp+Q Bm8Q== 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=MDS1F2tsBProb54qFBKrOBOwwtGW/345EOjX4PASMsc=; b=aBfqwelZHV/lw1Toj7d9TzS2mGNvjMS/No35UuUbK89xnsRO0EB/1nFOKCWtAGcReX ENaHx2veclQyu8p0AjhSwgycOLuu2mFm3Kl74p9/KisB7jAAFcFj2gCv1X8z/Lp//8j3 XOwpHdM6et5jkdvEnBQesHJ7Cn00G0UsRVB7OEJw8UyWsypZCZairCs+BY2I5hdxpIJT O4qAR8XthKsbCuvx7+n85Or9G8UnEbx0XqA52rt/olH/K9vzq01aDzXlNIAzsuGMCgQI xVbcCfail92PE7VjXvZZvE2X1VkGFgipDdQEMYceGGC/0RHoxt5WEjgY2Wc5dF7Rna6I fh+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=nh6S0Kgh; 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 ds18-20020a170907725200b0073d61fab74bsi1207628ejc.249.2022.09.20.04.02.39; Tue, 20 Sep 2022 04:02: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=nh6S0Kgh; 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 2BF8768BA2B; Tue, 20 Sep 2022 14:02:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9F72C68B9C5 for ; Tue, 20 Sep 2022 14:02:16 +0300 (EEST) Received: by mail-lj1-f178.google.com with SMTP id z20so2545946ljq.3 for ; Tue, 20 Sep 2022 04:02:16 -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=SKD+LkvGvSwxBZ3iz+uldiDa316RN866K3okk7enPpg=; b=nh6S0KghyNepi7Bw1EfohN06GuYRyBNwvMXTrxBDMDk2P9JVPN30RvH+L4OGPOKUL1 J5J3vf19fx6uD7Gd+0sfyrE2QHxZxY9cc0P03YNPeTpEbloZ52d+SdOi9DXZvK+CJreU E19jnn5QVbjl7qu/qOMFXgmwExtr9tOrJRSKdIKKm6s+AdO1aMOU5fQdjC2m8okHLQPW t9NYvgIVXDuJ7V1l+SdlmcXj6Ee7BATbxTPt5t69kiuAwcZB5eYIKdRnWwZsrzkdvdPb R13vP9r4hgbr/hBoz47KJIV3ceQ+gfmr2GaDBg0RAEo8yiZu/XcDbvu01T1vWxARuyvK cFgw== 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=SKD+LkvGvSwxBZ3iz+uldiDa316RN866K3okk7enPpg=; b=IENEc5oz0w/cleQYAXra/gAokvVWB24XfyN9Ls/X6aMWQqxHl30iKdvj2VrJ8HC9wo SVWsr4gATcNfTiRmFm/fZCgwXkwcYbsHnnqZjj3/pO7ELKXwyglS4d6Pm2qiBByfpfyU Dh6t9MUKtaUJV1R2RF/SwRPDcy5ScJpJFlyRy/USIWPSSdZA2Nl0DzZtRkMmjYFk0JIp gHGWZpVvBYh3SZ5BLXLuH6/I5oqFZSXitg/HHoAbGmc/7eVJMFldDqnPTijVipsyvRRp hEoaDrHwlzpG1T6Adf7UukjU7O0jqunSe+Gau4S4mghJd4AC3P/ZjmnbPB6m/s5S/qe/ xlWQ== X-Gm-Message-State: ACrzQf2WmSeSK6rvp1MohuyqXrHX59Xbv+1ImbacbTbBH/T24Ez809NJ xrjEhVD1PfMYZVh8PG76M0CvAjqxxsabAQ== X-Received: by 2002:a2e:a4b1:0:b0:26c:521:76b5 with SMTP id g17-20020a2ea4b1000000b0026c052176b5mr6793783ljm.258.1663671735606; Tue, 20 Sep 2022 04:02:15 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id d3-20020a19f243000000b00492f5ad0ae7sm265220lfk.43.2022.09.20.04.02.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 04:02:15 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 13:01:57 +0200 Message-Id: <20220920110158.15384-3-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920110158.15384-1-hum@semihalf.com> References: <20220920110158.15384-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] lavc/aarch64: Add neon implementation for vsad8_intra 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: Hh7k1jVI4oUR Provide optimized implementation for vsad8_intra function. Performance comparison tests are shown below. - vsad_5_c: 94.7 - vsad_5_neon: 20.7 Benchmarks and tests 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 | 42 ++++++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index fb51a833be..d3fa047a86 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -45,6 +45,8 @@ int vsad16_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); int vsad_intra16_neon(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, ptrdiff_t stride, int h) ; +int vsad_intra8_neon(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, + ptrdiff_t stride, int h) ; int vsse16_neon(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); int vsse_intra16_neon(MpegEncContext *c, const uint8_t *s, const uint8_t *dummy, @@ -75,6 +77,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->vsad[0] = vsad16_neon; c->vsad[4] = vsad_intra16_neon; + c->vsad[5] = vsad_intra8_neon; c->vsse[0] = vsse16_neon; c->vsse[4] = vsse_intra16_neon; diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 1e08d04869..1587f2ea43 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -1047,3 +1047,45 @@ function pix_median_abs16_neon, export=1 ret endfunc + +function vsad_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 + sub w4, w4, #1 // we need to make h-1 iterations + cmp w4, #3 + movi v16.8h, #0 + b.lt 2f + +1: + // v = abs( pix1[0] - pix1[0 + stride] ) + // score = sum(v) + ld1 {v1.8b}, [x1], x3 + sub w4, w4, #3 + ld1 {v2.8b}, [x1], x3 + uabal v16.8h, v0.8b, v1.8b + ld1 {v3.8b}, [x1], x3 + uabal v16.8h, v1.8b, v2.8b + cmp w4, #3 + mov v0.8b, v3.8b + uabal v16.8h, v2.8b, v3.8b + b.ge 1b + cbz w4, 3f + +2: + ld1 {v1.8b}, [x1], x3 + subs w4, w4, #1 + uabal v16.8h, v0.8b, v1.8b + mov v0.8b, v1.8b + cbnz w4, 2b + +3: + uaddlv s17, v16.8h + fmov w0, s17 + + ret +endfunc From patchwork Tue Sep 20 11:01:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 38073 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp1849566pzh; Tue, 20 Sep 2022 04:02:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7RlZdv7oJgkTrBN31OIGv541jFmvy0gmZX2SlnJibmwgQZeIm/TR2aIsjZMuW+bXIeIuDC X-Received: by 2002:a05:6402:4511:b0:43b:a182:8a0a with SMTP id ez17-20020a056402451100b0043ba1828a0amr19344319edb.410.1663671778157; Tue, 20 Sep 2022 04:02:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663671778; cv=none; d=google.com; s=arc-20160816; b=fXNFV0pD7NLC32xx9pAtbQ0YOi30/94mh/lnsgSqvsJjPB6xJHjqhNwNGbr7W4BLvI W90gB8GNwg5HjDx/lJtSBmueyqcHfBsekoPdTb2fH0UkJ6RMHM8GbCruTyJoflZWgnSx kKzBgwH4IqqPGSzQQ525tlxeAN9+faVitIXn9eOBrRH6a7nTTQH7bUEny8XieBUCDLFc DrhksFvyR3UqP03WkyBo+/t83FwlMIA+sGZyVexaZY4JI42HO8U0v1nNZKcwMy3hnpH8 TUlObyCAk1eH/AjfXZX5ng9pDTUOktldFeGmjqLmpPyouL/dY+bjjQCz9nQHw9OD5z3H Uo+Q== 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=qWlTYECoODHFHx9inzBueMMnT5VGeEZ1bsr9YBrdb0o=; b=FlaGcRbchW+ud9OVTpbiPh+eGSu1Mh07okRxg5sjm9fusQfWklGZSMiiOC4goF7YZ/ qd0U+b/9jZpJOVcZuC4p5+o6x9l9gdAgeUsaJ706ezdU2YYqYqPq60JY7sOjGH1mmPlr tPuThwm3UzvTNeIEA0ZjMj5xAfo1uhDxVfLY+cGpW/e0yWUvuHpoRG1ORD8Ex9AGaJRp F8dBjK1US5OKS3g7PWYBczRfFsPX57FLrJJOndmK9dRztlQUzG7QDOXpMhNZq5rbSODA BddashxGYmLbodk9Z2EHL8VpstxwtqV4xhCJet0wAJZQ3d0WLAfmNVzVEFpcQ5iEBrDf JWHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=mehaDam0; 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 h5-20020a1709070b0500b00730babc11e3si855283ejl.640.2022.09.20.04.02.49; Tue, 20 Sep 2022 04:02:58 -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=mehaDam0; 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 2C58C68BA3B; Tue, 20 Sep 2022 14:02:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f47.google.com (mail-lf1-f47.google.com [209.85.167.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E61B068B9C5 for ; Tue, 20 Sep 2022 14:02:18 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id w8so3078316lft.12 for ; Tue, 20 Sep 2022 04:02:18 -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=VHBzYjpVrHO4fjZ2qpt+/rzxVu4IkQd3a6djnQBs/YY=; b=mehaDam0zC1tYCZTJeNX5kV6vzKbBLAtyHah5sG+i2WDEGVFs7XT7O2DS/VAPULrXp 8EKNAcB5QGbl9+nIWn47fZpaWu1MVX/yk4zpvOZuttCugz2GNltlCWwjVB31LB5/P7u5 crJky6IQzN4mRBust5XCSEN2pV/2JnVcG/kI2z11uR41Uogqq3e9xyntkq8uSLj08nKs jFH9oTMIUK8G4leR8ngEvo2zirPE0iInY+7R538x126MH5GmN/5Sns8f6alHrgo6vVOZ 4EEOwCdYki0xf7JPwI4p7hVdoprIEeUNe+08Xlrmn1eTGZHi3dXfnkjDyGJFYPHdRVcO KLtA== 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=VHBzYjpVrHO4fjZ2qpt+/rzxVu4IkQd3a6djnQBs/YY=; b=djYVh9VgCk/RNTZgoIhiqPALQHy4u58bYZmonx9q4nHlCJQMMIgT2Nj+mP5SfAHEXH iL5LJoLdr1+tXfwt49ciQVGYQi/5DL8wJ7j+FEGvwXyGS+iV9UbcP4d4LcQf9nDNIx0d UVmWrD8nLmvsdE9EkJE5il7nvkJE+a8MfhMQc3XtnxOgMLxe+zFXoISbkgy9Jc/P4EQx MAQamN8/7H0JHKQqR/EvoFk4BS1jejVdvk3YPXshQLl3PwJbFPVfGA7SpuyFI86lKwKt J6IC2Q/UPRx+/avsvgkQQV7N170xPAZSHCN2Va3DRNewnY4q551uPN6JrdiDFcBKReQZ JqEw== X-Gm-Message-State: ACrzQf3aDcii2kGhg317JKlmjcGuy/ssXIultQ8LuyZsy5Cku1qJXeF9 PT7xe4XDtwQPIM9Tjj9mfj29X6ged5Wkzg== X-Received: by 2002:a05:6512:3e13:b0:499:1829:5181 with SMTP id i19-20020a0565123e1300b0049918295181mr8251449lfv.71.1663671737851; Tue, 20 Sep 2022 04:02:17 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id d3-20020a19f243000000b00492f5ad0ae7sm265220lfk.43.2022.09.20.04.02.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Sep 2022 04:02:17 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Sep 2022 13:01:58 +0200 Message-Id: <20220920110158.15384-4-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220920110158.15384-1-hum@semihalf.com> References: <20220920110158.15384-1-hum@semihalf.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavc/aarch64: Add neon implementation for pix_median_abs8 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: HAVeF00Gjk2a Provide optimized implementation for pix_median_abs8 function. Performance comparison tests are shown below. - median_sad_1_c: 277.0 - median_sad_1_neon: 82.0 Benchmarks and tests 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 | 62 ++++++++++++++++++++++++ 2 files changed, 65 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index d3fa047a86..e143f0816e 100644 --- a/libavcodec/aarch64/me_cmp_init_aarch64.c +++ b/libavcodec/aarch64/me_cmp_init_aarch64.c @@ -57,6 +57,8 @@ int nsse16_neon_wrapper(MpegEncContext *c, const uint8_t *s1, const uint8_t *s2, ptrdiff_t stride, int h); int pix_median_abs16_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, ptrdiff_t stride, int h); +int pix_median_abs8_neon(MpegEncContext *v, const uint8_t *pix1, const uint8_t *pix2, + ptrdiff_t stride, int h); av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) { @@ -85,6 +87,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->nsse[0] = nsse16_neon_wrapper; c->median_sad[0] = pix_median_abs16_neon; + c->median_sad[1] = pix_median_abs8_neon; } } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 1587f2ea43..11af4849f9 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -1089,3 +1089,65 @@ function vsad_intra8_neon, export=1 ret endfunc + +function pix_median_abs8_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *pix2 + // x3 ptrdiff_t stride + // w4 int h + + ld1 {v2.8b}, [x1], x3 + ld1 {v3.8b}, [x2], x3 + movi v31.8h, #0 + ext v0.8b, v2.8b, v2.8b, #1 + ext v1.8b, v3.8b, v3.8b, #1 + usubl v28.8h, v2.8b, v3.8b + usubl v26.8h, v0.8b, v1.8b + sub w4, w4, #1 // we need to make h-1 iterations + saba v31.8h, v26.8h, v28.8h + mov h18, v28.h[0] + cmp w4, #1 + sqabs h18, h18 + movi v0.8h, #0 + + b.lt 2f +1: + ld1 {v6.8b}, [x1], x3 // pix1 vector for V(j-1) + ld1 {v7.8b}, [x2], x3 // pix2 vector for V(j-1) + subs w4, w4, #1 + ext v4.8b, v6.8b, v6.8b, #1 // pix1 vector for V(j) + ext v5.8b, v7.8b, v7.8b, #1 // pix2 vector for V(j) + + // protected registers: v30, v29, v28, v27, v26, v25, v24, v23 + // scratch registers: v22, v21, v20, v19, v17 + + // To find median of three values, calculate sum of them + // and subtract max and min value from it. + usubl v30.8h, v6.8b, v7.8b // V(j-1) + usubl v24.8h, v4.8b, v5.8b // V(j) + saba v0.8h, v30.8h, v28.8h + add v22.8h, v26.8h, v30.8h + smin v20.8h, v26.8h, v30.8h + smax v19.8h, v26.8h, v30.8h + sub v22.8h, v22.8h, v28.8h + smin v17.8h, v19.8h, v22.8h + mov v28.16b, v30.16b + smax v20.8h, v20.8h, v17.8h // median values lower half + smax v19.8h, v25.8h, v29.8h + saba v31.8h, v24.8h, v20.8h + mov v26.16b, v24.16b + smax v17.8h, v22.8h, v19.8h // median values upper half + + b.ne 1b +2: + mov h17, v0.h[0] + ins v31.h[7], wzr + add d18, d18, d17 + uaddlv s17, v31.8h + add d18, d18, d17 + fmov w0, s18 + + ret + +endfunc