CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-01 13:58:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: sort-pmuevents: allow for additional type qualifiers and storage class

Browse Source 
With kernel 5.16 some structs in pmu-events do get a const qualifier, some
a static const storage class and qualifier.

The current sort-pmuevents cannot cope with that and drops all struct
arrays with such additional elements. This then leads to compiler errors.

Allow '^struct', '^const struct', '^static struct', '^static const struct'.

(From OE-Core rev: e0d5d93a18d1682f3393fc10133f08009f008601)

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
(cherry picked from commit 8406e83ade1c34d8a7d8063f2e7445aafa471721)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Max Krummenacher 2021-11-22 17:34:59 +01:00 committed by Richard Purdie
parent 8a0766f6f5
commit 17ea8b493d
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
meta/recipes-kernel/perf/perf/sort-pmuevents.py
View File

@ -33,10 +33,10 @@ if os.path.exists(outfile):
with open(infile, 'r') as file:
data = file.read()
preamble_regex = re.compile( '^(.*?)^struct', re.MULTILINE | re.DOTALL )
preamble_regex = re.compile( '^(.*?)^(struct|const struct|static struct|static const struct)', re.MULTILINE | re.DOTALL )
preamble = re.search( preamble_regex, data )
struct_block_regex = re.compile( '^struct.*?(\w+) (.*?)\[\] = {(.*?)^};', re.MULTILINE | re.DOTALL )
struct_block_regex = re.compile( '^(struct|const struct|static struct|static const struct).*?(\w+) (.*?)\[\] = {(.*?)^};', re.MULTILINE | re.DOTALL )
field_regex = re.compile( '{.*?},', re.MULTILINE | re.DOTALL )
cpuid_regex = re.compile( '\.cpuid = (.*?),', re.MULTILINE | re.DOTALL )
name_regex = re.compile( '\.name = (.*?),', re.MULTILINE | re.DOTALL )
@ -45,24 +45,25 @@ name_regex = re.compile( '\.name = (.*?),', re.MULTILINE | re.DOTALL )
# types and then their fields.
entry_dict = {}
for struct in re.findall( struct_block_regex, data ):
# print( "struct: %s %s" % (struct[0],struct[1]) )
entry_dict[struct[1]] = {}
entry_dict[struct[1]]['type'] = struct[0]
entry_dict[struct[1]]['fields'] = {}
for entry in re.findall( field_regex, struct[2] ):
# print( "struct: %s %s %s" % (struct[0],struct[1],struct[2]) )
entry_dict[struct[2]] = {}
entry_dict[struct[2]]['type_prefix'] = struct[0]
entry_dict[struct[2]]['type'] = struct[1]
entry_dict[struct[2]]['fields'] = {}
for entry in re.findall( field_regex, struct[3] ):
#print( " entry: %s" % entry )
cpuid = re.search( cpuid_regex, entry )
if cpuid:
#print( " cpuid found: %s" % cpuid.group(1) )
entry_dict[struct[1]]['fields'][cpuid.group(1)] = entry
entry_dict[struct[2]]['fields'][cpuid.group(1)] = entry
name = re.search( name_regex, entry )
if name:
#print( " name found: %s" % name.group(1) )
entry_dict[struct[1]]['fields'][name.group(1)] = entry
if not entry_dict[struct[1]]['fields']:
entry_dict[struct[1]]['fields']['0'] = entry
entry_dict[struct[2]]['fields'][name.group(1)] = entry
if not entry_dict[struct[2]]['fields']:
entry_dict[struct[2]]['fields']['0'] = entry
# created ordered dictionaries from the captured values. These are ordered by
# a sorted() iteration of the keys. We don't care about the order we read
@ -74,6 +75,7 @@ for struct in re.findall( struct_block_regex, data ):
entry_dict_sorted = OrderedDict()
for i in sorted(entry_dict.keys()):
entry_dict_sorted[i] = {}
entry_dict_sorted[i]['type_prefix'] = entry_dict[i]['type_prefix']
entry_dict_sorted[i]['type'] = entry_dict[i]['type']
entry_dict_sorted[i]['fields'] = {}
for f in sorted(entry_dict[i]['fields'].keys()):
@ -85,7 +87,7 @@ outf = open( outfile, 'w' )
print( preamble.group(1) )
outf.write( preamble.group(1) )
for d in entry_dict_sorted:
outf.write( "struct %s %s[] = {\n" % (entry_dict_sorted[d]['type'],d) )
outf.write( "%s %s %s[] = {\n" % (entry_dict_sorted[d]['type_prefix'], entry_dict_sorted[d]['type'],d) )
for f in entry_dict_sorted[d]['fields']:
outf.write( entry_dict_sorted[d]['fields'][f] + '\n' )