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 46E9FEEC2BA for ; Tue, 24 Feb 2026 00:42:04 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC48310E46C; Tue, 24 Feb 2026 00:42:03 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="jQ12nsyx"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.11]) by gabe.freedesktop.org (Postfix) with ESMTPS id 57C3C10E46A for ; Tue, 24 Feb 2026 00:42:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1771893720; x=1803429720; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=gTNF0v5wZvqqkf1yg/hxdOuWQPFHGBV/I7+rdLCCOSM=; b=jQ12nsyxHvhDsRhWbUvMYej/zSpYuhc2+9r26y4SOxDum2Ymo/4jHBjU iV4WRFcwpdvZzS4GEJEg22Xe/SYz+8v8dp/IWX7d65+LDpof0ld9wCV5q IvGusrc2sLHWU7zgztlH+9vfmyFtmv1aroPFTnkIt/5K4iHMT0JEG/UqO yD3/A5topYK+PqIsNdFBSvlF/j5ScAKxqa+WhnfRtjxvI9D+6n9umu6aY V1BmG0rnv8hwfwOcTCediELK3aAfENKdJ2HUSRepvl50dMitGwEkO3KCP /gK6GQ3UaaMevdeNGTrYjkCllBy8tX1Dp1J3aYFJOPdABqidE4JbcEcX3 A==; X-CSE-ConnectionGUID: rOCGp1XAQ1CULgV6fgeEgQ== X-CSE-MsgGUID: ALHvXMJMSdi9dhWVtYX0XQ== X-IronPort-AV: E=McAfee;i="6800,10657,11710"; a="83224688" X-IronPort-AV: E=Sophos;i="6.21,307,1763452800"; d="scan'208";a="83224688" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by orvoesa103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2026 16:41:59 -0800 X-CSE-ConnectionGUID: v1XxtwOHR3aGhX0Moxjflg== X-CSE-MsgGUID: oyrjZLrvReGlcDElEBHZ9Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,307,1763452800"; d="scan'208";a="246322607" Received: from orsosgc001.jf.intel.com ([10.88.27.185]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Feb 2026 16:41:59 -0800 From: Ashutosh Dixit To: igt-dev@lists.freedesktop.org Cc: jose.souza@intel.com, sushma.venkatesh.reddy@intel.com Subject: [PATCH i-g-t 1/2] lib/xe/oa: Add CRI metrics XML Date: Mon, 23 Feb 2026 16:41:50 -0800 Message-ID: <20260224004151.1836090-2-ashutosh.dixit@intel.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20260224004151.1836090-1-ashutosh.dixit@intel.com> References: <20260224004151.1836090-1-ashutosh.dixit@intel.com> MIME-Version: 1.0 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" Add updated python scripts, updated guids.xml and oa-cri.xml. Generated via repeated invocations of: update-guids.py --guids=guids.xml MetricsXML_CRI.xml > guids.cri.xml # copy new guid's from guids.cri.xml into guids.xml mdapi-xml-convert.py --guids=guids.xml MetricsXML_CRI.xml > oa-cri.xml Signed-off-by: Ashutosh Dixit --- lib/meson.build | 1 + lib/xe/oa-configs/guids.xml | 8 + lib/xe/oa-configs/mdapi-xml-convert.py | 12 +- lib/xe/oa-configs/oa-cri.xml | 3795 +++++++++++++++++++++ lib/xe/oa-configs/oa-metricset-codegen.py | 4 +- lib/xe/oa-configs/oa_guid_registry.py | 1 + lib/xe/oa-configs/update-guids.py | 1 + 7 files changed, 3819 insertions(+), 3 deletions(-) create mode 100644 lib/xe/oa-configs/oa-cri.xml diff --git a/lib/meson.build b/lib/meson.build index ea721ecf70..758a503ed6 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -476,6 +476,7 @@ xe_oa_hardware = [ 'lnl', 'bmg', 'ptl', + 'cri', ] xe_xml_files = [] diff --git a/lib/xe/oa-configs/guids.xml b/lib/xe/oa-configs/guids.xml index 23bca5b53c..48a61e6771 100644 --- a/lib/xe/oa-configs/guids.xml +++ b/lib/xe/oa-configs/guids.xml @@ -2792,4 +2792,12 @@ + + + + + + + + diff --git a/lib/xe/oa-configs/mdapi-xml-convert.py b/lib/xe/oa-configs/mdapi-xml-convert.py index add6aa373f..f6713123f8 100755 --- a/lib/xe/oa-configs/mdapi-xml-convert.py +++ b/lib/xe/oa-configs/mdapi-xml-convert.py @@ -183,7 +183,16 @@ mtl_chipset_oa_formats = { xe2_chipset_oa_formats = { '576B_PEC64LL': xe2_chipset_params_pec, '256B_GENERIC_NOA16': xehpsdv_chipset_params, + '192B_MPEC8LL_NOA16': mtl_chipset_oam_samedia_ll_params, + '128B_MPEC8_NOA16': mtl_chipset_oam_samedia_params, +} + +xe3_chipset_oa_formats = { + '576B_PEC64LL': xe2_chipset_params_pec, + '256B_GENERIC_NOA16': xehpsdv_chipset_params, + '192B_MPEC8LL_NOA16': mtl_chipset_oam_samedia_ll_params, '128B_MPEC8_NOA16': mtl_chipset_oam_samedia_params, + '128B_MERT_PEC8': mtl_chipset_oam_samedia_params, } chipsets = { @@ -207,6 +216,7 @@ chipsets = { 'LNL': xe2_chipset_oa_formats, 'BMG': xe2_chipset_oa_formats, 'PTL': xe2_chipset_oa_formats, + 'CRI': xe3_chipset_oa_formats, } xehp_plus = ( 'ACM', 'MTL' ) @@ -448,7 +458,7 @@ def read_token_to_rpn_read(chipset, token, raw_offsets, oa_format): if oa_format == '256B_GENERIC_NOA16': return read_token_to_rpn_read_oag(chipset, token, raw_offsets, oa_format) - if oa_format in ['192B_MPEC8LL_NOA16', '128B_MPEC8_NOA16']: + if oa_format in ['192B_MPEC8LL_NOA16', '128B_MPEC8_NOA16', '128B_MERT_PEC8']: return read_token_to_rpn_read_oam(chipset, token, raw_offsets, oa_format) if oa_format in ['576B_PEC64LL']: diff --git a/lib/xe/oa-configs/oa-cri.xml b/lib/xe/oa-configs/oa-cri.xml new file mode 100644 index 0000000000..83eeaa4652 --- /dev/null +++ b/lib/xe/oa-configs/oa-cri.xml @@ -0,0 +1,3795 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/xe/oa-configs/oa-metricset-codegen.py b/lib/xe/oa-configs/oa-metricset-codegen.py index 922fae58cb..c5c7a2c8d4 100644 --- a/lib/xe/oa-configs/oa-metricset-codegen.py +++ b/lib/xe/oa-configs/oa-metricset-codegen.py @@ -138,9 +138,9 @@ 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" or gen.chipset == "bmg" or gen.chipset == "ptl": + elif gen.chipset == "lnl" or gen.chipset == "bmg" or gen.chipset == "ptl" or gen.chipset == "cri": # See intel_xe_perf_accumulate_reports for the offsets - if set.oa_format == "128B_MPEC8_NOA16": + if set.oa_format == "128B_MPEC8_NOA16" or set.oa_format == "128B_MERT_PEC8": c(textwrap.dedent("""\ metric_set->perf_oa_format = XE_OAM_FORMAT_MPEC8u32_B8_C8; diff --git a/lib/xe/oa-configs/oa_guid_registry.py b/lib/xe/oa-configs/oa_guid_registry.py index 55c4968161..75939cfa2b 100644 --- a/lib/xe/oa-configs/oa_guid_registry.py +++ b/lib/xe/oa-configs/oa_guid_registry.py @@ -104,6 +104,7 @@ class Registry: 'LNL', 'BMG', 'PTL', + 'CRI', ) 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 c3f5a37c6e..d55958a0c0 100755 --- a/lib/xe/oa-configs/update-guids.py +++ b/lib/xe/oa-configs/update-guids.py @@ -168,6 +168,7 @@ chipsets = [ 'hsw', 'lnl', 'bmg', 'ptl', + 'cri', ] for chipset in chipsets: -- 2.48.1