From acce7d346027ae61f74eb3fa56679636eed5cb08 Mon Sep 17 00:00:00 2001 From: Jordan Justen Date: Wed, 16 Aug 2017 18:19:39 -0700 Subject: [PATCH] intel/genxml: Handle field names with different spacing/hyphen If a field name differs slightly between two generations then this change will still add the fields into the same group. For example, these will be treated as equal: * "Software Exception" and "Software Exception" * "Per Thread" and "Per-Thread" Signed-off-by: Jordan Justen Reviewed-by: Kenneth Graunke Reviewed-by: Lionel Landwerlin --- src/intel/genxml/gen_bits_header.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/intel/genxml/gen_bits_header.py b/src/intel/genxml/gen_bits_header.py index 8c87edb2e55..6dd0d7c6b75 100644 --- a/src/intel/genxml/gen_bits_header.py +++ b/src/intel/genxml/gen_bits_header.py @@ -182,12 +182,13 @@ class Container(object): self.length_by_gen[gen] = xml_attrs['length'] def get_field(self, field_name, create=False): - if field_name not in self.fields: + key = to_alphanum(field_name) + if key not in self.fields: if create: - self.fields[field_name] = Field(self, field_name) + self.fields[key] = Field(self, field_name) else: return None - return self.fields[field_name] + return self.fields[key] def has_prop(self, prop): if prop == 'length': -- 2.30.2