From patchwork Mon Sep 20 21:18:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30387 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6506:0:0:0:0:0 with SMTP id z6csp1820067iob; Mon, 20 Sep 2021 14:18:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynn9sj3hhSEeJIPKQu+YKrfFNpZjyDYVEMf2dMpfL89BePQ3vsyG3hLdPIGBj3UnYpJ66J X-Received: by 2002:a50:bf4d:: with SMTP id g13mr13162812edk.195.1632172725019; Mon, 20 Sep 2021 14:18:45 -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 s26si654638edi.291.2021.09.20.14.18.44; Mon, 20 Sep 2021 14:18:45 -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="ggMv3/mi"; 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 55D2568AFC0; Tue, 21 Sep 2021 00:18:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2022.outbound.protection.outlook.com [40.92.89.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9047668AE52 for ; Tue, 21 Sep 2021 00:18:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=b4QHcyFVvztepDvBnphgkyzp5au5OGg973g7IVYlh7cG65Ee5FkzROBfwu7a0+2jLL3sszXPNctd95PabKDf/t6CZZm76kkh4/3v79wu7OQ6nFTa21WdHy/yULfpp1fZ7NP9pbihvRYJYw3XCCSyIsIhBP4sqx46t4fZCegRhvGKYYZsTmVQlCGsdgrOasPM2NfPkZG7u4OCZu5nFYo8ZwkWaWx2TR+U+O0p0Xs7P+cnbDg8bD9zaXYVHzZWPm4bbWhMgyhlzXCE6ZQTc+YJdSPHFqMP/cbtIxJslbw6pg/6BqE6gj6b8PBxgaYW7vJVjP1RlsxG+KUfL5L+2yjljQ== 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; bh=xdl/+PhttUujRkb4fEY5B1R1PmqLhZA1KdwxPtI8FcY=; b=dOJBgr4/DWhT0nhFGADtUoQJbSmspS3LYZW6ebCiMU28JValaeDbBp4aiUZ3tnvHA8rqvYi961ZlsK0RKWv+TSg82AAeKXf3iDRWjqZFlLOEM73sL7cqx4HvupYdzzanrtFjUssgpCpcZpUSYEqL13XU/AXOpL4DCfDYN1BXfKO4YnUDqGGj9CxNBCALeJGEe6oJfvEZQkUy3P5JwvCxTV+WKPvnTYgjqE8SIgB+HXi5J7oDecZPRces9mCJi7ANE7QnOvmO9Nilv+JtFg34boISOI82dvBuE5RtUSEACL6GzN1foBjLi0RS5w/oiyoc2F3rgreS+JIBnjDuGybw0A== 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=xdl/+PhttUujRkb4fEY5B1R1PmqLhZA1KdwxPtI8FcY=; b=ggMv3/miA58zeSHYhdv+kgbi8Apym+D9DO7Nam9dikHH2na82e++57GOD7b0CdrmmzwLpYOesD8C7eDjOvqf+OeBZD67lZmszi8I4YMNbfKBjKqk0siV2I2gNfOO55w5j+HL4/vuVSgHJ1/TGdRB/tybzDJkaicWEwIK5jrlVV/TeQrO4efWyJdCOSnYApdMLFkmHCA+kBNsmf/OgK4zNAU6rcrC8IwcPT92wJ4upFVTJ77Axnh2bwt65FsGrDOTbgrkaBr1NjiLVFYvOOS3Wj4v4FCwtIn6i3oRawAboLDrhNF07c9gD5xFmAApvc2Xt7+UTMZrRxNJ8XQhXq8kFA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7301.eurprd03.prod.outlook.com (2603:10a6:20b:2eb::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14; Mon, 20 Sep 2021 21:18:32 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4523.016; Mon, 20 Sep 2021 21:18:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Sep 2021 23:18:19 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [kzT49aIwqfsWbmPIaHH0EozVlnAMPJu7] X-ClientProxiedBy: PR0P264CA0073.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::13) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210920211819.3306202-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR0P264CA0073.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:18::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4523.14 via Frontend Transport; Mon, 20 Sep 2021 21:18:31 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7da36935-8c2d-476b-bf8d-08d97c7c32e2 X-MS-Exchange-SLBlob-MailProps: EpEO96k6WokNgi+oLauEIxHNyV8zJzdjMpCubdEZxbP1BS1lZq61pRJvW+GYAd1AsSyhjaNVn79hEr7X8GFwtuTQ4dpBswV8qWHvXbugBpZsleeFHjPUmBizGDXLtpy0fgaHvi2zjCHg9LFC8z7L+zVBHZ369Ga66b72zZwZ3OCE56H92OuhZBK1pjuooDdw7XFlP73py8aZsfXdBvFgu9/U9K4oCelDibdot5QR1WAbXYtko8WPULXFNdwYZ2uzqGwNnJk2DpdOFnq7vQQDOir+a2iJVTKpkE8VqoREXBved3aAvujyy4WHayGSRy7HeQAJLJtahNMqtCYY7enkkpVc8FKlRee15n32QySArGJUbOQGDNI+G1MpOYK9EJG1vVKsOma6RpDWvui3JXFWbHDUgZj57h4vLJ5foHkF4VlYl9X5KTf2IBeAmDgJqyxFFK6dNYR8mtsHJIBy7zbkoS1NemAwh3RI/QI3zykw615uXgXTOjjj7TK9g++OAiKMyJn8U6xBe8xfEOETA/SZWgt2NaoLpVzYSqqHtPsQTZveVam6SmlZhFtbWOqPioK8d3EuWMUKBbVj2Z2rUy9PXBaDyD8mEdp/AnAQUKCfXX9ZVobjwU3Vc7n23QIzwuzEVkGZWyXrqiqVCGOlePu9je6g80dbLShGEVfhC1T8DtXXOphDWydrmDuYroD7XESzTwc1AKRclx1WPgAhOsw8gA0GDFAXqREoJ8CBpfKQW6+2x+7c/rItiYqc/F0rlj0+dmkmeJJpA1s= X-MS-TrafficTypeDiagnostic: AS8PR03MB7301: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oJfJ/at3wUFRL3/Qb3UTaVW+9KvFMwjIyeueBbYttBXpetOKirvqLdKYza8pK67pw3uKotrLsvA8s1+jvMTSq6kPbBa8XgnICsGusKfwkjKnoRWipvFcH3WpyjMp83NadztVCwfMies9jR/dYCDatqhEvazn3kgSYGS5hAExiAnul4nJHE2dILU68JiV6R52BHBaGjI9OMPtq1F5WcAzvYlQqhigUO9PcyHs6pI4BexEkK6RP9Lz9OWJGiN1mQ7kJ4d0I2TC6hbt0eOH7CpeDKUd2KpRfO7yh2UwGfiMAznGjpNS7687aVH7xVzUAl7Cf8DSLxbg3mZoyPygcY9q63HiEcTeO2lvjgRQUGT2rygx6XHGjWP6zjSYCifZl6IctQM3fWNezmfN3h3p2CWxX+wbeSXDSNJ+YzN207V549H37QpYo2ssKhAZfwfI1ex5 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pG0V5m/WL6bMHdh0/2zhowShqey4C2TKQ170k4+k847VvhlDzFG2NNh0HnJZETpYELpd1DlbQzAx2SyohVc3K9jJjNWKTiJl+ic/dIqIYQcrFix88pksyiV1pNO5bn8XCUDqgu9NosaEIKrZ/GfXCg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7da36935-8c2d-476b-bf8d-08d97c7c32e2 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2021 21:18:32.4192 (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: AS8PR03MB7301 Subject: [FFmpeg-devel] [PATCH 14/14] avcodec/elbg: Mark ELBGContext as being unaliased by using av_restrict 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: BwiFA+iAiU+G This improves performance: For msvideo1, the performance improved by 4.8% when encoding the sample from the fate-vsynth1-msvideo1 test; when encoding the sample from fate-vsynth1-cinepak, performance improved by 2%. The compiler user was GCC 10 and the calls to encode2 have been timed. Signed-off-by: Andreas Rheinhardt --- libavcodec/elbg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/elbg.c b/libavcodec/elbg.c index 712c125a58..d97a7bc3f9 100644 --- a/libavcodec/elbg.c +++ b/libavcodec/elbg.c @@ -346,7 +346,7 @@ static void do_shiftings(ELBGContext *elbg) } } -static void do_elbg(ELBGContext *elbg, int *points, int numpoints, +static void do_elbg(ELBGContext *av_restrict elbg, int *points, int numpoints, int max_steps) { int *const size_part = elbg->size_part; @@ -419,7 +419,7 @@ static void do_elbg(ELBGContext *elbg, int *points, int numpoints, * If not, it calls do_elbg for a (smaller) random sample of the points in * points. */ -static void init_elbg(ELBGContext *elbg, int *points, int *temp_points, +static void init_elbg(ELBGContext *av_restrict elbg, int *points, int *temp_points, int numpoints, int max_steps) { int dim = elbg->dim; @@ -447,7 +447,7 @@ int avpriv_elbg_do(ELBGContext **elbgp, int *points, int dim, int numpoints, int *codebook, int num_cb, int max_steps, int *closest_cb, AVLFG *rand_state, uintptr_t flags) { - ELBGContext *const elbg = *elbgp ? *elbgp : av_mallocz(sizeof(*elbg)); + ELBGContext *const av_restrict elbg = *elbgp ? *elbgp : av_mallocz(sizeof(*elbg)); if (!elbg) return AVERROR(ENOMEM);