[igt-dev] [PATCH i-g-t] lib/i915/perf: ensure conversion script preserves order of attributes

[igt-dev] [PATCH i-g-t] lib/i915/perf: ensure conversion script preserves order of attributes

[Lionel Landwerlin]

We've been bitten by this before.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
---
 lib/i915/perf-configs/mdapi-xml-convert.py | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/i915/perf-configs/mdapi-xml-convert.py b/lib/i915/perf-configs/mdapi-xml-convert.py
index f61a1cd1f..172ef0600 100755
--- a/lib/i915/perf-configs/mdapi-xml-convert.py
+++ b/lib/i915/perf-configs/mdapi-xml-convert.py
@@ -44,6 +44,7 @@ import re
 import sys
 import time
 import uuid
+import collections
 
 import xml.etree.ElementTree as et
 import xml.sax.saxutils as saxutils
@@ -544,8 +545,14 @@ def process_mux_configs(mdapi_set):
     return mux_configs
 
 
+def create_sub_element(parent, name):
+    el = et.SubElement(parent, name)
+    el.attrib = collections.OrderedDict()
+    return el
+
+
 def add_register_config(set, priority, availability, regs, type):
-    reg_config = et.SubElement(set, 'register_config')
+    reg_config = create_sub_element(set, 'register_config')
 
     reg_config.set('type', type)
 
@@ -555,7 +562,7 @@ def add_register_config(set, priority, availability, regs, type):
         reg_config.set('availability', availability)
 
     for reg in regs:
-        elem = et.SubElement(reg_config, 'register')
+        elem = create_sub_element(reg_config, 'register')
         elem.set('type', type)
         elem.set('address', "0x%08X" % reg[0])
         elem.set('value', "0x%08X" % reg[1])
@@ -617,7 +624,7 @@ for arg in args.xml:
             print_err("WARNING: skipping metric set '{0}', report size {1} invalid".format(set_symbol_name, mdapi_set.get('SnapshotReportSize')))
             continue
 
-        set = et.SubElement(metrics, 'set')
+        set = create_sub_element(metrics, 'set')
 
         set.set('chipset', chipset)
 
@@ -759,7 +766,7 @@ for arg in args.xml:
 
             symbol_name = mdapi_counter.get('SymbolName')
 
-            counter = et.SubElement(set, 'counter')
+            counter = create_sub_element(set, 'counter')
             counter.set('name', apply_aliases(mdapi_counter.get('ShortName'), aliases))
             counter.set('symbol_name', mdapi_counter.get('SymbolName'))
             counter.set('underscore_name', underscore(mdapi_counter.get('SymbolName')))
-- 
2.28.0

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev

[igt-dev] ✗ Fi.CI.BAT: failure for lib/i915/perf: ensure conversion script preserves order of attributes

[Patchwork]

[-- Attachment #1.1: Type: text/plain, Size: 5902 bytes --]

== Series Details ==

Series: lib/i915/perf: ensure conversion script preserves order of attributes
URL   : https://patchwork.freedesktop.org/series/83079/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_9202 -> IGTPW_5100
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with IGTPW_5100 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in IGTPW_5100, please notify your bug team to allow them
  to document this new failure mode, which will reduce false positives in CI.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/index.html

Possible new issues
-------------------

  Here are the unknown changes that may have been introduced in IGTPW_5100:

### IGT changes ###

#### Possible regressions ####

  * igt@kms_psr@primary_mmap_gtt:
    - fi-icl-u2:          NOTRUN -> [INCOMPLETE][1]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-icl-u2/igt@kms_psr@primary_mmap_gtt.html

  * igt@kms_psr@primary_page_flip:
    - fi-tgl-y:           [PASS][2] -> [INCOMPLETE][3]
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-tgl-y/igt@kms_psr@primary_page_flip.html
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-tgl-y/igt@kms_psr@primary_page_flip.html

  
Known issues
------------

  Here are the changes found in IGTPW_5100 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@i915_module_load@reload:
    - fi-byt-j1900:       [PASS][4] -> [DMESG-WARN][5] ([i915#1982]) +1 similar issue
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-byt-j1900/igt@i915_module_load@reload.html
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-byt-j1900/igt@i915_module_load@reload.html
    - fi-tgl-u2:          [PASS][6] -> [DMESG-WARN][7] ([i915#1982] / [k.org#205379])
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-tgl-u2/igt@i915_module_load@reload.html
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-tgl-u2/igt@i915_module_load@reload.html

  * igt@kms_busy@basic@flip:
    - fi-tgl-y:           [PASS][8] -> [DMESG-WARN][9] ([i915#1982])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-tgl-y/igt@kms_busy@basic@flip.html
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-tgl-y/igt@kms_busy@basic@flip.html

  * igt@kms_chamelium@dp-edid-read:
    - fi-cml-u2:          [PASS][10] -> [DMESG-WARN][11] ([i915#2203])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-cml-u2/igt@kms_chamelium@dp-edid-read.html
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-cml-u2/igt@kms_chamelium@dp-edid-read.html

  * igt@kms_cursor_legacy@basic-flip-before-cursor-legacy:
    - fi-icl-u2:          [PASS][12] -> [DMESG-WARN][13] ([i915#1982])
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-icl-u2/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html

  
#### Possible fixes ####

  * igt@debugfs_test@read_all_entries:
    - fi-tgl-y:           [DMESG-WARN][14] ([i915#1982]) -> [PASS][15] +2 similar issues
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-tgl-y/igt@debugfs_test@read_all_entries.html
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-tgl-y/igt@debugfs_test@read_all_entries.html

  * igt@gem_close_race@basic-process:
    - fi-tgl-y:           [DMESG-WARN][16] ([i915#402]) -> [PASS][17]
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-tgl-y/igt@gem_close_race@basic-process.html
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-tgl-y/igt@gem_close_race@basic-process.html

  * igt@kms_psr@cursor_plane_move:
    - fi-icl-u2:          [INCOMPLETE][18] -> [PASS][19]
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-icl-u2/igt@kms_psr@cursor_plane_move.html
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-icl-u2/igt@kms_psr@cursor_plane_move.html

  * igt@kms_psr@primary_mmap_gtt:
    - fi-cml-s:           [INCOMPLETE][20] -> [PASS][21]
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-cml-s/igt@kms_psr@primary_mmap_gtt.html
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-cml-s/igt@kms_psr@primary_mmap_gtt.html

  
#### Warnings ####

  * igt@kms_chamelium@dp-crc-fast:
    - fi-cml-u2:          [DMESG-WARN][22] ([i915#1982]) -> [INCOMPLETE][23] ([i915#2203])
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_9202/fi-cml-u2/igt@kms_chamelium@dp-crc-fast.html
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/fi-cml-u2/igt@kms_chamelium@dp-crc-fast.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
  [i915#2203]: https://gitlab.freedesktop.org/drm/intel/issues/2203
  [i915#402]: https://gitlab.freedesktop.org/drm/intel/issues/402
  [k.org#205379]: https://bugzilla.kernel.org/show_bug.cgi?id=205379


Participating hosts (44 -> 40)
------------------------------

  Missing    (4): fi-kbl-soraka fi-bsw-cyan fi-bdw-samus fi-hsw-4200u 


Build changes
-------------

  * CI: CI-20190529 -> None
  * IGT: IGT_5827 -> IGTPW_5100

  CI-20190529: 20190529
  CI_DRM_9202: 073691f2baf2db32197f744612f5249dcf942c79 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGTPW_5100: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/index.html
  IGT_5827: 7fd7e3fb8b42eb4e62a4575f6edc5a048e5bec3d @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_5100/index.html

[-- Attachment #1.2: Type: text/html, Size: 7222 bytes --]

[-- Attachment #2: Type: text/plain, Size: 154 bytes --]

_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev