From patchwork Thu Aug 31 22:22:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:299e:b0:149:dfde:5c0a with SMTP id f30csp571572pzh; Thu, 31 Aug 2023 15:22:05 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGssS52JxXxHnMxP/h+/sG1x2B/moBR1sLCfEID9flXDIT5HD1LQP3a8Jrg8oM4E/ZqYi4T X-Received: by 2002:a17:907:3e9c:b0:9a5:aa43:1c7c with SMTP id hs28-20020a1709073e9c00b009a5aa431c7cmr4960346ejc.26.1693520525452; Thu, 31 Aug 2023 15:22:05 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y22-20020a170906449600b0099bce59e6ddsi1568874ejo.169.2023.08.31.15.22.05; Thu, 31 Aug 2023 15:22:05 -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=@outlook.com header.s=selector1 header.b=SsMDfdAv; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7B4B168C804; Fri, 1 Sep 2023 01:21:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-he1eur01olkn2103.outbound.protection.outlook.com [40.92.65.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C37568C807 for ; Fri, 1 Sep 2023 01:21:40 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PUZpGhHDQ/HBJpKPTluzArF6mEOI8Gi07MRzDbCgTbd4NG2vgYlHKmwxNGjCYKQCMEzCfBD3E3skht6E6r/Gaci58riVhpT3Y7XwLGaAm0uAO3iXdHmPCVu28A4DwNt/jJPoavheDlLFPKBH+P2Qj46GORJkcSEmb/szsosnKzE/+gPAJCt65gz7to1B6p16KTDuCJjZF2Gv++TYOtWijzrPSp4KuzsZ/moxU1WzZxu6ZJvqiVt8MtjWpU+KiGPacRlrdBcVDU1zIahAZwCuguRDHMCZ0Ic350xuoBdr6bmq9eBVWlIA65EbDHn/eryf3onxgddw4O4gTd5bXQlDNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=3gnxdE9qBobhvAgaBjYNfQM+DlXOc63FSUTaCNbD//o=; b=ciU+uIIX1o1wSFzTEvNO9ByyS7sB0gu9Il7NeW+P3hfP4WwO2mYqOsxVRhysZyPZ7NX6BA/lDVSns3AzKTRMPqOol/VPvFREgc2GaZNGjbPrTGT1aAMhaguOoTCCTgW1zpidz0ASM1t2seAsa+7Ro8gHAI9uoCn2LB7E/1XCsA+EpfRCL6Ue0HK2syVi34APIqNtcd0BZiKI1BSq6ioWgyaqLJkr5U0A6G/1FaCQtPZuo/bW/gNX/ZW2Y8dF/CZo1d39MW51C+MLy8Zlztf+nrQO/U2ksz9KuhcoXKXkFwDxzwUVhgCF4/L8duHutrQuMrYEbrRE0WUZt9aQky3abg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3gnxdE9qBobhvAgaBjYNfQM+DlXOc63FSUTaCNbD//o=; b=SsMDfdAvQXpp3BZrud4aT04/nCCuSVSAj73Oqq0OlpThS7MaetAVJYvNE3weIZsXAvBaCukev9ocK7NPJADhXk9pZ7d7/bDbwnTdxHX68ToX7OKQ4Jbgh1VP6uwjfGVlazC6dW9WzMjtpFjy5u6iq4htrdFxlAzSUaqAHPh8j3BfU3YN91kHJ2MDsm23cxv4k16D9c1wzWtPvBjJh+IcMo5ffQVMwmHuHEC6R93C8Iqchk3pzg4a5r0j/rUmVP7JcC34ouQoCjO4IEnfHifnTaQL3kKw/O+llHaSzP98jTqYlW51yt/lPIXhSmFV64PL9KuiYE45KXw8/HlaHkZd6w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PRAP250MB0418.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:27b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6745.21; Thu, 31 Aug 2023 22:21:38 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6699.034; Thu, 31 Aug 2023 22:21:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 1 Sep 2023 00:22:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [snuy+cja129PXPZut093xd2NOUJ+Xiu/u4zaHQi8wv0=] X-ClientProxiedBy: ZR2P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:65::7) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230831222235.4160923-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PRAP250MB0418:EE_ X-MS-Office365-Filtering-Correlation-Id: 85a82a53-671f-49c6-4f1e-08dbaa70a4f5 X-MS-Exchange-SLBlob-MailProps: 70qbaZjg4msOH1kZ59XaVOI4Y8btiKHc5Sd9WFuYyjZX4/GtFSuXZ7elv66pG+OilrFQfpjis+uocMaIO+ZAvqoFaL4OWn98jjpymE1/p8cSWsQGF4Q8hktJ/sTr09l3cYlLumfgwOTRRinfmw1vBOn7jgGnJktEAjaeor1Ciov4k+iMqj2kblhYJhSKKAlcsEH1p+bg6/hXu7k5EHbjJyGnBMVpLlnej8X2AH1LNqKIH+mdMLRMdeLJnrfEuVXXy/zqxI8A+QojXn5jE+zpVNPJv5+9WO1i3iNxw+Dg8XETOPuHtdMDsbqw+Qxa/oSWC3+NjFegP3uXNWj1ARt++boq3iJKOxjTepwDzYUpFTTi2uP+OKdnUoJdx1sdQTCv8vzYGrnp8e7M9EpLXTM70D34xjjBHDFliqiAV9EIxJnCod2/35E7A/xIrBD1fpNn9MgdBs15uj2hyk9cq5zmSuMkXhzRyb/CC/TqkbyrToiSduXc3HRJTIRiB/+7c3fjPaPhOvaXrwVeSLbWMx8A4JTeQIfVxWGUpf3OhD7nnPTgpqD4wFXuWEgI1UL92dQMA4I2gey+NHeDbd03qsF9NpFYVUHHRTZbUH00RgxX3r4Iu6OwLvGargKURyHNnQXljpItgzLsLfLh228gSQZYasSnX5wvQJCz+3ui64gDyXDmcJLls8dUstHxzaLJkXelzv8bhkCH8xskfy2Z/Vw1MOZFewp786hGxxZrISWgDrimKcE8ikSZbA== X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kmUvqizQgFJ0RYaLtLZaRrUDQMbaLot5TPQR+R8Huq3SP4gbIAkWHu2fLhK4DX+6AEDA/EwJkMlBgVOjQn/Cgk0VeOPv2Ax9duyqUOwKJEUS1h62gGdyZ+qZTJqNkQt+t9MYzgJ1FYjAqWOaYVoZ+yWIQVJaghEYhfczE35XGvYZAAfg1idtl58yyP6/WZfpiofezFgo6h5ku9Pe3E8RdVRyZbZTq9iqJR7J1CoFq8XJ7Ky0AmO7+hTU3FEPWiGYvsGZcVaQVZnCfqLCVKUG/q8ynSLfctekggy0Bq3aynXILKof9lcJu+PxD2Y/GtdO4T6w2EMnwL2QNU01cTHP3mHEjJgQoyyCyR4/eClmH5fBEjj7Z3qzLmfRCbkNVCU4UhPq4P3FwooGNQOnDg+w8wjM5bx2U5nMsbiwBHdULte5nrjGKDD8R2wKWSL4Z2IYX6mZOpgB7J/zjvvdArL5C+j6lkq6lVjfLhU50PRbTi7nf/FFLDrH0uf+FUKzVeDEQ2o+sJRgxe2i2qMMYXuwfZrrjCt6LIG5jg9ujKnisOGSsj9YhOtnO+4yklsK0zteHhnovOToYSfjPljjpS+1UOYfYC9cfAj+dRPfgma8qOmTMczRvJ4IR/B4DbVdgo5U X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 6XZpcHZzQs7kAFVxmbP5mCg7PxGoLwKq5JzK3snnUqZC6fx1j+C/R5Wn+0dzrfyJGn0JNtko/0T++bL6h+Pd0Oxb7w/MjIoQLZq9sOCoNVncdegnGw3eEPwVAeroBRlTmoBabFsCNMkD40hSgEv4Itx1krEf0bVfWKfVycmtQ5ygC3bd2z5eLZjqHx/KsbRl4Vvw9gJmR5HmX6onE6RIZVFx29uSGwQnB24qER4plmR+44ZzvcHxF71Dblwd4UscNRLUAP5CxfZarB5a5OyQj7ee+xQhb0lIpsaF+WKd42ZQw3WaMz4CBxaTcdVBUhpS/vcr303kZFeSy556VwowvCvEruffAFU3/ZOIEkSjKp9khqWEDPCZtzqnEpjksiDOmtTibfheiAzqrVTNxPnpLWbLCCOFTzIjyTdQlMrvJ8wc+cYYz59Nc7cv6c6UJscVaU+8C5XNjng+Zbei3jHT5Y1AfS8ZAgQ+fyJH2WzysUXRh9QjYeJ+Ckquk+JGirXJV5urWyeWkNCqcRNFBWCFsKZuKUB2deT9Gy4fmeZ7G3aa2FK0p83c2cLWwX7q9oszZuAMz5Y96DlEAGtu1LK05+A5wHkYNhaIrrBr87Nm87EVeZPsX1QssJHPNGg/1jEJY5pTfYUGA1UCDueZbEA/j5mGL8F9Xa1oukkd3BIV1jm2hNqwk18nv+9tsA5Z7hqjRQnfxd51H2ynxxpdFt4NvymRhxbLOkxqEDIG+fWQiiOmiv8LpkRyNBa9oUz2SBhqZ6dFXw4x4Hl470L9DnlX7k4CuWnWlH8tfPa4joUJdY+A2S2F71FEKAqe6eQJeXj6mbRWeHlBS3JtTvn7gFutdpXyesQq09karNGFpcmhDT33TWIUoRbgSfrjytpuK6LxQB6X04Sajbd+R6+LOrEqMM6SwClrGCIq5XI3dVZ0t9ypZ1kDkDK+HQmeHbjHto/zwJFoYlkoH6Ihas7ZYcGGXeT6NeQ2pyiej6yrx+MtjUw7NxjJmAph7ZFncF+3qqqJtDyqGoVb+8Ld8DN3/U7IyJutCobXE7WAmTZvGGkdW58wjmUhTo6r63ikulEQCiS29Z4/Y4DHPxvrU3mQvdXaio0Dh/e5ESvHKYsoY/UFHzYxzVMCFaVZx21iKlQYVPF8buncLLpH0xBJ3Kh7xn9z6GuCPbQO3C9P+CSmC611i4O6jSJeDcZQLI3z9ilYSwz6TQc1qc4jtPxgxZGMjTlm4rwOlbhjMcyjChTJk9nT8ra3NvYfJejMEtiW/5ZauKLa X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 85a82a53-671f-49c6-4f1e-08dbaa70a4f5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2023 22:21:38.5709 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PRAP250MB0418 Subject: [FFmpeg-devel] [PATCH 11/13] tests/checkasm/hevc_*: Avoid using declare_func_emms where possible 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: X4EwhIaGkyPc Only the idct_dc and add_residual functions have MMX versions, so one can use the version with the stricter check (that checks that the MMX registers have not been clobbered) for all the other checks. Signed-off-by: Andreas Rheinhardt --- tests/checkasm/hevc_deblock.c | 2 +- tests/checkasm/hevc_idct.c | 2 +- tests/checkasm/hevc_pel.c | 52 +++++++++++++++++------------------ tests/checkasm/hevc_sao.c | 8 +++--- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/tests/checkasm/hevc_deblock.c b/tests/checkasm/hevc_deblock.c index 5e4338af1c..66fc8d5646 100644 --- a/tests/checkasm/hevc_deblock.c +++ b/tests/checkasm/hevc_deblock.c @@ -55,7 +55,7 @@ static void check_deblock_chroma(HEVCDSPContext *h, int bit_depth) LOCAL_ALIGNED_32(uint8_t, buf0, [BUF_SIZE]); LOCAL_ALIGNED_32(uint8_t, buf1, [BUF_SIZE]); - declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *pix, ptrdiff_t stride, int32_t *tc, uint8_t *no_p, uint8_t *no_q); + declare_func(void, uint8_t *pix, ptrdiff_t stride, int32_t *tc, uint8_t *no_p, uint8_t *no_q); if (check_func(h->hevc_h_loop_filter_chroma, "hevc_h_loop_filter_chroma%d", bit_depth)) { for (int i = 0; i < 4; i++) { diff --git a/tests/checkasm/hevc_idct.c b/tests/checkasm/hevc_idct.c index 49cfc4801f..9da8b858a0 100644 --- a/tests/checkasm/hevc_idct.c +++ b/tests/checkasm/hevc_idct.c @@ -91,7 +91,7 @@ static void check_transform_luma(HEVCDSPContext *h, int bit_depth) int block_size = 4; int size = block_size * block_size; - declare_func_emms(AV_CPU_FLAG_MMXEXT, void, int16_t *coeffs); + declare_func(void, int16_t *coeffs); randomize_buffers(coeffs0, size); memcpy(coeffs1, coeffs0, sizeof(*coeffs0) * size); diff --git a/tests/checkasm/hevc_pel.c b/tests/checkasm/hevc_pel.c index 43aa5cd084..f9a7a7717c 100644 --- a/tests/checkasm/hevc_pel.c +++ b/tests/checkasm/hevc_pel.c @@ -79,8 +79,8 @@ static void checkasm_check_hevc_qpel(void) HEVCDSPContext h; int size, bit_depth, i, j, row; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride, - int height, intptr_t mx, intptr_t my, int width); + declare_func(void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride, + int height, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -123,8 +123,8 @@ static void checkasm_check_hevc_qpel_uni(void) HEVCDSPContext h; int size, bit_depth, i, j; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int height, intptr_t mx, intptr_t my, int width); + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, + int height, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -165,8 +165,8 @@ static void checkasm_check_hevc_qpel_uni_w(void) HEVCDSPContext h; int size, bit_depth, i, j; const int *denom, *wx, *ox; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int height, int denom, int wx, int ox, intptr_t mx, intptr_t my, int width); + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, + int height, int denom, int wx, int ox, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -214,9 +214,9 @@ static void checkasm_check_hevc_qpel_bi(void) HEVCDSPContext h; int size, bit_depth, i, j; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int16_t *src2, - int height, intptr_t mx, intptr_t my, int width); + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, + int16_t *src2, + int height, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -259,10 +259,10 @@ static void checkasm_check_hevc_qpel_bi_w(void) HEVCDSPContext h; int size, bit_depth, i, j; const int *denom, *wx, *ox; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int16_t *src2, - int height, int denom, int wx0, int wx1, - int ox0, int ox1, intptr_t mx, intptr_t my, int width); + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, + int16_t *src2, + int height, int denom, int wx0, int wx1, + int ox0, int ox1, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -311,8 +311,8 @@ static void checkasm_check_hevc_epel(void) HEVCDSPContext h; int size, bit_depth, i, j, row; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride, - int height, intptr_t mx, intptr_t my, int width); + declare_func(void, int16_t *dst, uint8_t *src, ptrdiff_t srcstride, + int height, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -355,8 +355,8 @@ static void checkasm_check_hevc_epel_uni(void) HEVCDSPContext h; int size, bit_depth, i, j; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int height, intptr_t mx, intptr_t my, int width); + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, + int height, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -397,8 +397,8 @@ static void checkasm_check_hevc_epel_uni_w(void) HEVCDSPContext h; int size, bit_depth, i, j; const int *denom, *wx, *ox; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int height, int denom, int wx, int ox, intptr_t mx, intptr_t my, int width); + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, + int height, int denom, int wx, int ox, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -446,9 +446,9 @@ static void checkasm_check_hevc_epel_bi(void) HEVCDSPContext h; int size, bit_depth, i, j; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int16_t *src2, - int height, intptr_t mx, intptr_t my, int width); + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, + int16_t *src2, + int height, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); @@ -491,10 +491,10 @@ static void checkasm_check_hevc_epel_bi_w(void) HEVCDSPContext h; int size, bit_depth, i, j; const int *denom, *wx, *ox; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, - int16_t *src2, - int height, int denom, int wx0, int wx1, - int ox0, int ox1, intptr_t mx, intptr_t my, int width); + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, + int16_t *src2, + int height, int denom, int wx0, int wx1, + int ox0, int ox1, intptr_t mx, intptr_t my, int width); for (bit_depth = 8; bit_depth <= 12; bit_depth++) { ff_hevc_dsp_init(&h, bit_depth); diff --git a/tests/checkasm/hevc_sao.c b/tests/checkasm/hevc_sao.c index 94aa1942e1..da3f710537 100644 --- a/tests/checkasm/hevc_sao.c +++ b/tests/checkasm/hevc_sao.c @@ -80,8 +80,8 @@ static void check_sao_band(HEVCDSPContext *h, int bit_depth) int block_size = sao_size[i]; int prev_size = i > 0 ? sao_size[i - 1] : 0; ptrdiff_t stride = PIXEL_STRIDE*SIZEOF_PIXEL; - declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t dst_stride, ptrdiff_t src_stride, - int16_t *sao_offset_val, int sao_left_class, int width, int height); + declare_func(void, uint8_t *dst, uint8_t *src, ptrdiff_t dst_stride, ptrdiff_t src_stride, + int16_t *sao_offset_val, int sao_left_class, int width, int height); if (check_func(h->sao_band_filter[i], "hevc_sao_band_%d_%d", block_size, bit_depth)) { @@ -118,8 +118,8 @@ static void check_sao_edge(HEVCDSPContext *h, int bit_depth) int prev_size = i > 0 ? sao_size[i - 1] : 0; ptrdiff_t stride = PIXEL_STRIDE*SIZEOF_PIXEL; int offset = (AV_INPUT_BUFFER_PADDING_SIZE + PIXEL_STRIDE)*SIZEOF_PIXEL; - declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t stride_dst, - int16_t *sao_offset_val, int eo, int width, int height); + declare_func(void, uint8_t *dst, uint8_t *src, ptrdiff_t stride_dst, + int16_t *sao_offset_val, int eo, int width, int height); for (int w = prev_size + 4; w <= block_size; w += 4) { randomize_buffers(src0, src1, BUF_SIZE);