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 X-Spam-Level: X-Spam-Status: No, score=-12.4 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4EFF0C56202 for ; Thu, 26 Nov 2020 16:05:16 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C1CC321D40 for ; Thu, 26 Nov 2020 16:05:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C1CC321D40 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id F1F3F6E978; Thu, 26 Nov 2020 16:05:13 +0000 (UTC) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4F1BB6E949; Thu, 26 Nov 2020 16:05:12 +0000 (UTC) IronPort-SDR: Y57X4Ef8dMX8y0thBTIzJPj5YF1sFUzhyxmSvwXFU+EcCVJyoWGwwBfbMnkLD9VV01g8C0wcT6 hDqFv2+RGX0w== X-IronPort-AV: E=McAfee;i="6000,8403,9817"; a="171521084" X-IronPort-AV: E=Sophos;i="5.78,372,1599548400"; d="scan'208";a="171521084" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 08:05:09 -0800 IronPort-SDR: 56EuKtvfFujGfkq0ldovDhxBB+Rxjb6xwh3VKZqn/mh0mDh90YnghCDqB8ThyGQf5crxW089Qp g/NZ/PyLS38Q== X-IronPort-AV: E=Sophos;i="5.78,372,1599548400"; d="scan'208";a="547762408" Received: from gmoskovi-mobl.ger.corp.intel.com (HELO [10.251.182.78]) ([10.251.182.78]) by orsmga005-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 Nov 2020 08:05:07 -0800 To: Chris Wilson , intel-gfx@lists.freedesktop.org References: <20201126154856.738141-1-chris@chris-wilson.co.uk> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: Date: Thu, 26 Nov 2020 16:05:04 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201126154856.738141-1-chris@chris-wilson.co.uk> Content-Language: en-US Subject: Re: [Intel-gfx] [igt-dev] [PATCH i-g-t] tools/intel_gpu_top: Fixup imc event parsing X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: igt-dev@lists.freedesktop.org Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On 26/11/2020 15:48, Chris Wilson wrote: > After combining rapl_parse and imc_parse into a single pmu_parse, I left > the "energy-" prefixes used by rapl (but not imc) in place. Lift the > prefix to rapl_open() so that pmu_parse() does work for both rapl and > imc! > > Reported-by: Tvrtko Ursulin > Fixes: d0b71b967ccd ("tools/intel_gpu_top: Consolidate imc to use pmu_counter") > Signed-off-by: Chris Wilson > Cc: Tvrtko Ursulin > --- > tools/intel_gpu_top.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tools/intel_gpu_top.c b/tools/intel_gpu_top.c > index 5d42a2fad..3ff9236ed 100644 > --- a/tools/intel_gpu_top.c > +++ b/tools/intel_gpu_top.c > @@ -151,13 +151,13 @@ static int pmu_parse(struct pmu_counter *pmu, const char *path, const char *str) > > result &= igt_sysfs_scanf(dir, "type", "%"PRIu64, &pmu->type) == 1; > > - snprintf(buf, sizeof(buf) - 1, "events/energy-%s", str); > + snprintf(buf, sizeof(buf) - 1, "events/%s", str); > result &= igt_sysfs_scanf(dir, buf, "event=%"PRIx64, &pmu->config) == 1; > > - snprintf(buf, sizeof(buf) - 1, "events/energy-%s.scale", str); > + snprintf(buf, sizeof(buf) - 1, "events/%s.scale", str); > result &= igt_sysfs_scanf(dir, buf, "%lf", &pmu->scale) == 1; > > - snprintf(buf, sizeof(buf) - 1, "events/energy-%s.unit", str); > + snprintf(buf, sizeof(buf) - 1, "events/%s.unit", str); > result &= igt_sysfs_scanf(dir, buf, "%127s", buf) == 1; > pmu->units = strdup(buf); > > @@ -217,13 +217,13 @@ rapl_open(struct pmu_counter *pmu, > static void gpu_power_open(struct pmu_counter *pmu, > struct engines *engines) > { > - rapl_open(pmu, "gpu", engines); > + rapl_open(pmu, "energy-gpu", engines); > } > > static void pkg_power_open(struct pmu_counter *pmu, > struct engines *engines) > { > - rapl_open(pmu, "pkg", engines); > + rapl_open(pmu, "energy-pkg", engines); > } > > static uint64_t > Reviewed-by: Tvrtko Ursulin Regards, Tvrtko _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx