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: <f0d9ff32-c4e6-674e-0719-833334f39e5d@amd.com>
Date:   Fri, 2 Jun 2023 10:59:55 +0530
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.10.0
Subject: [PATCH] perf test amd: Fix build failure with amd-ibs-via-core-pmu.c
 -- Was: Re: [PATCH v5 27/34] perf pmu: Separate pmu and pmus
Content-Language: en-US
To:     Ian Rogers <irogers@google.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>
References: <20230527072210.2900565-1-irogers@google.com>
 <20230527072210.2900565-28-irogers@google.com>
Cc:     Suzuki K Poulose <suzuki.poulose@arm.com>,
        Mike Leach <mike.leach@linaro.org>,
        Leo Yan <leo.yan@linaro.org>,
        John Garry <john.g.garry@oracle.com>,
        Will Deacon <will@kernel.org>,
        James Clark <james.clark@arm.com>,
        Peter Zijlstra <peterz@infradead.org>,
        Ingo Molnar <mingo@redhat.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Jiri Olsa <jolsa@kernel.org>,
        Namhyung Kim <namhyung@kernel.org>,
        Adrian Hunter <adrian.hunter@intel.com>,
        Kajol Jain <kjain@linux.ibm.com>,
        Jing Zhang <renyu.zj@linux.alibaba.com>,
        Kan Liang <kan.liang@linux.intel.com>,
        Zhengjun Xing <zhengjun.xing@linux.intel.com>,
        Madhavan Srinivasan <maddy@linux.ibm.com>,
        Athira Rajeev <atrajeev@linux.vnet.ibm.com>,
        Ming Wang <wangming01@loongson.cn>,
        Huacai Chen <chenhuacai@kernel.org>,
        Sandipan Das <sandipan.das@amd.com>,
        Dmitrii Dolgov <9erthalion6@gmail.com>,
        Sean Christopherson <seanjc@google.com>,
        Ali Saidi <alisaidi@amazon.com>, Rob Herring <robh@kernel.org>,
        Thomas Richter <tmricht@linux.ibm.com>,
        Kang Minchul <tegongkang@gmail.com>,
        linux-kernel@vger.kernel.org, coresight@lists.linaro.org,
        linux-arm-kernel@lists.infradead.org,
        linux-perf-users@vger.kernel.org
