anv,hasvk,genxml: Rename genxml files using verx10

It could be confusing that a newer platform named with a smaller
number than a half-generation of an older platform like 'gfx20' and
'gfx75' in xml files.

Down the road, it can be a little worse once we pass something like
'gfx40' when there is already a gfx45.xml for the oldest platform.

Unify naming xml files with verx10 numbers to resolve the issue.

Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31943>

src/intel/genxml/README

@@ -76,3 +76,6 @@ Keeping genxml files tidy :
 
       3) Sort <struct> tags by dependency so that other scripts have
          everything properly ordered.
+
+   As a convention, a genxml file name includes its version number multiplied
+   by 10 (verx10).

src/intel/genxml/gen110.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="ICL" gen="11">
-  <import name="gen9.xml">
+  <import name="gen90.xml">
     <exclude name="ACTHD_UDW" />
     <exclude name="BCS_ACTHD_UDW" />
     <exclude name="BCS_RING_BUFFER_CTL" />

src/intel/genxml/gen120.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="TGL" gen="12">
-  <import name="gen11.xml">
+  <import name="gen110.xml">
     <exclude name="3DSTATE_CPS" />
     <exclude name="L3CNTLREG" />
     <exclude name="PERFCNT1" />

src/intel/genxml/gen125.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="GFX125" gen="12.5">
-  <import name="gen12.xml">
+  <import name="gen120.xml">
     <exclude name="3D_CHICKEN3" />
     <exclude name="GPGPU_WALKER" />
     <exclude name="GT_MODE" />

src/intel/genxml/gen300.xml

@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="XE3" gen="30">
-  <import name="gen20.xml" />
+  <import name="gen200.xml" />
 </genxml>

src/intel/genxml/gen300_rt.xml

@@ -1,4 +1,4 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="RT" gen="30">
-  <import name="gen20_rt.xml" />
+  <import name="gen200_rt.xml" />
 </genxml>

src/intel/genxml/gen45.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="CTG" gen="4.5">
-  <import name="gen4.xml" />
+  <import name="gen40.xml" />
   <struct name="CLIP_STATE" length="11">
     <field name="GRF Register Count" start="1" end="3" type="uint" />
     <field name="Kernel Start Pointer" start="6" end="31" type="address" />

src/intel/genxml/gen60.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="SNB" gen="6">
-  <import name="gen5.xml">
+  <import name="gen50.xml">
     <exclude name="3DSTATE_CONSTANT_COLOR" />
     <exclude name="3DSTATE_GLOBAL_DEPTH_OFFSET_CLAMP" />
     <exclude name="3DSTATE_PIPELINED_POINTERS" />

src/intel/genxml/gen70.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="IVB" gen="7">
-  <import name="gen6.xml">
+  <import name="gen60.xml">
     <exclude name="3DSTATE_BINDING_TABLE_POINTERS" />
     <exclude name="3DSTATE_GS_SVB_INDEX" />
     <exclude name="3DSTATE_SAMPLER_STATE_POINTERS" />

src/intel/genxml/gen75.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="HSW" gen="7.5">
-  <import name="gen7.xml" />
+  <import name="gen70.xml" />
   <enum name="Shader Channel Select" prefix="SCS">
     <value name="ZERO" value="0" />
     <value name="ONE" value="1" />

src/intel/genxml/gen90.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <genxml name="SKL" gen="9">
-  <import name="gen8.xml">
+  <import name="gen80.xml">
     <exclude name="Clear Color" />
     <exclude name="INSTPM" />
     <exclude name="MEMORY_OBJECT_CONTROL_STATE" />

src/intel/genxml/genX_cl_pack.h

@@ -10,31 +10,31 @@
 #endif
 
 #if (GFX_VERx10 == 40)
-#  include "genxml/gen4_cl_pack.h"
+#  include "genxml/gen40_cl_pack.h"
 #elif (GFX_VERx10 == 45)
 #  include "genxml/gen45_cl_pack.h"
 #elif (GFX_VERx10 == 50)
-#  include "genxml/gen5_cl_pack.h"
+#  include "genxml/gen50_cl_pack.h"
 #elif (GFX_VERx10 == 60)
-#  include "genxml/gen6_cl_pack.h"
+#  include "genxml/gen60_cl_pack.h"
 #elif (GFX_VERx10 == 70)
-#  include "genxml/gen7_cl_pack.h"
+#  include "genxml/gen70_cl_pack.h"
 #elif (GFX_VERx10 == 75)
 #  include "genxml/gen75_cl_pack.h"
 #elif (GFX_VERx10 == 80)
-#  include "genxml/gen8_cl_pack.h"
+#  include "genxml/gen80_cl_pack.h"
 #elif (GFX_VERx10 == 90)
-#  include "genxml/gen9_cl_pack.h"
+#  include "genxml/gen90_cl_pack.h"
 #elif (GFX_VERx10 == 110)
-#  include "genxml/gen11_cl_pack.h"
+#  include "genxml/gen110_cl_pack.h"
 #elif (GFX_VERx10 == 120)
-#  include "genxml/gen12_cl_pack.h"
+#  include "genxml/gen120_cl_pack.h"
 #elif (GFX_VERx10 == 125)
 #  include "genxml/gen125_cl_pack.h"
 #elif (GFX_VERx10 == 200)
-#  include "genxml/gen20_cl_pack.h"
+#  include "genxml/gen200_cl_pack.h"
 #elif (GFX_VERx10 == 300)
-#  include "genxml/gen30_cl_pack.h"
+#  include "genxml/gen300_cl_pack.h"
 #else
 #  error "Need to add a pack header include for this gen"
 #endif

src/intel/genxml/genX_pack.h

@@ -29,31 +29,31 @@
 #endif
 
 #if (GFX_VERx10 == 40)
-#  include "genxml/gen4_pack.h"
+#  include "genxml/gen40_pack.h"
 #elif (GFX_VERx10 == 45)
 #  include "genxml/gen45_pack.h"
 #elif (GFX_VERx10 == 50)
-#  include "genxml/gen5_pack.h"
+#  include "genxml/gen50_pack.h"
 #elif (GFX_VERx10 == 60)
-#  include "genxml/gen6_pack.h"
+#  include "genxml/gen60_pack.h"
 #elif (GFX_VERx10 == 70)
-#  include "genxml/gen7_pack.h"
+#  include "genxml/gen70_pack.h"
 #elif (GFX_VERx10 == 75)
 #  include "genxml/gen75_pack.h"
 #elif (GFX_VERx10 == 80)
-#  include "genxml/gen8_pack.h"
+#  include "genxml/gen80_pack.h"
 #elif (GFX_VERx10 == 90)
-#  include "genxml/gen9_pack.h"
+#  include "genxml/gen90_pack.h"
 #elif (GFX_VERx10 == 110)
-#  include "genxml/gen11_pack.h"
+#  include "genxml/gen110_pack.h"
 #elif (GFX_VERx10 == 120)
-#  include "genxml/gen12_pack.h"
+#  include "genxml/gen120_pack.h"
 #elif (GFX_VERx10 == 125)
 #  include "genxml/gen125_pack.h"
 #elif (GFX_VERx10 == 200)
-#  include "genxml/gen20_pack.h"
+#  include "genxml/gen200_pack.h"
 #elif (GFX_VERx10 == 300)
-#  include "genxml/gen30_pack.h"
+#  include "genxml/gen300_pack.h"
 #else
 #  error "Need to add a pack header include for this gen"
 #endif

src/intel/genxml/genX_rt_pack.h

@@ -51,9 +51,9 @@
 #elif (GFX_VERx10 == 125)
 #  include "genxml/gen125_rt_pack.h"
 #elif (GFX_VERx10 == 200)
-#  include "genxml/gen20_rt_pack.h"
+#  include "genxml/gen200_rt_pack.h"
 #elif (GFX_VERx10 == 300)
-#  include "genxml/gen30_rt_pack.h"
+#  include "genxml/gen300_rt_pack.h"
 #else
 #  error "Need to add a pack header include for this gen"
 #endif

src/intel/genxml/intel_genxml.py

