From patchwork Mon Jun 12 13:36:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3924 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp95530vsw; Mon, 12 Jun 2017 06:43:28 -0700 (PDT) X-Received: by 10.28.27.151 with SMTP id b145mr7920298wmb.83.1497275008140; Mon, 12 Jun 2017 06:43:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497275008; cv=none; d=google.com; s=arc-20160816; b=Fj88Uz2+VDxHFjIf9V8wLrvCwPcrtYhO2LN0xMXwGA0EE0lpBDwAtKZWwQIWT7sMOg 3whaOJFUJ2QvwyHMSf70GuUyezjsDlfK4g3Guevw8JrDCpzK6nhw6mlQ/nM9GwbFOt+h IpkzAG5/xsbBQUR2rbQHJHaZJLTiwsuhInkjnPGs1vF4ydRp86wsYOII8hNyH8iC0P2L vZnPAhxURNxWmZrygjsi1lq4NLhUC19KVkvAHqdYyjwR7GrZ3zc+gsjdj3dveaos9RFs thBKBidkPiNcvVYxERhnKvVPF8T93+U8O7aCmjxRdsDPvpBzjCaCm94CHbnVh6l+LU38 B/6g== 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:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=CYhAPDZ8Fiy53TvmG0XAPOCnftcb+qskfwHEm7Ut60c=; b=nR/u14Nog6m6QqhflTKR/VS1SCoFLRmBCy/xo4Vls3P/zrlIWjQXaBPT9nolnEvCfZ uCKGYDDv5guGUmcOoiEibGhT05BdECBlFDQAzQ+Wk6hUkiD89Eqh4PHDeufYh6np/+dw gF4ME78/fEJUwAECwm+qx6zUpcAd0ySme59WL/WN6WUiP+63a/yRyfbBG8dJFNeinUHm CoywzzeYiTvwX1OWb5a8MVJxaUfvolQ39geD5zyBNM9gcU1+kePIM+STXbBn3I73NCtz VL+YBAf8zh+0G+kHK8JDaq84e/qlWf51wCZ39zHhDL43ZQo/2Ptsl8Y37LqkGu4c2sBC g8cQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.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 c21si9034308wre.190.2017.06.12.06.43.16; Mon, 12 Jun 2017 06:43:28 -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=@ob-encoder-com.20150623.gappssmtp.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 DE6A3689F95; Mon, 12 Jun 2017 16:43:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 245D7689F90 for ; Mon, 12 Jun 2017 16:43:10 +0300 (EEST) Received: by mail-wr0-f193.google.com with SMTP id e23so22159377wre.3 for ; Mon, 12 Jun 2017 06:43:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ob-encoder-com.20150623.gappssmtp.com; s=20150623; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=Jz190IlShqxiu9HDX1hFMMWB+fXNOOu8syG6kwdA2+o=; b=1x8ggmAqHZJc6iZ60+/Yi64uXRYm2ACm/cXDkk8R2oB5eQdCfnRYJox1A9yp6PqlN3 p/LQ7QzCpn/3jlDEd2M1eOKrCe+nKPc3iVohJa8ZsKnse4HAbTNlm66A9fH7kU+CVR1Y 1SVlEz5pDw4Vd+KZaX+JW8FEhsXUez7y4diMaxruPTTP+wOaeV1YZwu9cjivQROGNuOk 8szY+Aa30Ex596lUyojGHsaX1dE/3qqZQ22lRzlLrjX8RExcZydBrh1sQGr1GddCuBiw gBLCD9A/vx4iZ90d3eBGb99POTTLABszJ4qfmP/T/NG1DihTDrzeaWnfeA8k2oouINqo F8xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=Jz190IlShqxiu9HDX1hFMMWB+fXNOOu8syG6kwdA2+o=; b=L7FKRkfV2kmjtJfZ+IPQt7Yf8I7VAeCOafCKs1+YWo+Y3iK+0qKvttW7W2Okpv9x5Q iiQK4t01tS+CWhw3HgBRjM1qGLCNgixr5Pa9QnwFVCgSiFHsvUMOwIprGPJj7WL7b7oa LWL/aW9GSbq0YosGu8wkiiti1G9uVG0q0pPDbKliyv+m8AoketlazJGaByoXpM4Gz5DT BjNQxr/M2dWznDPmLeBenAyDcljLqmKXFHMn+idv18MMxUP1ElpO5gC2NfuM3Z7QEDAO c9NKSebFmBViGWUbH/fdl4X29L8fiF94cINXtiruh962A8TtK7upUkq8VuxXvxbS0ZQe IB7g== X-Gm-Message-State: AODbwcC7CSsgHoKjRZeLlifsWXSTQEk+FIYMhhJ0OoJcL5UclXFXCL9o rE/03wR4ilawnVtjI0o= X-Received: by 10.80.137.136 with SMTP id g8mr35014384edg.125.1497274585058; Mon, 12 Jun 2017 06:36:25 -0700 (PDT) Received: from Highwind.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id t27sm4691091edh.1.2017.06.12.06.36.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Jun 2017 06:36:24 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Mon, 12 Jun 2017 15:36:08 +0200 Message-Id: <20170612133609.24172-6-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170612133609.24172-1-jdarnley@obe.tv> References: <20170612133609.24172-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 5/6] avcodec/x86: add x86-64 8-bit simple_idct add function 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" --- libavcodec/x86/idctdsp_init.c | 2 ++ libavcodec/x86/simple_idct.h | 3 ++ libavcodec/x86/simple_idct10.asm | 61 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+) diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index 1826d01e0e..9da60d1a1e 100644 --- a/libavcodec/x86/idctdsp_init.c +++ b/libavcodec/x86/idctdsp_init.c @@ -103,6 +103,7 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, avctx->idct_algo == FF_IDCT_SIMPLEMMX)) { c->idct = ff_simple_idct8_sse2; c->idct_put = ff_simple_idct8_put_sse2; + c->idct_add = ff_simple_idct8_add_sse2; c->perm_type = FF_IDCT_PERM_TRANSPOSE; } } @@ -115,6 +116,7 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, avctx->idct_algo == FF_IDCT_SIMPLEMMX)) { c->idct = ff_simple_idct8_avx; c->idct_put = ff_simple_idct8_put_avx; + c->idct_add = ff_simple_idct8_add_avx; c->perm_type = FF_IDCT_PERM_TRANSPOSE; } diff --git a/libavcodec/x86/simple_idct.h b/libavcodec/x86/simple_idct.h index b559f8527c..9b64cfe9bc 100644 --- a/libavcodec/x86/simple_idct.h +++ b/libavcodec/x86/simple_idct.h @@ -35,6 +35,9 @@ void ff_simple_idct8_avx(int16_t *block); void ff_simple_idct8_put_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block); void ff_simple_idct8_put_avx(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_simple_idct8_add_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_simple_idct8_add_avx(uint8_t *dest, ptrdiff_t line_size, int16_t *block); + void ff_simple_idct10_sse2(int16_t *block); void ff_simple_idct10_avx(int16_t *block); diff --git a/libavcodec/x86/simple_idct10.asm b/libavcodec/x86/simple_idct10.asm index f31fb5cfa5..29e18fe6a6 100644 --- a/libavcodec/x86/simple_idct10.asm +++ b/libavcodec/x86/simple_idct10.asm @@ -82,6 +82,31 @@ SECTION .text movhps %8, %12 %endmacro +%macro LOAD_ZXBW_8 16 + pmovzxbw %1, %9 + pmovzxbw %2, %10 + pmovzxbw %3, %11 + pmovzxbw %4, %12 + pmovzxbw %5, %13 + pmovzxbw %6, %14 + pmovzxbw %7, %15 + pmovzxbw %8, %16 +%endmacro + +%macro LOAD_ZXBW_4 9 + movh %1, %5 + movh %2, %6 + movh %3, %7 + movh %4, %8 + punpcklbw %1, %9 + punpcklbw %2, %9 + punpcklbw %3, %9 + punpcklbw %4, %9 +%endmacro + +%define PASS4ROWS(base, stride, stride3) \ + [base], [base + stride], [base + 2*stride], [base + stride3] + %macro idct_fn 0 cglobal simple_idct8, 1, 1, 16, block IDCT_FN "", 11, pw_round_20_div_w4, 20, "store" @@ -99,6 +124,42 @@ cglobal simple_idct8_put, 3, 4, 16, pixels, lsize, block STORE_HI_LO PASS8ROWS(pixelsq, r2, lsizeq, r3), m8, m1, m4, m9 RET +; TODO: optimise by not writing the final data to the block. +cglobal simple_idct8_add, 3, 4, 16, pixels, lsize, block + IDCT_FN "", 11, pw_round_20_div_w4, 20 + lea r2, [3*lsizeq] + lea r3, [pixelsq + r2] + %if cpuflag(sse4) + LOAD_ZXBW_8 m3, m5, m6, m7, m12, m13, m14, m15, PASS8ROWS(pixelsq, r3, lsizeq, r2) + paddsw m8, m3 + paddsw m0, m5 + paddsw m1, m6 + paddsw m2, m7 + paddsw m4, m12 + paddsw m11, m13 + paddsw m9, m14 + paddsw m10, m15 + %else + pxor m12, m12 + LOAD_ZXBW_4 m3, m5, m6, m7, PASS4ROWS(pixelsq, lsizeq, r2), m12 + paddsw m8, m3 + paddsw m0, m5 + paddsw m1, m6 + paddsw m2, m7 + lea pixelsq, [pixelsq + 4*lsizeq] + LOAD_ZXBW_4 m3, m5, m6, m7, PASS4ROWS(pixelsq, lsizeq, r2), m12 + paddsw m4, m3 + paddsw m11, m5 + paddsw m9, m6 + paddsw m10, m7 + %endif + packuswb m8, m0 + packuswb m1, m2 + packuswb m4, m11 + packuswb m9, m10 + STORE_HI_LO PASS8ROWS(pixelsq, r3, lsizeq, r2), m8, m1, m4, m9 +RET + cglobal simple_idct10, 1, 1, 16, block IDCT_FN "", 12, "", 19, "store" RET