[PATCH i-g-t 2/2] tests/intel/xe_oa: more CRI changes

[Ashutosh Dixit <ashutosh.dixit@intel.com>]

Changes to consume the CRI metric set xml and for the mertoa unit.

Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
---
 lib/xe/xe_oa.c      | 3 +++
 tests/intel/xe_oa.c | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/lib/xe/xe_oa.c b/lib/xe/xe_oa.c
index 229deafa71..b2f447c944 100644
--- a/lib/xe/xe_oa.c
+++ b/lib/xe/xe_oa.c
@@ -40,6 +40,7 @@
 #include "xe_oa_metrics_lnl.h"
 #include "xe_oa_metrics_bmg.h"
 #include "xe_oa_metrics_ptl.h"
+#include "xe_oa_metrics_cri.h"
 
 static struct intel_xe_perf_logical_counter_group *
 intel_xe_perf_logical_counter_group_new(struct intel_xe_perf *perf,
@@ -303,6 +304,8 @@ intel_xe_perf_for_devinfo(uint32_t device_id,
 		intel_xe_perf_load_metrics_bmg(perf);
 	} else if (devinfo->is_pantherlake) {
 		intel_xe_perf_load_metrics_ptl(perf);
+	} else if (devinfo->is_crescentisland) {
+		intel_xe_perf_load_metrics_cri(perf);
 	} else if (intel_graphics_ver(device_id) >= IP_VER(20, 0)) {
 		intel_xe_perf_load_metrics_lnl(perf);
 	} else {
diff --git a/tests/intel/xe_oa.c b/tests/intel/xe_oa.c
index 927f3f4f20..2c739f6363 100644
--- a/tests/intel/xe_oa.c
+++ b/tests/intel/xe_oa.c
@@ -359,6 +359,7 @@ static const char *oa_unit_name[] = {
 	[DRM_XE_OA_UNIT_TYPE_OAG] = "oag",
 	[DRM_XE_OA_UNIT_TYPE_OAM] = "oam",
 	[DRM_XE_OA_UNIT_TYPE_OAM_SAG] = "sag",
+	[DRM_XE_OA_UNIT_TYPE_MERT] = "mert",
 };
 
 /* Wrapper to deconstify @inst for xe_exec_queue_create */
@@ -381,6 +382,8 @@ static struct intel_xe_perf_metric_set *oa_unit_metric_set(const struct drm_xe_o
 		 (oau->oa_unit_type == DRM_XE_OA_UNIT_TYPE_OAM ||
 		  oau->oa_unit_type == DRM_XE_OA_UNIT_TYPE_OAM_SAG))
 		test_set_name = "MediaSet1";
+	else if (oau->oa_unit_type == DRM_XE_OA_UNIT_TYPE_MERT)
+		test_set_name = "MertExtSet";
 	else
 		igt_assert_f(!"reached", "Unknown oa_unit_type %d\n", oau->oa_unit_type);
 
-- 
2.48.1