Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <8a1f34f7-1835-ee89-5ff0-1421ccc2e07c@amd.com>
Date:   Tue, 6 Jun 2023 08:42:17 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.0
Subject: Re: [PATCH v2] perf test amd: Fix build failure with
 amd-ibs-via-core-pmu.c
Content-Language: en-US
To:     Arnaldo Carvalho de Melo <acme@kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Peter Zijlstra <peterz@infradead.org>
Cc:     irogers@google.com, suzuki.poulose@arm.com, mike.leach@linaro.org,
        leo.yan@linaro.org, john.g.garry@oracle.com, will@kernel.org,
        james.clark@arm.com, mingo@redhat.com, mark.rutland@arm.com,
        alexander.shishkin@linux.intel.com, jolsa@kernel.org,
        namhyung@kernel.org, adrian.hunter@intel.com, kjain@linux.ibm.com,
        renyu.zj@linux.alibaba.com, kan.liang@linux.intel.com,
        zhengjun.xing@linux.intel.com, maddy@linux.ibm.com,
        atrajeev@linux.vnet.ibm.com, wangming01@loongson.cn,
        chenhuacai@kernel.org, sandipan.das@amd.com, 9erthalion6@gmail.com,
        seanjc@google.com, robh@kernel.org, tmricht@linux.ibm.com,
        tegongkang@gmail.com, linux-kernel@vger.kernel.org,
        coresight@lists.linaro.org, linux-arm-kernel@lists.infradead.org,
        linux-perf-users@vger.kernel.org,
        Ravi Bangoria <ravi.bangoria@amd.com>
References: <CAP-5=fUPZ7+nAcxBp5sFBfxzkOH8kzWkLV0uziHqxYC0cDbbDw@mail.gmail.com>
 <20230603044650.286-1-ravi.bangoria@amd.com> <ZH3w7TWRQZsPqhB2@kernel.org>
