From patchwork Tue Apr 13 00:45:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Dekker X-Patchwork-Id: 26887 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 2712144B5A4 for ; Tue, 13 Apr 2021 03:45:37 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 069686898F6; Tue, 13 Apr 2021 03:45:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from wout1-smtp.messagingengine.com (wout1-smtp.messagingengine.com [64.147.123.24]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 961586883C5 for ; Tue, 13 Apr 2021 03:45:30 +0300 (EEST) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id CC9A91286 for ; Mon, 12 Apr 2021 20:45:27 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Mon, 12 Apr 2021 20:45:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=fm1; bh=X8UgPrljkQPGGnKdpHe2fabpkf 63b455mr0N9h+Xndg=; b=PnA5NGny/ufw4j3l5JYq9T/coVCvB5UsKU5pqGzNwd 5X6AxZLzxn4rhy4eyoek1zqbhTnNwSabdJLhFtUxHIeImZIxzOGitWoVam+WdtRC HfJmm7jNkmzl40BaGe7xmjdBfGO0x8x3FUiYLrMMJqIxAPXaWhW2N3h5+spDO5hK vqY3g70PTZJWoXlX87y+iaAsfcJit9oFOBay1faTsScF6Fs7ZCg5r2CqffR7m8L3 TS0ChhbCIVxtSc1YE7ifeObaiHxz6TrfFrtHs2zmh1OYutPG/ylm+1JTmsjqVBVd umQO5MAaF8i2Ncv9ivOQmvg874cDpeOd/pj4QbGv4HlA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=X8UgPrljkQPGGnKdp He2fabpkf63b455mr0N9h+Xndg=; b=vcR/rrF+xI2eTiitkT5F9+yhUOFN8LdEt DrntkJhRor5OwWCXi6hTW8Vs+5n4S19rw48+JSgpxjs9zsyWhe04Iky3CB4yeKRn hIiUKavsSJhPMe7DYVGFPawbabedSvymz8X8J69erFaxxWLiYFmXSvg6m/2qmVvy e3TWINcSM385x6U96ryasMItCJkj4WzqOzBsr1OB/GiiL/fyh/sQBOb0C2lVo8nY hGqVk9BwEWP42W1rXQT4hBa20b66DoMXiIOgn02TxfrzWzze66Tf2sAMlkfcXm2w uFlmhUyhZp/YzTjiGxfJMmKsOmr5f9iuVgTrecFwI1KYGDjA6jw2Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrudekkedgfeejucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvffufffkofgggfestdekredtre dttdenucfhrhhomheplfhoshhhucffvghkkhgvrhcuoehjohhshhesihhtrghnihhmuhhl rdhliheqnecuggftrfgrthhtvghrnhepkefgjefgjeetgedvvddvieeijedviefgvdfgff dujeffffffjefgleekhfeugfevnecukfhppeekjedruddvfedrudelvddrvdejnecuvehl uhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhhoshhhsehith grnhhimhhulhdrlhhi X-ME-Proxy: Received: from users-MBP.fritz.box (i577bc01b.versanet.de [87.123.192.27]) by mail.messagingengine.com (Postfix) with ESMTPA id AA80724005A for ; Mon, 12 Apr 2021 20:45:26 -0400 (EDT) From: Josh Dekker To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Apr 2021 02:45:23 +0200 Message-Id: <20210413004523.6500-1-josh@itanimul.li> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] checkasm: add (private) kperf timing for macOS X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Josh Dekker --- configure | 2 + tests/checkasm/Makefile | 1 + tests/checkasm/checkasm.c | 19 ++++- tests/checkasm/checkasm.h | 10 ++- tests/checkasm/macos_kperf.c | 143 +++++++++++++++++++++++++++++++++++ tests/checkasm/macos_kperf.h | 23 ++++++ 6 files changed, 195 insertions(+), 3 deletions(-) create mode 100644 tests/checkasm/macos_kperf.c create mode 100644 tests/checkasm/macos_kperf.h diff --git a/configure b/configure index d7a3f507e8..a47e3dea67 100755 --- a/configure +++ b/configure @@ -490,6 +490,7 @@ Developer options (useful when working on FFmpeg itself): --ignore-tests=TESTS comma-separated list (without "fate-" prefix in the name) of tests whose result is ignored --enable-linux-perf enable Linux Performance Monitor API + --enable-macos-kperf enable macOS kperf (private) API --disable-large-tests disable tests that use a large amount of memory NOTE: Object files are built at the place where configure is launched. @@ -1949,6 +1950,7 @@ CONFIG_LIST=" fontconfig large_tests linux_perf + macos_kperf memory_poisoning neon_clobber_test ossfuzz diff --git a/tests/checkasm/Makefile b/tests/checkasm/Makefile index 1827a4e134..4abaef9c63 100644 --- a/tests/checkasm/Makefile +++ b/tests/checkasm/Makefile @@ -58,6 +58,7 @@ CHECKASMOBJS-$(CONFIG_AVUTIL) += $(AVUTILOBJS) CHECKASMOBJS-$(ARCH_AARCH64) += aarch64/checkasm.o CHECKASMOBJS-$(HAVE_ARMV5TE_EXTERNAL) += arm/checkasm.o CHECKASMOBJS-$(HAVE_X86ASM) += x86/checkasm.o +CHECKASMOBJS-$(CONFIG_MACOS_KPERF) += macos_kperf.o CHECKASMOBJS += $(CHECKASMOBJS-yes) checkasm.o CHECKASMOBJS := $(sort $(CHECKASMOBJS:%=tests/checkasm/%)) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 8338e8ff58..4c42040244 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -26,6 +26,8 @@ # ifndef _GNU_SOURCE # define _GNU_SOURCE // for syscall (performance monitoring API) # endif +#elif CONFIG_MACOS_KPERF +#include "macos_kperf.h" #endif #include @@ -637,9 +639,20 @@ static int bench_init_linux(void) } return 0; } -#endif +#elif CONFIG_MACOS_KPERF +static int bench_init_kperf(void) +{ + if (ff_kperf_init() || ff_kperf_setup()) + return -1; -#if !CONFIG_LINUX_PERF + if (ff_kperf_cycles(NULL)) { + fprintf(stderr, "checkasm must be run as root to use kperf on macOS\n"); + return -1; + } + + return 0; +} +#else static int bench_init_ffmpeg(void) { #ifdef AV_READ_TIME @@ -656,6 +669,8 @@ 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 diff --git a/tests/checkasm/checkasm.h b/tests/checkasm/checkasm.h index ef6645e3a2..4127081d74 100644 --- a/tests/checkasm/checkasm.h +++ b/tests/checkasm/checkasm.h @@ -31,6 +31,8 @@ #include #include #include +#elif CONFIG_MACOS_KPERF +#include "macos_kperf.h" #endif #include "libavutil/avstring.h" @@ -224,7 +226,7 @@ typedef struct CheckasmPerf { int iterations; } CheckasmPerf; -#if defined(AV_READ_TIME) || CONFIG_LINUX_PERF +#if defined(AV_READ_TIME) || CONFIG_LINUX_PERF || CONFIG_MACOS_KPERF #if CONFIG_LINUX_PERF #define PERF_START(t) do { \ @@ -235,6 +237,12 @@ typedef struct CheckasmPerf { ioctl(sysfd, PERF_EVENT_IOC_DISABLE, 0); \ read(sysfd, &t, sizeof(t)); \ } while (0) +#elif CONFIG_MACOS_KPERF +#define PERF_START(t) do { \ + t = 0; \ + ff_kperf_cycles(&t); \ +} while (0) +#define PERF_STOP(t) ff_kperf_cycles(&t) #else #define PERF_START(t) t = AV_READ_TIME() #define PERF_STOP(t) t = AV_READ_TIME() - t diff --git a/tests/checkasm/macos_kperf.c b/tests/checkasm/macos_kperf.c new file mode 100644 index 0000000000..e6ae316608 --- /dev/null +++ b/tests/checkasm/macos_kperf.c @@ -0,0 +1,143 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "macos_kperf.h" +#include +#include +#include + +#define KPERF_LIST \ + F(int, kpc_get_counting, void) \ + F(int, kpc_force_all_ctrs_set, int) \ + F(int, kpc_set_counting, uint32_t) \ + F(int, kpc_set_thread_counting, uint32_t) \ + F(int, kpc_set_config, uint32_t, void *) \ + F(int, kpc_get_config, uint32_t, void *) \ + F(int, kpc_set_period, uint32_t, void *) \ + F(int, kpc_get_period, uint32_t, void *) \ + F(uint32_t, kpc_get_counter_count, uint32_t) \ + F(uint32_t, kpc_get_config_count, uint32_t) \ + F(int, kperf_sample_get, int *) \ + F(int, kpc_get_thread_counters, int, unsigned int, void *) + +#define F(ret, name, ...) \ + typedef ret name##proc(__VA_ARGS__); \ + static name##proc *name = NULL; +KPERF_LIST +#undef F + +#define CFGWORD_EL0A32EN_MASK (0x10000) +#define CFGWORD_EL0A64EN_MASK (0x20000) +#define CFGWORD_EL1EN_MASK (0x40000) +#define CFGWORD_EL3EN_MASK (0x80000) +#define CFGWORD_ALLMODES_MASK (0xf0000) + +#define CPMU_NONE 0 +#define CPMU_CORE_CYCLE 0x02 +#define CPMU_INST_A64 0x8c +#define CPMU_INST_BRANCH 0x8d +#define CPMU_SYNC_DC_LOAD_MISS 0xbf +#define CPMU_SYNC_DC_STORE_MISS 0xc0 +#define CPMU_SYNC_DTLB_MISS 0xc1 +#define CPMU_SYNC_ST_HIT_YNGR_LD 0xc4 +#define CPMU_SYNC_BR_ANY_MISP 0xcb +#define CPMU_FED_IC_MISS_DEM 0xd3 +#define CPMU_FED_ITLB_MISS 0xd4 + +#define KPC_CLASS_FIXED_MASK (1 << 0) +#define KPC_CLASS_CONFIGURABLE_MASK (1 << 1) +#define KPC_CLASS_POWER_MASK (1 << 2) +#define KPC_CLASS_RAWPMU_MASK (1 << 3) + +#define COUNTERS_COUNT 10 +#define CONFIG_COUNT 8 +#define KPC_MASK (KPC_CLASS_CONFIGURABLE_MASK | KPC_CLASS_FIXED_MASK) + +int ff_kperf_setup() +{ + uint64_t config[COUNTERS_COUNT] = {0}; + config[0] = CPMU_CORE_CYCLE | CFGWORD_EL0A64EN_MASK; + // config[3] = CPMU_INST_BRANCH | CFGWORD_EL0A64EN_MASK; + // config[4] = CPMU_SYNC_BR_ANY_MISP | CFGWORD_EL0A64EN_MASK; + // config[5] = CPMU_INST_A64 | CFGWORD_EL0A64EN_MASK; + + if (kpc_set_config(KPC_MASK, config)) { + fprintf(stderr, "kperf: kpc_set_config failed\n"); + return -1; + } + + if (kpc_force_all_ctrs_set(1)) { + fprintf(stderr, "kperf: kpc_force_all_ctrs_set failed\n"); + return -1; + } + + if (kpc_set_counting(KPC_MASK)) { + fprintf(stderr, "kperf: kpc_set_counting failed\n"); + return -1; + } + + if (kpc_set_thread_counting(KPC_MASK)) { + fprintf(stderr, "kperf: kpc_set_thread_counting failed\n"); + return -1; + } + + return 0; +} + +int ff_kperf_init() +{ + void *kperf = dlopen("/System/Library/PrivateFrameworks/kperf.framework/Versions/A/kperf", RTLD_LAZY); + if (!kperf) { + fprintf(stderr, "kperf: kperf = %p\n", kperf); + return -1; + } + +#define F(ret, name, ...) \ + name = (name##proc *)(dlsym(kperf, #name)); \ + if (!name) { \ + fprintf(stderr, "kperf: %s = %p\n", #name, (void *)name); \ + return -1; \ + } + KPERF_LIST +#undef F + + if (kpc_get_counter_count(KPC_MASK) != COUNTERS_COUNT) { + fprintf(stderr, "kperf: wrong fixed counters count\n"); + return -1; + } + + if (kpc_get_config_count(KPC_MASK) != CONFIG_COUNT) { + fprintf(stderr, "kperf: wrong fixed config count\n"); + return -1; + } + + return 0; +} + +int ff_kperf_cycles(uint64_t *cycles) +{ + uint64_t counters[COUNTERS_COUNT]; + if (kpc_get_thread_counters(0, COUNTERS_COUNT, counters)) { + return -1; + } + + if (cycles) + *cycles = counters[0] - *cycles; + + return 0; +} diff --git a/tests/checkasm/macos_kperf.h b/tests/checkasm/macos_kperf.h new file mode 100644 index 0000000000..dddd6e4d24 --- /dev/null +++ b/tests/checkasm/macos_kperf.h @@ -0,0 +1,23 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with FFmpeg; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include + +int ff_kperf_setup(void); +int ff_kperf_init(void); +int ff_kperf_cycles(uint64_t *cycles);