Messages in this thread Patch in this message | | | Date | Thu, 21 Jun 2018 12:18:00 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH 2/2] perf test shell: make perf inet_pton test more portable |
| |
Em Thu, Jun 21, 2018 at 11:19:15AM -0300, Arnaldo Carvalho de Melo escreveu: > Em Wed, Jun 20, 2018 at 07:45:46PM -0500, Kim Phillips escreveu: > > On Wed, 20 Jun 2018 10:46:22 -0300 > > Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > > > > Em Tue, Jun 19, 2018 at 06:49:52PM -0500, Kim Phillips escreveu: > > > > Debian based systems such as Ubuntu have dash as their default shell. > > > > Even if the normal or root user's shell is bash, certain scripts still > > > > call /bin/sh, which points to dash, so we fix this perf test by > > > > rewriting it in a more portable way. > > > > > > Isn't it better to just make /bin/bash a requirement for these tests? > > > > Perf is more bug-prone in distributions other than its main developers' > > distributions, and when its own built-in tests start depending on those > > same (primary) distributions' preferences, tests start to get skipped > > on the secondary ones, which start to get subsequently ignored and > > That is a valid concern, I test build it on many, many distros, running > 'perf test' in all of them was always in the backlog, I guess this is > the time for me to try and have it running on them all, running > privileged containers so that all the tests can run there, perhaps some > will need to be tweaked to skip when running on a container environment, > hopefully not. > > For reference, before pushing upstream all these environments are test > built, many with all the devel libraries to exercise building with all > the features present in the codebase, both with and without libelf, with > gcc and when available, with clang as well: > > 1 alpine:3.4 : Ok gcc (Alpine 5.3.0) 5.3.0 > 2 alpine:3.5 : Ok gcc (Alpine 6.2.1) 6.2.1 20160822 > 3 alpine:3.6 : Ok gcc (Alpine 6.3.0) 6.3.0 > 4 alpine:3.7 : Ok gcc (Alpine 6.4.0) 6.4.0 > 5 alpine:edge : Ok gcc (Alpine 6.4.0) 6.4.0 > 6 amazonlinux:1 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-11) > 7 amazonlinux:2 : Ok gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5) > 8 android-ndk:r12b-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) > 9 android-ndk:r15c-arm : Ok arm-linux-androideabi-gcc (GCC) 4.9.x 20150123 (prerelease) > 10 centos:5 : Ok gcc (GCC) 4.1.2 20080704 (Red Hat 4.1.2-55) > 11 centos:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-18) > 12 centos:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-16) > 13 debian:7 : Ok gcc (Debian 4.7.2-5) 4.7.2 > 14 debian:8 : Ok gcc (Debian 4.9.2-10+deb8u1) 4.9.2 > 15 debian:9 : Ok gcc (Debian 6.3.0-18+deb9u1) 6.3.0 20170516 > 16 debian:experimental : Ok gcc (Debian 7.3.0-15) 7.3.0 > 17 debian:experimental-x-arm64 : Ok aarch64-linux-gnu-gcc (Debian 7.3.0-15) 7.3.0 > 18 debian:experimental-x-mips : Ok mips-linux-gnu-gcc (Debian 7.3.0-19) 7.3.0 > 19 debian:experimental-x-mips64 : Ok mips64-linux-gnuabi64-gcc (Debian 7.3.0-18) 7.3.0 > 20 debian:experimental-x-mipsel : Ok mipsel-linux-gnu-gcc (Debian 7.3.0-20) 7.3.0 > 21 fedora:20 : Ok gcc (GCC) 4.8.3 20140911 (Red Hat 4.8.3-7) > 22 fedora:21 : Ok gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6) > 23 fedora:22 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) > 24 fedora:23 : Ok gcc (GCC) 5.3.1 20160406 (Red Hat 5.3.1-6) > 25 fedora:24 : Ok gcc (GCC) 6.3.1 20161221 (Red Hat 6.3.1-1) > 26 fedora:24-x-ARC-uClibc : Ok arc-linux-gcc (ARCompact ISA Linux uClibc toolchain 2017.09-rc2) 7.1.1 20170710 > 27 fedora:25 : Ok gcc (GCC) 6.4.1 20170727 (Red Hat 6.4.1-1) > 28 fedora:26 : Ok gcc (GCC) 7.3.1 20180130 (Red Hat 7.3.1-2) > 29 fedora:27 : Ok gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5) > 30 fedora:28 : Ok gcc (GCC) 8.0.1 20180324 (Red Hat 8.0.1-0.20) > 31 fedora:rawhide : Ok gcc (GCC) 8.0.1 20180324 (Red Hat 8.0.1-0.20) > 32 gentoo-stage3-amd64:latest : Ok gcc (Gentoo 6.4.0-r1 p1.3) 6.4.0 > 33 mageia:5 : Ok gcc (GCC) 4.9.2 > 34 mageia:6 : Ok gcc (Mageia 5.5.0-1.mga6) 5.5.0 > 35 opensuse:42.1 : Ok gcc (SUSE Linux) 4.8.5 > 36 opensuse:42.2 : Ok gcc (SUSE Linux) 4.8.5 > 37 opensuse:42.3 : Ok gcc (SUSE Linux) 4.8.5 > 38 opensuse:tumbleweed : Ok gcc (SUSE Linux) 7.3.1 20180323 [gcc-7-branch revision 258812] > 39 oraclelinux:6 : Ok gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-18.0.7) > 40 oraclelinux:7 : Ok gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-28.0.1) > 41 ubuntu:12.04.5 : Ok gcc (Ubuntu/Linaro 4.6.3-1ubuntu5) 4.6.3 > 42 ubuntu:14.04.4 : Ok gcc (Ubuntu 4.8.4-2ubuntu1~14.04.3) 4.8.4 > 43 ubuntu:14.04.4-x-linaro-arm64 : Ok aarch64-linux-gnu-gcc (Linaro GCC 5.4-2017.05) 5.4.1 20170404 > 44 ubuntu:15.04 : Ok gcc (Ubuntu 4.9.2-10ubuntu13) 4.9.2 > 45 ubuntu:16.04 : Ok gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 46 ubuntu:16.04-x-arm : Ok arm-linux-gnueabihf-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 47 ubuntu:16.04-x-arm64 : Ok aarch64-linux-gnu-gcc (Ubuntu/Linaro 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 48 ubuntu:16.04-x-powerpc : Ok powerpc-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 49 ubuntu:16.04-x-powerpc64 : Ok powerpc64-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 50 ubuntu:16.04-x-powerpc64el : Ok powerpc64le-linux-gnu-gcc (Ubuntu/IBM 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 51 ubuntu:16.04-x-s390 : Ok s390x-linux-gnu-gcc (Ubuntu 5.4.0-6ubuntu1~16.04.9) 5.4.0 20160609 > 52 ubuntu:16.10 : Ok gcc (Ubuntu 6.2.0-5ubuntu12) 6.2.0 20161005 > 53 ubuntu:17.04 : Ok gcc (Ubuntu 6.3.0-12ubuntu2) 6.3.0 20170406 > 54 ubuntu:17.10 : Ok gcc (Ubuntu 7.2.0-8ubuntu3.2) 7.2.0 > 55 ubuntu:18.04 : Ok gcc (Ubuntu 7.3.0-16ubuntu3) 7.3.0 > > So I'll try running it on the non-cross-builds (x-something) containers, > because so far I'm just running these on x86_64 as the host machine. > > > become acceptable to testers, which is a whole pattern I'd like to > > avoid if at all possible. I'd eventually like to see the real perf run > > Agreed. > > > on Android, for example, and adding bash to Android is nontrivial, > > AFAICT. > > Fair enough. > > > > I think the alternative is cryptic :-\ > > > > I think that's because of the fake array stuff, which technically isn't > > needed by design. How about something like the following? > > Thanks for trying to address my concern, looking... > > > diff --git a/tools/perf/tests/shell/record+probe_libc_inet_pton.sh b/tools/perf/tests/shell/record+probe_libc_inet_pton.sh > > index 263057039693..d5cceaeba42d 100755 > > --- a/tools/perf/tests/shell/record+probe_libc_inet_pton.sh > > +++ b/tools/perf/tests/shell/record+probe_libc_inet_pton.sh > > @@ -14,20 +14,21 @@ libc=$(grep -w libc /proc/self/maps | head -1 | sed -r 's/.*[[:space:]](\/.*)/\1 > > nm -Dg $libc 2>/dev/null | fgrep -q inet_pton || exit 254 > > > > trace_libc_inet_pton_backtrace() { > > + newline='\n' > > idx=0 > > - expected[0]="ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\)" > > - expected[1]=".*inet_pton\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" > > + expected="ping[][0-9 \.:]+probe_libc:inet_pton: \([[:xdigit:]]+\)" > > + expected="${expected}${newline}.*inet_pton\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$"
Ok, seems to be the common ground, unfortunately expected+="${newline}..." is not present in dash :-\
[root@jouet ~]# a="AA " [root@jouet ~]# a+="BB " [root@jouet ~]# echo $a AA BB [root@jouet ~]# dash # a="AA " # a+="BB " dash: 2: a+=BB : not found # let a+="BB " dash: 3: let: not found # a="AA " # a="${a} BB " # echo $a AA BB #
Would be good if we had some utility that given a two files, one with regexps, could tell if, line by line, those expressions matched, better, one that is present in all these OSes...
- Arnaldo
> > case "$(uname -m)" in > > s390x) > > eventattr='call-graph=dwarf,max-stack=4' > > - expected[2]="gaih_inet.*\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" > > - expected[3]="(__GI_)?getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" > > - expected[4]="main\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" > > + expected="${expected}${newline}gaih_inet.*\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" > > + expected="${expected}${newline}(__GI_)?getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc|inlined\)$" > > + expected="${expected}${newline}main\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" > > ;; > > *) > > eventattr='max-stack=3' > > - expected[2]="getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" > > - expected[3]=".*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" > > + expected="${expected}${newline}getaddrinfo\+0x[[:xdigit:]]+[[:space:]]\($libc\)$" > > + expected="${expected}${newline}.*\+0x[[:xdigit:]]+[[:space:]]\(.*/bin/ping.*\)$" > > ;; > > esac > > > > @@ -35,14 +36,16 @@ trace_libc_inet_pton_backtrace() { > > > > perf record -e probe_libc:inet_pton/$eventattr/ -o $file ping -6 -c 1 ::1 > /dev/null 2>&1 > > perf script -i $file | while read line ; do > > + [ -z "${line}" ] && break > > echo $line > > - echo "$line" | egrep -q "${expected[$idx]}" > > + idx=$((idx + 1)) > > + first="$(echo ${expected} | head -$idx | tail -1)" > > + [ -z "${first}" ] && break > > + echo "$line" | egrep -q "$first" > > if [ $? -ne 0 ] ; then > > - printf "FAIL: expected backtrace entry %d \"%s\" got \"%s\"\n" $idx "${expected[$idx]}" "$line" > > + printf "FAIL: expected backtrace entry %d \"%s\" got \"%s\"\n" $idx "${first}" "$line" > > exit 1 > > fi > > - let idx+=1 > > - [ -z "${expected[$idx]}" ] && break > > done > > > > # If any statements are executed from this point onwards, > > > > Thanks, > > > > Kim
| |