From patchwork Thu Dec 16 16:27:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Kelly X-Patchwork-Id: 32662 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp609598iog; Thu, 16 Dec 2021 08:27:26 -0800 (PST) X-Google-Smtp-Source: ABdhPJxhJrjtCzwtyGQ4Hj75SLU/YJJTuuVtJEdYOuEgUwaHq3oB2GPQKZPOmMJ0Kg84snGA8Y2c X-Received: by 2002:a17:906:2e93:: with SMTP id o19mr2292079eji.408.1639672046523; Thu, 16 Dec 2021 08:27:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1639672046; cv=none; d=google.com; s=arc-20160816; b=Dj6rVwp7SAqe31UFy632tNidbwEJY2hs7dPxia1P7RUSt/w5Tp+0xuwvkmVg2woWfj Eo7BUSNGgi6rGfRY+7JQ6mBh+2mlSjQToNjhg1RkSiu5qw8Z056TJpNK5BO/DBdWynnz LTxbQs2OYhT2Dbo6cUiITIzJq9jYyN8Yy6lVu1r1G74Th/brJVfVrPb6+GpRr8dzMqfm j1vLTs0z3U8BFbT7pGZ8t6wtCmN0yQuyjKdQlKSw30HudU0odtClUK1ttPHqy0pbl+f7 MgDIUEbOa2Q1tNdyIYj4+QOwe5SZOPB7j+suMus7W0IEcgr3KKMe3O9vgFnF87MAXtWp JOJA== 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:to:from:mime-version:message-id:date :dkim-signature:delivered-to; bh=RTTidFohYVqbh1tl9O9LUicMGBowTN5CD952Xi/cF9A=; b=a80euOs+9n4KUwbhWQG2VIMtLhJfAgpAyJRdIJ5MUCCi9YmBDMRIGnhKGvnNVh0vSH mxJgPxNnUXanLllob3Soc8E24IXufBqyrncaYtB16GUKU6HXvr4tp8cX+8/um18nBWmC mv1WJ/1g9/APDCWQn7NTnq1SsdidbwokniD1aPZ4pzNNOIEHxu0J5/LHlKweKscqXxKT 0XDLHguV0EwSnrR8eAdfrvlT/MNhA3ikZdYMJQ3AMW3UXhTpvVTbN9F0djJP2J/gLvoC 9MAH/A3R8GEI92xgxUDiWlvO7ia7YzT0C5rkThR8RmRzB0XYQRBBZu5slsrv5cQTMBS8 FRow== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=bW5+2fEB; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id js19si4694322ejc.573.2021.12.16.08.27.25; Thu, 16 Dec 2021 08:27:26 -0800 (PST) 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=@google.com header.s=20210112 header.b=bW5+2fEB; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A4EB68AEEC; Thu, 16 Dec 2021 18:27:22 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f73.google.com (mail-qv1-f73.google.com [209.85.219.73]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E327C68807F for ; Thu, 16 Dec 2021 18:27:15 +0200 (EET) Received: by mail-qv1-f73.google.com with SMTP id a7-20020a056214062700b00410c76282c3so7442721qvx.4 for ; Thu, 16 Dec 2021 08:27:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=/7NaVRUhALixXogEMPRAJtuOPUcP7SmMIhmOMmV+Mhg=; b=bW5+2fEBekIjfxG3RNL3/ps4RylqCzCpTqvjnifVIIrRjcv0Tk49xoRk2iBAmYOKNP GdI0z4XHR1Vl2HwM5bu5vo6/Updbk5ETt8LNNtqiW1akGo56hTgqjpX02IJ5v5Ajm7jJ 9nOgbUf1DlbA6S8saBFbRJkEekCGN2Rs7SzRVm99QXWqw3A25PGIutx1wTrxIrJGp2wL Ou4g2Tas2lXBmUnhYJtI39Rmex3F4z4yybk10RdJYd+tc17ZgSnBUFBBPw2zqFA3xodG WtBcqKkB8vd0dTituQCYxIe+cx0eYmeeNzvH1yQLQSKMZzqjoDveAt0dHTLHgU93AECj GkWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=/7NaVRUhALixXogEMPRAJtuOPUcP7SmMIhmOMmV+Mhg=; b=qjYP3NCGQDO79ItgBOvTHtTyOwXzDRNbJf+WM4wdEUIa7n7qP4JG0tcpDtnnStSdlT 44CpViAAnH6AxvFlWWrltESD479E3D5y12fD+Pd0gQ5/RyBaJ19Dl3cFb/BE9YNhUsM7 e/yfKnexShroZqpEuhxAR8d9q6KAHhgpIUt5qdKAL28z94hXYnz/BTPaxVW++H/s1DW7 u2d8k565Fz6IQAAilgGeKrM2A/pKx/92qXdEQ1Ex9hgXBsw85adX8gl/eMR1n9E1DoER gpwh61sETJOKiK+UzlJR/eYnnMkyzHJ0PCeF1oY9RzseXQxxFwe0GaMKrqzmGSz35tbt aPfA== X-Gm-Message-State: AOAM530V61FPYob7FkdsorMR3rM9m/1pZ1MmcVoLyMzq6sdkJ62UjjTS DIHHU6txZ36SeSNppPB2Z9Q3tjRKoHVdGfP91wMwzpx1MyKdxLWL7UyReQQ5675Q5MZNfQUM3ao V7ZYVylaaBw+L0YsOyrnPKUxXDhkEq4MNjDKizterMYgjiLDndSf6dfJyLMNCuC5HiuoErgU= X-Received: from alankelly0.zrh.corp.google.com ([2a00:79e0:61:301:d309:ede:58fa:3ff6]) (user=alankelly job=sendgmr) by 2002:a05:622a:185:: with SMTP id s5mr17483634qtw.299.1639672034106; Thu, 16 Dec 2021 08:27:14 -0800 (PST) Date: Thu, 16 Dec 2021 17:27:10 +0100 Message-Id: <20211216162710.2181015-1-alankelly@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.1.173.g76aa8bc2d0-goog From: Alan Kelly To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] x86/scale_avx2: Change asm indent from 2 to 4 spaces. 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: Alan Kelly Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: YyHQJLHM2iNG --- libswscale/x86/scale_avx2.asm | 96 +++++++++++++++++------------------ 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/libswscale/x86/scale_avx2.asm b/libswscale/x86/scale_avx2.asm index 2cd7e968d3..eb472db12f 100644 --- a/libswscale/x86/scale_avx2.asm +++ b/libswscale/x86/scale_avx2.asm @@ -45,63 +45,63 @@ SECTION .text %macro SCALE_FUNC 1 cglobal hscale8to15_%1, 7, 9, 16, pos0, dst, w, srcmem, filter, fltpos, fltsize, count, inner - pxor m0, m0 - mova m15, [swizzle] - mov countq, $0 - movsxd wq, wd + pxor m0, m0 + mova m15, [swizzle] + mov countq, $0 + movsxd wq, wd %ifidn %1, X4 - mova m14, [four] - shr fltsized, 2 + mova m14, [four] + shr fltsized, 2 %endif .loop: - movu m1, [fltposq] - movu m2, [fltposq+32] + movu m1, [fltposq] + movu m2, [fltposq+32] %ifidn %1, X4 - pxor m9, m9 - pxor m10, m10 - pxor m11, m11 - pxor m12, m12 - mov innerq, $0 + pxor m9, m9 + pxor m10, m10 + pxor m11, m11 + pxor m12, m12 + mov innerq, $0 .innerloop: %endif - vpcmpeqd m13, m13 - vpgatherdd m3,[srcmemq + m1], m13 - vpcmpeqd m13, m13 - vpgatherdd m4,[srcmemq + m2], m13 - vpunpcklbw m5, m3, m0 - vpunpckhbw m6, m3, m0 - vpunpcklbw m7, m4, m0 - vpunpckhbw m8, m4, m0 - vpmaddwd m5, m5, [filterq] - vpmaddwd m6, m6, [filterq + 32] - vpmaddwd m7, m7, [filterq + 64] - vpmaddwd m8, m8, [filterq + 96] - add filterq, $80 + vpcmpeqd m13, m13 + vpgatherdd m3,[srcmemq + m1], m13 + vpcmpeqd m13, m13 + vpgatherdd m4,[srcmemq + m2], m13 + vpunpcklbw m5, m3, m0 + vpunpckhbw m6, m3, m0 + vpunpcklbw m7, m4, m0 + vpunpckhbw m8, m4, m0 + vpmaddwd m5, m5, [filterq] + vpmaddwd m6, m6, [filterq + 32] + vpmaddwd m7, m7, [filterq + 64] + vpmaddwd m8, m8, [filterq + 96] + add filterq, $80 %ifidn %1, X4 - paddd m9, m5 - paddd m10, m6 - paddd m11, m7 - paddd m12, m8 - paddd m1, m14 - paddd m2, m14 - add innerq, $1 - cmp innerq, fltsizeq - jl .innerloop - vphaddd m5, m9, m10 - vphaddd m6, m11, m12 + paddd m9, m5 + paddd m10, m6 + paddd m11, m7 + paddd m12, m8 + paddd m1, m14 + paddd m2, m14 + add innerq, $1 + cmp innerq, fltsizeq + jl .innerloop + vphaddd m5, m9, m10 + vphaddd m6, m11, m12 %else - vphaddd m5, m5, m6 - vphaddd m6, m7, m8 + vphaddd m5, m5, m6 + vphaddd m6, m7, m8 %endif - vpsrad m5, 7 - vpsrad m6, 7 - vpackssdw m5, m5, m6 - vpermd m5, m15, m5 - vmovdqu [dstq + countq * 2], m5 - add fltposq, $40 - add countq, $10 - cmp countq, wq - jl .loop + vpsrad m5, 7 + vpsrad m6, 7 + vpackssdw m5, m5, m6 + vpermd m5, m15, m5 + vmovdqu [dstq + countq * 2], m5 + add fltposq, $40 + add countq, $10 + cmp countq, wq + jl .loop REP_RET %endmacro