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 B43A54957D for ; Wed, 12 Jun 2024 15:23:23 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 15DAC68D988; Wed, 12 Jun 2024 18:23:15 +0300 (EEST) Received: from out203-205-221-173.mail.qq.com (out203-205-221-173.mail.qq.com [203.205.221.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 69A8668D924 for ; Wed, 12 Jun 2024 18:23:06 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1718205776; bh=JJAUV2c05VqbkE87PQVOKGI9slYPk5dawsDB8s+FCVo=; h=From:To:Cc:Subject:Date; b=QZVMn2+jC0IBOsTXI3xusITdgirX8UMvVJQ3FdgAvzuHvepaDnwYLFZeG34mTp1K5 96APrBJWWL3JTW8znrJpi9zl0S1V6suURQG93mqgsq4dtsMDYDzN1j1Yc3zAuzqKUd HjYnZzKG1wMUycjdFyS1lfpyfJrHAjnqCX6eepAc= Received: from ZHILIZHAO-MB1.tencent.com ([58.246.12.194]) by newxmesmtplogicsvrsza29-0.qq.com (NewEsmtp) with SMTP id 5B6A9CDA; Wed, 12 Jun 2024 23:22:54 +0800 X-QQ-mid: xmsmtpt1718205774tacc75nsr Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0aliGGX87TxNX+xAXQq5eenX9SnZvuOZnvDxAo7IzhIm/qUPlwQR xasYCel5v+uQ/QjjV1gZsTvYdZUtgpJYBKnOqCmw2jJNRtNlbCiHlD49v/yI6amhCGJnveLXSntm POkwOxsceLYIbgSN7aeWe6plGLZGUKI8oVSQXGSShePFkuueIR35WZhr+I8F0lMyy0QnRyv1beA6 4B6skiT91Bq6QO/TRo3TZQotNRi3u54wVq1V9YG51Pj8Pe3nVQ3ssd4kf+gzzxRUMM8bv6Ffj39m 2zNyOAI7waYLIJW3oBHva0AWAyYOrytcaNizr9BLzy+NcoiRYXQOAtO6FluXXPI+rFDsZ24tC3Yq nRcplxGA+oBUJQnfckvx27sJOtPwP7lSrXmPNZb5OgbNS3OZZLbBphuVIaDbaPL2/SIVvo/rh0cH tYfDvSfly6DPLhouS9Y9Xn4NqQC0JNHMJ1ttn2gGSlogXlojdYEbzJOJtKj/etrKQd4of1WEszag iUf/aGQJ1zB3fzN0HVJRoBRYVGVOjPZh2uUwdSRBFmLCHuIwoIVos9Yd6p6sAJ8xbM52gGAYd1n4 JHz5SXE4LHTmKQXuc3ynyxAymt9F5A5S8RW8couhUfTrp6XgSMtkYEO6RpuRo0gDcs4tW3SsOJiK DDjsTDPEYcOYbYZWq7dv338QqRY4u5vebUU6SOWa5OoD5q9lRQeKCojDqakYHyQH2ylx/McYiXOK 558q4ecsQdQZqCfgyu9JAwVFBaTCL24uECYab2hLkb1phrHfcsBIBpcMgRDgjCI4IV0FC9IOnWta RNyt4ARfDuZAvtdOO1YBS24ijkVDIT1WhgFwI5YsnG/5WySj70ydCLkdueiQqJgxG4iO91s5LtFq pL02KOF3LHCnVdfzGwFrSvE4yzyl7b0HffiPAe4c2m5HGNKNnxviNNXAlG3zWIyAiYiTxjeAtHxC zv2PaRQoSZhv8pdzG0bBjE5G8R+KBX X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 23:22:51 +0800 X-OQ-MSGID: <20240612152252.33554-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [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 Cc: Zhao Zhili 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: 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. --- 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".