From:   Ravi Bangoria <ravi.bangoria@amd.com>
In-Reply-To: <20230527072210.2900565-28-irogers@google.com>
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?THNncklOejJNZVlxNHJRREM5QUFwUGdqbnhhTTBEWG9VNWhwSWpoZUgwV2lr?=
 =?utf-8?B?c0pyK21LUXZoOUMwZVVFUkVwdjYvVkY2d1VEaC8xSys5UWNnN2oyQUJ2WTE3?=
 =?utf-8?B?ZWgxWTBUc0s5YmFzOTVBUHBWaGJNQ0YybTR4Q2RqTEo1dzFMNWxTM3hpMHdw?=
 =?utf-8?B?OFVpUWNxcUJ6OSt0VVVNeHd1MmZZTmtBcWtpVk1PNEE0cjFiZURJVWlVVmZk?=
 =?utf-8?B?UUttem9zcmxtMm5tZmFLN01nVFhPZGdEQVpNWkFlM05QRkFkbk91NU5hajVJ?=
 =?utf-8?B?LzBlV3Z2NmRyV0taK2ZqZzJqVzZvVFFpRVBXUjkycnJtcm1hMHdUOWNEVDZq?=
 =?utf-8?B?dFpMMlE1cEZTQUZIYk1qYmFPOE5KbU1GYUt4TTZzdjBxOFFFWHBJRVhMazFJ?=
 =?utf-8?B?TGVmdFo2YnY2SUNuZndjQ3FLVUlLSXI2dndjeEhDQ0YxelBUQXg3a3hCMnBr?=
 =?utf-8?B?QlhUZUg5L3JrUGFpZTd2QTBacW5vUUJRUkQrdWgzTTFGajBYSnkyaXFUMmVV?=
 =?utf-8?B?T0NqelZHKzI0dmlNc3lxWUNxMUJQdy9IZVZlZG1hQTd0NW5XbzJaTHM0ajk4?=
 =?utf-8?B?YzJQOE1aMVM2M1JTRUJ4UkRETGtEYk1aSW9QZE5TTlExTGNwTFBZRnVGOUpY?=
 =?utf-8?B?L05ENWp5STh6TVFaR3hRVUJtV09zWGo3ak02SXc3Sm9TL3Q2T3REM0h2NUM2?=
 =?utf-8?B?YmdqTEJZTXdyNkRlbjJUM0JkRlMwUTNTNWQ0UFlmeUozNDc4bE9pTE1pU1Nz?=
 =?utf-8?B?NkMrZ09WSnVNT1RVdzNGbEZnRVY2dVpFYnFoS0RYTTdHb2toQ1RVY2F3d2E5?=
 =?utf-8?B?OE1SQUhCZGpVT2twaGRtaVF5ZFhRbGY2dmNGd0YxTzVmNmIzYVRQa1libFJp?=
 =?utf-8?B?dHF3TzgwTkVTektucnBwR1grVFNsRk05Wk43VmpoUVVWYmlFU2ZOUnJEY3Z2?=
 =?utf-8?B?b1EyL0ZTcHdHYmh6L1Jma3R5QXB1Q05ZLzZEbkV6b3ZodXcvWUJFTnkrWEtU?=
 =?utf-8?B?cWxSM0N0ZnFGV2RkMlNVMmVIQkwrN3kzWTNZYWlmQXp3dUxTOTB3Q1dEZDlM?=
 =?utf-8?B?OHl2TUJDWjVvbkVHUythQ2N0bnRuMEdEUTlNUUtnSTRNd3JtWW5aQWdIQjVv?=
 =?utf-8?B?bFhJSTFrOFZMb1M0Sk5kSnY4TzRQSzZDY2hBSElZeWtZWWtiREF0SU9Tc1Bn?=
 =?utf-8?B?VzFFaW90amlPanh4Kyt5ZTQ4OUtnRFdwMUxsZEcvcWV3T0lNdGZPZVh2SmRL?=
 =?utf-8?B?ZmZSMlVraXdid2lPYjI2QjkwNHd1TzJQVEdUV0RhNlZFT3IzRWFrbGNGeGFo?=
 =?utf-8?B?ajQxbFhRTXc2RVhjb1BnckVjam5CaUdmR053eGNVYks5U2oyQmNRaHBJemhm?=
 =?utf-8?B?amRXNGJtbkRhWCt5NWVaYUE1RjdxeW02cXFTWFdEaDBOaEhKSFBDT3J0c1I3?=
 =?utf-8?B?ZE5JQTFqWkJMSXBld2g4VEIrSlR3NnQzQ0FKenJNb1pjVUMzWXQzT05jUTli?=
 =?utf-8?B?Z0hlWi96YTJTZjNBVFRURU9TRGtkQU1vSnpMYWt4YzJpcm1wdWNpWlVKNHpk?=
 =?utf-8?B?cGlHaWtncUdWSmYxWmgyWnlzR3lzcS85NFZ4dzd2UXZPaEc5ek5KcUxiTVZ0?=
 =?utf-8?B?UVVUL2U3NFI3R2FyOWYyenAzRnErUjN1Njh4bjFrNjUwWXRZYUhNazJjdGVW?=
 =?utf-8?B?MmhHb213Q21UeVlWRndXczZndlFpeTBGbE5WbjJuRWMveFN1RC9KT0dJVnhB?=
 =?utf-8?B?M0NZTFdpK0JEa0ViS05nRDFNYzRtV2trRENaWnlhdUR1bE5FQS9uTSt0OGhS?=
 =?utf-8?B?MnBkWEdmNFRMZ2RLYXpYbVhEb0h4SXZYQkdHNXFnWHk1NjlpVW1VVjJQT2RE?=
 =?utf-8?B?Um10ZjBqdWExNWV2Y0Zxdm84OXZFM1RGUC9SZ0IzMjZvRzN1Zm42RTByMjNI?=
 =?utf-8?B?TkhmYjI4cWJWdjVJNldZRy9mOVBOa2llV2lMekVJODF2MnpTWmE4ZWNGUWhn?=
 =?utf-8?B?ekZrN1AxaGhONjg3RlFsdk0wSDVsdmJCODFJcVNRWG1yWGU2OGx4Z0FFTlJ5?=
 =?utf-8?B?djNJc0ZzSG83bGZUV2RKQnE4d1BKV0Z3WWtOWTdiWUMwTU81aUQzVjBtUDZG?=
 =?utf-8?Q?ME2oU9DXafQBY05en242ALfBr?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 13215103-9478-4609-0f02-08db632a80e7
X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB6584.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2023 05:30:41.0551
 (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: CEH8ykFSdZSs6ozhVvvkSHGw8Yp2kiuKCym9hWHQUi6muYGMPicvtfn0NVyLPZREQ5trMkWref6CBTxmLcPSOQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8409
X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO,
        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 27-May-23 12:52 PM, Ian Rogers wrote:
> Separate and hide the pmus list in pmus.[ch]. Move pmus functionality
> out of pmu.[ch] into pmus.[ch] renaming pmus functions which were
> prefixed perf_pmu__ to perf_pmus__.

I'm seeing perf tool build failures on linux-next because a patch[1] went in
via Peter's tree needed some changes done by this patch.

[1]: https://lore.kernel.org/lkml/168372562075.404.10852387134590654382.tip-bot2@tip-bot2

Below patch fixes the issue.

From c041b94df00baea024b64d4b19e37ee827484e74 Mon Sep 17 00:00:00 2001
From: Ravi Bangoria <ravi.bangoria@amd.com>
Date: Thu, 1 Jun 2023 15:23:22 +0530
Subject: [PATCH] perf test amd: Fix build failure with amd-ibs-via-core-pmu.c

Since amd-ibs-via-core-pmu.c was applied via Peter's tree, some of
the changes came via Arnaldo's tree did not reflected 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>
---
 tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c b/tools/perf/arch/x86/tests/amd-ibs-via-core-pmu.c
index 2902798ca5c1..1e08b2455725 100644
--- 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,10 +44,10 @@ int test__amd_ibs_via_core_pmu(struct test_suite *test __maybe_unused,
 	int ret = TEST_OK;
 	int fd, i;
 
-	if (list_empty(&pmus))
-		perf_pmu__scan(NULL);
+	/* No way to know whether pmus list is already populated or not. */
+	perf_pmus__scan(NULL);
 
-	ibs_pmu = perf_pmu__find("ibs_op");
+	ibs_pmu = perf_pmus__find("ibs_op");
 	if (!ibs_pmu)
 		return TEST_SKIP;
 
-- 
2.40.1