From patchwork Wed Jul 11 09:46:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shiyou Yin X-Patchwork-Id: 9681 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:104:0:0:0:0:0 with SMTP id c4-v6csp294470jad; Wed, 11 Jul 2018 02:46:44 -0700 (PDT) X-Google-Smtp-Source: AAOMgpf9bMddy01FubZgIokVmZKnhbRPu+xfWaqJqEZihJTGydinvN60sYXdGgQ4zbK/jIl6ib4z X-Received: by 2002:adf:e34d:: with SMTP id n13-v6mr12759511wrj.158.1531302404681; Wed, 11 Jul 2018 02:46:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531302404; cv=none; d=google.com; s=arc-20160816; b=Lakda7n6o3jp7lvhUQFVJljoMCNCtZC25xpxQyt3cACLYu2aDpmPzInJU8kSdC5nZ0 se7lftJ70Sl344Fs7Sf0GLooWaMTa12G/1BhSklCR7fyaWwYzQYWVi4vxuO5S989x3z/ ejW3iMzpH7l0F/hdD5MMpTheflIet/dUzVXfSuaWcdrwSmQFy3WM3z7GKNq/1Dgq2rVx /wxfvaGKkDdXuvmtD+sbVKW9nREFEEE2301AnZeg+WqpYzv0mq+/BvUcfpyDOHIOUEJN MnIA3oGEfqe8sxshigOTRMkvdZo9NXml4qA7DLTBXVzIxVVdqygNnJcCWedb8URhoF1Y wdag== 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:delivered-to :arc-authentication-results; bh=0za4Lnmq7WPPR64PqqDk3VYfpbhcfWiNUc64e5Z+IOg=; b=PH+5MRfM2PiWMwKNmBitLReHT1x+tI7gxjOwJfJP8wGvwPKBR2DAIdDwO/kT1HQeqc LCY+faGysNAyIvYx8m8uFinbCSNyeJC+Iw5UDPoHK57t5eVVpGct5yWcBfXGakUynb5Z HZw3OiAAxnSw2n9dpbcF0+e/0LPQkNj/zjMHtidzasOoWFQEgd8nYZg9K101CKCLKKeV FDA9fG/HRnXVDNk9pVeEG+jG8sO7d1aLd7Uxm9CxeLa38tbfDQinPceOdLkJBHroBi3G ZPxuTwPTC73S0bdUztLUoyqBUa/ZkSlCOEn+DRjnkB4FI2xTehEBiDAQ3FKwkVolnhSa LFPQ== ARC-Authentication-Results: i=1; mx.google.com; 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 a135-v6si1109137wmd.156.2018.07.11.02.46.44; Wed, 11 Jul 2018 02:46:44 -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; 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 A597568A678; Wed, 11 Jul 2018 12:46:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5977668A63D for ; Wed, 11 Jul 2018 12:46:16 +0300 (EEST) Received: from localhost (unknown [202.141.160.96]) by mail (Coremail) with SMTP id QMiowPAxuOHM0EVbwmqSAA--.52863S3; Wed, 11 Jul 2018 17:41:33 +0800 (CST) From: Shiyou Yin To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Jul 2018 17:46:20 +0800 Message-Id: <1531302380-16733-1-git-send-email-yinshiyou-hf@loongson.cn> X-Mailer: git-send-email 2.1.0 X-CM-TRANSID: QMiowPAxuOHM0EVbwmqSAA--.52863S3 X-Coremail-Antispam: 1UD129KBjvJXoW3uw47KF18Xry8AryUKF1xKrg_yoWDZw4rpa y8Ar1Fv3W2vF45Xa1UJw1UCF13ZF1DtFsakFyq9F10v3s3tFn7Xr4xGr93GrWYya4ayF4q yF1UAa4Sywn5Gr7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUk2b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rwA2F7IY1VAKz4 vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7Cj xVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I8E87Iv6xkF7I 0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40E x7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv67AKxVW8JVWxJwAm72CE4IkC6x 0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lF7xvr2IYc2Ij64vIr40E4x8a64kEw24lc2xS Y4AK67AK6r4fMxAIw28IcxkI7VAKI48JMxC20s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I 8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWU XwCI42IY6xIIjxv20xvE14v26r1I6r4UMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8Jw CI42IY6xAIw20EY4v20xvaj40_JFI_Gr1lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2 z280aVCY1x0267AKxVWUJVW8JbIYCTnIWIevJa73UjIFyTuYvjxUxpuWDUUUU X-CM-SenderInfo: p1lq2x5l1r3gtki6z05rqj20fqof0/ Subject: [FFmpeg-devel] [PATCH 8/9] avcodec/mips: [loongson] reoptimize put&add pixels with mmi v2. 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" Reoptimized following functions with mmi: 1. ff_put_pixels4_8_mmi. 2. ff_put_pixels8_8_mmi. 3. ff_put_pixels16_8_mmi. 4. ff_add_pixels_clamped_mmi. Change-Id: I80be1891f52942e432a72e96c135bc9ead92972f Signed-off-by: Shiyou Yin --- libavcodec/mips/hpeldsp_mmi.c | 133 +++++++++++++++++++----------------------- libavcodec/mips/idctdsp_mmi.c | 71 +++++++++------------- 2 files changed, 89 insertions(+), 115 deletions(-) diff --git a/libavcodec/mips/hpeldsp_mmi.c b/libavcodec/mips/hpeldsp_mmi.c index 1bba70e..3272367 100644 --- a/libavcodec/mips/hpeldsp_mmi.c +++ b/libavcodec/mips/hpeldsp_mmi.c @@ -29,36 +29,32 @@ void ff_put_pixels4_8_mmi(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - double ftmp[2]; - mips_reg addr[2]; DECLARE_VAR_LOW32; - DECLARE_VAR_ADDRT; __asm__ volatile ( - PTR_ADDU "%[addr1], %[line_size], %[line_size] \n\t" "1: \n\t" - PTR_ADDU "%[addr0], %[pixels], %[line_size] \n\t" - MMI_ULWC1(%[ftmp0], %[pixels], 0x00) - MMI_ULWC1(%[ftmp1], %[addr0], 0x00) - MMI_SWC1(%[ftmp0], %[block], 0x00) - MMI_SWXC1(%[ftmp1], %[block], %[line_size], 0x00) - PTR_ADDU "%[pixels], %[pixels], %[addr1] \n\t" - PTR_ADDU "%[block], %[block], %[addr1] \n\t" - - PTR_ADDU "%[addr0], %[pixels], %[line_size] \n\t" - MMI_ULWC1(%[ftmp0], %[pixels], 0x00) - MMI_ULWC1(%[ftmp1], %[addr0], 0x00) - MMI_SWC1(%[ftmp0], %[block], 0x00) - MMI_SWXC1(%[ftmp1], %[block], %[line_size], 0x00) - PTR_ADDU "%[pixels], %[pixels], %[addr1] \n\t" - PTR_ADDU "%[block], %[block], %[addr1] \n\t" + MMI_ULWC1($f0, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + MMI_ULWC1($f1, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + MMI_ULWC1($f2, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + MMI_ULWC1($f3, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" PTR_ADDI "%[h], %[h], -0x04 \n\t" + + MMI_SWC1($f0, %[block], 0x00) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SWC1($f1, %[block], 0x00) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SWC1($f2, %[block], 0x00) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SWC1($f3, %[block], 0x00) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + "bnez %[h], 1b \n\t" - : [ftmp0]"=&f"(ftmp[0]), [ftmp1]"=&f"(ftmp[1]), - RESTRICT_ASM_LOW32 - RESTRICT_ASM_ADDRT - [addr0]"=&r"(addr[0]), [addr1]"=&r"(addr[1]), + : RESTRICT_ASM_LOW32 [block]"+&r"(block), [pixels]"+&r"(pixels), [h]"+&r"(h) : [line_size]"r"((mips_reg)line_size) @@ -69,37 +65,32 @@ void ff_put_pixels4_8_mmi(uint8_t *block, const uint8_t *pixels, void ff_put_pixels8_8_mmi(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - double ftmp[2]; - mips_reg addr[3]; DECLARE_VAR_ALL64; __asm__ volatile ( - PTR_ADDU "%[addr1], %[line_size], %[line_size] \n\t" "1: \n\t" - MMI_ULDC1(%[ftmp0], %[pixels], 0x00) - PTR_ADDU "%[addr0], %[pixels], %[line_size] \n\t" - MMI_ULDC1(%[ftmp1], %[addr0], 0x00) - MMI_SDC1(%[ftmp0], %[block], 0x00) - PTR_ADDU "%[addr2], %[block], %[line_size] \n\t" - MMI_SDC1(%[ftmp1], %[addr2], 0x00) - PTR_ADDU "%[pixels], %[pixels], %[addr1] \n\t" - PTR_ADDU "%[block], %[block], %[addr1] \n\t" - - MMI_ULDC1(%[ftmp0], %[pixels], 0x00) - PTR_ADDU "%[addr0], %[pixels], %[line_size] \n\t" - MMI_ULDC1(%[ftmp1], %[addr0], 0x00) - MMI_SDC1(%[ftmp0], %[block], 0x00) - PTR_ADDU "%[addr2], %[block], %[line_size] \n\t" - MMI_SDC1(%[ftmp1], %[addr2], 0x00) - PTR_ADDU "%[pixels], %[pixels], %[addr1] \n\t" - PTR_ADDU "%[block], %[block], %[addr1] \n\t" + MMI_ULDC1($f0, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + MMI_ULDC1($f1, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + MMI_ULDC1($f2, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + MMI_ULDC1($f3, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" PTR_ADDI "%[h], %[h], -0x04 \n\t" + + MMI_SDC1($f0, %[block], 0x00) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SDC1($f1, %[block], 0x00) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SDC1($f2, %[block], 0x00) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SDC1($f3, %[block], 0x00) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + "bnez %[h], 1b \n\t" - : [ftmp0]"=&f"(ftmp[0]), [ftmp1]"=&f"(ftmp[1]), - RESTRICT_ASM_ALL64 - [addr0]"=&r"(addr[0]), [addr1]"=&r"(addr[1]), - [addr2]"=&r"(addr[2]), + : RESTRICT_ASM_ALL64 [block]"+&r"(block), [pixels]"+&r"(pixels), [h]"+&r"(h) : [line_size]"r"((mips_reg)line_size) @@ -110,42 +101,40 @@ void ff_put_pixels8_8_mmi(uint8_t *block, const uint8_t *pixels, void ff_put_pixels16_8_mmi(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h) { - double ftmp[4]; DECLARE_VAR_ALL64; __asm__ volatile ( "1: \n\t" - MMI_ULDC1(%[ftmp0], %[pixels], 0x00) - MMI_ULDC1(%[ftmp2], %[pixels], 0x08) + MMI_ULDC1($f0, %[pixels], 0x00) + MMI_ULDC1($f2, %[pixels], 0x08) PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" - MMI_ULDC1(%[ftmp1], %[pixels], 0x00) - MMI_ULDC1(%[ftmp3], %[pixels], 0x08) - MMI_SDC1(%[ftmp0], %[block], 0x00) - MMI_SDC1(%[ftmp2], %[block], 0x08) - PTR_ADDU "%[block], %[block], %[line_size] \n\t" - MMI_SDC1(%[ftmp1], %[block], 0x00) - MMI_SDC1(%[ftmp3], %[block], 0x08) + MMI_ULDC1($f1, %[pixels], 0x00) + MMI_ULDC1($f3, %[pixels], 0x08) PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" - PTR_ADDU "%[block], %[block], %[line_size] \n\t" - - MMI_ULDC1(%[ftmp0], %[pixels], 0x00) - MMI_ULDC1(%[ftmp2], %[pixels], 0x08) + MMI_ULDC1($f4, %[pixels], 0x00) + MMI_ULDC1($f6, %[pixels], 0x08) PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" - MMI_ULDC1(%[ftmp1], %[pixels], 0x00) - MMI_ULDC1(%[ftmp3], %[pixels], 0x08) - MMI_SDC1(%[ftmp0], %[block], 0x00) - MMI_SDC1(%[ftmp2], %[block], 0x08) - PTR_ADDU "%[block], %[block], %[line_size] \n\t" - MMI_SDC1(%[ftmp1], %[block], 0x00) - MMI_SDC1(%[ftmp3], %[block], 0x08) + MMI_ULDC1($f5, %[pixels], 0x00) + MMI_ULDC1($f7, %[pixels], 0x08) PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" - PTR_ADDU "%[block], %[block], %[line_size] \n\t" PTR_ADDI "%[h], %[h], -0x04 \n\t" + + MMI_SDC1($f0, %[block], 0x00) + MMI_SDC1($f2, %[block], 0x08) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SDC1($f1, %[block], 0x00) + MMI_SDC1($f3, %[block], 0x08) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SDC1($f4, %[block], 0x00) + MMI_SDC1($f6, %[block], 0x08) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + MMI_SDC1($f5, %[block], 0x00) + MMI_SDC1($f7, %[block], 0x08) + PTR_ADDU "%[block], %[block], %[line_size] \n\t" + "bnez %[h], 1b \n\t" - : [ftmp0]"=&f"(ftmp[0]), [ftmp1]"=&f"(ftmp[1]), - [ftmp2]"=&f"(ftmp[2]), [ftmp3]"=&f"(ftmp[3]), - RESTRICT_ASM_ALL64 + : RESTRICT_ASM_ALL64 [block]"+&r"(block), [pixels]"+&r"(pixels), [h]"+&r"(h) : [line_size]"r"((mips_reg)line_size) diff --git a/libavcodec/mips/idctdsp_mmi.c b/libavcodec/mips/idctdsp_mmi.c index b797965..93d5fc6 100644 --- a/libavcodec/mips/idctdsp_mmi.c +++ b/libavcodec/mips/idctdsp_mmi.c @@ -174,50 +174,35 @@ void ff_put_signed_pixels_clamped_mmi(const int16_t *block, void ff_add_pixels_clamped_mmi(const int16_t *block, uint8_t *av_restrict pixels, ptrdiff_t line_size) { - double ftmp[8]; - uint64_t tmp[1]; - mips_reg addr[1]; - DECLARE_VAR_ALL64; - DECLARE_VAR_ADDRT; - __asm__ volatile ( - "li %[tmp0], 0x04 \n\t" - "xor %[ftmp0], %[ftmp0], %[ftmp0] \n\t" - "1: \n\t" - MMI_LDC1(%[ftmp1], %[block], 0x00) - MMI_LDC1(%[ftmp2], %[block], 0x08) - MMI_LDC1(%[ftmp3], %[block], 0x10) - MMI_LDC1(%[ftmp4], %[block], 0x18) - MMI_LDC1(%[ftmp5], %[pixels], 0x00) - MMI_LDXC1(%[ftmp6], %[pixels], %[line_size], 0x00) - "mov.d %[ftmp7], %[ftmp5] \n\t" - "punpcklbh %[ftmp5], %[ftmp5], %[ftmp0] \n\t" - "punpckhbh %[ftmp7], %[ftmp7], %[ftmp0] \n\t" - "paddh %[ftmp1], %[ftmp1], %[ftmp5] \n\t" - "paddh %[ftmp2], %[ftmp2], %[ftmp7] \n\t" - "mov.d %[ftmp7], %[ftmp6] \n\t" - "punpcklbh %[ftmp6], %[ftmp6], %[ftmp0] \n\t" - "punpckhbh %[ftmp7], %[ftmp7], %[ftmp0] \n\t" - "paddh %[ftmp3], %[ftmp3], %[ftmp6] \n\t" - "paddh %[ftmp4], %[ftmp4], %[ftmp7] \n\t" - "packushb %[ftmp1], %[ftmp1], %[ftmp2] \n\t" - "packushb %[ftmp3], %[ftmp3], %[ftmp4] \n\t" - MMI_SDC1(%[ftmp1], %[pixels], 0x00) - MMI_SDXC1(%[ftmp3], %[pixels], %[line_size], 0x00) - "addi %[tmp0], %[tmp0], -0x01 \n\t" - PTR_ADDIU "%[block], %[block], 0x20 \n\t" - PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" - PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" - "bnez %[tmp0], 1b" - : [ftmp0]"=&f"(ftmp[0]), [ftmp1]"=&f"(ftmp[1]), - [ftmp2]"=&f"(ftmp[2]), [ftmp3]"=&f"(ftmp[3]), - [ftmp4]"=&f"(ftmp[4]), [ftmp5]"=&f"(ftmp[5]), - [ftmp6]"=&f"(ftmp[6]), [ftmp7]"=&f"(ftmp[7]), - [tmp0]"=&r"(tmp[0]), - RESTRICT_ASM_ALL64 - RESTRICT_ASM_ADDRT - [addr0]"=&r"(addr[0]), - [pixels]"+&r"(pixels), [block]"+&r"(block) + "li $10, 0x04 \n\t" + "xor $f0, $f0, $f0 \n\t" + "1: \n\t" + + "gslqc1 $f2, $f1, 0x00(%[block]) \n\t" + "gslqc1 $f4, $f3, 0x10(%[block]) \n\t" + PTR_ADDIU "%[block], %[block], 0x20 \n\t" + MMI_LDC1($f5, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + MMI_LDC1($f6, %[pixels], 0x00) + PTR_SUBU "%[pixels], %[pixels], %[line_size] \n\t" + "punpckhbh $f7, $f5, $f0 \n\t" + "punpcklbh $f5, $f5, $f0 \n\t" + "punpckhbh $f8, $f6, $f0 \n\t" + "punpcklbh $f6, $f6, $f0 \n\t" + "paddh $f1, $f1, $f5 \n\t" + "paddh $f2, $f2, $f7 \n\t" + "paddh $f3, $f3, $f6 \n\t" + "paddh $f4, $f4, $f8 \n\t" + "packushb $f1, $f1, $f2 \n\t" + "packushb $f3, $f3, $f4 \n\t" + MMI_SDC1($f1, %[pixels], 0x00) + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + MMI_SDC1($f3, %[pixels], 0x00) + "addi $10, $10, -0x01 \n\t" + PTR_ADDU "%[pixels], %[pixels], %[line_size] \n\t" + "bnez $10, 1b \n\t" + : [pixels]"+&r"(pixels), [block]"+&r"(block) : [line_size]"r"((mips_reg)line_size) : "memory" );