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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id A5A97CD37B4 for ; Tue, 3 Sep 2024 20:55:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 63CDA10E594; Tue, 3 Sep 2024 20:55:07 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="XuxU11Ay"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) by gabe.freedesktop.org (Postfix) with ESMTPS id 3718910E5F7 for ; Tue, 3 Sep 2024 20:55:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1725396906; x=1756932906; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=bYoMfFjQiA65GFgPQxLhXMXFxh6cz9aNXe+6vRtBQJM=; b=XuxU11Ay4G73tQcMu4uDf8Zu8rtCVXfnYSyMt93dOOOEIFuq/Kb8HO9b rD2u0m5wtj/Xc5zS5sFVcrhTGIfbqYGqFPSZ897cxLIpqltel3GozPGq1 wstJnXjUCvEaaWehfeQnacCbrjk3iSRuvw6DHnsbW2Mg3CBVSqiOODvrM K4mEkSNJHHHX+rIEmnZW/y1Bzs8AusdCtssDIDGSmxqQL4lICJyRqclYB ZpoBLyk2FqGQQiEYDHm5P1g1fGsi1xbnKXQdwE22/6f2sxm8JY4yBMgiu 2F8YvZN9SQBOGr/c7sbtMwq9O0ZjosVG4MfVDOLXazOweYOeDNxRHLjv2 A==; X-CSE-ConnectionGUID: aUXR8ikoTwOqIiRQyGj50Q== X-CSE-MsgGUID: QJOSYF6kSTKIONqe5tCmNg== X-IronPort-AV: E=McAfee;i="6700,10204,11184"; a="13353510" X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="13353510" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 13:55:06 -0700 X-CSE-ConnectionGUID: 2WkmeIPSS/ikbySRmfsNMA== X-CSE-MsgGUID: B8vRixHfS2SXZ3LFxndxyA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.10,199,1719903600"; d="scan'208";a="95841896" Received: from josouza-mobl2.bz.intel.com ([10.87.243.88]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Sep 2024 13:55:04 -0700 From: =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= To: igt-dev@lists.freedesktop.org Cc: Ashutosh Dixit , =?UTF-8?q?Jos=C3=A9=20Roberto=20de=20Souza?= Subject: [PATCH i-g-t v3 3/4] xe/oa: Update scripts to support BMG Date: Tue, 3 Sep 2024 13:54:56 -0700 Message-ID: <20240903205457.109320-3-jose.souza@intel.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240903205457.109320-1-jose.souza@intel.com> References: <20240903205457.109320-1-jose.souza@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: igt-dev@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development mailing list for IGT GPU Tools List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" Cc: Ashutosh Dixit Reviewed-by: Ashutosh Dixit Signed-off-by: José Roberto de Souza --- lib/meson.build | 1 + lib/xe/oa-configs/guids.xml | 9 +++++++++ lib/xe/oa-configs/mdapi-xml-convert.py | 1 + lib/xe/oa-configs/oa-metricset-codegen.py | 2 +- lib/xe/oa-configs/oa_guid_registry.py | 1 + lib/xe/oa-configs/update-guids.py | 1 + lib/xe/xe_oa.c | 5 ++++- 7 files changed, 18 insertions(+), 2 deletions(-) diff --git a/lib/meson.build b/lib/meson.build index 4af2bc7432..1c83bc5c30 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -417,6 +417,7 @@ xe_oa_hardware = [ 'pvc', 'mtlgt2', 'mtlgt3', 'lnl', + 'bmg', ] xe_xml_files = [] diff --git a/lib/xe/oa-configs/guids.xml b/lib/xe/oa-configs/guids.xml index 27330edd3d..dd912d00f1 100644 --- a/lib/xe/oa-configs/guids.xml +++ b/lib/xe/oa-configs/guids.xml @@ -2760,4 +2760,13 @@ + + + + + + + + + diff --git a/lib/xe/oa-configs/mdapi-xml-convert.py b/lib/xe/oa-configs/mdapi-xml-convert.py index 602a3965af..df6ab3f9cb 100755 --- a/lib/xe/oa-configs/mdapi-xml-convert.py +++ b/lib/xe/oa-configs/mdapi-xml-convert.py @@ -207,6 +207,7 @@ chipsets = { 'ACM': xehpsdv_chipset_oa_formats, 'MTL': mtl_chipset_oa_formats, 'LNL': xe2_chipset_oa_formats, + 'BMG': xe2_chipset_oa_formats, } xehp_plus = ( 'ACM', 'MTL' ) diff --git a/lib/xe/oa-configs/oa-metricset-codegen.py b/lib/xe/oa-configs/oa-metricset-codegen.py index 5fa12f9caf..8816c0893f 100644 --- a/lib/xe/oa-configs/oa-metricset-codegen.py +++ b/lib/xe/oa-configs/oa-metricset-codegen.py @@ -138,7 +138,7 @@ def generate_metric_sets(args, gen): metric_set->c_offset = metric_set->b_offset + 8; metric_set->perfcnt_offset = metric_set->c_offset + 8; """)) - elif gen.chipset == "lnl": + elif gen.chipset == "lnl" or gen.chipset == "bmg": c(textwrap.dedent("""\ metric_set->perf_oa_format = XE_OA_FORMAT_PEC64u64; diff --git a/lib/xe/oa-configs/oa_guid_registry.py b/lib/xe/oa-configs/oa_guid_registry.py index 969d40e568..4b07faf59c 100644 --- a/lib/xe/oa-configs/oa_guid_registry.py +++ b/lib/xe/oa-configs/oa_guid_registry.py @@ -102,6 +102,7 @@ class Registry: 'PVC', 'MTL', 'LNL', + 'BMG', ) if name in known_chipsets: return name diff --git a/lib/xe/oa-configs/update-guids.py b/lib/xe/oa-configs/update-guids.py index 18f3458e84..5a099a1587 100755 --- a/lib/xe/oa-configs/update-guids.py +++ b/lib/xe/oa-configs/update-guids.py @@ -166,6 +166,7 @@ chipsets = [ 'hsw', 'acmgt1', 'acmgt2', 'acmgt3', 'mtlgt2', 'mtlgt3', 'lnl', + 'bmg', ] for chipset in chipsets: diff --git a/lib/xe/xe_oa.c b/lib/xe/xe_oa.c index 4764ed1fcf..a7df68488c 100644 --- a/lib/xe/xe_oa.c +++ b/lib/xe/xe_oa.c @@ -38,6 +38,7 @@ #include "xe_oa_metrics_mtlgt3.h" #include "xe_oa_metrics_pvc.h" #include "xe_oa_metrics_lnl.h" +#include "xe_oa_metrics_bmg.h" static struct intel_xe_perf_logical_counter_group * intel_xe_perf_logical_counter_group_new(struct intel_xe_perf *perf, @@ -300,8 +301,10 @@ intel_xe_perf_for_devinfo(uint32_t device_id, } else if (devinfo->is_pontevecchio) { perf->devinfo.eu_threads_count = 8; intel_xe_perf_load_metrics_pvc(perf); - } else if (intel_graphics_ver(device_id) >= IP_VER(20, 0)) { + } else if (devinfo->is_lunarlake) { intel_xe_perf_load_metrics_lnl(perf); + } else if (devinfo->is_battlemage) { + intel_xe_perf_load_metrics_bmg(perf); } else { return unsupported_xe_oa_platform(perf); } -- 2.46.0