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 A9E5AD6A227 for ; Fri, 15 Nov 2024 02:20:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5835210E131; Fri, 15 Nov 2024 02:20:38 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="ZEC6LVk8"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1125710E131 for ; Fri, 15 Nov 2024 02:20:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1731637237; x=1763173237; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=TAssWyrnYYNbS90aN7Jvthu+1myuegZiZEXRuR4xMH4=; b=ZEC6LVk8MGWDmuDPanTbF4GpJPHbP0mJkusSsUOX5nnINTjxwmiUNOqA 82KXR77yVuoCvWY4YSaOzU0FpJMU4Xny6e8TxMHP7a6/teoQRJwDuBIz6 ixIXQ7oW9QUSZMZ6Xkl76DhfYR5MX+JcpqRdhxxyMTwgtzylVIaZcleOS 7dX+5N1QlyMu34JXBNnh6SquVfuxZ7yaSd7v/DdKn7Tu0Jd+WJLFdGfNG lFaK+RqSTMGJlsZHpOJ46tXy3E40GyJ9YOJJHrt2pP7H718TLVSZcAxQS DNjehNbJKRSCk8H1dz6sIDf5qS9Ki1eGFgq4o1oXeRn16AM/ZMMQydLx+ Q==; X-CSE-ConnectionGUID: dA00J+8SRhqx3VxdjJR5dA== X-CSE-MsgGUID: meL/HDOcTL+EKFPW/sES9g== X-IronPort-AV: E=McAfee;i="6700,10204,11256"; a="57025965" X-IronPort-AV: E=Sophos;i="6.12,155,1728975600"; d="scan'208";a="57025965" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2024 18:20:36 -0800 X-CSE-ConnectionGUID: REfJUsEpSmW2tVKKeSZsNA== X-CSE-MsgGUID: D65Ze8PmS1GSp7zd31Jh9Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.12,155,1728975600"; d="scan'208";a="125920582" Received: from orsosgc001.jf.intel.com ([10.165.21.142]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2024 18:20:36 -0800 From: Ashutosh Dixit To: igt-dev@lists.freedesktop.org Cc: Jose Souza , Umesh Nerlige Ramappa Subject: [PATCH i-g-t] lib/xe/oa: Re-instate TestOa metric sets in LNL/BMG XML's Date: Thu, 14 Nov 2024 18:20:31 -0800 Message-ID: <20241115022031.3794406-1-ashutosh.dixit@intel.com> X-Mailer: git-send-email 2.41.0 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" TestOa metrics for LNL set was dropped in 548fd137a9fe ("xe/oa: Update oa-lnl.xml"). However TestOa metrics can be useful for checking OA data. We are trying to figure out how to make use of the TestOa metrics for OA validation but for now reinstate TestOa metrics in LNL/BMG XML's. Generated via repeated invocations of: update-guids.py --guids=guids.xml MetricsXML_LNL.xml > guids.lnl.xml # copy new guid's from guids.lnl.xml into guids.xml mdapi-xml-convert.py --guids=guids.xml MetricsXML_LNL.xml > oa-lnl.xml and update-guids.py --guids=guids.xml MetricsXML_BMG.xml > guids.bmg.xml # copy new guid's from guids.bmg.xml into guids.xml mdapi-xml-convert.py --guids=guids.xml MetricsXML_BMG.xml > oa-bmg.xml Signed-off-by: Ashutosh Dixit --- lib/xe/oa-configs/codegen.py | 3 + lib/xe/oa-configs/guids.xml | 3 +- lib/xe/oa-configs/oa-bmg.xml | 664 ++++++++++++++++++++++++++++++++++- lib/xe/oa-configs/oa-lnl.xml | 344 +++++++++++++++++- 4 files changed, 1009 insertions(+), 5 deletions(-) diff --git a/lib/xe/oa-configs/codegen.py b/lib/xe/oa-configs/codegen.py index 51498f803d..7251f5c7a6 100644 --- a/lib/xe/oa-configs/codegen.py +++ b/lib/xe/oa-configs/codegen.py @@ -352,6 +352,9 @@ class Gen: m = re.search(r'\$GtSlice([0-9]+)XeCore([0-9]+)$', name) if m: return 'intel_xe_perf_devinfo_subslice_available(&perf->devinfo, {0}, {1})'.format(m.group(1), m.group(2)) + m = re.search(r'\$GtXeCore([0-99]+)$', name) + if m: + return 'intel_xe_perf_devinfo_subslice_available(&perf->devinfo, {0}, 0)'.format(m.group(1)) return None def output_rpn_equation_code(self, set, counter, equation): diff --git a/lib/xe/oa-configs/guids.xml b/lib/xe/oa-configs/guids.xml index dd912d00f1..c8831a912e 100644 --- a/lib/xe/oa-configs/guids.xml +++ b/lib/xe/oa-configs/guids.xml @@ -2755,11 +2755,11 @@ - + @@ -2769,4 +2769,5 @@ + diff --git a/lib/xe/oa-configs/oa-bmg.xml b/lib/xe/oa-configs/oa-bmg.xml index 15ca7ed26d..b94e7f9ca1 100644 --- a/lib/xe/oa-configs/oa-bmg.xml +++ b/lib/xe/oa-configs/oa-bmg.xml @@ -1,5 +1,5 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/lib/xe/oa-configs/oa-lnl.xml b/lib/xe/oa-configs/oa-lnl.xml index 5a8586f03a..1ab28e1acc 100644 --- a/lib/xe/oa-configs/oa-lnl.xml +++ b/lib/xe/oa-configs/oa-lnl.xml @@ -1,5 +1,5 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- 2.41.0