1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
#!/usr/bin/env python3
# coding=utf-8
# SPDX-License-Identifier: MIT
#
# Copyright © 2024 Intel Corporation
#
#
# This script can:
#
# - Automatically add template entries for unregistered metric sets diescovered
# in new mdapi xml files.
# - Once mdapi-convert-xml.py has been run to output register configs for new
# metric sets then re-running this script can add the config_hash attribute
# to corresponding registry entries.
#
# The script is designed to allow incremental updates/fixups of the guid
# registry by working in terms of:
#
# 1) load all the existing state
# 2) apply tweaks/modifications
# 3) write everything back out
#
# The script should gracefully handle incomplete guid entries, which is
# important when considering how the mdapi-xml-convert.py script depends on the
# 'mdapi_config_hash' attribute while adding the 'config_hash' attribute
# depends on the configs output by mdapi-xml-convert.py.
import argparse
import os.path
import re
import sys
import time
import uuid
import xml.etree.ElementTree as et
import xml.sax.saxutils as saxutils
import oa_guid_registry as oa_registry
def print_err(*args):
sys.stderr.write(' '.join(map(str,args)) + '\n')
def guid_hashing_key(guid_obj):
ret = oa_registry.Registry.chipset_derive_hash(guid_obj['chipset'],
guid_obj['name'],
guid_obj['mdapi_config_hash'])
return ret
parser = argparse.ArgumentParser()
parser.add_argument("xml", nargs="+", help="XML description of metrics")
parser.add_argument("--guids", required=True, help="Metric set GUID registry")
args = parser.parse_args()
guids = []
guid_index = {} # guid objects indexed by id
mdapi_config_hash_guid_table = {} # indexed by MDAPI XML register config hash
named_guid_table = {} # indexed by name=<chipset>_<symbol_name>
# 1) read everything we have currently
#
guids_xml = et.parse(args.guids)
for guid in guids_xml.findall(".//guid"):
guid_obj = {}
if guid.get('id') != None:
guid_obj['id'] = guid.get('id')
else:
guid_obj['id'] = str(uuid.uuid4())
if guid.get('mdapi_config_hash') != None:
guid_obj['mdapi_config_hash'] = guid.get('mdapi_config_hash')
if guid.get('config_hash') != None:
guid_obj['config_hash'] = guid.get('config_hash')
if guid.get('chipset') != None:
guid_obj['chipset'] = guid.get('chipset')
if guid.get('name') != None:
guid_obj['name'] = guid.get('name')
named_guid_table[guid_obj['chipset'] + "_" + guid_obj['name']] = guid_obj
if 'mdapi_config_hash' in guid_obj:
hashing_key = oa_registry.Registry.chipset_derive_hash(guid_obj['chipset'],
guid_obj['name'],
guid_obj['mdapi_config_hash'])
mdapi_config_hash_guid_table[hashing_key] = guid_obj
guids.append(guid_obj)
if guid_obj['id'] in guid_index:
print_err("Duplicate GUID " + guid_obj['id'] + "!")
sys.exit(1)
guid_index[guid_obj['id']] = guid_obj
#
# 2) fixup/modify the guid entries...
#
for arg in args.xml:
internal = et.parse(arg)
concurrent_group = internal.find(".//ConcurrentGroup")
chipset = oa_registry.Registry.chipset_name(concurrent_group.get('SupportedHW')).lower()
if concurrent_group.get('SupportedGT') != None:
chipset = chipset + oa_registry.Registry.gt_name(concurrent_group.get('SupportedGT')).lower()
for mdapi_set in internal.findall(".//MetricSet"):
mdapi_config_hash = oa_registry.Registry.mdapi_hw_config_hash(mdapi_set)
set_name = oa_registry.Registry.sanitize_symbol_name(mdapi_set.get('SymbolName'))
name = chipset + "_" + set_name;
hashing_key = oa_registry.Registry.chipset_derive_hash(chipset, set_name, mdapi_config_hash)
if hashing_key in mdapi_config_hash_guid_table:
guid_obj = mdapi_config_hash_guid_table[hashing_key]
guid_obj['name'] = set_name
guid_obj['chipset'] = chipset
guid_obj['matched_mdapi'] = True
elif name in named_guid_table:
guid_obj = named_guid_table[name]
guid_obj['matched_mdapi'] = True
guid_obj['mdapi_config_hash'] = mdapi_config_hash
if 'config_hash' in guid_obj:
del guid_obj['config_hash']
guid_obj['comment'] = "WARNING: MDAPI XML config hash changed! If upstream, double check raw counter semantics unchanged"
print_err("WARNING: MDAPI XML config hash changed for \"" + set_name + "\" (" + chipset + ") If upstream, double check raw counter semantics unchanged")
else:
guid_obj = { 'mdapi_config_hash': mdapi_config_hash,
'id': str(uuid.uuid4()),
'name': set_name,
'chipset': chipset,
'unregistered': True,
'matched_mdapi': True,
'comment': "New"
}
guid_index[guid_obj['id']] = guid_obj
mdapi_config_hash_guid_table[guid_hashing_key(guid_obj)] = guid_obj
guids.append(guid_obj)
print_err("New GUID \"" + guid_obj['id'] + "\" for metric set = " + set_name + " (" + chipset + ")")
named_guid_table[chipset + '_' + set_name] = guid_obj
chipsets = [ 'hsw',
'bdw', 'chv',
'sklgt2', 'sklgt3', 'sklgt4', 'kblgt2', 'kblgt3', 'cflgt2', 'cflgt3',
'bxt', 'glk',
'cnl',
'icl', 'ehl',
'tglgt1', 'tglgt2', 'rkl', 'dg1', 'adl',
'acmgt1', 'acmgt2', 'acmgt3',
'mtlgt2', 'mtlgt3',
'lnl',
'bmg',
'ptl',
]
for chipset in chipsets:
filename = 'oa-' + chipset + '.xml'
if not os.path.isfile(filename):
continue
public = et.parse(filename)
for metricset in public.findall(".//set"):
set_name = metricset.get('symbol_name')
config_hash = oa_registry.Registry.hw_config_hash(metricset)
guid_key = chipset + "_" + set_name
if guid_key in named_guid_table:
guid_obj = named_guid_table[guid_key]
guid_obj['config_hash'] = config_hash
#
# 3) write all the guids back out...
print("<guids>")
for guid_obj in guids:
comment = None
line = "<guid"
if 'matched_mdapi' not in guid_obj:
comment = "Not found in MDAPI XML file[s]; Entry copied unmodified (maybe removed from MDAPI XML or not all files given on command line)"
if 'comment' in guid_obj:
comment = guid_obj['comment']
if 'config_hash' in guid_obj:
line = line + ' config_hash="' + guid_obj['config_hash'] + '"'
if 'mdapi_config_hash' in guid_obj:
line = line + ' mdapi_config_hash="' + guid_obj['mdapi_config_hash'] + '"'
line = line + ' id="' + guid_obj['id'] + '"'
if 'chipset' in guid_obj:
line = line + ' chipset="' + guid_obj['chipset'] + '"'
if 'name' in guid_obj:
line = line + ' name="' + guid_obj['name'] + '"'
line = line + ' />'
if comment != None:
print(" <!-- ↓" + comment + " -->")
print(" " + line)
print("</guids>")
|
