From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2205) id 3705E385829F; Fri, 5 Aug 2022 14:13:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3705E385829F Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom de Vries To: gdb-cvs@sourceware.org Subject: [binutils-gdb] [gdb] Add unit test for gdb::sequential_for_each X-Act-Checkin: binutils-gdb X-Git-Author: Tom de Vries X-Git-Refname: refs/heads/master X-Git-Oldrev: b069b588cfe10e6bf20ed723cf796686ba4fc0dc X-Git-Newrev: 728d5439e3f5e812246237670f5d9dc9f0d97bae Message-Id: <20220805141317.3705E385829F@sourceware.org> Date: Fri, 5 Aug 2022 14:13:17 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Aug 2022 14:13:17 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D728d5439e3f5= e812246237670f5d9dc9f0d97bae commit 728d5439e3f5e812246237670f5d9dc9f0d97bae Author: Tom de Vries Date: Fri Aug 5 16:12:56 2022 +0200 [gdb] Add unit test for gdb::sequential_for_each =20 With commit 18a5766d09c ("[gdbsupport] Add sequential_for_each") I adde= d a drop-in replacement for gdb::parallel_for_each, but there's nothing mak= ing sure that the two remain in sync. =20 Extend the unit test for gdb::parallel_for_each to test both. =20 Do this using a slightly unusual file-self-inclusion. Doing so keep th= ings readable and maintainable, and avoids macrofying functions. =20 Tested on x86_64-linux. Diff: --- 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/paralle= l-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 . = */ =20 +/* 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 f= or + 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; }; =20 +/* 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 =20 std::atomic counter (0); - gdb::parallel_for_each (1, 0, NUMBER, - [&] (int start, int end) - { - counter +=3D end - start; - }); - + FOR_EACH (1, 0, NUMBER, + [&] (int start, int end) + { + counter +=3D end - start; + }); SELF_CHECK (counter =3D=3D NUMBER); =20 counter =3D 0; - gdb::parallel_for_each (1, 0, 0, - [&] (int start, int end) - { - counter +=3D end - start; - }); + FOR_EACH (1, 0, 0, + [&] (int start, int end) + { + counter +=3D end - start; + }); SELF_CHECK (counter =3D=3D 0); =20 auto task_size_max_ =3D [] (int iter) @@ -75,11 +127,11 @@ test (int n_threads) auto task_size_max =3D gdb::make_function_view (task_size_max_); =20 counter =3D 0; - gdb::parallel_for_each (1, 0, NUMBER, - [&] (int start, int end) - { - counter +=3D end - start; - }, task_size_max); + FOR_EACH (1, 0, NUMBER, + [&] (int start, int end) + { + counter +=3D end - start; + }, task_size_max); SELF_CHECK (counter =3D=3D NUMBER); =20 auto task_size_one_ =3D [] (int iter) @@ -89,35 +141,14 @@ test (int n_threads) auto task_size_one =3D gdb::make_function_view (task_size_one_); =20 counter =3D 0; - gdb::parallel_for_each (1, 0, NUMBER, - [&] (int start, int end) - { - counter +=3D end - start; - }, task_size_one); + FOR_EACH (1, 0, NUMBER, + [&] (int start, int end) + { + counter +=3D end - start; + }, task_size_one); SELF_CHECK (counter =3D=3D NUMBER); =20 #undef NUMBER } =20 -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 */