From 777034690294aded758ec05a0b3aa1b1bd5e043a Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Mon, 27 Jun 2022 11:39:37 +0300 Subject: [PATCH] intel/perf: support new variable names Signed-off-by: Lionel Landwerlin Reviewed-by: Ivan Briano Part-of: --- src/intel/perf/gen_perf.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/intel/perf/gen_perf.py b/src/intel/perf/gen_perf.py index 5fc5c0ea08d..2b3150592e5 100644 --- a/src/intel/perf/gen_perf.py +++ b/src/intel/perf/gen_perf.py @@ -227,16 +227,21 @@ exp_ops["=="] = (2, splice_equal) hw_vars = {} hw_vars["$EuCoresTotalCount"] = "perf->sys_vars.n_eus" +hw_vars["$VectorEngineTotalCount"] = "perf->sys_vars.n_eus" hw_vars["$EuSlicesTotalCount"] = "perf->sys_vars.n_eu_slices" hw_vars["$EuSubslicesTotalCount"] = "perf->sys_vars.n_eu_sub_slices" +hw_vars["$XeCoreTotalCount"] = "perf->sys_vars.n_eu_sub_slices" hw_vars["$EuDualSubslicesTotalCount"] = "perf->sys_vars.n_eu_sub_slices" hw_vars["$EuDualSubslicesSlice0123Count"] = "perf->sys_vars.n_eu_slice0123" hw_vars["$EuThreadsCount"] = "perf->devinfo.num_thread_per_eu" +hw_vars["$VectorEngineThreadsCount"] = "perf->devinfo.num_thread_per_eu" hw_vars["$SliceMask"] = "perf->sys_vars.slice_mask" +hw_vars["$SliceTotalCount"] = "perf->sys_vars.n_eu_slices" # subslice_mask is interchangeable with subslice/dual-subslice since Gfx12+ # only has dual subslices which can be assimilated with 16EUs subslices. hw_vars["$SubsliceMask"] = "perf->sys_vars.subslice_mask" hw_vars["$DualSubsliceMask"] = "perf->sys_vars.subslice_mask" +hw_vars["$XeCoreMask"] = "perf->sys_vars.subslice_mask" hw_vars["$GpuTimestampFrequency"] = "perf->devinfo.timestamp_frequency" hw_vars["$GpuMinFrequency"] = "perf->sys_vars.gt_min_freq" hw_vars["$GpuMaxFrequency"] = "perf->sys_vars.gt_max_freq" @@ -249,7 +254,7 @@ def resolve_variable(name, set, allow_counters): m = re.search('\$GtSlice([0-9]+)$', name) if m: return 'intel_device_info_slice_available(&perf->devinfo, {0})'.format(m.group(1)) - m = re.search('\$GtSlice([0-9]+)DualSubslice([0-9]+)$', name) + m = re.search('\$GtSlice([0-9]+)XeCore([0-9]+)$', name) if m: return 'intel_device_info_subslice_available(&perf->devinfo, {0}, {1})'.format(m.group(1), m.group(2)) if allow_counters and name in set.counter_vars: