From patchwork Mon Aug 22 15:26:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hubert Mazur X-Patchwork-Id: 37399 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1361527pzh; Mon, 22 Aug 2022 08:27:16 -0700 (PDT) X-Google-Smtp-Source: AA6agR7dG6vtlX/T1aUKUsD1IPgeVl/Tuql+jM5KtXydX4KfXysRo5R4wucMtns8gl/hhFdaI7yT X-Received: by 2002:a05:6402:4311:b0:447:9fb:b710 with SMTP id m17-20020a056402431100b0044709fbb710mr15037edc.272.1661182035979; Mon, 22 Aug 2022 08:27:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661182035; cv=none; d=google.com; s=arc-20160816; b=0i27imgud4wI1KGMdIPSIuxT9dQkltAbbQGaD2dfibD+emUsmqx6RYspxtahKLYran bZnUBgca/gCW72xuQa+KQ5g79BePg5fZJbCrarJWSi/Y5I+nuh/xvz0p+LKc+KqRK+R9 ky6A3L+21h5D4/j9ml0DX/bCHSTpWrhvZwoRfpCcqHnZNA1PW19agZH06QxijGZ25GoF 6qdlkkIjNoR5euby8XqtO08XrnLoxlYaKtkXBn7pVbyMBn1ReWIr6oeUB87NS/KbKWgV FrGWQ6nNYGxJsDB5ydX0zutirypFoG4jW58oXFXJ37tFnlPwgbohNf6qRp7EBCK18W/E 9pHQ== 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=tE1czw2bfjfHsq/FD+f1DwBQGhLHanwe9COMO3nLDek=; b=URKttyZfKv1Af8n9qssylkuGj6qpFP7njWYjoapNRbRpxnZIAcExknE695djBpBmZv aoHW8bpnkALs0+l4Ph2O127MLh+GbbAOQHuwA4aD7jTNVNii9oFbC7S+tcuLthPufHBP 9Lh9/0O67/vWrJzIttNwC5X+XopIfN0mc/L5pb1DGq10b/1yjWyzgQYTb5n6RtSmR+sq DcOOLvyoPTSq9O7NyphtO0OqbE8zSY3jjINiY+AR/P7rSHmacI71gOQauH4p+5r4OKJD dy9isyBg5RxftNVg23v2p6nr6rGcGw1N7Aafg9iUznISaxnospgD346/EoT3Y3uF09ot YT0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@semihalf.com header.s=google header.b=CSi1nUtN; 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 ec40-20020a0564020d6800b0043d0c49375bsi8596589edb.389.2022.08.22.08.27.15; Mon, 22 Aug 2022 08:27:15 -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=CSi1nUtN; 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 0FDA068BA0C; Mon, 22 Aug 2022 18:26:51 +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 5F95A68BA2F for ; Mon, 22 Aug 2022 18:26:44 +0300 (EEST) Received: by mail-lf1-f49.google.com with SMTP id be9so7832405lfb.12 for ; Mon, 22 Aug 2022 08:26:44 -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=Ab2fXCqaExS7bHmukV+siuKUQ1DWa+I6kb+MaKV06bc=; b=CSi1nUtNDgA7RWmOEUC/7C9yiKaFaxy2QPwGpFHOzj4is1/mX/mni5BO/FefcryXr8 sqlfqRY9t6QEQcMjp1uORokkL+KeSsRqIIzc3gwn1upXoGw685gQ7DU8a+khg8HNDHT1 I0QcJjtTX1xaM5XnOct1U9BkWM/22z6jekzaUZbLodE8Whfukq6nx2BuqGe2/EOLG7/a MaWx8KUcAEWfpLzdZRcG7MJPdX9BCZHLmLhotl4n5IaEu3KUlN3xvi7cQl7Y4FCPF/Yi p7huRJOmWIUqxcDlk108DmBM5Rx/bZ5IrquQKv7302mqAZQTRDnwPXbQLAZ7eQWR8q5M CjOw== 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=Ab2fXCqaExS7bHmukV+siuKUQ1DWa+I6kb+MaKV06bc=; b=Wkc3FyEE1wNOsIHDXshRwNMKuOI9sGdYvp7LIk22l2K2ShAVyxHflfrcYsd6TP8lQn qoFvverfG+IAAhOUeIVZ4mf0ja2TgILbPfr8ym0fNcakNOrO7s57Q3QO3x2SpGprOw1d rP2EnNA67kgIS57GUBKoDZAE5hO5nisFAtbm+ZheGICDqmgyL3RaCz6OusowLSN4JAvp ERj6V9vWAEp1QWBcnkK99x+/xlkQcAD+ELONd4CSI4cRo24q3iD/GdZvpRRcOWI6yQXn L2/cH7f7EmYC8Hl0Kk961ynmEWX8hjADF2RMMyJNpqOBRHy/FHWN1mpJvAR/tf6IS+3V aASQ== X-Gm-Message-State: ACgBeo15tzt7eJkURDjdgoJ2+CdGuA3FXlbaL1VhK8PgDB0a6ycU4hqz cYjh26w8ke9qm7CaYUliKTzVW0IgBUkAtw== X-Received: by 2002:a05:6512:2294:b0:492:e136:5211 with SMTP id f20-20020a056512229400b00492e1365211mr2601676lfu.273.1661182003381; Mon, 22 Aug 2022 08:26:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 08:26:43 -0700 (PDT) From: Hubert Mazur To: ffmpeg-devel@ffmpeg.org Date: Mon, 22 Aug 2022 17:26:25 +0200 Message-Id: <20220822152627.1992008-4-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 3/5] lavc/aarch64: Add neon implementation for vsad_intra16 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: udgP2wqu+Qe+ Provide optimized implementation for vsad_intra16 function for arm64. Performance comparison tests are shown below. - vsad_4_c: 177.2 - vsad_4_neon: 24.5 Benchmarks and tests are run with checkasm tool on AWS Gravtion 3. Signed-off-by: Hubert Mazur --- libavcodec/aarch64/me_cmp_init_aarch64.c | 3 ++ libavcodec/aarch64/me_cmp_neon.S | 58 ++++++++++++++++++++++++ 2 files changed, 61 insertions(+) diff --git a/libavcodec/aarch64/me_cmp_init_aarch64.c b/libavcodec/aarch64/me_cmp_init_aarch64.c index 7b81e48d16..af83f7ed1e 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 vsad_intra16_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); @@ -64,6 +66,7 @@ av_cold void ff_me_cmp_init_aarch64(MECmpContext *c, AVCodecContext *avctx) c->sse[2] = sse4_neon; c->vsad[0] = vsad16_neon; + c->vsad[4] = vsad_intra16_neon; c->vsse[0] = vsse16_neon; } diff --git a/libavcodec/aarch64/me_cmp_neon.S b/libavcodec/aarch64/me_cmp_neon.S index 279bae7cb5..126e267fdc 100644 --- a/libavcodec/aarch64/me_cmp_neon.S +++ b/libavcodec/aarch64/me_cmp_neon.S @@ -756,3 +756,61 @@ function vsse16_neon, export=1 ret endfunc + +function vsad_intra16_neon, export=1 + // x0 unused + // x1 uint8_t *pix1 + // x2 uint8_t *dummy + // x3 ptrdiff_t stride + // w4 int h + + sub w4, w4, #1 // we need to make h-1 iterations + add x5, x1, x3 // pix1 + stride + cmp w4, #4 + movi v16.8h, #0 + + b.lt 2f + +// make 4 iterations at once +1: + // v = abs( pix1[0] - pix1[0 + stride] ) + // score = sum(v) + // abs(x) = ( (x > 0) ? (x) : (-x) ) + + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x5], x3 + ld1 {v2.16b}, [x1], x3 + uabal v16.8h, v0.8b, v1.8b + ld1 {v3.16b}, [x5], x3 + uabal2 v16.8h, v0.16b, v1.16b + ld1 {v4.16b}, [x1], x3 + uabal v16.8h, v2.8b, v3.8b + ld1 {v5.16b}, [x5], x3 + uabal2 v16.8h, v2.16b, v3.16b + ld1 {v6.16b}, [x1], x3 + uabal v16.8h, v4.8b, v5.8b + ld1 {v7.16b}, [x5], x3 + uabal2 v16.8h, v4.16b, v5.16b + sub w4, w4, #4 + uabal v16.8h, v6.8b, v7.8b + cmp w4, #4 + uabal2 v16.8h, v6.16b, v7.16b + + b.ge 1b + cbz w4, 3f + +// iterate by one +2: + ld1 {v0.16b}, [x1], x3 + ld1 {v1.16b}, [x5], x3 + subs w4, w4, #1 + uabal v16.8h, v0.8b, v1.8b + uabal2 v16.8h, v0.16b, v1.16b + cbnz w4, 2b + +3: + uaddlv s17, v16.8h + fmov w0, s17 + + ret +endfunc