From patchwork Sat Oct 8 01:24:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38620 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:789c:b0:9c:c2cd:5584 with SMTP id bf28csp292894pzc; Fri, 7 Oct 2022 18:24:44 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4h57yY6B8gAwc+c55gkNFSgoLr6GOF86Y+YyfaOa/2AnLpv7qBtyY7P6e4RPmDb2W5XWL9 X-Received: by 2002:a17:907:a4e:b0:77d:94d:8148 with SMTP id be14-20020a1709070a4e00b0077d094d8148mr6006077ejc.607.1665192284555; Fri, 07 Oct 2022 18:24:44 -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 z16-20020a056402275000b00459cc499817si4341698edd.534.2022.10.07.18.24.44; Fri, 07 Oct 2022 18:24: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; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=o5h6AxCk; 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 0C0EF68BBA0; Sat, 8 Oct 2022 04:24:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-DB5-obe.outbound.protection.outlook.com (mail-db5eur02olkn2088.outbound.protection.outlook.com [40.92.50.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C895968BBA0 for ; Sat, 8 Oct 2022 04:24:27 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UfznosCNKW1/liBiml8ZUBxpoC/WxU7y53fZVDZgSr94RJnNLml7+H/X7jPfHjgyCIA1rJo4q8aoNi1AHRg10z03BiubW7SxXyKVirjp123Mvzze/Vm+KKGSEGtx49EWYXl6iml5G/V+/6PdZR97ofBagm8y32aQsbnBFDy2oBrcLrkm2qUty8lFvyqEO+vxcPWLzQHkH2QlBPYx/YLu5seJOzBRfe5ymblq/3zsoI8Q9RdC4XpVFAeBKQ6ypaayZ5IlN/btmChe7CqreoKtgLeu+9JGZVfymte/UuCGmNeYofBjWyz3X4EYYV1eixkpHveDQUGmBxvsXSZ8+QI+1Q== 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=a7Degn/Jsqw8Z382S6lP8AHbJ0Vqll5ELoR0YzNxEm4=; b=QAtFbWwu5Ja06MCWPanKd5S3YEwLDeBxXFs+SSAho322h0VKo15VZN2Fs2h3fXz8t2H3mxGhL+6Vdsw3p0rU3C1q/ml0bwAEC/xHcr2HyhJPRL6OdL9WHfSz/M1sUfM22qDwxZmFJIb5GeTtMMyzB9dLLXYpLJRYP82NFp6OAcb+Z/7pmevcP9/D8GIJUMIWgLZp5/9QB561qjS0ShPmL+eikzZ7o1w+YPiv+fR3kXBNHwUpkLXztYZcQT1h15KHH9U+SrefZ9b9g6dQ1gRCS84Xz0kPwtnkpAXdk4IoFAtLKzqg9d85XFFob1NcnQ8h0aF44qLnNm5vPiGWkr2CoQ== 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=a7Degn/Jsqw8Z382S6lP8AHbJ0Vqll5ELoR0YzNxEm4=; b=o5h6AxCkThvygHVDEtyP3XR0rHPe9YfsAukGMwkpyz3/vYPQC76Zg7UboXCD2pTcDwQnmfcSwpbUoNd+99K5EgZNbSdR/5E4cn9Od5wAMkMSos2dOIX2W1VLyGcrbRUsYyebzxEblQd6hFmgK3kh+zHVK3X00/McNR6LugC5p5ahXUlT092FTcMagqwAIFmIBuGx74jY/a31D5k/sj5Tm7lV6uUyneDWb8FVMbPQxzIwBNofc3YHkJwh22Nh8aqcU8jOwko41Qh64frpeQ0GNDiFtDa0VU+03Qh7EsZMzrb3jg9Ww0p+5nNATaGEiPB4+inMMNgqIuWfXlQNk5Drcw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by PR3P250MB0098.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:171::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5709.15; Sat, 8 Oct 2022 01:24:24 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::68bd:2fc7:ac52:38f8%9]) with mapi id 15.20.5676.028; Sat, 8 Oct 2022 01:24:24 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Oct 2022 03:24:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [5psCcTmzcLO22/k7n7nY9Lfowd7LtsfXbIQok9WDiWU=] X-ClientProxiedBy: ZR0P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::7) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20221008012412.309522-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|PR3P250MB0098:EE_ X-MS-Office365-Filtering-Correlation-Id: 1b8537ad-529f-4c2e-9a6a-08daa8cbd5c4 X-MS-Exchange-SLBlob-MailProps: a+H6FLLcF3rUGeq4fk4l5dm1gk0Jy5Lf1SB8SM52qqujzxuHDxbwE6Xt0BVmgYyNfWPVve3F6mILXZ2P3QhNaDTCOLnsTSrZvjeywV6w7+zcLgHRVYFJ0ZahZlAIL88vFnMS/pJndZi+Hrp9YAXfZOmF3NU1BUlAsHKKF4GItmQyQx33qTqCDJDGhqQ3iULHK65/SxTQN3oOc1iUvEfhWcXQj68odqraPGnIScrvCB3HJQaMjfOMv+sODympX7qWRAwfMHUStvuAD9QWp9hSwTK4qzN9JamILjaNdHBL3wTQAOCsz458g+TB0UC/Nz4rBzIYITRn1zicNXtTmU8LrvSKnuMYww0PWXBRdZrFB/qyexC8t5fPxI/KBPJeqKY6nTdzV7RP9/ltLeagGn+8AL2El9txnKx3P+TO2Orq9WxPltafoPvg6ihTM/tuBhKiUEzOr+NphsA//0pUxFQTxSnulFr9ApJ3TU8mnt+YJSn0ecqEk5JapTEqjZnWqyMrkjXGE9snfVOVaMlyrK+AsSdO5baWPykeF702+86gK7WwgfGZakE9vRxgA3nvo3/Ig2SG0ZAJhXO7s15EhjR+qIZOqezumX0/1brqBs6Sz1wDuHvujmYNiXhnFBijQtbtyrpLWY+HIGo9CNqPUCxL1cR/X7Rz2gl6W/zCOU1X1mORNBk1G2Ad7/XMYK4JcPFpTpt/1MxOTnre2PAD+LvAGWypX+mESp81bm1uiRdx90IGXQZjR16ZRNrLg2qM5nN9MCISSjmSgqOwc8MwyQa2n5OEfwhR5pFYECf+mdYgHtJ6cT6K7+kLyLV0yLIucRno X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4kBRmZaaY8hLAx0ZEDjCMhDabcqXLGCCt6qD035tDeA7FAP+vRJOzGB5KZq0qcSYcq4sJiy2g3iF3LpXFFW6b5cdcz4DAKAYtmXWzTC6a4my8rBLTXQ+3glFIjv27tcoAroSoPZhqCT1goISKkmNTphKh3hpIlszHpz4RRNpWhEO/W8/KJQNjhEBbN7hg7X6WpRjLuq8HSyZ6HRyoWRfujpbdxriNJMixabsBPTEkSilPP6ua4fQvOqZcxgmZq1EJQ2/6032M3veN4s7WNvkIg8N4HJEsfRmkOgHxcH5X2ep/EYjjDWPlju56EiEouEz8TjgoyqGI52EqKqAHmCxuF375YGAaQtN9oheHBd+99esgI9fehWqVT37vzW1u+ny5VMao5/qR4qqt16B8Dioj8N4p1BJdttxCma03P2tVcoPTPEMuHIUU7MLbouxezXrh5E3t6dDbmZgr7yoLmT5vIkx5fbB3s+hU+twnMt/aiA8yLo890trKeya/1fsj1Y5cqT4dAJsyadfxv2ImEY8bM9NZnFR7uV76EF9Z569k9zNOVFuNTRg/Bec63vzTjJMXWUbvQBMg2CpLMq+CNPNtrFubUlo9QNiNOnb4vJVzPVpgXtfZfNY23hrmP4NMkW/1wKG3IJ2WimDmKfvqQe8cNpHqTd1YQufAq30YP1fSP1SMYzKINh+UjWV92jBBHNO X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dAL2IHatg5OhwwuYnCHXmLWpvZocez1MlPGxtwH6iTrBa7/lxkchdWOb6RgnnxW/IA97A0dkz8dJ04r/vAvyY+UfWc1FvLEHTVym/0h2HsUCYeN7yuvz8+29tSvD+UUlMj3S2TvtSEVTSetxt5xNKXvBE20SnB27mTzKYFQf9Cw4+5FpLbxlN69Nd4gY6riLIn+dPHuDbaesyXt7rZJOdOFiSGZdjhXPn3tv6rYzNFFu54gzDQkN8evV30Jwvpok2R3YF6MfTgTyglvyPnu9h9NapGvCIyfeqMRCRadIbRW0srNo5ZT60XS8iq4ami92l/wnkpQfu8Can9Ytj4q9OvTf7dCVf346/xGmLs3S7Bk/XR7dh9p2FW/l5on/nfvHuWI6Ul5G9GMz9WWEdWZvO0VTnJ0EQADXQuFe05EoaCaJavPw6y5X/PCh8yXZCGBEc+iNRl6xtlhecBTKckXQhbUDj+zRdorvh/MBRo8xZx8tt5bjiQ/aWZ9zYHYgm/fwddNSoWSOS+uifTX7Rg7nrjuH8BfAra2uJghOi2QN6Ms91Nw87DIW1QEPDdogMVkx8PqPb5QIQ3waFEMkJ1/hkVY+lzxKxOry7RN5+mt8o4KsrIYAsCs0pHn3IGwXZAG/M+zkMZmxG0UI7Sfnys2nHjpt6UKK75fZWmix1CAVDyN0KHVm2kzSitVwnSE8j7iXjTCf2UUuVaaUW5lgZHUJJ5+bO6r/a8cUiLLs/uOOVxRAn/OrzxCvlmmAev+e/PcV/5Q95Vv3RX3ddxXcMB1eli6dv0aVRee7IJagkgV2BszKqZH8qG6mRem1xO7saNZ7sH+ChH7gKDmOXitx0Q3cqTrizdUeyXeJ7OJXSg3C3tqPs5f0XCCixm15DQHq0QvaMN4Vbk29oOkziADtoHo2sCXWNDRCIWnY693INNGqIX7laW+yluLm6wsgwyk1f2DUabjOQs4HNUSElE/qzu63fpTWFgxSi1YS17IqczM+NVrd4W732El5orhJdZXbmKk/7P0k92zcew+AVyjeVHFPew/KooY9iWmScK3/OotYnMA8Ke87jOryUJgcsc9iBahDA+GlouDB4YT30ERNROKiV7c0V7kfdUKnIq0rgpl2ZeIggZgMRzKud2cyXPD0hfqcZ1n11JipopeM0UZfQukhBuvv6ObsTUxqSM5L1yItt6Q0mBYD/Oj+OSGgxJvYfRgvBFaJI4ezTEnHLoD6sSDpt7UM2QURwjsEu6qDPYFVYeuvs3UBXEySq+Ojv4VIZ4wj4XpVS0CK3vZSwbMsj+tdbBZEQrMZ51hcs1xwT+5i2z+sFM8C95rNUZs7q6whTenf X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1b8537ad-529f-4c2e-9a6a-08daa8cbd5c4 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Oct 2022 01:24:24.6480 (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: PR3P250MB0098 Subject: [FFmpeg-devel] [PATCH 5/9] checkasm/llviddsp: Be strict about MMX 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: HrfWNBgvZ+gQ There is no MMX code for llviddsp after commit fed07efcde72824ac1ada80d4af4e91ac4fcfc14, so use declare_func instead of declare_func_emms() to also test that we are not in MMX mode after return. Signed-off-by: Andreas Rheinhardt --- tests/checkasm/llviddsp.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/checkasm/llviddsp.c b/tests/checkasm/llviddsp.c index 66e08c8099..d948a9832d 100644 --- a/tests/checkasm/llviddsp.c +++ b/tests/checkasm/llviddsp.c @@ -48,7 +48,7 @@ static void check_add_bytes(LLVidDSPContext c, int width) uint8_t *dst1 = av_mallocz(width); uint8_t *src0 = av_calloc(width, sizeof(*src0)); uint8_t *src1 = av_calloc(width, sizeof(*src1)); - declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, uint8_t *src, ptrdiff_t w); + declare_func(void, uint8_t *dst, uint8_t *src, ptrdiff_t w); init_buffer(src0, src1, uint8_t, width); @@ -78,9 +78,9 @@ static void check_add_median_pred(LLVidDSPContext c, int width) { uint8_t *src1 = av_calloc(width, sizeof(*src1)); uint8_t *diff0 = av_calloc(width, sizeof(*diff0)); uint8_t *diff1 = av_calloc(width, sizeof(*diff1)); - declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *dst, const uint8_t *src1, - const uint8_t *diff, ptrdiff_t w, - int *left, int *left_top); + declare_func(void, uint8_t *dst, const uint8_t *src1, + const uint8_t *diff, ptrdiff_t w, + int *left, int *left_top); init_buffer(src0, src1, uint8_t, width); init_buffer(diff0, diff1, uint8_t, width); @@ -114,7 +114,7 @@ static void check_add_left_pred(LLVidDSPContext c, int width, int acc, const cha uint8_t *dst1 = av_mallocz(width); uint8_t *src0 = av_calloc(width, sizeof(*src0)); uint8_t *src1 = av_calloc(width, sizeof(*src1)); - declare_func_emms(AV_CPU_FLAG_MMX, int, uint8_t *dst, uint8_t *src, ptrdiff_t w, int acc); + declare_func(int, uint8_t *dst, uint8_t *src, ptrdiff_t w, int acc); init_buffer(src0, src1, uint8_t, width); @@ -143,7 +143,7 @@ static void check_add_left_pred_16(LLVidDSPContext c, unsigned mask, int width, uint16_t *dst1 = av_calloc(width, sizeof(*dst1)); uint16_t *src0 = av_calloc(width, sizeof(*src0)); uint16_t *src1 = av_calloc(width, sizeof(*src1)); - declare_func_emms(AV_CPU_FLAG_MMX, int, uint16_t *dst, uint16_t *src, unsigned mask, ptrdiff_t w, unsigned acc); + declare_func(int, uint16_t *dst, uint16_t *src, unsigned mask, ptrdiff_t w, unsigned acc); init_buffer(src0, src1, uint16_t, width); @@ -168,8 +168,8 @@ static void check_add_left_pred_16(LLVidDSPContext c, unsigned mask, int width, static void check_add_gradient_pred(LLVidDSPContext c, int w) { int src_size, stride; uint8_t *src0, *src1; - declare_func_emms(AV_CPU_FLAG_MMX, void, uint8_t *src, const ptrdiff_t stride, - const ptrdiff_t width); + declare_func(void, uint8_t *src, const ptrdiff_t stride, + const ptrdiff_t width); stride = w + 32; src_size = (stride + 32) * 2; /* dsp need previous line, and ignore the start of the line */