From 39afaf8e8f4c68c5b5578dfde78178e183de155c Mon Sep 17 00:00:00 2001 From: Lionel Landwerlin Date: Thu, 2 May 2019 11:16:30 +0100 Subject: [PATCH] scripts: update i915 gen script for upstream refactor https://patchwork.freedesktop.org/series/60176/ Signed-off-by: Lionel Landwerlin --- scripts/i915-perf-kernelgen.py | 42 +++++++++++++++++----------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/scripts/i915-perf-kernelgen.py b/scripts/i915-perf-kernelgen.py index b950657d..601ffe37 100755 --- a/scripts/i915-perf-kernelgen.py +++ b/scripts/i915-perf-kernelgen.py @@ -218,31 +218,31 @@ def output_config(metric_set, config): c("};") def output_config_select(metric_set): - c("dev_priv->perf.oa.mux_regs =") + c("dev_priv->perf.mux_regs =") c.indent(8) c("mux_config_" + metric_set['perf_name_lc'] + ";") c.outdent(8) - c("dev_priv->perf.oa.mux_regs_len =") + c("dev_priv->perf.mux_regs_len =") c.indent(8) c("ARRAY_SIZE(mux_config_" + metric_set['perf_name_lc'] + ");") c.outdent(8) c("\n") - c("dev_priv->perf.oa.b_counter_regs =") + c("dev_priv->perf.b_counter_regs =") c.indent(8) c("b_counter_config_" + metric_set['perf_name_lc'] + ";") c.outdent(8) - c("dev_priv->perf.oa.b_counter_regs_len =") + c("dev_priv->perf.b_counter_regs_len =") c.indent(8) c("ARRAY_SIZE(b_counter_config_" + metric_set['perf_name_lc'] + ");") c.outdent(8) c("\n") - c("dev_priv->perf.oa.flex_regs =") + c("dev_priv->perf.flex_regs =") c.indent(8) c("flex_eu_config_" + metric_set['perf_name_lc'] + ";") c.outdent(8) - c("dev_priv->perf.oa.flex_regs_len =") + c("dev_priv->perf.flex_regs_len =") c.indent(8) c("ARRAY_SIZE(flex_eu_config_" + metric_set['perf_name_lc'] + ");") c.outdent(8) @@ -273,30 +273,30 @@ def output_sysfs_code(sets): c.indent(8) for metric_set in sets: - c("strlcpy(dev_priv->perf.oa.test_config.uuid,") + c("strlcpy(dev_priv->perf.test_config.uuid,") c.indent(8) c("\"" + metric_set['guid'] + "\",") - c("sizeof(dev_priv->perf.oa.test_config.uuid));") + c("sizeof(dev_priv->perf.test_config.uuid));") c.outdent(8) - c("dev_priv->perf.oa.test_config.id = 1;") + c("dev_priv->perf.test_config.id = 1;") c("\n") - c("dev_priv->perf.oa.test_config.mux_regs = mux_config_" + metric_set['perf_name_lc'] + ";") - c("dev_priv->perf.oa.test_config.mux_regs_len = ARRAY_SIZE(mux_config_" + metric_set['perf_name_lc'] + ");") + c("dev_priv->perf.test_config.mux_regs = mux_config_" + metric_set['perf_name_lc'] + ";") + c("dev_priv->perf.test_config.mux_regs_len = ARRAY_SIZE(mux_config_" + metric_set['perf_name_lc'] + ");") c("\n") - c("dev_priv->perf.oa.test_config.b_counter_regs = b_counter_config_" + metric_set['perf_name_lc'] + ";") - c("dev_priv->perf.oa.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_" + metric_set['perf_name_lc'] + ");") + c("dev_priv->perf.test_config.b_counter_regs = b_counter_config_" + metric_set['perf_name_lc'] + ";") + c("dev_priv->perf.test_config.b_counter_regs_len = ARRAY_SIZE(b_counter_config_" + metric_set['perf_name_lc'] + ");") c("\n") - c("dev_priv->perf.oa.test_config.flex_regs = flex_eu_config_" + metric_set['perf_name_lc'] + ";") - c("dev_priv->perf.oa.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_" + metric_set['perf_name_lc'] + ");") + c("dev_priv->perf.test_config.flex_regs = flex_eu_config_" + metric_set['perf_name_lc'] + ";") + c("dev_priv->perf.test_config.flex_regs_len = ARRAY_SIZE(flex_eu_config_" + metric_set['perf_name_lc'] + ");") c("\n") - c("dev_priv->perf.oa.test_config.sysfs_metric.name = \"" + metric_set['guid'] + "\";") - c("dev_priv->perf.oa.test_config.sysfs_metric.attrs = dev_priv->perf.oa.test_config.attrs;") + c("dev_priv->perf.test_config.sysfs_metric.name = \"" + metric_set['guid'] + "\";") + c("dev_priv->perf.test_config.sysfs_metric.attrs = dev_priv->perf.test_config.attrs;") c("\n") - c("dev_priv->perf.oa.test_config.attrs[0] = &dev_priv->perf.oa.test_config.sysfs_metric_id.attr;") + c("dev_priv->perf.test_config.attrs[0] = &dev_priv->perf.test_config.sysfs_metric_id.attr;") c("\n") - c("dev_priv->perf.oa.test_config.sysfs_metric_id.attr.name = \"id\";") - c("dev_priv->perf.oa.test_config.sysfs_metric_id.attr.mode = 0444;") - c("dev_priv->perf.oa.test_config.sysfs_metric_id.show = show_" + metric_set['perf_name_lc'] + "_id;") + c("dev_priv->perf.test_config.sysfs_metric_id.attr.name = \"id\";") + c("dev_priv->perf.test_config.sysfs_metric_id.attr.mode = 0444;") + c("dev_priv->perf.test_config.sysfs_metric_id.show = show_" + metric_set['perf_name_lc'] + "_id;") c.outdent(8) c("}")