From patchwork Mon Aug 22 15:26:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37398 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1361440pzh; Mon, 22 Aug 2022 08:27:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR6Y+uq61hHclPsQsVU2sYJ8wIEcpK70Eqay/ObDlagOUVTINfsK/44H/8dVfhVTBrJd0ILc X-Received: by 2002:a05:6402:14cd:b0:446:52ed:f131 with SMTP id f13-20020a05640214cd00b0044652edf131mr11871795edx.341.1661182026845; Mon, 22 Aug 2022 08:27:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661182026; cv=none; d=google.com; s=arc-20160816; b=auDg/Jdx4z0VTjnLQFF3odeOVTNM4GbOcYfnjOIUBrIrOltiFp3ZDvM+VTqCjDCBhE W07z79GyD/0MDXYXL4zZudLTIpIL3F8gN6Lm9VKbhP1APgpuj8BCfRy/lLCoQ63reVLV VWOso1r2+FXnjU1W7P9lgdVqH3EK9tCbbs2bhRRBUOyLybIwyH+K0NsHwgF1hQknmxl7 R7s3RBgEILXYIlE0xQ+xaZWaRXb7vOBpv0gqtK2Z8fAhxzYO2i2xrDG2OY3Pb08F6vV/ L4IYP4LfC2OqUDLtF6rHweHBVaXmzB+hWQel9rE7ppYz2aMZR2YV3/8E18lUIA6lhCv6 fWhA== 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=M/+ExitrdNGyeY00ipUOV/Hux4cVTCUlWowFnvmvwcU=; b=Vs8/vaFCvEwaZ2kzHkTJ3lbtv3xLmQdCyIUM/urPPEDwFRroEpcbmAyD7dojuo9LJp h9wde9+O7vXW4nVt/WUv9FJs5RbR0dq39W3DuIQp5iUeF9SQDLl3T7od3nPPybmWa/XL vAnR46H0eAqoEuyVMa2XYv00VbE77QpMC6XB8STA+d5F81DNlziM/rmUxSx9234q3NuC kbBIE4aiaUJdf/Z08aYjZICvt01W7L2uKmayWRmSUh2myziv3r8UNi1796+MwL+nGms9 yS8657Rj5NDLQ3YwC8VD6QkcQTE/YmsxFSM/fBY98UwINg0yDHaeNiPyfwF7tehlvYHH wszw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b="DK+0Y/gZ"; 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 cx1-20020a05640222a100b00445e63a702fsi8607074edb.215.2022.08.22.08.27.06; Mon, 22 Aug 2022 08:27:06 -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="DK+0Y/gZ"; 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 E5D1668BA2D; Mon, 22 Aug 2022 18:26:48 +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 CC46568BA1C for ; Mon, 22 Aug 2022 18:26:42 +0300 (EEST) Received: by mail-lf1-f47.google.com with SMTP id be9so7832329lfb.12 for ; Mon, 22 Aug 2022 08:26:42 -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; bh=JOowWCXKUNlSQSlUTEaEnzMt07wxf7+1QgxYoBrQbjk=; b=DK+0Y/gZ4jBg2t/1j4Qttv3WJzLVTvfxnGCpKw9G4mEeHzkn/A3TmfaLl7JmhND8X0 wUcKEXOfK/2gtOwwF5bhn/Rp24W7WCDPdNNzde+AyTH/0R4GvnN6ifmYwicxvJZBamCH dDW7PHAOJ8dwLuOc+Dbpn3nML5HPzzi3RdHglTBxQLOgHNWCGH59dt54P4qgDsZ0HTNs QH8INjUNM1qGk2TpjRMQ7mYfXyC+ZA+cIFvHrnZOL9c4n+udmxnWEfd/dzmripBca1ay mhaflXltDB8ro+ALrbQ3fbFGpa3iEOQAzHQVCM2PctzvXeleClx/rI3wwYGlLElTyQRM tOLw== 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; bh=JOowWCXKUNlSQSlUTEaEnzMt07wxf7+1QgxYoBrQbjk=; b=MUvoJyg+3p2386Yq4I9fpKMJk8utSUMhUo0eqdQ0Zr8TE4MQUrKYigYQPvmejo7Jnw y36eGwsbaLNsklVyM9mEkjNBhb+p45OxqoHbipYqdrYT/4VcNgnygzn0Kps697q6oB5e 3MeahnYCMkU/1/+4fIVpUuGrpi360hc+H8Y18emlAZ0h55wEJBJt7JoTt+YSqNzhgQp9 7d3RBxbWKMRagkwE6xU/G73N1KpvhHXnOl4pg7f8HDHm+y+vKeMKyL8JdDbzn3DsIeaZ msa9T8VuGLBGfGEa/3+zxUgJBLKnwywhWPRDTDFTqWIK9J7QMACb/qpjF2RIwr6gZy3G 3WXA== X-Gm-Message-State: ACgBeo0Cc5ptRBHVsC8hCCgj+nXNIfCR5r3Bki5ekiGLLEEj7XGXf78c kNo2/bLmmz2sj9ZkGRE7+s4iJ0TsHmNBAA== X-Received: by 2002:a05:6512:33d6:b0:492:c423:1672 with SMTP id d22-20020a05651233d600b00492c4231672mr6840297lfg.432.1661182001855; Mon, 22 Aug 2022 08:26:41 -0700 (PDT) Received: from hum-HP-ProBook-440-G7.office.semihalf.net ([83.142.187.84]) by smtp.gmail.com with ESMTPSA id z13-20020a056512370d00b00492f21c161esm2921lfr.123.2022.08.22.08.26.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 08:26:41 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Aug 2022 17:26:24 +0200 Message-Id: <20220822152627.1992008-3-hum@semihalf.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220822152627.1992008-1-hum@semihalf.com> References: <20220822152627.1992008-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: RLrAzIeb/+WC 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 | 97 ++++++++++++++++++++++++ 2 files changed, 101 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 d4c0099854..279bae7cb5 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -659,3 +659,100 @@ 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 + + movi v30.4s, #0 + movi v29.4s, #0 + + add x5, x1, x3 // pix1 + stride + add x6, x2, x3 // pix2 + stride + sub w4, w4, #1 // we need to make h-1 iterations + cmp w4, #3 // check if we can make 4 iterations at once + b.le 2f + +// make 4 iterations at once +1: + // x = abs(pix1[0] - pix2[0] - pix1[0 + stride] + pix2[0 + stride]) = + // res = (x) * (x) + ld1 {v0.16b}, [x1], x3 // Load pix1[0], first iteration + ld1 {v1.16b}, [x2], x3 // Load pix2[0], first iteration + ld1 {v2.16b}, [x5], x3 // Load pix1[0 + stride], first iteration + usubl v28.8h, v0.8b, v1.8b // Signed difference of pix1[0] - pix2[0], first iteration + ld1 {v3.16b}, [x6], x3 // Load pix2[0 + stride], first iteration + usubl2 v27.8h, v0.16b, v1.16b // Signed difference of pix1[0] - pix2[0], first iteration + usubl v26.8h, v3.8b, v2.8b // Signed difference of pix1[0 + stride] - pix2[0 + stride], first iteration + usubl2 v25.8h, v3.16b, v2.16b // Signed difference of pix1[0 + stride] - pix2[0 + stride], first iteration + ld1 {v4.16b}, [x1], x3 // Load pix1[0], second iteration + sqadd v28.8h, v28.8h, v26.8h // Add first iteration + ld1 {v6.16b}, [x5], x3 // Load pix1[0 + stride], second iteration + sqadd v27.8h, v27.8h, v25.8h // Add first iteration + ld1 {v5.16b}, [x2], x3 // Load pix2[0], second iteration + smlal v30.4s, v28.4h, v28.4h // Multiply-accumulate first iteration + ld1 {v7.16b}, [x6], x3 // Load pix2[0 + stride], second iteration + usubl v26.8h, v4.8b, v5.8b // Signed difference of pix1[0] - pix2[0], second iteration + smlal2 v29.4s, v28.8h, v28.8h // Multiply-accumulate first iteration + usubl2 v25.8h, v4.16b, v5.16b // Signed difference of pix1[0] - pix2[0], second iteration + usubl v24.8h, v7.8b, v6.8b // Signed difference of pix1[0 + stride] - pix2[0 + stride], first iteration + smlal v30.4s, v27.4h, v27.4h // Multiply-accumulate first iteration + usubl2 v23.8h, v7.16b, v6.16b // Signed difference of pix1[0 + stride] - pix2[0 + stride], first iteration + sqadd v24.8h, v26.8h, v24.8h // Add second iteration + smlal2 v29.4s, v27.8h, v27.8h // Multiply-accumulate first iteration + sqadd v23.8h, v25.8h, v23.8h // Add second iteration + ld1 {v18.16b}, [x1], x3 // Load pix1[0], third iteration + smlal v30.4s, v24.4h, v24.4h // Multiply-accumulate second iteration + ld1 {v31.16b}, [x2], x3 // Load pix2[0], third iteration + ld1 {v17.16b}, [x5], x3 // Load pix1[0 + stride], third iteration + smlal2 v29.4s, v24.8h, v24.8h // Multiply-accumulate second iteration + ld1 {v16.16b}, [x6], x3 // Load pix2[0 + stride], third iteration + usubl v22.8h, v18.8b, v31.8b // Signed difference of pix1[0] - pix2[0], third iteration + smlal v30.4s, v23.4h, v23.4h // Multiply-accumulate second iteration + usubl2 v21.8h, v18.16b, v31.16b // Signed difference of pix1[0] - pix2[0], third iteration + usubl v20.8h, v16.8b, v17.8b // Signed difference of pix1[0 + stride] - pix2[0 + stride], first iteration + smlal2 v29.4s, v23.8h, v23.8h // Multiply-accumulate second iteration + sqadd v20.8h, v22.8h, v20.8h // Add third iteration + usubl2 v19.8h, v16.16b, v17.16b // Signed difference of pix1[0 + stride] - pix2[0 + stride], first iteration + smlal v30.4s, v20.4h, v20.4h // Multiply-accumulate third iteration + sqadd v19.8h, v21.8h, v19.8h // Add third iteration + smlal2 v29.4s, v20.8h, v20.8h // Multiply-accumulate third iteration + sub w4, w4, #3 + smlal v30.4s, v19.4h, v19.4h // Multiply-accumulate third iteration + cmp w4, #3 + smlal2 v29.4s, v19.8h, v19.8h // Multiply-accumulate third iteration + + b.ge 1b + + cbz w4, 3f + +// iterate by once +2: + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x2], x3 + ld1 {v2.16b}, [x5], x3 + usubl v28.8h, v0.8b, v1.8b + ld1 {v3.16b}, [x6], x3 + usubl2 v27.8h, v0.16b, v1.16b + usubl v26.8h, v3.8b, v2.8b + usubl2 v25.8h, v3.16b, v2.16b + sqadd v28.8h, v28.8h, v26.8h + sqadd v27.8h, v27.8h, v25.8h + smlal v30.4s, v28.4h, v28.4h + smlal2 v29.4s, v28.8h, v28.8h + subs w4, w4, #1 + smlal v30.4s, v27.4h, v27.4h + smlal2 v29.4s, v27.8h, v27.8h + + b.ne 2b + +3: + add v30.4s, v30.4s, v29.4s + saddlv d17, v30.4s + fmov w0, s17 + + ret +endfunc