From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753228AbdDLHN1 (ORCPT ); Wed, 12 Apr 2017 03:13:27 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:43234 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751992AbdDLHNY (ORCPT ); Wed, 12 Apr 2017 03:13:24 -0400 Subject: Re: [GIT PULL 00/18] perf/core improvements and fixes To: Ingo Molnar , Arnaldo Carvalho de Melo References: <20170412005215.30135-1-acme@kernel.org> <20170412053055.GA9923@gmail.com> Cc: linux-kernel@vger.kernel.org, Alexander Shishkin , Andi Kleen , Andreas Krebbel , Andrew Vagin , David Ahern , David Carrillo-Cisneros , Don Zickus , He Kuang , Hendrik Brueckner , Jiri Olsa , Kan Liang , Martin Schwidefsky , Masami Hiramatsu , Namhyung Kim , Paul Turner , Peter Zijlstra , Simon Que , stable@kernel.org, #@infradead.org, v4.10+@infradead.org, Stephane Eranian , Taeung Song , Wang Nan , Yao Jin , Arnaldo Carvalho de Melo From: Christian Borntraeger Date: Wed, 12 Apr 2017 09:13:10 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170412053055.GA9923@gmail.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 x-cbid: 17041207-0020-0000-0000-00000BBE2E80 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00006921; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000208; SDB=6.00846396; UDB=6.00417482; IPR=6.00624832; BA=6.00005284; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00015015; XFM=3.00000013; UTC=2017-04-12 07:13:21 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17041207-0021-0000-0000-00005B99978E Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-04-12_06:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1702020001 definitions=main-1704120061 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/12/2017 07:30 AM, Ingo Molnar wrote: > > * Arnaldo Carvalho de Melo wrote: > >> Hi Ingo, >> >> Please consider pulling, >> >> - Arnaldo >> >> Test results at the end of this message, as usual. >> >> The following changes since commit 9df9078ef2086652647248ee6e82ca8f661cb3f5: >> >> perf/amd/uncore: Fix pr_fmt() prefix (2017-04-11 08:44:59 +0200) >> >> are available in the git repository at: >> >> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git tags/perf-core-for-mingo-4.12-20170411 >> >> for you to fetch changes up to 986a5bc028a84d487c354a529730b48682d1fb41: >> >> perf annotate: Use stripped line instead of raw disassemble line (2017-04-11 16:22:23 -0300) >> >> ---------------------------------------------------------------- >> perf/core improvements and fixes: >> >> User visible: >> >> - Support s390 jump instructions in perf annotate (Christian Borntraeger) >> >> - When failing to setup multiple events (e.g. '-e irq_vectors:*'), state >> which one caused the failure (Yao Jin) >> >> - Various fixes for pipe mode, where the output of 'perf record' is >> written to stdout instead of to a perf.data file, fixing workloads >> such as: (David Carrillo-Cisneros) >> >> $ perf record -o - noploop | perf inject -b > perf.data >> >> $ perf record -o - noploop | perf annotate >> >> Infrastructure: >> >> - Simplify ltrim() implementation (Arnaldo Carvalho de Melo) >> >> - Use ltrim() and rtrim() in places where ad-hoc equivalents were being >> used (Taeung Song) >> >> Signed-off-by: Arnaldo Carvalho de Melo >> >> ---------------------------------------------------------------- >> Arnaldo Carvalho de Melo (3): >> perf callchains: Switch from strtok() to strtok_r() when parsing options >> perf script: Use strtok_r() when parsing output field list >> perf string: Simplify ltrim() implementation >> >> Christian Borntraeger (2): >> perf annotate s390: Fix perf annotate error -95 (4.10 regression) >> perf annotate s390: Implement jump types for perf annotate >> >> David Carrillo-Cisneros (6): >> perf inject: Don't proceed if perf_session__process_event() fails >> perf inject: Copy events when reordering events in pipe mode >> perf tools: Describe pipe mode in perf.data-file-fomat.txt >> perf annotate: Process attr and build_id records >> perf session: Don't rely on evlist in pipe mode >> perf tools: Do not print missing features in pipe-mode >> >> Jin Yao (1): >> perf evsel: Return exact sub event which failed with EPERM for wildcards >> >> Taeung Song (6): >> perf stat: Refactor the code to strip csv output with ltrim() >> perf ui browser: Refactor the code to parse color configs with ltrim() >> perf pmu: Refactor wordwrap() with ltrim() >> perf tools: Refactor the code to strip command name with {l,r}trim() >> perf annotate: Refactor the code to parse disassemble lines with {l,r}trim() >> perf annotate: Use stripped line instead of raw disassemble line >> >> tools/perf/Documentation/perf.data-file-format.txt | 19 +++++++- >> tools/perf/arch/s390/annotate/instructions.c | 30 ++++++++++++ >> tools/perf/builtin-annotate.c | 2 + >> tools/perf/builtin-inject.c | 2 + >> tools/perf/builtin-script.c | 4 +- >> tools/perf/builtin-stat.c | 10 +--- >> tools/perf/ui/browser.c | 2 +- >> tools/perf/util/annotate.c | 54 +++++++--------------- >> tools/perf/util/callchain.c | 4 +- >> tools/perf/util/event.c | 11 +---- >> tools/perf/util/evsel.c | 8 +++- >> tools/perf/util/header.c | 3 ++ >> tools/perf/util/ordered-events.c | 3 +- >> tools/perf/util/pmu.c | 3 +- >> tools/perf/util/session.c | 17 +++++-- >> tools/perf/util/string.c | 6 +-- >> 16 files changed, 105 insertions(+), 73 deletions(-) >> create mode 100644 tools/perf/arch/s390/annotate/instructions.c > > Pulled, thanks a lot Arnaldo! > > Note, there was a conflict in tools/perf/util/annotate.c due to the s390 fix in > perf/urgent. I've fixed it up, but please double check the conflict resolution I > made in 43d5b075c400. > > Thanks, > > Ingo > The merge looks wrong: dbdebdc53 (Ravi Bangoria 2016-11-23 21:33:46 +0530 133) }, 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 134) { 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 135) .name = "s390", d9f8dfa9b (Christian Borntraeger 2017-04-06 09:51:52 +0200 136) .init = s390__annotate_init, e77852b32 (Christian Borntraeger 2017-04-06 09:51:51 +0200 137) .objdump = { e77852b32 (Christian Borntraeger 2017-04-06 09:51:51 +0200 138) .comment_char = '#', e77852b32 (Christian Borntraeger 2017-04-06 09:51:51 +0200 139) }, e77852b32 (Christian Borntraeger 2017-04-06 09:51:51 +0200 140) }, 43d5b075c (Ingo Molnar 2017-04-12 07:29:13 +0200 141) { 43d5b075c (Ingo Molnar 2017-04-12 07:29:13 +0200 142) .name = "s390", 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 143) .objdump = { 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 144) .comment_char = '#', 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 145) }, 3c1a42795 (Christian Borntraeger 2017-04-06 09:51:51 +0200 146) }, 786c1b518 (Arnaldo Carvalho de Melo 2016-11-16 15:39:50 -0300 147) }; You can delete line 141-146