From patchwork Thu Jun 15 13:34:26 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Darnley X-Patchwork-Id: 3987 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.22.4 with SMTP id 4csp807077vsw; Thu, 15 Jun 2017 06:48:38 -0700 (PDT) X-Received: by 10.223.157.25 with SMTP id k25mr4166713wre.156.1497534518831; Thu, 15 Jun 2017 06:48:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497534518; cv=none; d=google.com; s=arc-20160816; b=LTQ/mmkPupJ5dgqhUTT+Ybd6L8kO3yNR/V5pVHmAN/opuil2k4sCXCtVcGa7mu6f0r m4SCOmjggg+XTGu5sPt9Ix6KKJQ3tAFVZI4DUtMmeaYrn0xSYnk8lJTTeU9+CZOECxyX u0CbdG5Gfppiwn5mJ4W5tH4FRMwRtPOAiLVlM/YJrA8FLyx4H6Os+UL4rUcpV772BC6k 0c9xwblbN/ZK2DuQH078V4c68wxRS052ynZ54bdFXelNe7vR6CB9rLg2oN9UR2/fcSuq VDbBJqeC5s244Pkn41c3osSWn1M3KC0ed57dRyYHm1nhDZI54E7xecQaRw7rRGElkNaz 9NgA== 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=Ga2BasQYQKAfXZ8BVsDDdsG8HOtco2eUdO9YRBUvkWQ=; b=kOviyeni/Q7pPUZkHcLQDlN7g3WaSsOnc3HW/H5DziXL6Rw1GIUZ2zcJR4LpqIrFSa E+UdNDLhAsYUXgAINgFEx8D+iX2xhHrWuHw6SuUAZC8aSXguBpuJxdkiFeE6zZ27AGo9 bWHnwOF4+lIWXKHy2kvRmsN0FBWUV/CJsTKwCYCvfdwpa/emcLekBZkt4KAARIEPnkyA zQm0tk3YLw8YdVyC5nk9nRBxtesT8OhSvXumXfURk1t7BXB6zaPSQJmKo30XYO/X7Wak 2IioeB8susRqalmI59MBkQRruhsRCDi4+jUV19vg2Rm7lwvqOFcXk35EmBGscexvK6yq Z/cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@ob-encoder-com.20150623.gappssmtp.com header.b=T/m8ecgi; 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 j22si186556wre.322.2017.06.15.06.48.38; Thu, 15 Jun 2017 06:48:38 -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 header.b=T/m8ecgi; 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 5440568A338; Thu, 15 Jun 2017 16:48:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B9BAD68A315 for ; Thu, 15 Jun 2017 16:48:25 +0300 (EEST) Received: by mail-wr0-f195.google.com with SMTP id y25so1643739wrd.1 for ; Thu, 15 Jun 2017 06:48:28 -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=KbYJXIqpDhikbTUX5GOBugfZp4Pt+pGDjAQqRa9RTlI=; b=T/m8ecgim5CW9VQ3G5dIUyhK8xOc0J52tdGutznklYB7Qf29Z4KUuCi6aFzIRx3mQo +hyLh0OW0Ooi2ZaxUeInaErx1q3muOVIraZtcGDM6nBoKlmnFsr9RGhyr9Vf57UlKSUZ /MeJ0LOUmLPF231F9VOe2FODl0GQ1nDYurJgnak3CuLaN42DYLSeZQqIucaaLQ+iacl9 fWS1W/wFa8JZ/BQXretDaUHdPios2LI/Itt3fWEdr807EP6dUrHVeXI2reKRkogCV/SR 6cTw2rO849dL/7fZgy806SRoaMIFt3FM20lE7I3YRYGUXWJEqAFsGj7oT6Ssh9eFxDlW Ilxw== 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=KbYJXIqpDhikbTUX5GOBugfZp4Pt+pGDjAQqRa9RTlI=; b=a+BktpBUwpkg6Tm2Fv4/NRZ44rQmG4wKeucbgoQyboJWkLyVtopc6/770RBODgi/9e 44yuC8JdfGACIB3QJXnILFWM//LHPz2ZZR4T+NEiOl+sz209bbN2TbClOY/aF60U6h2d Mw4GBQ33cD62l21kj4HLuZ+BJy0qJtLUdhyLVzi4uRq1iswwX5lIiioGyODttVT4G88Q CFGMdUkS1utJKQpz2coq08DlioMKlNUanmR0TGY+j+8zp0a5TfGaBFjSv+P20+8rFhnK XWLuduT7bGNQAovNwQeHlN0Jc+66BPP92f5QQwotWm2XJaUK1FfZybTorDuQj7FNMrBl +DWg== X-Gm-Message-State: AKS2vOy+umSyWwGA5A4+yxo2KwtNqgpzEQNd+uWaL6gtBQ4szXsy3cHF 1sZ/nnOW1J5RHc5Z+ms= X-Received: by 10.223.130.85 with SMTP id 79mr1413461wrb.111.1497534055421; Thu, 15 Jun 2017 06:40:55 -0700 (PDT) Received: from Ifrit.systemlords.lan (d51a44418.access.telenet.be. [81.164.68.24]) by smtp.gmail.com with ESMTPSA id c55sm211027wrc.7.2017.06.15.06.40.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 06:40:55 -0700 (PDT) From: James Darnley To: FFmpeg development discussions and patches Date: Thu, 15 Jun 2017 15:34:26 +0200 Message-Id: <20170615133426.4484-7-jdarnley@obe.tv> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20170615133426.4484-1-jdarnley@obe.tv> References: <20170615133426.4484-1-jdarnley@obe.tv> Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/x86: add an 8-bit simple IDCT function based on the x86-64 high depth functions 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" Includes add/put functions Rounding contributed by Ronald S. Bultje --- libavcodec/tests/x86/dct.c | 2 + libavcodec/x86/idctdsp_init.c | 23 ++++++++++ libavcodec/x86/simple_idct.h | 9 ++++ libavcodec/x86/simple_idct10.asm | 94 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 128 insertions(+) diff --git a/libavcodec/tests/x86/dct.c b/libavcodec/tests/x86/dct.c index 34f5b8767b..317d973f9f 100644 --- a/libavcodec/tests/x86/dct.c +++ b/libavcodec/tests/x86/dct.c @@ -88,10 +88,12 @@ static const struct algo idct_tab_arch[] = { #if HAVE_YASM #if ARCH_X86_64 #if HAVE_SSE2_EXTERNAL + { "SIMPLE8-SSE2", ff_simple_idct8_sse2, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2}, { "SIMPLE10-SSE2", ff_simple_idct10_sse2, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2}, { "SIMPLE12-SSE2", ff_simple_idct12_sse2, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_SSE2, 1 }, #endif #if HAVE_AVX_EXTERNAL + { "SIMPLE8-AVX", ff_simple_idct8_avx, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX}, { "SIMPLE10-AVX", ff_simple_idct10_avx, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX}, { "SIMPLE12-AVX", ff_simple_idct12_avx, FF_IDCT_PERM_TRANSPOSE, AV_CPU_FLAG_AVX, 1 }, #endif diff --git a/libavcodec/x86/idctdsp_init.c b/libavcodec/x86/idctdsp_init.c index f1c915aa00..9da60d1a1e 100644 --- a/libavcodec/x86/idctdsp_init.c +++ b/libavcodec/x86/idctdsp_init.c @@ -94,9 +94,32 @@ av_cold void ff_idctdsp_init_x86(IDCTDSPContext *c, AVCodecContext *avctx, c->idct_add = ff_simple_idct_add_sse2; c->perm_type = FF_IDCT_PERM_SIMPLE; } + + if (ARCH_X86_64 && + !high_bit_depth && + avctx->lowres == 0 && + (avctx->idct_algo == FF_IDCT_AUTO || + avctx->idct_algo == FF_IDCT_SIMPLEAUTO || + 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; + } } if (ARCH_X86_64 && avctx->lowres == 0) { + if (EXTERNAL_AVX(cpu_flags) && + !high_bit_depth && + (avctx->idct_algo == FF_IDCT_AUTO || + avctx->idct_algo == FF_IDCT_SIMPLEAUTO || + 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; + } + if (avctx->bits_per_raw_sample == 10 && (avctx->idct_algo == FF_IDCT_AUTO || avctx->idct_algo == FF_IDCT_SIMPLEAUTO || diff --git a/libavcodec/x86/simple_idct.h b/libavcodec/x86/simple_idct.h index d17ef6a462..9b64cfe9bc 100644 --- a/libavcodec/x86/simple_idct.h +++ b/libavcodec/x86/simple_idct.h @@ -29,6 +29,15 @@ void ff_simple_idct_put_mmx(uint8_t *dest, ptrdiff_t line_size, int16_t *block); void ff_simple_idct_add_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block); void ff_simple_idct_put_sse2(uint8_t *dest, ptrdiff_t line_size, int16_t *block); +void ff_simple_idct8_sse2(int16_t *block); +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 b492303a57..efc8e7ac3e 100644 --- a/libavcodec/x86/simple_idct10.asm +++ b/libavcodec/x86/simple_idct10.asm @@ -31,11 +31,14 @@ SECTION_RODATA cextern pw_2 cextern pw_16 +cextern pw_32 cextern pw_1023 cextern pw_4095 +pd_round_11: times 4 dd 1<<(11-1) pd_round_12: times 4 dd 1<<(12-1) pd_round_15: times 4 dd 1<<(15-1) pd_round_19: times 4 dd 1<<(19-1) +pd_round_20: times 4 dd 1<<(20-1) %macro CONST_DEC 3 const %1 @@ -77,8 +80,99 @@ CONST_DEC w3_min_w7_lo, W3sh2_lo, -W7sh2 SECTION .text +%macro STORE_HI_LO 12 + movq %1, %9 + movq %3, %10 + movq %5, %11 + movq %7, %12 + movhps %2, %9 + movhps %4, %10 + movhps %6, %11 + 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 +define_constants _lo + +cglobal simple_idct8, 1, 1, 16, block + IDCT_FN "", 11, pw_32, 20, "store" +RET + +; TODO: optimise by not writing the final data to the block. +cglobal simple_idct8_put, 3, 4, 16, pixels, lsize, block + IDCT_FN "", 11, pw_32, 20 + lea r3, [3*lsizeq] + lea r2, [pixelsq + r3] + packuswb m8, m0 + packuswb m1, m2 + packuswb m4, m11 + packuswb m9, m10 + 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_32, 20 + lea r2, [3*lsizeq] + %if cpuflag(sse4) + lea r3, [pixelsq + r2] + 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 r3, [pixelsq + 4*lsizeq] + LOAD_ZXBW_4 m3, m5, m6, m7, PASS4ROWS(r3, lsizeq, r2), m12 + paddsw m4, m3 + paddsw m11, m5 + paddsw m9, m6 + paddsw m10, m7 + lea r3, [pixelsq + r2] + %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 + define_constants _hi cglobal simple_idct10, 1, 1, 16, block