From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2041) id F27E63858D35; Wed, 28 Jun 2023 17:36:31 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F27E63858D35 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Vladimir Mezentsev To: bfd-cvs@sourceware.org, gdb-cvs@sourceware.org Subject: [binutils-gdb] gprofng: Add new tests X-Act-Checkin: binutils-gdb X-Git-Author: Vladimir Mezentsev X-Git-Refname: refs/heads/master X-Git-Oldrev: 205e4380c8006a40f1ddc34418923d2850c63d9a X-Git-Newrev: a06dd73324289cda1c9f8e6c4cff5732ceea21bb Message-Id: <20230628173631.F27E63858D35@sourceware.org> Date: Wed, 28 Jun 2023 17:36:31 +0000 (GMT) X-BeenThere: binutils-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Binutils-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jun 2023 17:36:32 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Da06dd7332428= 9cda1c9f8e6c4cff5732ceea21bb commit a06dd73324289cda1c9f8e6c4cff5732ceea21bb Author: Vladimir Mezentsev Date: Mon Jun 26 14:36:50 2023 -0700 gprofng: Add new tests =20 gprofng/ChangeLog 2023-06-26 Vladimir Mezentsev =20 * Makefile.am: Pass CLOCK_GETTIME_LINK to the testsuite * Makefile.in: Rebuild. * testsuite/gprofng.display/gp-archive.exp: New file. * testsuite/gprofng.display/gp-collect-app_F.exp: New file. * testsuite/gprofng.display/setpath_map.exp: New file. * testsuite/lib/smalltest.c: New file. Diff: --- gprofng/Makefile.am | 1 + gprofng/Makefile.in | 1 + gprofng/testsuite/gprofng.display/gp-archive.exp | 70 ++++++++++++++++++= ++++ .../testsuite/gprofng.display/gp-collect-app_F.exp | 62 +++++++++++++++++++ gprofng/testsuite/gprofng.display/setpath_map.exp | 65 ++++++++++++++++++= ++ gprofng/testsuite/lib/smalltest.c | 39 ++++++++++++ 6 files changed, 238 insertions(+) diff --git a/gprofng/Makefile.am b/gprofng/Makefile.am index b0c960a0ae0..b1d976ab202 100644 --- a/gprofng/Makefile.am +++ b/gprofng/Makefile.am @@ -65,6 +65,7 @@ check-small check-extra check-install: site.exp developme= nt.exp if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then \ $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsuite \ JDK_INC=3D"$(jdk_inc)" \ + CLOCK_GETTIME_LINK=3D"$(CLOCK_GETTIME_LINK)" \ CHECK_TARGET=3D$@ \ PREFIX=3D"$(prefix)" \ GPROFNG_BROKEN_JAVAC=3D"$(GPROFNG_BROKEN_JAVAC)" \ diff --git a/gprofng/Makefile.in b/gprofng/Makefile.in index 582e0bb8716..06b563cb8ef 100644 --- a/gprofng/Makefile.in +++ b/gprofng/Makefile.in @@ -942,6 +942,7 @@ uninstall-am: @TCL_TRY_TRUE@ if $(SHELL) -c "$$runtest --version" > /dev/null 2>&1; then= \ @TCL_TRY_TRUE@ $$runtest --tool $(DEJATOOL) --srcdir $${srcroot}/testsui= te \ @TCL_TRY_TRUE@ JDK_INC=3D"$(jdk_inc)" \ +@TCL_TRY_TRUE@ CLOCK_GETTIME_LINK=3D"$(CLOCK_GETTIME_LINK)" \ @TCL_TRY_TRUE@ CHECK_TARGET=3D$@ \ @TCL_TRY_TRUE@ PREFIX=3D"$(prefix)" \ @TCL_TRY_TRUE@ GPROFNG_BROKEN_JAVAC=3D"$(GPROFNG_BROKEN_JAVAC)" \ diff --git a/gprofng/testsuite/gprofng.display/gp-archive.exp b/gprofng/tes= tsuite/gprofng.display/gp-archive.exp new file mode 100644 index 00000000000..04871f91682 --- /dev/null +++ b/gprofng/testsuite/gprofng.display/gp-archive.exp @@ -0,0 +1,70 @@ +# Copyright (C) 2021-2023 Free Software Foundation, Inc. +# +# This file is part of the GNU Binutils. +# +# This program 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 3 of the License, or +# (at your option) any later version. +# +# This program 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 this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301, USA. +# + +# This script tests the -a option for "profng archive". + +global srcdir CC CLOCK_GETTIME_LINK +set gprofng $::env(GPROFNG) +set tdir "tmpdir/gp-archive" + +proc check_gp_archive { a_opt } { + global tdir gprofng + set cmd "$gprofng archive -a $a_opt $tdir/exp.er" + set output [run_native_host_cmd "$cmd"] + if { [lindex $output 0] !=3D 0 } then { + set out [lindex $output 1] + send_log "'$cmd' failed\n" + fail $tdir + exit 1 + } + + run_native_host_cmd "mv $tdir/t.c $tdir/t.c.1" + set output [run_native_host_cmd "$gprofng display text -source main $tdi= r/exp.er"] + set out [lindex $output 1] + if { [string first "CORRECTSOURCE" [lindex $output 1]] < 0 } then { + set out [lindex $output 1] + send_log "CORRECTSOURCE is not found aafter '$cmd'\n" + fail $tdir + exit 1 + } +} + +run_native_host_cmd "mkdir -p $tdir" + +# Build test, create experiment: +set output [run_native_host_cmd "cd $tdir && \ + cat $srcdir/lib/smalltest.c | sed '1 i /* CORRECTSOURCE */' > t.c && \ + $CC -g t.c $CLOCK_GETTIME_LINK && \ + $gprofng collect app -p on -a off -O exp.er ./a.out"] + +if { [lindex $output 0] !=3D 0 } then { + set out [lindex $output 1] + send_log "Experiment is not created in $tdir\n" + fail $tdir + exit 1 +} + + +check_gp_archive src + +run_native_host_cmd "rm -rf $tdir/exp.er/archives/*; mv $tdir/t.c.1 $tdir/= t.c" +check_gp_archive usedsrc + +pass $dir diff --git a/gprofng/testsuite/gprofng.display/gp-collect-app_F.exp b/gprof= ng/testsuite/gprofng.display/gp-collect-app_F.exp new file mode 100644 index 00000000000..f4aa764642f --- /dev/null +++ b/gprofng/testsuite/gprofng.display/gp-collect-app_F.exp @@ -0,0 +1,62 @@ +# Copyright (C) 2021-2023 Free Software Foundation, Inc. +# +# This file is part of the GNU Binutils. +# +# This program 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 3 of the License, or +# (at your option) any later version. +# +# This program 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 this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301, USA. + + +# gp-collect-app should follow descendants, which names match specified re= gular expressions +# +# This script tests the following cases: +# 1. collect -F off +# 2. collect -F on +# 3. collect -F =3D + +set gprofng $::env(GPROFNG) +set tdir "tmpdir/gp-collect-app_F" + +proc run_gp_collect_app { subExpCnt F_opt } { + global tdir gprofng + set output [run_native_host_cmd "cd $tdir && \ + $gprofng collect app -p on -a off -F '$F_opt' -O exp.er \ + sh -c 'mkdir t && touch t/x; rm -rf t' "] + if { [lindex $output 0] !=3D 0 } then { + set out [lindex $output 1] + send_log "Experiment is not created in $tdir\n" + fail $tdir + exit 1 + } + + set output [run_native_host_cmd "find $tdir -name '*x1.er' | wc -l"] + set subExp [lindex $output 1] + if { $subExp !=3D $subExpCnt } then { + set out [lindex $output 1] + send_log "Test failed for -F $F_opt. subExp=3D$subExp. Shold be $subEx= pCnt\n" + fail $tdir + exit 1 + } + return $output +} + +run_native_host_cmd "mkdir -p $tdir" + +run_gp_collect_app 0 "off" +run_gp_collect_app 3 "on" +run_gp_collect_app 1 "=3Dmkd.r" +run_gp_collect_app 2 "=3Dmkdir|touch" + +pass $dir + diff --git a/gprofng/testsuite/gprofng.display/setpath_map.exp b/gprofng/te= stsuite/gprofng.display/setpath_map.exp new file mode 100644 index 00000000000..698076d7c9e --- /dev/null +++ b/gprofng/testsuite/gprofng.display/setpath_map.exp @@ -0,0 +1,65 @@ +# Copyright (C) 2021-2023 Free Software Foundation, Inc. +# +# This file is part of the GNU Binutils. +# +# This program 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 3 of the License, or +# (at your option) any later version. +# +# This program 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 this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, +# MA 02110-1301, USA. +# + +# This script tests -setpath and -pathmap for "profng display text" + +global srcdir CC CLOCK_GETTIME_LINK +set gprofng $::env(GPROFNG) +set tdir "tmpdir/setpath_map" + +run_native_host_cmd "mkdir -p $tdir/src" + +# Build test, create experiment: +set output [run_native_host_cmd "cd $tdir && \ + cat $srcdir/lib/smalltest.c | sed '1 i /* CORRECTSOURCE */' > t.c && \ + $CC -g t.c $CLOCK_GETTIME_LINK && \ + $gprofng collect app -p on -a off -O exp.er ./a.out"] + +if { [lindex $output 0] !=3D 0 } then { + set out [lindex $output 1] + send_log "Experiment is not created in $tdir\n" + fail $tdir + exit 1 +} + +# Copy the "good" file to $tdir/src. Mark old file as "wrong": +run_native_host_cmd "cp $tdir/t.c $tdir/src" +run_native_host_cmd "sed -i 's/CORRECTSOURCE/WRONGSOURCE/' $tdir/t.c" + +# Test -setpath: +set output [run_native_host_cmd "$gprofng display text -setpath $tdir/src = -source main $tdir/exp.er"] +if { [string first "CORRECTSOURCE" [lindex $output 1]] < 0 } then { + set out [lindex $output 1] + send_log "CORRECTSOURCE is not found in $gprofng display text -setpath $= tdir/src -source main $tdir/exp.er\n" + fail $tdir + exit 1 +} + +# Test -pathmap: +set output [run_native_host_cmd "$gprofng display text -pathmap $tdir $tdi= r/src -source main $tdir/exp.er"] +set out [lindex $output 1] +if { [string first "CORRECTSOURCE" [lindex $output 1]] < 0 } then { + set out [lindex $output 1] + send_log "CORRECTSOURCE is not found in $gprofng display text -pathmap $= tdir $tdir/src -source main $tdir/exp.er\n" + fail $tdir + exit 1 +} + +pass $dir diff --git a/gprofng/testsuite/lib/smalltest.c b/gprofng/testsuite/lib/smal= ltest.c new file mode 100644 index 00000000000..49bd3957c45 --- /dev/null +++ b/gprofng/testsuite/lib/smalltest.c @@ -0,0 +1,39 @@ +#include +#include + +time_t +gethrtime (void) +{ + struct timespec tp; + time_t rc =3D 0; +#ifdef CLOCK_MONOTONIC_RAW + int r =3D clock_gettime (CLOCK_MONOTONIC_RAW, &tp); +#else + int r =3D clock_gettime (CLOCK_MONOTONIC, &tp); +#endif + + if (r =3D=3D 0) + rc =3D ((time_t) tp.tv_sec) * 1e9 + (time_t) tp.tv_nsec; + return rc; +} + +volatile long x; /* temp variable for long calculation */ + +int +main (int argc, char **argv) +{ + long long count =3D 0; + time_t start =3D gethrtime (); + + do + { + x =3D 0; + for (int j =3D 0; j < 1000000; j++) + x =3D x + 1; + count++; + } + while (start + 2e9 > gethrtime ()); + printf("count=3D%lld x=3D%lld\n", count, x); + return 0; +} +