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 D77104AB2A for ; Wed, 12 Jun 2024 15:23:14 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C0B2968D97D; Wed, 12 Jun 2024 18:23:13 +0300 (EEST) Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com [203.205.221.205]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DD9E68D70E 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=1718205778; bh=Ui/DvMQeW0GdXmlSx6z4KLeUGaTHGgl59kcnE+8VAUI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=EFOghkN4cIBo53NNXj5WVu+fOPZvSd605J3LfOF+zAkRcZFEdXBwwPIETiBfuQ/3/ 0Qe8Qpc38tKB3dgI6zGLrAg448GGMWOLOSaFUcnrTFB3p0khpJl62BeabYl0U7Tq3F F/w8n19YHFtbJB15a/RHYNp1DEZdicRhmk/uHL4E= 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: xmsmtpt1718205776tbikv4pz2 Message-ID: X-QQ-XMAILINFO: MWmI3y6OsbKEO0e+/+QKIIy6QD8NRF1cumKN+32rPqiMmPlbwrJUxfhmqhq4CW HstFt3VzMPlZvIJT2gh4Zx8SPN/A+0RZdnXZYhqYR2rb6aJUhE0YY9Gtcr2z3/OQlErub0nQ0kRw l/VSR74I4Zsu/xAht6Kvjalk3QIMCeSE5yVsQzHj1XXjgenWw+AEkBlUalq2zBtf2x8xjwNZ5gpc eRvkOGtB6qiW5by8E3voDSZk4aylu5UgM7KE0BunUfhX8RkP/Z9AB5apfGfpz7EMuSAk7kZxW78m dovsBDJlYBbNUJZZTI17uLcuR8KHa4QRkAQ3ikIltnokcpgVVQ9Jy6c9kC198TBQ1epZgIibxhfH f7/DSeS+4it0qsKkuH/IPW0LNwihBOCTOddEQEgGZAHN4RdNmrhLRdmcs4MoU/vhM9jet2uHrToh a8EA3vZW6o6DKFBy25RHkb27x7adKzmovZACeM3v6J/I2lRIeJewKWLwqoXWOxnDxGT3RiJ26ffM Y58lYo4K60jyJeDGfLuT2sTPGCwr7Y/c3DxJNsjNt/jB06pj+rk7fPgRv0jxjA7NEa74PmjqOvq4 IfozPluqpj2h7/4207s/nE1yLLMZtP0v1e2WC6MtyZWut9z8s5HyIULZFrLWrNm5dkgpg1auW5Wu cg+hntZ9TixVampeIlI1sUFLZncy+LNG8POAVlLULsW6l5Haz473rsxK0GK9FXaJuW8TEhDO9zn9 j544zzj6EA3f9XeewrMvVzlIWMLpelzZrNHJm8NAl3k8qbiMer9FIRqWImF/96HUzuLXBaSRrk20 +fIh/GWmICm3RF4ah1hYhTO/lW/IoQ2MjjQqXEotH+nKgib2zXrsXJxu1QprEdQoyOnKK3P0bEzn ZgPxwhNS7tXflHAC4oNQSx76DdsWu5Aeyicf2IPxIWBc6rgi0Nf0oN/CH64aRraGtQZKNG2vg31W dGQN6fFsm/3+euWZ1gYD7LStNgGBbqgLTTJTFNt0S/cL7jPhNYPaDn9+3e+XszdkvCwKz+j4U= X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2024 23:22:52 +0800 X-OQ-MSGID: <20240612152252.33554-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240612152252.33554-1-quinkblack@foxmail.com> References: <20240612152252.33554-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avutil/macos_kperf: Fix assert which makes kperf failed to run 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 On m1, kpc_get_counter_count(KPC_MASK) return 8. The exact value doesn't matter in our case. --- libavutil/macos_kperf.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/libavutil/macos_kperf.c b/libavutil/macos_kperf.c index a0bc845fd3..906b276a34 100644 --- a/libavutil/macos_kperf.c +++ b/libavutil/macos_kperf.c @@ -67,14 +67,15 @@ KPERF_LIST #define KPC_CLASS_POWER_MASK (1 << 2) #define KPC_CLASS_RAWPMU_MASK (1 << 3) -#define COUNTERS_COUNT 10 +#define KPC_MAX_COUNTERS 32 #define CONFIG_COUNT 8 #define KPC_MASK (KPC_CLASS_CONFIGURABLE_MASK | KPC_CLASS_FIXED_MASK) static void kperf_init(void) { - uint64_t config[COUNTERS_COUNT] = {0}; + uint64_t config[CONFIG_COUNT] = {0}; void *kperf = NULL; + uint32_t n; av_assert0(kperf = dlopen("/System/Library/PrivateFrameworks/kperf.framework/Versions/A/kperf", RTLD_LAZY)); @@ -82,8 +83,10 @@ static void kperf_init(void) KPERF_LIST #undef F - av_assert0(kpc_get_counter_count(KPC_MASK) == COUNTERS_COUNT); - av_assert0(kpc_get_config_count(KPC_MASK) == CONFIG_COUNT); + n = kpc_get_counter_count(KPC_MASK); + av_assert0(n <= KPC_MAX_COUNTERS); + n = kpc_get_config_count(KPC_MASK); + av_assert0(n <= CONFIG_COUNT); config[0] = CPMU_CORE_CYCLE | CFGWORD_EL0A64EN_MASK; // config[3] = CPMU_INST_BRANCH | CFGWORD_EL0A64EN_MASK; @@ -99,11 +102,11 @@ static void kperf_init(void) uint64_t ff_kperf_cycles(void) { static AVOnce init_static_once = AV_ONCE_INIT; - uint64_t counters[COUNTERS_COUNT]; + uint64_t counters[KPC_MAX_COUNTERS]; ff_thread_once(&init_static_once, kperf_init); - if (kpc_get_thread_counters(0, COUNTERS_COUNT, counters)) { + if (kpc_get_thread_counters(0, KPC_MAX_COUNTERS, counters)) { return -1; } -- 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".