Re: [igt-dev] [PATCH i-g-t 22/23] lib/i915/perf: make warning message more helpful

[Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>]

On Tue, Aug 23, 2022 at 06:30:35PM +0000, Umesh Nerlige Ramappa wrote:
>From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
>
>This helped debugging some XEHPSDV stuff but is also more readable.
>
>Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Umesh Nerlige Ramappa <umesh.nerlige.ramappa@intel.com>

Umesh
>---
> lib/i915/perf-configs/mdapi-xml-convert.py | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/lib/i915/perf-configs/mdapi-xml-convert.py b/lib/i915/perf-configs/mdapi-xml-convert.py
>index f27d6657..1d161674 100755
>--- a/lib/i915/perf-configs/mdapi-xml-convert.py
>+++ b/lib/i915/perf-configs/mdapi-xml-convert.py
>@@ -884,10 +884,15 @@ for arg in args.xml:
>             # delta equations are expected to be identical so warn if that's
>             # not true...
>             if bool(raw_read_eq) ^ bool(delta_read_eq) or raw_read_eq != delta_read_eq:
>-                print_err("WARNING: Inconsistent raw and delta report equations for " + \
>-                          mdapi_set.get('ShortName') + " :: " + mdapi_counter.get('SymbolName') + \
>-                          "(" + mdapi_counter.get('ShortName') + ")" + ": raw=\"" + str(raw_read_eq) + \
>-                          "\" delta=\"" + str(delta_read_eq) + "\" (SKIPPING)")
>+                print_err(("WARNING: Inconsistent raw and delta report equations for {0} :: {1} ({2}): " +
>+                           "raw=\"{3}\" / \"{4}\" delta=\"{5}\" / \"{6}\" (SKIPPING)")
>+                          .format(mdapi_set.get('ShortName'),
>+                                  mdapi_counter.get('SymbolName'),
>+                                  mdapi_counter.get('ShortName'),
>+                                  str(raw_read_eq),
>+                                  mdapi_counter.get('SnapshotReportReadEquation'),
>+                                  str(delta_read_eq),
>+                                  mdapi_counter.get('DeltaReportReadEquation')))
>                 set.remove(counter)
>                 continue
>
>-- 
>2.25.1
>