@@ -181,21 +181,21 @@ def sort_xml(xml: et.ElementTree) -> None:
 # (genxml_import.py uses GenXml.add_xml_imports, which relies on
 # `default_imports`.)
 default_imports = OrderedDict([
-    ('gen4.xml', ()),
-    ('gen45.xml', ('gen4.xml',)),
-    ('gen5.xml', ('gen45.xml',)),
-    ('gen6.xml', ('gen5.xml',)),
-    ('gen7.xml', ('gen6.xml',)),
-    ('gen75.xml', ('gen7.xml',)),
-    ('gen8.xml', ('gen75.xml',)),
-    ('gen9.xml', ('gen8.xml',)),
-    ('gen11.xml', ('gen9.xml',)),
-    ('gen12.xml', ('gen11.xml',)),
-    ('gen125.xml', ('gen12.xml',)),
-    ('gen20.xml', ('gen125.xml',)),
-    ('gen20_rt.xml', ('gen125_rt.xml',)),
-    ('gen30.xml', ('gen20.xml',)),
-    ('gen30_rt.xml', ('gen20_rt.xml',)),
+    ('gen40.xml', ()),
+    ('gen45.xml', ('gen40.xml',)),
+    ('gen50.xml', ('gen45.xml',)),
+    ('gen60.xml', ('gen50.xml',)),
+    ('gen70.xml', ('gen60.xml',)),
+    ('gen75.xml', ('gen70.xml',)),
+    ('gen80.xml', ('gen75.xml',)),
+    ('gen90.xml', ('gen80.xml',)),
+    ('gen110.xml', ('gen90.xml',)),
+    ('gen120.xml', ('gen110.xml',)),
+    ('gen125.xml', ('gen120.xml',)),
+    ('gen200.xml', ('gen125.xml',)),
+    ('gen200_rt.xml', ('gen125_rt.xml',)),
+    ('gen300.xml', ('gen200.xml',)),
+    ('gen300_rt.xml', ('gen200_rt.xml',)),
     ])
 known_genxml_files = list(default_imports.keys())
 

src/intel/genxml/meson.build

@@ -2,25 +2,25 @@
 # SPDX-License-Identifier: MIT
 
 gen_xml_files = [
-  'gen4.xml',
+  'gen40.xml',
   'gen45.xml',
-  'gen5.xml',
-  'gen6.xml',
-  'gen7.xml',
+  'gen50.xml',
+  'gen60.xml',
+  'gen70.xml',
   'gen75.xml',
-  'gen8.xml',
-  'gen9.xml',
-  'gen11.xml',
-  'gen12.xml',
+  'gen80.xml',
+  'gen90.xml',
+  'gen110.xml',
+  'gen120.xml',
   'gen125.xml',
-  'gen20.xml',
-  'gen30.xml',
+  'gen200.xml',
+  'gen300.xml',
 ]
 
 gen_xml_rt_files = [
   'gen125_rt.xml',
-  'gen20_rt.xml',
-  'gen30_rt.xml',
+  'gen200_rt.xml',
+  'gen300_rt.xml',
 ]
 
 gen_pack_header_deps = files('intel_genxml.py', 'util.py')

src/intel/vulkan/anv_batch_chain.c

@@ -34,7 +34,7 @@
 
 #include "common/intel_debug_identifier.h"
 
-#include "genxml/gen9_pack.h"
+#include "genxml/gen90_pack.h"
 #include "genxml/genX_bits.h"
 
 #include "util/perf/u_trace.h"

src/intel/vulkan/anv_blorp.c

@@ -22,7 +22,7 @@
  */
 
 #include "anv_private.h"
-#include "genxml/gen8_pack.h"
+#include "genxml/gen80_pack.h"
 
 static bool
 lookup_blorp_shader(struct blorp_batch *batch,

src/intel/vulkan/anv_device.c

@@ -50,7 +50,7 @@
 #include "i915/anv_device.h"
 #include "xe/anv_device.h"
 
-#include "genxml/gen7_pack.h"
+#include "genxml/gen70_pack.h"
 #include "genxml/genX_bits.h"
 
 static void

src/intel/vulkan/anv_utrace.c

@@ -26,7 +26,7 @@
 
 #include "common/intel_debug_identifier.h"
 #include "ds/intel_tracepoints.h"
-#include "genxml/gen9_pack.h"
+#include "genxml/gen90_pack.h"
 #include "perf/intel_perf.h"
 #include "util/perf/cpu_trace.h"
 

src/intel/vulkan_hasvk/anv_batch_chain.c

@@ -34,7 +34,7 @@
 
 #include "common/intel_debug_identifier.h"
 
-#include "genxml/gen8_pack.h"
+#include "genxml/gen80_pack.h"
 #include "genxml/genX_bits.h"
 #include "perf/intel_perf.h"
 

src/intel/vulkan_hasvk/anv_device.c

@@ -59,7 +59,7 @@
 #include "common/intel_uuid.h"
 #include "perf/intel_perf.h"
 
-#include "genxml/gen7_pack.h"
+#include "genxml/gen70_pack.h"
 #include "genxml/genX_bits.h"
 
 static const driOptionDescription anv_dri_options[] = {