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 9FA0249E75 for ; Tue, 13 Aug 2024 14:04:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27F5768DA50; Tue, 13 Aug 2024 17:03:52 +0300 (EEST) Received: from fout6-smtp.messagingengine.com (fout6-smtp.messagingengine.com [103.168.172.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73F7D68DA15 for ; Tue, 13 Aug 2024 17:03:45 +0300 (EEST) Received: from phl-compute-02.internal (phl-compute-02.nyi.internal [10.202.2.42]) by mailfout.nyi.internal (Postfix) with ESMTP id 3AC2C1387A01 for ; Tue, 13 Aug 2024 10:03:44 -0400 (EDT) Received: from phl-mailfrontend-01 ([10.202.2.162]) by phl-compute-02.internal (MEProxy); Tue, 13 Aug 2024 10:03:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=itanimul.li; h= cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:subject:subject:to:to; s=fm1; t=1723557824; x= 1723644224; bh=77x91ihj/P/bOY4vzS8agC9N0DNzxp3SzHfbTGKb2aE=; b=P BPY94EqSEibKtT6i6tusVb8FluGdlIdQV82e2xzF4z2KMEG46TTpiZu3DR99w000 ZZEsWKD8YEQVTvjujctTnGFWb+oSFxHS6k1RmF43CmVrrCoNQY7Muf9sXE159r6E TEPiuZU341qAuoC8PSvDLp3xhlcG6YVO0FJQg8sqW+pwBcRSdtwgNmP1dyswmotB CfCbT1zheBpIgBN13PvfCDi5SCTNkgNfZ9Rr6VFKOrP9kLVn7ayEsL+Pfytz1wWG bZlbojIySvTrQkrujuVaiaq96vhT0+aSmUzPqkOW1Bn3h5r+JAfHUyQ+A/FkIp8O QV2bYfHufV/i216f6aqbg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1723557824; x=1723644224; bh=77x91ihj/P/bO Y4vzS8agC9N0DNzxp3SzHfbTGKb2aE=; b=M/LgV8U2FkwyPG5tfkCThDCnfyGbc bULA5Ntu+Z+cj5tReN/ZEqwldybFGap5JXkr4BTFfyXdfE3G3K0UgqCEFeK4CgLQ Qi/IDknD6h13JPHu40ZOKPuNIr/8LNp9XiP7Vc9pE+iklfHg5/acTtE/A0GZprfy 3B1DYR/0axX55XhdvLbJ7TbbD+Tng/BXbFWYcGTjBLEixy3R6O9TYcIjanzoWRRE HnMKTEakeQLqWQYVzGx5aVZ2+z4dxDfswrKIHwpsmklFVOLinhBBY9cfB340hEEr nG9J/83JAmv4GnBPryr0/o5O3+VC4iT5SmJrUueWIrN1+GdB6r8YsyRDA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeeftddruddtvddgjedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdggtfgfnhhsuhgsshgtrhhisggvpdfu rfetoffkrfgpnffqhgenuceurghilhhouhhtmecufedttdenucenucfjughrpefhvffuff fkofgjfhgggfestdekredtredttdenucfhrhhomhepfdflrdcuffgvkhhkvghrfdcuoehj uggvkhesihhtrghnihhmuhhlrdhliheqnecuggftrfgrthhtvghrnhepgedvhfffudduge ehveeikeeifeefgfevffektdehkeeifefhveeuteeufefhteetnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepjhguvghksehithgrnhhimhhulh drlhhipdhnsggprhgtphhtthhopedupdhmohguvgepshhmthhpohhuthdprhgtphhtthho pehffhhmphgvghdquggvvhgvlhesfhhfmhhpvghgrdhorhhg X-ME-Proxy: Feedback-ID: i84994747:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for ; Tue, 13 Aug 2024 10:03:43 -0400 (EDT) From: "J. Dekker" To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2024 16:03:32 +0200 Message-ID: <20240813140338.143045-3-jdek@itanimul.li> X-Mailer: git-send-email 2.44.1 In-Reply-To: <20240813140338.143045-1-jdek@itanimul.li> References: <20240813140338.143045-1-jdek@itanimul.li> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/7] checkasm: add wildcompares for test & functions 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: Added: --test= Filter tests by glob style pattern. --bench[=] Run benchmark and optionally filter functions by glob style pattern. Example: $ ./tests/checkasm/checkasm --bench=yuva* [...] yuva420p_bgr24_8_c: 34.5 ( 1.00x) yuva420p_bgr24_8_ssse3: 31.1 ( 1.11x) yuva420p_bgr24_128_c: 310.6 ( 1.00x) yuva420p_bgr24_128_ssse3: 178.1 ( 1.74x) yuva420p_bgr24_1080_c: 2509.6 ( 1.00x) yuva420p_bgr24_1080_ssse3: 1471.5 ( 1.71x) yuva420p_bgr24_1920_c: 4462.6 ( 1.00x) yuva420p_bgr24_1920_ssse3: 2331.1 ( 1.91x) [...] Ported from dav1d. Signed-off-by: J. Dekker --- tests/checkasm/checkasm.c | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/tests/checkasm/checkasm.c b/tests/checkasm/checkasm.c index 0095758268..79cf39c27f 100644 --- a/tests/checkasm/checkasm.c +++ b/tests/checkasm/checkasm.c @@ -385,7 +385,7 @@ static struct { int cpu_flag; const char *cpu_flag_name; - const char *test_name; + const char *test_pattern; int verbose; int csv; int tsv; @@ -771,6 +771,22 @@ static void signal_handler(int s) { } #endif +/* Compares a string with a wildcard pattern. */ +static int wildstrcmp(const char *str, const char *pattern) +{ + const char *wild = strchr(pattern, '*'); + if (wild) { + const size_t len = wild - pattern; + if (strncmp(str, pattern, len)) return 1; + while (*++wild == '*'); + if (!*wild) return 0; + str += len; + while (*str && wildstrcmp(str, wild)) str++; + return !*str; + } + return strcmp(str, pattern); +} + /* Perform tests and benchmarks for the specified cpu flag if supported by the host */ static void check_cpu_flag(const char *name, int flag) { @@ -786,7 +802,7 @@ static void check_cpu_flag(const char *name, int flag) state.cpu_flag_name = name; for (i = 0; tests[i].func; i++) { - if (state.test_name && strcmp(tests[i].name, state.test_name)) + if (state.test_pattern && wildstrcmp(tests[i].name, state.test_pattern)) continue; state.current_test_name = tests[i].name; tests[i].func(); @@ -882,11 +898,12 @@ static int usage(const char *path) { fprintf(stderr, "Usage: %s [options...] [seed]\n" - " --test= Run specific test.\n" - " --bench Run benchmark.\n" - " --csv, --tsv Output benchmark results in CSV or TSV format.\n" - " --runs= Manual number of benchmark iterations to run 2**.\n" - " --verbose Increase verbosity.\n", + " --test= Filter tests by glob style pattern.\n" + " --bench[=] Run benchmark and optionally filter functions\n" + " by glob style pattern.\n" + " --csv, --tsv Print benchmark results in CSV or TSV format.\n" + " --runs= Manual number of benchmark iterations to run 2**.\n" + " --verbose Increase verbosity.\n", path); return 1; } @@ -931,9 +948,9 @@ int main(int argc, char *argv[]) state.bench_pattern = arg + 8; state.bench_pattern_len = strlen(state.bench_pattern); } else - state.bench_pattern = ""; + state.bench_pattern = "*"; } else if (!strncmp(arg, "--test=", 7)) { - state.test_name = arg + 7; + state.test_pattern = arg + 7; } else if (!strcmp(arg, "--csv")) { state.csv = 1; state.tsv = 0; } else if (!strcmp(arg, "--tsv")) { @@ -1037,7 +1054,7 @@ void *checkasm_check_func(void *func, const char *name, ...) int checkasm_bench_func(void) { return !state.num_failed && state.bench_pattern && - !strncmp(state.current_func->name, state.bench_pattern, state.bench_pattern_len); + !wildstrcmp(state.current_func->name, state.bench_pattern); } /* Indicate that the current test has failed */ -- 2.45.1 _______________________________________________ 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".