From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by sourceware.org (Postfix) with ESMTPS id 558A63857C5D for ; Fri, 22 Jul 2022 17:03:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 558A63857C5D Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 4DE3F3832E for ; Fri, 22 Jul 2022 17:03:46 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 3BFC813AB3 for ; Fri, 22 Jul 2022 17:03:46 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8CyeDXLY2mKvMAAAMHmgww (envelope-from ) for ; Fri, 22 Jul 2022 17:03:46 +0000 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH 4/4] [gdb] Add unit test for gdb::sequential_for_each Date: Fri, 22 Jul 2022 19:03:45 +0200 Message-Id: <20220722170345.24713-4-tdevries@suse.de> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20220722170345.24713-1-tdevries@suse.de> References: <20220722170345.24713-1-tdevries@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2022 17:03:49 -0000 With commit 18a5766d09c ("[gdbsupport] Add sequential_for_each") I added a drop-in replacement for gdb::parallel_for_each, but there's nothing making sure that the two remain in sync. Extend the unit test for gdb::parallel_for_each to test both. Do this using a slightly unusual file-self-inclusion. Doing so keep things readable and maintainable, and avoids macrofying functions. Tested on x86_64-linux. --- gdb/unittests/parallel-for-selftests.c | 117 ++++++++++++++++--------- 1 file changed, 74 insertions(+), 43 deletions(-) diff --git a/gdb/unittests/parallel-for-selftests.c b/gdb/unittests/parallel-for-selftests.c index 6e341f64037..75c1deb17dc 100644 --- a/gdb/unittests/parallel-for-selftests.c +++ b/gdb/unittests/parallel-for-selftests.c @@ -17,6 +17,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +/* This file is divided in two parts: + - FOR_EACH-undefined, and + - FOR_EACH-defined. + The former includes the latter, more than once, with different values for + FOR_EACH. The FOR_EACH-defined part reads like a regular function. */ +#ifndef FOR_EACH + #include "defs.h" #include "gdbsupport/selftest.h" #include "gdbsupport/parallel-for.h" @@ -43,8 +50,54 @@ struct save_restore_n_threads int n_threads; }; +/* Define test_par using TEST in the FOR_EACH-defined part. */ +#define TEST test_par +#define FOR_EACH gdb::parallel_for_each +#include "parallel-for-selftests.c" +#undef FOR_EACH +#undef TEST + +/* Define test_seq using TEST in the FOR_EACH-defined part. */ +#define TEST test_seq +#define FOR_EACH gdb::sequential_for_each +#include "parallel-for-selftests.c" +#undef FOR_EACH +#undef TEST + static void test (int n_threads) +{ + test_par (n_threads); + test_seq (n_threads); +} + +static void +test_n_threads () +{ + test (0); + test (1); + test (3); +} + +} +} + +#endif /* CXX_STD_THREAD */ + +void _initialize_parallel_for_selftests (); +void +_initialize_parallel_for_selftests () +{ +#ifdef CXX_STD_THREAD + selftests::register_test ("parallel_for", + selftests::parallel_for::test_n_threads); +#endif /* CXX_STD_THREAD */ +} + +#else /* FOR_EACH */ + +static void +TEST (int n_threads) { save_restore_n_threads saver; gdb::thread_pool::g_thread_pool->set_thread_count (n_threads); @@ -52,20 +105,19 @@ test (int n_threads) #define NUMBER 10000 std::atomic counter (0); - gdb::parallel_for_each (1, 0, NUMBER, - [&] (int start, int end) - { - counter += end - start; - }); - + FOR_EACH (1, 0, NUMBER, + [&] (int start, int end) + { + counter += end - start; + }); SELF_CHECK (counter == NUMBER); counter = 0; - gdb::parallel_for_each (1, 0, 0, - [&] (int start, int end) - { - counter += end - start; - }); + FOR_EACH (1, 0, 0, + [&] (int start, int end) + { + counter += end - start; + }); SELF_CHECK (counter == 0); auto task_size_max_ = [] (int iter) @@ -75,11 +127,11 @@ test (int n_threads) auto task_size_max = gdb::make_function_view (task_size_max_); counter = 0; - gdb::parallel_for_each (1, 0, NUMBER, - [&] (int start, int end) - { - counter += end - start; - }, task_size_max); + FOR_EACH (1, 0, NUMBER, + [&] (int start, int end) + { + counter += end - start; + }, task_size_max); SELF_CHECK (counter == NUMBER); auto task_size_one_ = [] (int iter) @@ -89,35 +141,14 @@ test (int n_threads) auto task_size_one = gdb::make_function_view (task_size_one_); counter = 0; - gdb::parallel_for_each (1, 0, NUMBER, - [&] (int start, int end) - { - counter += end - start; - }, task_size_one); + FOR_EACH (1, 0, NUMBER, + [&] (int start, int end) + { + counter += end - start; + }, task_size_one); SELF_CHECK (counter == NUMBER); #undef NUMBER } -static void -test_n_threads () -{ - test (0); - test (1); - test (3); -} - -} -} - -#endif /* CXX_STD_THREAD */ - -void _initialize_parallel_for_selftests (); -void -_initialize_parallel_for_selftests () -{ -#ifdef CXX_STD_THREAD - selftests::register_test ("parallel_for", - selftests::parallel_for::test_n_threads); -#endif /* CXX_STD_THREAD */ -} +#endif /* FOR_EACH */ -- 2.35.3