From 8c8a1966ab03551bac91d470caef49288ba81da3 Mon Sep 17 00:00:00 2001
From: Dylan Baker <dylan.c.baker@intel.com>
Date: Mon, 3 Oct 2022 10:45:47 -0700
Subject: [PATCH] intel/genxml: reprocess xml with elementree output

This makes two relatively small changes, first it addes the encoding to
the xml delcaration, and switches the quote style. Second, it changes
the final newline. These seemed minor enough to not warrent patches to
make the old wrter do the same thing as the new writer.

Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18955>
---
 src/intel/genxml/gen11.xml  | 4 ++--
 src/intel/genxml/gen12.xml  | 4 ++--
 src/intel/genxml/gen125.xml | 4 ++--
 src/intel/genxml/gen4.xml   | 4 ++--
 src/intel/genxml/gen45.xml  | 4 ++--
 src/intel/genxml/gen5.xml   | 4 ++--
 src/intel/genxml/gen6.xml   | 4 ++--
 src/intel/genxml/gen7.xml   | 4 ++--
 src/intel/genxml/gen75.xml  | 4 ++--
 src/intel/genxml/gen8.xml   | 4 ++--
 src/intel/genxml/gen9.xml   | 4 ++--
 src/intel/genxml/gen_rt.xml | 4 ++--
 12 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index de74efebb00..84206409413 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="ICL" gen="11">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -6908,4 +6908,4 @@
   <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
     <field name="VS Invocation Count Report" start="0" end="63" type="uint" />
   </register>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 26534e3350e..990f50145d1 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="TGL" gen="12">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -7158,4 +7158,4 @@
   <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
     <field name="VS Invocation Count Report" start="0" end="63" type="uint" />
   </register>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 9adfdebb249..390e30ebeed 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="GFX125" gen="12.5">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -7807,4 +7807,4 @@
   <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
     <field name="VS Invocation Count Report" start="0" end="63" type="uint" />
   </register>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen4.xml b/src/intel/genxml/gen4.xml
index 7d2567b4ee6..cbb62fb33cf 100644
--- a/src/intel/genxml/gen4.xml
+++ b/src/intel/genxml/gen4.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="BRW" gen="4">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -1009,4 +1009,4 @@
     <field name="Destination X2 Coordinate" start="64" end="79" type="int" />
     <field name="Destination Y2 Coordinate" start="80" end="95" type="int" />
   </instruction>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen45.xml b/src/intel/genxml/gen45.xml
index e15cbdb1264..d879ac958df 100644
--- a/src/intel/genxml/gen45.xml
+++ b/src/intel/genxml/gen45.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="CTG" gen="4.5">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -1041,4 +1041,4 @@
     <field name="Destination X2 Coordinate" start="64" end="79" type="int" />
     <field name="Destination Y2 Coordinate" start="80" end="95" type="int" />
   </instruction>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen5.xml b/src/intel/genxml/gen5.xml
index 816756bfa8d..a7520b6dc9e 100644
--- a/src/intel/genxml/gen5.xml
+++ b/src/intel/genxml/gen5.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="ILK" gen="5">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -1115,4 +1115,4 @@
     <field name="Destination X2 Coordinate" start="64" end="79" type="int" />
     <field name="Destination Y2 Coordinate" start="80" end="95" type="int" />
   </instruction>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index dda91fb5c03..d4088edc986 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="SNB" gen="6">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -2822,4 +2822,4 @@
     <field name="RBWait" start="11" end="11" type="bool" />
     <field name="Buffer Length (in pages - 1)" start="12" end="20" type="uint" />
   </register>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
index 5604ded24fd..30b0e66c205 100644
--- a/src/intel/genxml/gen7.xml
+++ b/src/intel/genxml/gen7.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="IVB" gen="7">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -3808,4 +3808,4 @@
   <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
     <field name="VS Invocation Count Report" start="0" end="63" type="uint" />
   </register>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
index e44f588167e..27f67336b5b 100644
--- a/src/intel/genxml/gen75.xml
+++ b/src/intel/genxml/gen75.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="HSW" gen="7.5">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -4247,4 +4247,4 @@
   <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
     <field name="VS Invocation Count Report" start="0" end="63" type="uint" />
   </register>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
index 6b449c75687..139729eea9f 100644
--- a/src/intel/genxml/gen8.xml
+++ b/src/intel/genxml/gen8.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="BDW" gen="8">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -4744,4 +4744,4 @@
   <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
     <field name="VS Invocation Count Report" start="0" end="63" type="uint" />
   </register>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index b6fb5ddce97..0433af00853 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="SKL" gen="9">
   <enum name="3D_Color_Buffer_Blend_Factor" prefix="BLENDFACTOR">
     <value name="ONE" value="1" />
@@ -6541,4 +6541,4 @@
   <register name="VS_INVOCATION_COUNT" length="2" num="0x2320">
     <field name="VS Invocation Count Report" start="0" end="63" type="uint" />
   </register>
-</genxml>
+</genxml>
\ No newline at end of file
diff --git a/src/intel/genxml/gen_rt.xml b/src/intel/genxml/gen_rt.xml
index c56c3962a73..ddb23a932ac 100644
--- a/src/intel/genxml/gen_rt.xml
+++ b/src/intel/genxml/gen_rt.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?>
+<?xml version='1.0' encoding='utf-8'?>
 <genxml name="RT" gen="">
   <struct name="BINDLESS_SHADER_RECORD" length="2">
     <field name="Offset To Local Arguments" start="0" end="2" type="uint" />
@@ -171,4 +171,4 @@
     <field name="Closest Hit" start="0" end="63" type="BINDLESS_SHADER_RECORD" />
     <field name="Any Hit" start="64" end="127" type="BINDLESS_SHADER_RECORD" />
   </struct>
-</genxml>
+</genxml>
\ No newline at end of file