From:   Ravi Bangoria <ravi.bangoria@amd.com>
In-Reply-To: <ZH3w7TWRQZsPqhB2@kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MDdjYTZwdm96djRWSmF3QkREVGF6Y3BZeGxjVWNIampzeXZTQk5RU0EzSk0w?=
 =?utf-8?B?QngvUTdNZTZGV20xR3Q3WlFDMWVJbzFiaWJPYUxEMURLd25JY1J3aEVBSDdM?=
 =?utf-8?B?aW9qSUs2VDlzaDllVHdHaGIxL2VHR3BYdVZCZkNsRndDeFNZVG9CWHdDeE5p?=
 =?utf-8?B?NC8vb1RhdFBmSFBPeXQxRTZ1Y1ZLVFRWWWMyVlRBVVYvaDhhcVkzTmhzcjFT?=
 =?utf-8?B?WEI2cERXWGY5bm1mV0pwQjFxbjk5b3FCK2ZzNG9ZVkNWU0hWYXptSXdyc3FE?=
 =?utf-8?B?UzlSdFFFV2w5NGREUWdpQWt0MHIyMGdoQk0vdVp6RkFmQkFYbXZEbEtHeGxQ?=
 =?utf-8?B?ZVBNeVl1L3hEVkZoUStxOFVaVklCREovZUVZNDBxNnYvWlllcHJZeFBJZTBl?=
 =?utf-8?B?MnBNTkcrb3RJNjVDREZHNE5paWQ1ZUZvWUdyZzRWdlZmSU02TkNLQmN4enFE?=
 =?utf-8?B?MGpEMXIrYlNDSUFxbWhVRlF2eGVOREtOV2pMOS9zUzNVUU80aGdZOWg4MEZ5?=
 =?utf-8?B?eUZOcGh0eFJqUm45cEpYODlQSDVnMG9xOEhhVmVDdW5TTzd6R01lNm1wMnk1?=
 =?utf-8?B?eEU5QUlCWENCdnlCbUU2bmdoNDlhWlYrTWExK2FtNU92VWU3QUhDTEFRazBV?=
 =?utf-8?B?VGZCY2V4c3JvUzlpRXc5cVF5ZU1ZSlVTcmxkVnMxR2tkRUVQSkpRMUZ4NnRT?=
 =?utf-8?B?MkMxaUxzV0gzODBjRzg2bm9YamlLT254bHdzUDAyTGtOa3RVL0x4cjRXOHFx?=
 =?utf-8?B?ODc0UE42TktYeDVrN3Y3SG1VZzZ6a3FlMmIvVTlKblAvRm51Yk9ONFVPU3VT?=
 =?utf-8?B?c3dFS1FVVjN6SGxLVHBPcHAweVJmYTdheXNnYWZNQlpxbFU2RW1DU1FScUQ5?=
 =?utf-8?B?Q2tsbnJCZjJtdFNCYzZsZTlaQnNWMXcyK1FCSkRZUjJCQmNHWitiVkdCN2Js?=
 =?utf-8?B?NVAvTFI1OG9qa2lVU0pHMGt1UkJ2ZlJJVEdBOVNFcytsNG9iMWIxZDNtUTBN?=
 =?utf-8?B?Rlk3UnNHTEpKZjFTWFY0a3lkOXRBdHV0cjNWbjJ4T1BvNW41eGNNM3RTS1pK?=
 =?utf-8?B?czRFRFMvV3lVeGNlaDJBNGhGZ1pIRXpGWi9BeGJNRTZDYnpMM2dpZGE5TWRO?=
 =?utf-8?B?TGhrM2pERXh1ekw4YU8vdmtSaFU3cDFEY1FaeUlLRmZCTDBaOGMweGkvaDB4?=
 =?utf-8?B?d2Jva0xIK21IaUozTXppbDRRaE1qWEQvTFFjcHI5SG0wT20rZmRKV0ZxZUw2?=
 =?utf-8?B?TXpWTVlNMkliN0pzYjJFdzBwVXZ6Q2paQWY5NjNjQTIwVXNTRTB2Wk8yNVlk?=
 =?utf-8?B?OUNYallhQm1Pamg0UGNheFBYNzZDdFVsTVBSRlk4eU5LQm5XU1AwemRNdTJj?=
 =?utf-8?B?V2VnNFpEQUhxbDlhYWdDd2NkbjFpREdtbTVwZS9xdHFOcXhGcmVGcTd2RlhE?=
 =?utf-8?B?L0R2MThpaFJWV2kzUnZvK1I2RUE5eVFnM0FzbU1MTzljNlc3WXcwVnNXcXdt?=
 =?utf-8?B?NGJQOXRDWitXbS9ZLzIrR2xqbGk2d3I3NDEwYTBvZnRyWjFVVHBqTjVhQi9m?=
 =?utf-8?B?czQ3WkF5ZW0vaWdHNEVzU2E5cGlQWkI0THVrcFcwemNUZDVGekNhTm9mSDFD?=
 =?utf-8?B?MmVhaWowcGNLNVc2N2hNc0JQNGNwRXpBUWJUbUlmRWN2OStmdnMwQ2tBaWt3?=
 =?utf-8?B?eXVITEZHQ2Y5VVBTR0Niek4vY1ptOWpMNjNiRjNHYzdyN1lzb3VNSkxRLzk0?=
 =?utf-8?B?Y2FZT2xLb21LN3dtNDVWMUkrU3dPWmJrRnVMYkhpRXJDNUJlVE8vU1NLbWJr?=
 =?utf-8?B?ZVRnRElDY01MdnZlblNXMWlrZkR2MUhvNUJ4WTlhOXJiM1RLY1RBa082TjZu?=
 =?utf-8?B?WDlSaVFybXZCTGRRNW53Zi8vSjFiN20vbDIvM3gwWTh2QTcvcXlsK3h1V2N2?=
 =?utf-8?B?S2wxaWNaYnZabVNEUTdiVkJrSFhMVUsrSlBEbnVmMDdSZjR6QnFGWk1HSE9l?=
 =?utf-8?B?aG1JT1lxekRRT2t1bnhRaEpuazVJaVRoR3ovUkVmeUhjdktCaE9iTmtGN2xs?=
 =?utf-8?B?aTRqenFYWlZ6T0o3UGpRa1IzdHhGejFIeHZPaGRnRktzY253dnl1ck8zTGNH?=
 =?utf-8?Q?xgAt3gJlkrcVcQNmdh04ZBBzm?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 406be41a-ab07-4425-ae3c-08db663c006c
