From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AA82C4167E for ; Mon, 21 Nov 2022 09:54:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230494AbiKUJyO (ORCPT ); Mon, 21 Nov 2022 04:54:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231152AbiKUJxr (ORCPT ); Mon, 21 Nov 2022 04:53:47 -0500 Received: from out30-133.freemail.mail.aliyun.com (out30-133.freemail.mail.aliyun.com [115.124.30.133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7C7FF59B; Mon, 21 Nov 2022 01:53:32 -0800 (PST) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R691e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046051;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=20;SR=0;TI=SMTPD_---0VVKH0rx_1669024405; Received: from 30.221.147.226(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VVKH0rx_1669024405) by smtp.aliyun-inc.com; Mon, 21 Nov 2022 17:53:28 +0800 Message-ID: Date: Mon, 21 Nov 2022 17:53:25 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [External] : [RFC PATCH v2 1/6] perf vendor events arm64: Add topdown L1 metrics for neoverse-n2 To: John Garry , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andrew Kilroy , Shuai Xue , Zhuo Song References: <1667214694-89839-1-git-send-email-renyu.zj@linux.alibaba.com> <1668411720-3581-2-git-send-email-renyu.zj@linux.alibaba.com> <590ff032-d271-48ee-a4d8-141cc070c335@oracle.com> From: Jing Zhang In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org 在 2022/11/15 下午7:19, John Garry 写道: > On 15/11/2022 08:43, Jing Zhang wrote: >> I didn't find out how to put the metric as an arch std event, it would be best if you could provide me with an example in the upstream code, >> thank you very much. > > As things stand, I don't think it's supported. We only support regular events for std arch events (and not metrics). > > However we could expand support for metrics. > > For the example of hip08 and FRONTEND_BOUND, we would have: > > --->8--- > > diff --git a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json > index 6443a061e22a..5b1ca45224de 100644 > --- a/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json > +++ b/tools/perf/pmu-events/arch/arm64/hisilicon/hip08/metrics.json > @@ -1,10 +1,6 @@ >  [ >      { > -        "MetricExpr": "FETCH_BUBBLE / (4 * CPU_CYCLES)", > -        "PublicDescription": "Frontend bound L1 topdown metric", > -        "BriefDescription": "Frontend bound L1 topdown metric", > -        "MetricGroup": "TopDownL1", > -        "MetricName": "frontend_bound" > +        "ArchStdEvent": "FRONTEND_BOUND" >      }, >      { >          "MetricExpr": "(INST_SPEC - INST_RETIRED) / (4 * CPU_CYCLES)", > diff --git a/tools/perf/pmu-events/arch/arm64/sbsa.json b/tools/perf/pmu-events/arch/arm64/sbsa.json > new file mode 100644 > index 000000000000..10b9c0cccc40 > --- /dev/null > +++ b/tools/perf/pmu-events/arch/arm64/sbsa.json > @@ -0,0 +1,9 @@ > +[ > +    { > +        "MetricExpr": "FETCH_BUBBLE / (4 * CPU_CYCLES)", > +        "PublicDescription": "Frontend bound L1 topdown metric", > +        "BriefDescription": "Frontend bound L1 topdown metric", > +        "MetricGroup": "TopDownL1", > +        "MetricName": "FRONTEND_BOUND" > +    } > +] > diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py > index 0daa3e007528..77049853c0bf 100755 > --- a/tools/perf/pmu-events/jevents.py > +++ b/tools/perf/pmu-events/jevents.py > @@ -352,6 +352,8 @@ def preprocess_arch_std_files(archpath: str) -> None: >        for event in read_json_events(item.path, topic=''): >          if event.name: >            _arch_std_events[event.name.lower()] = event > +        if event.metric_name: > +          _arch_std_events[event.metric_name.lower()] = event > > >  def print_events_table_prefix(tblname: str) -> None: Sorry for slow response. I tried the method you provided, but it didn't work, is there any other steps I am missing? Or is this method not currently supported? diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/metrics.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/metrics index 8ff1dfe..2ad30ec 100644 --- a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/metrics.json +++ b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/metrics.json @@ -1,10 +1,6 @@ [ { - "MetricExpr": "(stall_slot_frontend - cpu_cycles) / (5 * cpu_cycles)", - "PublicDescription": "Frontend bound L1 topdown metric", - "BriefDescription": "Frontend bound L1 topdown metric", - "MetricGroup": "TopDownL1", - "MetricName": "frontend_bound" + "ArchStdEvent": "FRONTEND_BOUND" }, diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeli index f9fae15..e8536e2 100644 --- a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json +++ b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json @@ -6,9 +6,6 @@ { "ArchStdEvent": "STALL_BACKEND_MEM" - } + }, + { + "MetricExpr": "(stall_slot_frontend - cpu_cycles) / (5 * cpu_cycles)", + "PublicDescription": "Frontend bound L1 topdown metric", + "BriefDescription": "Frontend bound L1 topdown metric", + "MetricGroup": "TopDownL1", + "MetricName": "FRONTEND_BOUND" + } ] diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py index 0daa3e0..7704985 100755 --- a/tools/perf/pmu-events/jevents.py +++ b/tools/perf/pmu-events/jevents.py @@ -352,6 +352,8 @@ def preprocess_arch_std_files(archpath: str) -> None: for event in read_json_events(item.path, topic=''): if event.name: _arch_std_events[event.name.lower()] = event + if event.metric_name: + _arch_std_events[event.metric_name.lower()] = event #./perf stat -e FRONTEND_BOUND sleep 1 event syntax error: 'FRONTEND_BOUND' \___ parser error Run 'perf list' for a list of valid events Usage: perf stat [] [] -e, --event event selector. use 'perf list' to list available events diff --git a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeli index f9fae15..1089ca0 100644 --- a/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json +++ b/tools/perf/pmu-events/arch/arm64/arm/neoverse-n2/pipeline.json @@ -6,18 +6,24 @@ "ArchStdEvent": "STALL_BACKEND" }, { - "ArchStdEvent": "STALL_SLOT_FRONTEND" + "ArchStdEvent": "STALL_SLOT_FRONTEND", + "MetricExpr": "STALL_SLOT_FRONTEND - CPU_CYCLES" }, { #./perf stat -e stall_slot_frontend sleep 1 Add CPU_CYCLES event to groups to get metric expression for stall_slot_frontend Performance counter stats for 'sleep 1': 5,125,457 stall_slot_frontend //it's still the original value. 1.001017680 seconds time elapsed 0.001162000 seconds user 0.000000000 seconds sys Thanks, Jing From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 826E8C433FE for ; Mon, 21 Nov 2022 09:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uZeikGzkP0c0ajkOF2VBGdBWs2cZbYfSQFbwnT2RrBA=; b=cRgwnvoGpZDKn1 yNG1ndj73v6mQKfYMCkVwKXi+T9p4XqgbWCJdqU4HRZYg/SF4jRIltlySeuH2ybHX0ZgOfRcQfYjK ppquzrYEl7MrbszkGWbX15NYNcdi2HYk77rKXortXGFEUySpI36S+TBCzR5Q79KiI13c8L9doaYn3 YMGhk65vb1FcYmkyRDF2AAVpEfavwXTuL4s9qVAZ/S9SXsxyqX78adsHRtNpwfyNKmThscS7+LuZ5 FhlqWOiDfSPnlVTZh+1W6NAEx1/5/+1ojU52joXLzcEpFTbtZtdAskJpaw6ChdbRDQREz1lEFKiK1 l+jGvj53gQPqFEoPv5cg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ox3Uh-00C0hI-Hs; Mon, 21 Nov 2022 09:53:39 +0000 Received: from out30-132.freemail.mail.aliyun.com ([115.124.30.132]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ox3Ud-00C0bq-CM for linux-arm-kernel@lists.infradead.org; Mon, 21 Nov 2022 09:53:38 +0000 X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R691e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046051;MF=renyu.zj@linux.alibaba.com;NM=1;PH=DS;RN=20;SR=0;TI=SMTPD_---0VVKH0rx_1669024405; Received: from 30.221.147.226(mailfrom:renyu.zj@linux.alibaba.com fp:SMTPD_---0VVKH0rx_1669024405) by smtp.aliyun-inc.com; Mon, 21 Nov 2022 17:53:28 +0800 Message-ID: Date: Mon, 21 Nov 2022 17:53:25 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.4.1 Subject: Re: [External] : [RFC PATCH v2 1/6] perf vendor events arm64: Add topdown L1 metrics for neoverse-n2 To: John Garry , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Andrew Kilroy , Shuai Xue , Zhuo Song References: <1667214694-89839-1-git-send-email-renyu.zj@linux.alibaba.com> <1668411720-3581-2-git-send-email-renyu.zj@linux.alibaba.com> <590ff032-d271-48ee-a4d8-141cc070c335@oracle.com> From: Jing Zhang In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221121_015335_646238_B0D06052 X-CRM114-Status: GOOD ( 22.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org CgrlnKggMjAyMi8xMS8xNSDkuIvljYg3OjE5LCBKb2huIEdhcnJ5IOWGmemBkzoKPiBPbiAxNS8x MS8yMDIyIDA4OjQzLCBKaW5nIFpoYW5nIHdyb3RlOgo+PiBJIGRpZG4ndCBmaW5kIG91dCBob3cg dG8gcHV0IHRoZSBtZXRyaWMgYXMgYW4gYXJjaCBzdGQgZXZlbnQsIGl0IHdvdWxkIGJlIGJlc3Qg aWYgeW91IGNvdWxkIHByb3ZpZGUgbWUgd2l0aCBhbiBleGFtcGxlIGluIHRoZSB1cHN0cmVhbSBj b2RlLAo+PiB0aGFuayB5b3UgdmVyeSBtdWNoLgo+IAo+IEFzIHRoaW5ncyBzdGFuZCwgSSBkb24n dCB0aGluayBpdCdzIHN1cHBvcnRlZC4gV2Ugb25seSBzdXBwb3J0IHJlZ3VsYXIgZXZlbnRzIGZv ciBzdGQgYXJjaCBldmVudHMgKGFuZCBub3QgbWV0cmljcykuCj4gCj4gSG93ZXZlciB3ZSBjb3Vs ZCBleHBhbmQgc3VwcG9ydCBmb3IgbWV0cmljcy4KPiAKPiBGb3IgdGhlIGV4YW1wbGUgb2YgaGlw MDggYW5kIEZST05URU5EX0JPVU5ELCB3ZSB3b3VsZCBoYXZlOgo+IAo+IC0tLT44LS0tCj4gCj4g ZGlmZiAtLWdpdCBhL3Rvb2xzL3BlcmYvcG11LWV2ZW50cy9hcmNoL2FybTY0L2hpc2lsaWNvbi9o aXAwOC9tZXRyaWNzLmpzb24gYi90b29scy9wZXJmL3BtdS1ldmVudHMvYXJjaC9hcm02NC9oaXNp bGljb24vaGlwMDgvbWV0cmljcy5qc29uCj4gaW5kZXggNjQ0M2EwNjFlMjJhLi41YjFjYTQ1MjI0 ZGUgMTAwNjQ0Cj4gLS0tIGEvdG9vbHMvcGVyZi9wbXUtZXZlbnRzL2FyY2gvYXJtNjQvaGlzaWxp Y29uL2hpcDA4L21ldHJpY3MuanNvbgo+ICsrKyBiL3Rvb2xzL3BlcmYvcG11LWV2ZW50cy9hcmNo L2FybTY0L2hpc2lsaWNvbi9oaXAwOC9tZXRyaWNzLmpzb24KPiBAQCAtMSwxMCArMSw2IEBACj4g wqBbCj4gwqDCoMKgwqAgewo+IC3CoMKgwqDCoMKgwqDCoCAiTWV0cmljRXhwciI6ICJGRVRDSF9C VUJCTEUgLyAoNCAqIENQVV9DWUNMRVMpIiwKPiAtwqDCoMKgwqDCoMKgwqAgIlB1YmxpY0Rlc2Ny aXB0aW9uIjogIkZyb250ZW5kIGJvdW5kIEwxIHRvcGRvd24gbWV0cmljIiwKPiAtwqDCoMKgwqDC oMKgwqAgIkJyaWVmRGVzY3JpcHRpb24iOiAiRnJvbnRlbmQgYm91bmQgTDEgdG9wZG93biBtZXRy aWMiLAo+IC3CoMKgwqDCoMKgwqDCoCAiTWV0cmljR3JvdXAiOiAiVG9wRG93bkwxIiwKPiAtwqDC oMKgwqDCoMKgwqAgIk1ldHJpY05hbWUiOiAiZnJvbnRlbmRfYm91bmQiCj4gK8KgwqDCoMKgwqDC oMKgICJBcmNoU3RkRXZlbnQiOiAiRlJPTlRFTkRfQk9VTkQiCj4gwqDCoMKgwqAgfSwKPiDCoMKg wqDCoCB7Cj4gwqDCoMKgwqDCoMKgwqDCoCAiTWV0cmljRXhwciI6ICIoSU5TVF9TUEVDIC0gSU5T VF9SRVRJUkVEKSAvICg0ICogQ1BVX0NZQ0xFUykiLAo+IGRpZmYgLS1naXQgYS90b29scy9wZXJm L3BtdS1ldmVudHMvYXJjaC9hcm02NC9zYnNhLmpzb24gYi90b29scy9wZXJmL3BtdS1ldmVudHMv YXJjaC9hcm02NC9zYnNhLmpzb24KPiBuZXcgZmlsZSBtb2RlIDEwMDY0NAo+IGluZGV4IDAwMDAw MDAwMDAwMC4uMTBiOWMwY2NjYzQwCj4gLS0tIC9kZXYvbnVsbAo+ICsrKyBiL3Rvb2xzL3BlcmYv cG11LWV2ZW50cy9hcmNoL2FybTY0L3Nic2EuanNvbgo+IEBAIC0wLDAgKzEsOSBAQAo+ICtbCj4g K8KgwqDCoCB7Cj4gK8KgwqDCoMKgwqDCoMKgICJNZXRyaWNFeHByIjogIkZFVENIX0JVQkJMRSAv ICg0ICogQ1BVX0NZQ0xFUykiLAo+ICvCoMKgwqDCoMKgwqDCoCAiUHVibGljRGVzY3JpcHRpb24i OiAiRnJvbnRlbmQgYm91bmQgTDEgdG9wZG93biBtZXRyaWMiLAo+ICvCoMKgwqDCoMKgwqDCoCAi QnJpZWZEZXNjcmlwdGlvbiI6ICJGcm9udGVuZCBib3VuZCBMMSB0b3Bkb3duIG1ldHJpYyIsCj4g K8KgwqDCoMKgwqDCoMKgICJNZXRyaWNHcm91cCI6ICJUb3BEb3duTDEiLAo+ICvCoMKgwqDCoMKg wqDCoCAiTWV0cmljTmFtZSI6ICJGUk9OVEVORF9CT1VORCIKPiArwqDCoMKgIH0KPiArXQo+IGRp ZmYgLS1naXQgYS90b29scy9wZXJmL3BtdS1ldmVudHMvamV2ZW50cy5weSBiL3Rvb2xzL3BlcmYv cG11LWV2ZW50cy9qZXZlbnRzLnB5Cj4gaW5kZXggMGRhYTNlMDA3NTI4Li43NzA0OTg1M2MwYmYg MTAwNzU1Cj4gLS0tIGEvdG9vbHMvcGVyZi9wbXUtZXZlbnRzL2pldmVudHMucHkKPiArKysgYi90 b29scy9wZXJmL3BtdS1ldmVudHMvamV2ZW50cy5weQo+IEBAIC0zNTIsNiArMzUyLDggQEAgZGVm IHByZXByb2Nlc3NfYXJjaF9zdGRfZmlsZXMoYXJjaHBhdGg6IHN0cikgLT4gTm9uZToKPiDCoMKg wqDCoMKgwqAgZm9yIGV2ZW50IGluIHJlYWRfanNvbl9ldmVudHMoaXRlbS5wYXRoLCB0b3BpYz0n Jyk6Cj4gwqDCoMKgwqDCoMKgwqDCoCBpZiBldmVudC5uYW1lOgo+IMKgwqDCoMKgwqDCoMKgwqDC oMKgIF9hcmNoX3N0ZF9ldmVudHNbZXZlbnQubmFtZS5sb3dlcigpXSA9IGV2ZW50Cj4gK8KgwqDC oMKgwqDCoMKgIGlmIGV2ZW50Lm1ldHJpY19uYW1lOgo+ICvCoMKgwqDCoMKgwqDCoMKgwqAgX2Fy Y2hfc3RkX2V2ZW50c1tldmVudC5tZXRyaWNfbmFtZS5sb3dlcigpXSA9IGV2ZW50Cj4gCj4gCj4g wqBkZWYgcHJpbnRfZXZlbnRzX3RhYmxlX3ByZWZpeCh0YmxuYW1lOiBzdHIpIC0+IE5vbmU6CgoK U29ycnkgZm9yIHNsb3cgcmVzcG9uc2UuCgpJIHRyaWVkIHRoZSBtZXRob2QgeW91IHByb3ZpZGVk LCBidXQgaXQgZGlkbid0IHdvcmssIGlzIHRoZXJlIGFueSBvdGhlciBzdGVwcyBJIGFtIG1pc3Np bmc/Ck9yIGlzIHRoaXMgbWV0aG9kIG5vdCBjdXJyZW50bHkgc3VwcG9ydGVkPwoKCmRpZmYgLS1n aXQgYS90b29scy9wZXJmL3BtdS1ldmVudHMvYXJjaC9hcm02NC9hcm0vbmVvdmVyc2UtbjIvbWV0 cmljcy5qc29uIGIvdG9vbHMvcGVyZi9wbXUtZXZlbnRzL2FyY2gvYXJtNjQvYXJtL25lb3ZlcnNl LW4yL21ldHJpY3MKaW5kZXggOGZmMWRmZS4uMmFkMzBlYyAxMDA2NDQKLS0tIGEvdG9vbHMvcGVy Zi9wbXUtZXZlbnRzL2FyY2gvYXJtNjQvYXJtL25lb3ZlcnNlLW4yL21ldHJpY3MuanNvbgorKysg Yi90b29scy9wZXJmL3BtdS1ldmVudHMvYXJjaC9hcm02NC9hcm0vbmVvdmVyc2UtbjIvbWV0cmlj cy5qc29uCkBAIC0xLDEwICsxLDYgQEAKIFsKICAgICB7Ci0gICAgICAgICJNZXRyaWNFeHByIjog IihzdGFsbF9zbG90X2Zyb250ZW5kIC0gY3B1X2N5Y2xlcykgLyAoNSAqIGNwdV9jeWNsZXMpIiwK LSAgICAgICAgIlB1YmxpY0Rlc2NyaXB0aW9uIjogIkZyb250ZW5kIGJvdW5kIEwxIHRvcGRvd24g bWV0cmljIiwKLSAgICAgICAgIkJyaWVmRGVzY3JpcHRpb24iOiAiRnJvbnRlbmQgYm91bmQgTDEg dG9wZG93biBtZXRyaWMiLAotICAgICAgICAiTWV0cmljR3JvdXAiOiAiVG9wRG93bkwxIiwKLSAg ICAgICAgIk1ldHJpY05hbWUiOiAiZnJvbnRlbmRfYm91bmQiCisgICAgICAgICJBcmNoU3RkRXZl bnQiOiAiRlJPTlRFTkRfQk9VTkQiCiAgICAgfSwKCgpkaWZmIC0tZ2l0IGEvdG9vbHMvcGVyZi9w bXUtZXZlbnRzL2FyY2gvYXJtNjQvYXJtL25lb3ZlcnNlLW4yL3BpcGVsaW5lLmpzb24gYi90b29s cy9wZXJmL3BtdS1ldmVudHMvYXJjaC9hcm02NC9hcm0vbmVvdmVyc2UtbjIvcGlwZWxpCmluZGV4 IGY5ZmFlMTUuLmU4NTM2ZTIgMTAwNjQ0Ci0tLSBhL3Rvb2xzL3BlcmYvcG11LWV2ZW50cy9hcmNo L2FybTY0L2FybS9uZW92ZXJzZS1uMi9waXBlbGluZS5qc29uCisrKyBiL3Rvb2xzL3BlcmYvcG11 LWV2ZW50cy9hcmNoL2FybTY0L2FybS9uZW92ZXJzZS1uMi9waXBlbGluZS5qc29uCkBAIC02LDkg KzYsNiBAQAogICAgIHsKICAgICAgICAgIkFyY2hTdGRFdmVudCI6ICJTVEFMTF9CQUNLRU5EX01F TSIKLSAgICB9CisgICAgfSwKKyAgICB7CisgICAgICAgICJNZXRyaWNFeHByIjogIihzdGFsbF9z bG90X2Zyb250ZW5kIC0gY3B1X2N5Y2xlcykgLyAoNSAqIGNwdV9jeWNsZXMpIiwKKyAgICAgICAg IlB1YmxpY0Rlc2NyaXB0aW9uIjogIkZyb250ZW5kIGJvdW5kIEwxIHRvcGRvd24gbWV0cmljIiwK KyAgICAgICAgIkJyaWVmRGVzY3JpcHRpb24iOiAiRnJvbnRlbmQgYm91bmQgTDEgdG9wZG93biBt ZXRyaWMiLAorICAgICAgICAiTWV0cmljR3JvdXAiOiAiVG9wRG93bkwxIiwKKyAgICAgICAgIk1l dHJpY05hbWUiOiAiRlJPTlRFTkRfQk9VTkQiCisgICAgfQogXQoKCmRpZmYgLS1naXQgYS90b29s cy9wZXJmL3BtdS1ldmVudHMvamV2ZW50cy5weSBiL3Rvb2xzL3BlcmYvcG11LWV2ZW50cy9qZXZl bnRzLnB5CmluZGV4IDBkYWEzZTAuLjc3MDQ5ODUgMTAwNzU1Ci0tLSBhL3Rvb2xzL3BlcmYvcG11 LWV2ZW50cy9qZXZlbnRzLnB5CisrKyBiL3Rvb2xzL3BlcmYvcG11LWV2ZW50cy9qZXZlbnRzLnB5 CkBAIC0zNTIsNiArMzUyLDggQEAgZGVmIHByZXByb2Nlc3NfYXJjaF9zdGRfZmlsZXMoYXJjaHBh dGg6IHN0cikgLT4gTm9uZToKICAgICAgIGZvciBldmVudCBpbiByZWFkX2pzb25fZXZlbnRzKGl0 ZW0ucGF0aCwgdG9waWM9JycpOgogICAgICAgICBpZiBldmVudC5uYW1lOgogICAgICAgICAgIF9h cmNoX3N0ZF9ldmVudHNbZXZlbnQubmFtZS5sb3dlcigpXSA9IGV2ZW50CisgICAgICAgIGlmIGV2 ZW50Lm1ldHJpY19uYW1lOgorICAgICAgICAgIF9hcmNoX3N0ZF9ldmVudHNbZXZlbnQubWV0cmlj X25hbWUubG93ZXIoKV0gPSBldmVudAoKCiMuL3BlcmYgc3RhdCAtZSBGUk9OVEVORF9CT1VORCBz bGVlcCAxCmV2ZW50IHN5bnRheCBlcnJvcjogJ0ZST05URU5EX0JPVU5EJwogICAgICAgICAgICAg ICAgICAgICBcX19fIHBhcnNlciBlcnJvcgpSdW4gJ3BlcmYgbGlzdCcgZm9yIGEgbGlzdCBvZiB2 YWxpZCBldmVudHMKCiBVc2FnZTogcGVyZiBzdGF0IFs8b3B0aW9ucz5dIFs8Y29tbWFuZD5dCgog ICAgLWUsIC0tZXZlbnQgPGV2ZW50PiAgIGV2ZW50IHNlbGVjdG9yLiB1c2UgJ3BlcmYgbGlzdCcg dG8gbGlzdCBhdmFpbGFibGUgZXZlbnRzCgoKCmRpZmYgLS1naXQgYS90b29scy9wZXJmL3BtdS1l dmVudHMvYXJjaC9hcm02NC9hcm0vbmVvdmVyc2UtbjIvcGlwZWxpbmUuanNvbiBiL3Rvb2xzL3Bl cmYvcG11LWV2ZW50cy9hcmNoL2FybTY0L2FybS9uZW92ZXJzZS1uMi9waXBlbGkKaW5kZXggZjlm YWUxNS4uMTA4OWNhMCAxMDA2NDQKLS0tIGEvdG9vbHMvcGVyZi9wbXUtZXZlbnRzL2FyY2gvYXJt NjQvYXJtL25lb3ZlcnNlLW4yL3BpcGVsaW5lLmpzb24KKysrIGIvdG9vbHMvcGVyZi9wbXUtZXZl bnRzL2FyY2gvYXJtNjQvYXJtL25lb3ZlcnNlLW4yL3BpcGVsaW5lLmpzb24KQEAgLTYsMTggKzYs MjQgQEAKICAgICAgICAgIkFyY2hTdGRFdmVudCI6ICJTVEFMTF9CQUNLRU5EIgogICAgIH0sCiAg ICAgewotICAgICAgICAiQXJjaFN0ZEV2ZW50IjogIlNUQUxMX1NMT1RfRlJPTlRFTkQiCisgICAg ICAgICJBcmNoU3RkRXZlbnQiOiAiU1RBTExfU0xPVF9GUk9OVEVORCIsCisgICAgICAgICJNZXRy aWNFeHByIjogIlNUQUxMX1NMT1RfRlJPTlRFTkQgLSBDUFVfQ1lDTEVTIgogICAgIH0sCiAgICAg ewoKIy4vcGVyZiBzdGF0IC1lIHN0YWxsX3Nsb3RfZnJvbnRlbmQgc2xlZXAgMQpBZGQgQ1BVX0NZ Q0xFUyBldmVudCB0byBncm91cHMgdG8gZ2V0IG1ldHJpYyBleHByZXNzaW9uIGZvciBzdGFsbF9z bG90X2Zyb250ZW5kCgogUGVyZm9ybWFuY2UgY291bnRlciBzdGF0cyBmb3IgJ3NsZWVwIDEnOgoK ICAgICAgICAgNSwxMjUsNDU3ICAgICAgc3RhbGxfc2xvdF9mcm9udGVuZCAgLy9pdCdzIHN0aWxs IHRoZSBvcmlnaW5hbCB2YWx1ZS4KCiAgICAgICAxLjAwMTAxNzY4MCBzZWNvbmRzIHRpbWUgZWxh cHNlZAoKICAgICAgIDAuMDAxMTYyMDAwIHNlY29uZHMgdXNlcgogICAgICAgMC4wMDAwMDAwMDAg c2Vjb25kcyBzeXMKCgpUaGFua3MsCkppbmcKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4LWFy bS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK