From patchwork Wed Feb 28 16:18:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 46622 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a919:b0:19e:cdac:8cce with SMTP id cd25csp31345pzb; Wed, 28 Feb 2024 08:17:33 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXu9wM5V7jh7YhGMjjvCzZtqEoiopqcRkzeY9QgmaH/3umS25WR5hxtMZ8k8kydzEUTMhdZNsspgYDSDhpzrYqN2pnuFdtF5Fwhaw== X-Google-Smtp-Source: AGHT+IGXP7civZNfIH11hoskoiN5sOmK/kXvtJLlwRpAywAqgP75YPp7TuDDvsBEgsGDy8Y62kqA X-Received: by 2002:aa7:c456:0:b0:565:9fff:6046 with SMTP id n22-20020aa7c456000000b005659fff6046mr8392384edr.3.1709137053317; Wed, 28 Feb 2024 08:17:33 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c6-20020aa7c746000000b00564f04e4347si1821880eds.203.2024.02.28.08.17.31; Wed, 28 Feb 2024 08:17:33 -0800 (PST) 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=BQoiF15p; 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 7309568CDE2; Wed, 28 Feb 2024 18:17:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2081.outbound.protection.outlook.com [40.92.90.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 21EBD68CCAF for ; Wed, 28 Feb 2024 18:17:14 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R1plcoeUqUl8eHjqFOfyVMBXPuL88XpQeFCl/iiND3GhibYHltrs6suIweNbfLZy0X1n7v9LpbvtwipCurvalrtp3ADJPl4xHbABaxWDHAL24hZCyUkMWMP+fCG/HzNsCnRzfp8AK6UZvHHxhjZEn7sy8jYiZR+4fuJJIC7Ig4O6nMfxQ38lIWh45QBMtW0fPdsqPBJrX90owDr2GwWIZfCJ8yUfmAAOGRXKF6fE/jYcYkG54BPxF916iSQ2vPGyYO7XgTco2XkinQ1rT20NKG2WNFLRXxNf71QpZD/QZ/JiTJWQCan5RhkhEm9+1H39Wj4GJjkuRYO7+IQXCVEh1g== 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=b4efS7EvHuLAlXe4UoZ2yr+2ll1h1oflJsgtL5mGkkI=; b=g/3oTginmyYj3kPBfZ7oqcAkzLGd+iyuVE8dUQJtboigzWlnFWOFZghwPGk+hX+OY9s5hkCM5Y9SAkN5J64PvQQVtzzsU0zxKPmXVfVs/yHtj5Tbosutvozcx49EQAuJ09WPN15Cz04NXiKit8OxXt5Mt+F6ID9zppi6anObs19OHFMJZlguarOgnGu6vCQo7GJCO+PflP7qiPv9vTXHgZMJXNr7uiXSE/T1l8Ogkn63RSR39JPhUz0yGv0hehfgS0eSkR/HbBpKFA1AVnCHOvW9I7CefAogbUbSN4BSbExW4iz/hiLOJa6T1yyOvECTxrT+0klNu13IpgGc48xTkw== 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=b4efS7EvHuLAlXe4UoZ2yr+2ll1h1oflJsgtL5mGkkI=; b=BQoiF15p/ZQuEpq4n0nsiW9BmneDRHKjYApk+Jma3zptG906IeixlhcJPx1Lp4T0QZn4DDF/SbKOMl46YG+YcaHxXFFqJXU6Dw51Sn8hjE0TvnVFGMcpmKDUMJOqOcWHc6XY5DVSjENHOaWdaZ2akAerqBK46x7yuVpYhNTG7qq6IcRC3n83J2VJP4o1MvAZJ2NJ8D04N/YKa1bVjlu9B97ZsSzV4UAhOdxrnz6AY++zl+5OIrm12Cu+qfurhFBBfRM9XgpkeigEGgstyS2aoElkz2RVok+b4SvA/SixKRoz/Hli0UJMQcOCtSacTW6eYI7275V7lpw6E1PZzqhi0A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0512.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7316.34; Wed, 28 Feb 2024 16:17:13 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::65aa:deb0:a18e:d48d%5]) with mapi id 15.20.7316.023; Wed, 28 Feb 2024 16:17:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 28 Feb 2024 17:18:43 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [fpBBQ59cTVF2x6r1E9IUxU3bRR+N9CGb0JxbV736D2s=] X-ClientProxiedBy: ZR2P278CA0067.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:52::14) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240228161844.2187053-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0512:EE_ X-MS-Office365-Filtering-Correlation-Id: 3e742bdb-5800-4bbe-b1f0-08dc3878b8eb X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SQy8yixyc3hUYyOhYrsPQqqxbU5i89hhSzqOutkkzGXMS+mrlOEQIY+d1AKpY0KZsQIJgvQJzqTUIogJ4qbUrrF3HR3tvZPulykenUMJiRhr6b+npoFu9r99Yp/j00tsQLonDty8PSMxYn5Has0RL7jTrCxKgjTo9Z4heCtviuy9ZBoGH6IypkgjTaiCrl6PxGqWNclbuzgHEz5TDZk2sacU1CZdfxWX9TOC8EDzBbD46AZB/PB+1vFXP4UbkGCGoeyblaRKZFnS+LRTLq73P/QRYv7okQabLHmDHcay/IJrSlqR+P9XlQM3pGIUMAUqJ+leKp7NmgTxBYNkdAnNxHlm2b12LXf6JvHqAke9Ufs1aUtC8WiQSIR0GWEXjxGuJjiE9kYbFauHzroOWXrnn+c7bV/kjd9DW6PYODPXgGkOlNJwADI5QiRwEmYqzu1rj9kyxII32LlwlsaOcsJmazwP9iwm7RiZTDHhoV9kthMu/iVZRqbRgn46UbrIjLjlX2LWLS2oN6x9T/rfsnYDDy9B9MBD7MnAY3WObd8mtZf9Bo2UoGDYMBJkSJkKv7yAmr7Ptqg49ISEex/PeutIN7HB33fKW/CPvEKUq/LELLWFmKeKruwkrWH+nIar5v4P X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: zKm9cJJze6NrunhIv/jFiXtDAn6V/X7Ba1kmOb9VgQkwW6R/2B+0ZilfmT60BEQOQXSErfoXtnXM6LS6gFN50wmBbHhiGbtbSdPjSYAnxxUfAJwhsLbzs+/hokXu9xZMvHs4cNRIzcMtMM4Rso3fYZee/x4AuRFv02AFdURg5m9NRH3dlSAFWDnjyaGATI6it43/S5HjnKSfgcLqif6XuRJNtvp4p+TJbaLo7Y18rMZlCFmut7Qu9OoBqJ0Sf+Fqp1YxwzBcDAedv7G1Ba3tLADT8Ogt4u0s3s5hBt1KhRcQtChIdzPmIDrB2Qcoi3j4CdqI0Tjq15z/vZRTnT/EmA+gsl5WjnOEB5+o01lS9QTEAKf6VrtTB00UrIcaKq8YvBasnbCYnbIE55+h4nlVLmzcnlQED5H/ppFoxN1bsCeojsCGlBgv0ku3MaX2i2a5HKH0TGJufqZyvc8j2v68idHAdzjTvr4qKArTk71kf6nG539zZ62pYbOFgZxLvt2CNleohYPC/Kjs04aG5wEq73JRpeomY1idN0olrvGDuOR71vLkpjwPARzvOY10gQPoquhDUCP/H+i0BbBVaLulZTSjaIyNT6LNESkmfTE9RZBKXRvawVniY7Tng9w0HTgY6FS8w3C1h+3dNpStmt6W8LlEQUk2Z6abVZ0sZJlXVYIuEE3mFAXhvgAoIho9fK71tRvdedy3ERGGwS83TDX01eMmlbADCN0mwcsjps1gDchpQKZsbBinZOprPUmTeE1UlT3z9PF+VRFkKadqDVY0bduP9Yv6dhIcVPpNWi21a7l8pY89FS4m1AGT2qDpC1u77BkuocZxnWbwxDzs5KTxQsFVIGM8d4Rlw9Uj5ZygovMrrg3kui+bI7bBTnTNMmZNuw69WnAv4Y+z/IMbqO6iBceLpdnMn0Xy0+7/AvK4iOv8h7LTxwIMjTBrpoiYj/c9Nz+a2okyA1C/oWGaCNKZvW1ZuHDNiExdLwYhbXQxjA4Q38DmVMsjNAutNWB0u5gm9cnR+GDEcOMHyZBiCJ4YDtE+uWJlg3FVYMGetcyunX6aAcGz89W05vyOzxUhF/XA82drA8TNdT3UBYCX9pP1q7POed/QH+fo+l1NUeKMmKbKPBzWHD9My4R+mnQyjvz32Sm/m3NrXMsnOHspUKPyM3dUjsqU/zmtdDsV0yr/CY5OS89CwygapMxniYqqx5QPKFgni37LQk7JXnN36eUXnOZ8prI3s+YUqHzz9YMqxK0KQIFTrqdLMKyJtrR2eUfJa4Kmm0ZMOunDmxvEsPdIKQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3e742bdb-5800-4bbe-b1f0-08dc3878b8eb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Feb 2024 16:17:13.1263 (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: AS4P250MB0512 Subject: [FFmpeg-devel] [PATCH 5/6] checkasm/vvc_mc: Don't use declare_func_emms 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: hfzwMQJTxbHA There is no MMX DSP code for VVC, so one can use the stricter declare_func which also tests that we are not in MMX mode at the end of this function. Signed-off-by: Andreas Rheinhardt --- tests/checkasm/vvc_mc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/checkasm/vvc_mc.c b/tests/checkasm/vvc_mc.c index 8adb00573f..ce34965b7d 100644 --- a/tests/checkasm/vvc_mc.c +++ b/tests/checkasm/vvc_mc.c @@ -74,7 +74,7 @@ static void check_put_vvc_luma(void) LOCAL_ALIGNED_32(uint8_t, src1, [SRC_BUF_SIZE]); VVCDSPContext c; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, int16_t *dst, const uint8_t *src, const ptrdiff_t src_stride, + declare_func(void, int16_t *dst, const uint8_t *src, const ptrdiff_t src_stride, const int height, const int8_t *hf, const int8_t *vf, const int width); for (int bit_depth = 8; bit_depth <= 12; bit_depth += 2) { @@ -122,7 +122,7 @@ static void check_put_vvc_luma_uni(void) LOCAL_ALIGNED_32(uint8_t, src1, [SRC_BUF_SIZE]); VVCDSPContext c; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int height, const int8_t *hf, const int8_t *vf, int width); for (int bit_depth = 8; bit_depth <= 12; bit_depth += 2) { @@ -172,7 +172,7 @@ static void check_put_vvc_chroma(void) LOCAL_ALIGNED_32(uint8_t, src1, [SRC_BUF_SIZE]); VVCDSPContext c; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, int16_t *dst, const uint8_t *src, const ptrdiff_t src_stride, + declare_func(void, int16_t *dst, const uint8_t *src, const ptrdiff_t src_stride, const int height, const int8_t *hf, const int8_t *vf, const int width); for (int bit_depth = 8; bit_depth <= 12; bit_depth += 2) { @@ -220,7 +220,7 @@ static void check_put_vvc_chroma_uni(void) LOCAL_ALIGNED_32(uint8_t, src1, [SRC_BUF_SIZE]); VVCDSPContext c; - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dststride, + declare_func(void, uint8_t *dst, ptrdiff_t dststride, uint8_t *src, ptrdiff_t srcstride, int height, const int8_t *hf, const int8_t *vf, int width); for (int bit_depth = 8; bit_depth <= 12; bit_depth += 2) { @@ -282,7 +282,7 @@ static void check_avg(void) for (int h = 2; h <= MAX_CTU_SIZE; h *= 2) { for (int w = 2; w <= MAX_CTU_SIZE; w *= 2) { { - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dst_stride, + declare_func(void, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *src0, const int16_t *src1, int width, int height); if (check_func(c.inter.avg, "avg_%d_%dx%d", bit_depth, w, h)) { memset(dst0, 0, AVG_DST_BUF_SIZE); @@ -296,7 +296,7 @@ static void check_avg(void) } } { - declare_func_emms(AV_CPU_FLAG_MMX | AV_CPU_FLAG_MMXEXT, void, uint8_t *dst, ptrdiff_t dst_stride, + declare_func(void, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *src0, const int16_t *src1, int width, int height, int denom, int w0, int w1, int o0, int o1); {