From patchwork Thu Jul 26 21:03:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 9811 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp63184jad; Thu, 26 Jul 2018 14:09:36 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeGbuIJ4olFzox9Y+24XcXoCaTXHZ1RBOJcgry08iFXV+c+o90PK1GnH0BT4S5m8TdFJb8b X-Received: by 2002:a5d:4b90:: with SMTP id b16-v6mr1693671wrt.168.1532639376607; Thu, 26 Jul 2018 14:09:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532639376; cv=none; d=google.com; s=arc-20160816; b=PEw5cyy0mKcaQp+LQv895JPix2tANDdwtZQ7YzNDBLvxd/8ouE07vQ74y+v8EzkrIM A/dNC2gmAPrGE0x89HcemBnZ2lwAijldWmq+zJZDMmdK5UNQwHYKpeTZ6I0JR3f72ZWx ER4ZCm/9457XfQnO8aCsES8RwfdX5eTA/J1OgCMkvhdmh+PkowzaWS1TK0Q7LVR8d8c5 F5dl3ZKn8KzNs/pLXd8V51Gbjw8fqdOs7kxeCLCB6Qiqprr2F3p+VNKhq1haiYkEK/1T GRaGdHPqQtx39K/eCH94y44Zm4CFBRvkROpNGVYFm+986jTv+FYgOV8alT3pvtEDdHU9 e0jQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=blmlUWaLHthNU6WOGc6yxBfEzsJISuHEhzIoSlkhU9k=; b=cSufRWvcMEBOQJjZ3mLQbivWM5pyL4SdOPTdKwHUuhqZIYb0Kl8XpkGWFIqvq/miw5 pHcEerJKlyuxrzI0NrmXpOPF3e7T5pEwnsJSbKPCgSQTeSNGB1SsGQYbSer4dnRnrb7G jJ7v9XIK8pC1RGJCwMQaA8zsZkzk0f9WgyvyBVklqdMVc0nVnVHUkQorUtSD8aW8sxXV AXYIovYKysS1TPYZCK7BqMx6sxkc5KlZ/7ENRShXXEg0lBoUmrCdRzGVUSMPcygBI94i 5GR2ypz5sEufaq1l9uD+z7ZjGSW0iD7XhjXV7z9kB603rka4EQld2/Ydu51y8SpwJb5f AW9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=k4NIpVnf; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 32-v6si1927808wrc.289.2018.07.26.14.09.36; Thu, 26 Jul 2018 14:09:36 -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=@gmail.com header.s=20161025 header.b=k4NIpVnf; 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=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D08E68A46C; Fri, 27 Jul 2018 00:09:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f68.google.com (mail-lf1-f68.google.com [209.85.167.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A5C9D68A41E for ; Fri, 27 Jul 2018 00:09:13 +0300 (EEST) Received: by mail-lf1-f68.google.com with SMTP id j8-v6so2148679lfb.4 for ; Thu, 26 Jul 2018 14:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=ZW5Vbn6ynGfRbVy5JTQyA6m/7nEcH7u4onl6wFUqxew=; b=k4NIpVnfNOIePhbraWTKvRY2WjdpnD+NvwA2e4gneGS73jeIUtjdAamocXJuvmetCD I+oEcWoUzLtf5Z/JzEj5n6Kyqrs3y/SabjTzv5pF+LWxwh3ev6WCijPt4IFeykcIhw5y HmS+/2CYAW1mCGget7f8ZacsUDadeXo3ZK9o6GV4KPygYaoYwAtup7pyigo2U3UdXKJz 6QE3ZGkm1taFWxWQdS/vxO+0b3ypKltCyySy84g5Nodrv156MKrcnV4YUm2WJw/9tI+L HuH3p2AXeCtGMFbLN1fzpAIBrDFCLHco8WqftzUdWVewBIkKxvWJU3sj/+4z8mHnXBpB UFMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=ZW5Vbn6ynGfRbVy5JTQyA6m/7nEcH7u4onl6wFUqxew=; b=D07Q8dP6ANralCaDPGSsVknVIvnG7DVs+ZTjsSuAKr3Ue60rPBE9xaMf/MXeQVolWi 5wAUnY2wDuy0AslMys7H/NIgAi0yWzaGXZTdzJUTcHR9t2oTGGEezl963/5WEklXcvRS pKIVgdCashUOrm+X/QTC1Pf1kEqJOPpOjuha1S6wur2yO5u+U9SMaIChpb/50+nKE3DT uGMtgfNv856FxXRo7KFuG9UaHmGplHzaf0gWUg5zcaMo0n+9OkYhnrDTMBX4mHhCu/o4 tYJTR4Pc9dgGabzDaB7flxO/uaZVpiBd3XErgOJ3gyngDto/QyAVssjHsGrktoeFMINk PyFg== X-Gm-Message-State: AOUpUlG5BADpJncjwRVyvRMA1sMKHTrXInYjaxTtmfqoa/Zv5rZTtTlA AJmYyrTelk4J7PAnkCD1MkbOZMiG X-Received: by 2002:a19:eb1b:: with SMTP id j27-v6mr2401819lfh.0.1532639028990; Thu, 26 Jul 2018 14:03:48 -0700 (PDT) Received: from localhost.localdomain (91-159-194-103.elisa-laajakaista.fi. [91.159.194.103]) by smtp.gmail.com with ESMTPSA id w14-v6sm372179ljh.71.2018.07.26.14.03.47 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 26 Jul 2018 14:03:48 -0700 (PDT) From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Fri, 27 Jul 2018 00:03:46 +0300 Message-Id: <20180726210346.28828-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] lavfi/nlmeans: fixup aarch64 assembly with clang X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Clang is more strict about some things. --- libavfilter/aarch64/vf_nlmeans_neon.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/aarch64/vf_nlmeans_neon.S b/libavfilter/aarch64/vf_nlmeans_neon.S index 6308a428db..ac16157bbd 100644 --- a/libavfilter/aarch64/vf_nlmeans_neon.S +++ b/libavfilter/aarch64/vf_nlmeans_neon.S @@ -22,7 +22,7 @@ // acc_sum_store(ABCD) = {X+A, X+A+B, X+A+B+C, X+A+B+C+D} .macro acc_sum_store x, xb - dup v24.4S, v24.4S[3] // ...X -> XXXX + dup v24.4s, v24.s[3] // ...X -> XXXX ext v25.16B, v26.16B, \xb, #12 // ext(0000,ABCD,12)=0ABC add v24.4S, v24.4S, \x // XXXX+ABCD={X+A,X+B,X+C,X+D} add v24.4S, v24.4S, v25.4S // {X+A,X+B+A,X+C+B,X+D+C} (+0ABC) @@ -37,7 +37,7 @@ function ff_compute_safe_ssd_integral_image_neon, export=1 movi v26.4S, #0 // used as zero for the "rotations" in acc_sum_store sub x3, x3, w6, UXTW // s1 padding (s1_linesize - w) sub x5, x5, w6, UXTW // s2 padding (s2_linesize - w) - sub x9, x0, x1, UXTW #2 // dst_top + sub x9, x0, w1, UXTW #2 // dst_top sub x1, x1, w6, UXTW // dst padding (dst_linesize_32 - w) lsl x1, x1, #2 // dst padding expressed in bytes 1: mov w10, w6 // width copy for each line