X-MS-Exchange-CrossTenant-AuthSource: PH7PR12MB6588.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Jun 2023 03:13:29.8165
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 9f2FumqUGyYpjl/46+pgGUx9TZKdGXSKAyvozU9fc8gWkinLZozp/lAONJEDs+AnWybkytLwmSEDjQZuJ9vhZw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB4915
X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,NICE_REPLY_A,
        RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,
        T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no
        version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On 05-Jun-23 7:57 PM, Arnaldo Carvalho de Melo wrote:
> Em Sat, Jun 03, 2023 at 10:16:50AM +0530, Ravi Bangoria escreveu:
>> Since amd-ibs-via-core-pmu.c was applied via Peter's tree, some of
>> the changes came via Arnaldo's tree did not reflect in this file,
>> which is causing build failures.
>>
>>   arch/x86/tests/amd-ibs-via-core-pmu.c:47:25: error: ‘pmus’ undeclared
>>   (first use in this function)
>>      47 |         if (list_empty(&pmus))
>>         |                         ^~~~
>>   arch/x86/tests/amd-ibs-via-core-pmu.c:48:17: error: implicit declaration
>>   of function ‘perf_pmu__scan’; did you mean
>>   perf_pmus__scan’? [-Werror=implicit-function-declaration]
>>      48 |                 perf_pmu__scan(NULL);
>>         |                 ^~~~~~~~~~~~~~
>>         |                 perf_pmus__scan
>>   arch/x86/tests/amd-ibs-via-core-pmu.c:50:19: error: implicit declaration
>>   of function ‘perf_pmu__find’; did you mean
>>   perf_pmus__find’? [-Werror=implicit-function-declaration]
>>      50 |         ibs_pmu = perf_pmu__find("ibs_op");
>>         |                   ^~~~~~~~~~~~~~
>>         |                   perf_pmus__find
>>
>> Fix those.
>>
>> Fixes: 1eaf496ed386 ("perf pmu: Separate pmu and pmus")
>> Signed-off-by: Ravi Bangoria <ravi.bangoria@amd.com>
> 
> I wonder how to solve the various merge issues here:
> 
> 1. this clashes with:
> 
> commit ae4aa00a1a9358e0007f6edc71b018a0b0d21190
> Author: Ian Rogers <irogers@google.com>
> Date:   Tue May 2 15:38:27 2023 -0700
> 
>     perf test: Move x86 hybrid tests to arch/x86
> 
> --------------
> 
> I tried cherry-picking the cset that introduces amd-ibs-via-core-pmu.c,
> moved the test__hybrid lines a bit and then tried test merging the
> result with tip/master, it works.
> 
> But then I tried applying this fix as a follow up cset, perf-tools-next
> would have bisection history broken, but nah, but then I hit:
> 
> ⬢[acme@toolbox perf-tools-next]$ git merge tip/master
> Auto-merging tools/perf/arch/x86/include/arch-tests.h
> Auto-merging tools/perf/arch/x86/tests/Build
> Auto-merging tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
> CONFLICT (add/add): Merge conflict in tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
> Auto-merging tools/perf/arch/x86/tests/arch-tests.c
> Automatic merge failed; fix conflicts and then commit the result.
> ⬢[acme@toolbox perf-tools-next]$ git diff
> diff --cc tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
> index 78b1902f6f59d8ce,2902798ca5c1ed1c..0000000000000000
> --- a/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
> +++ b/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
> @@@ -44,7 -44,10 +44,14 @@@ int test__amd_ibs_via_core_pmu(struct t
>         int ret = TEST_OK;
>         int fd, i;
>   
> ++<<<<<<< HEAD
>  +      ibs_pmu = perf_pmus__find("ibs_op");
> ++=======
> +       if (list_empty(&pmus))
> +               perf_pmu__scan(NULL);
> + 
> +       ibs_pmu = perf_pmu__find("ibs_op");
> ++>>>>>>> tip/master
>         if (!ibs_pmu)
>                 return TEST_SKIP;
>   
> 
> How are things like this resolved in linux-next?
> 
> Removing this test from tip/master and I carry a fixed up
> tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c introduction patch?

I'm hoping Stephen will reply on merge question. But if you want me to resend
the patch rebased on a specific branch, I would be happy to do that.

Thanks,
Ravi