From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B7B25487C6 for ; Sun, 16 Jun 2024 06:41:03 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C08568D6A6; Sun, 16 Jun 2024 09:41:01 +0300 (EEST) Received: from out203-205-221-149.mail.qq.com (out203-205-221-149.mail.qq.com [203.205.221.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2D11768D627 for ; Sun, 16 Jun 2024 09:40:53 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1718520050; bh=FLy5LItMRgYD3w/1chwPV+pCjOjDzCnarT7HfqcYj5c=; h=From:Subject:Date:References:To:In-Reply-To; b=FpVmSSrU3FvtqyrHSUJUJWg466YodtxXtWHi5fzJqcXnAJ7vjwakoMvjDel5s+NuJ fIOCkiBDEDQUUxEGvLQQmCPu+r4x/c3bd9BSDeIKpxET0qFM6+9EPcWYxT3ufvgl03 y+EVXHqYG1dTTvJoCXhGZGcDBL5O93chJdaAWPxA= Received: from smtpclient.apple ([113.116.28.85]) by newxmesmtplogicsvrsza15-1.qq.com (NewEsmtp) with SMTP id A3193C6A; Sun, 16 Jun 2024 14:40:49 +0800 X-QQ-mid: xmsmtpt1718520049tp9vesukq Message-ID: X-QQ-XMAILINFO: MIAHdi1iQo+zuCoNMTYBprWn0EPBNO1b5G9ZF9LnYuOLW6RUWRBv+B3MU8LP/d yIhudztEI966xAZRcoDFA2SgiIZbXR+MHRw8T/UGCRUGkuOy07eCgrx46PH0IIH+7AIKXxWsy2Cl YA2vfFMghsrnLekpkU9ljnIj4jeQjTGJmLHp+/igoxiJfZ1CMbaejFZQqlLpBu7RUuc7tv/Lj6mY fToIo+HU6tzVo4UX1C67WWJI8wnqBKcddnlxiHc+cDr+eDm7qDSx3IBwBrEwS0BT4U2QOOW04Qoh /vcNhoAGgh1Ef2YPgDKt65wlAIvLUPGoF4YkOR5Ng7PIjjirRwTcwy5WymKfD75/c5D5JcglsQjy BEKnfFv/4kdVobagp7b/EpV13bFDjfgI3K+vPmtnqrN7GeQY4Ckjxl+zO/b/kmiFfFtRF7lcKUzJ HLn1vGz3+7I4zmGF+YIS+ZorJJddy3kwekUrJQQ7uiddTPV4k5kVxesl1EsYcIf/Abc+VSdfpUwE gQD9BcTNb3EnjVW2n/zCr6iDZqE9G1fSlkqaieRp0ITaXaBdTlMWoDq9lfzBo64/BNXBTpJ0bZMI UM6Jwu7HhBbpRXpXRmMc1UUefBDZNttrjIYtNeHyuFgUcIVA2yPtPpBE3g0vfNArN7mKKx79FSRu n25esY87YULSAn2rlHS38CLs/f7Xco9JCYJfH8uDRIVp5OXHA9hhNJ8h2AN7/fzJtERDFUj7Q4NY YWBLmDdwBN0sH9JblUWwM/AIqVsbT5/haKkFkMl19vFn/NmXUfmcMYova6AgloIoIIDfRyAVkQBU CteVclyR6DbvX4tmaRZ4+0IEfbqf858HSJDAElwZlvTJ3tp/wgPW+JLmI+SepUXS26sybkRmGhdE 9FMNgT31Z+wGy0LTQ/0qj9m3OjPOEM9iQivUIgLSf7Imt0tPpZW3Ktx7iyvrv4RLCaqR8iAv+ciT Kgjo+h26FvvlptQmx7N/yq7JAtHq9XVhgPbp7RaUFc74j+7CdUtmr0wdM+dvhIRlEGv/rxCUtY17 1vBKi37w== X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3774.500.171.1.1\)) Date: Sun, 16 Jun 2024 14:40:39 +0800 References: To: FFmpeg development discussions and patches In-Reply-To: X-OQ-MSGID: X-Mailer: Apple Mail (2.3774.500.171.1.1) Subject: Re: [FFmpeg-devel] [PATCH 1/2] avutil/timer: define macos kperf as AV_READ_TIME 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > On Jun 12, 2024, at 23:22, Zhao Zhili wrote: > > From: Zhao Zhili > > Firstly, make ff_kperf_cycles as an implementation of AV_READ_TIME > avoids code duplication. > > Secondly, fix compilation error since 6a18c0bc87e when macos-kperf > is enabled. mach_time.h is included only when CONFIG_MACOS_KPERF > is 0. The error happened due to define mach_absolute_time as > AV_READ_TIME but missing include mach_time.h. Define macos kperf > as AV_READ_TIME fixed the issue. Ping. > --- > libavutil/macos_kperf.c | 8 +++----- > libavutil/macos_kperf.h | 3 ++- > libavutil/timer.h | 10 ---------- > tests/checkasm/checkasm.c | 8 -------- > 4 files changed, 5 insertions(+), 24 deletions(-) > > diff --git a/libavutil/macos_kperf.c b/libavutil/macos_kperf.c > index 9fb047eeee..a0bc845fd3 100644 > --- a/libavutil/macos_kperf.c > +++ b/libavutil/macos_kperf.c > @@ -96,15 +96,13 @@ static void kperf_init(void) > av_assert0(kpc_set_thread_counting(KPC_MASK) == 0); > } > > -void ff_kperf_init(void) > +uint64_t ff_kperf_cycles(void) > { > static AVOnce init_static_once = AV_ONCE_INIT; > + uint64_t counters[COUNTERS_COUNT]; > + > ff_thread_once(&init_static_once, kperf_init); > -} > > -uint64_t ff_kperf_cycles(void) > -{ > - uint64_t counters[COUNTERS_COUNT]; > if (kpc_get_thread_counters(0, COUNTERS_COUNT, counters)) { > return -1; > } > diff --git a/libavutil/macos_kperf.h b/libavutil/macos_kperf.h > index d039691340..40bbc616df 100644 > --- a/libavutil/macos_kperf.h > +++ b/libavutil/macos_kperf.h > @@ -21,7 +21,8 @@ > > #include > > -void ff_kperf_init(void); > uint64_t ff_kperf_cycles(void); > > +#define AV_READ_TIME ff_kperf_cycles > + > #endif /* AVUTIL_MACOS_KPERF_H */ > diff --git a/libavutil/timer.h b/libavutil/timer.h > index 6bd6a0c645..16f2b1a96c 100644 > --- a/libavutil/timer.h > +++ b/libavutil/timer.h > @@ -142,16 +142,6 @@ > read(linux_perf_fd, &tperf, sizeof(tperf)); \ > TIMER_REPORT(id, tperf) > > -#elif CONFIG_MACOS_KPERF > - > -#define START_TIMER \ > - uint64_t tperf; \ > - ff_kperf_init(); \ > - tperf = ff_kperf_cycles(); > - > -#define STOP_TIMER(id) \ > - TIMER_REPORT(id, ff_kperf_cycles() - tperf); > - > #elif defined(AV_READ_TIME) > #define START_TIMER \ > uint64_t tend; \ > diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c > index 2329e2e1bc..28237b4d25 100644 > --- a/tests/checkasm/checkasm.c > +++ b/tests/checkasm/checkasm.c > @@ -775,12 +775,6 @@ static int bench_init_linux(void) > } > return 0; > } > -#elif CONFIG_MACOS_KPERF > -static int bench_init_kperf(void) > -{ > - ff_kperf_init(); > - return 0; > -} > #else > static int bench_init_ffmpeg(void) > { > @@ -806,8 +800,6 @@ static int bench_init(void) > { > #if CONFIG_LINUX_PERF > int ret = bench_init_linux(); > -#elif CONFIG_MACOS_KPERF > - int ret = bench_init_kperf(); > #else > int ret = bench_init_ffmpeg(); > #endif > -- > 2.42.0 > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".