From 38172dcba9b2d9f6c51052c5a30ac68a0d3fe755 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Wed, 27 Jun 2018 11:21:34 -0700 Subject: [PATCH] v3d: Merge the V3D 4.1 and 4.2 XML into V3D 3.3'x XML. The XML ends up noisier if you're only looking at one version, but from the diffstat there's obvious wins in terms of deduplication. This will get even more significant if we ever support 3.2 or 4.0. --- src/broadcom/Android.genxml.mk | 8 +- src/broadcom/Makefile.genxml.am | 16 +- src/broadcom/Makefile.sources | 2 - src/broadcom/cle/meson.build | 21 +- src/broadcom/cle/v3d_packet_v33.xml | 606 ++++++++++++++- src/broadcom/cle/v3d_packet_v41.xml | 1057 -------------------------- src/broadcom/cle/v3d_packet_v42.xml | 1059 --------------------------- 7 files changed, 607 insertions(+), 2162 deletions(-) delete mode 100644 src/broadcom/cle/v3d_packet_v41.xml delete mode 100644 src/broadcom/cle/v3d_packet_v42.xml diff --git a/src/broadcom/Android.genxml.mk b/src/broadcom/Android.genxml.mk index 908569fcc76..eb5d142fe09 100644 --- a/src/broadcom/Android.genxml.mk +++ b/src/broadcom/Android.genxml.mk @@ -58,15 +58,15 @@ $(intermediates)/broadcom/cle/v3d_packet_v33_pack.h: $(LOCAL_PATH)/cle/v3d_packe $(call header-gen) $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py -$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v41.xml +$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: PRIVATE_VER := 41 -$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v41.xml $(LOCAL_PATH)/cle/gen_pack_header.py +$(intermediates)/broadcom/cle/v3d_packet_v41_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py $(call header-gen) $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/cle/gen_pack_header.py -$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v42.xml +$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_XML := $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: PRIVATE_VER := 42 -$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v42.xml $(LOCAL_PATH)/cle/gen_pack_header.py +$(intermediates)/broadcom/cle/v3d_packet_v42_pack.h: $(LOCAL_PATH)/cle/v3d_packet_v33.xml $(LOCAL_PATH)/cle/gen_pack_header.py $(call header-gen) $(intermediates)/broadcom/cle/v3d_xml.h: $(addprefix $(MESA_TOP)/src/broadcom/,$(BROADCOM_GENXML_XML_FILES)) $(MESA_TOP)/src/intel/genxml/gen_zipped_file.py diff --git a/src/broadcom/Makefile.genxml.am b/src/broadcom/Makefile.genxml.am index 7949bf6f705..8828207d2aa 100644 --- a/src/broadcom/Makefile.genxml.am +++ b/src/broadcom/Makefile.genxml.am @@ -28,9 +28,21 @@ SUFFIXES = _pack.h .xml $(BROADCOM_GENXML_GENERATED_FILES): cle/gen_pack_header.py -.xml_pack.h: +cle/v3d_packet_v21_pack.h: $(srcdir)/cle/v3d_packet_v21.xml $(srcdir)/cle/gen_pack_header.py $(MKDIR_GEN) - $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< `echo $@ | sed -r 's|.*_v([0-9][0-9])_pack.h|\1|g'` > $@ || ($(RM) $@; false) + $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 21 > $@ || ($(RM) $@; false) + +cle/v3d_packet_v33_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 33 > $@ || ($(RM) $@; false) + +cle/v3d_packet_v41_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 41 > $@ || ($(RM) $@; false) + +cle/v3d_packet_v42_pack.h: $(srcdir)/cle/v3d_packet_v33.xml $(srcdir)/cle/gen_pack_header.py + $(MKDIR_GEN) + $(PYTHON_GEN) $(srcdir)/cle/gen_pack_header.py $< 42 > $@ || ($(RM) $@; false) GEN_ZIPPED = $(srcdir)/../intel/genxml/gen_zipped_file.py cle/v3d_xml.h: $(GEN_ZIPPED) $(BROADCOM_GENXML_XML_FILES) diff --git a/src/broadcom/Makefile.sources b/src/broadcom/Makefile.sources index dc225b939d7..05e4588446a 100644 --- a/src/broadcom/Makefile.sources +++ b/src/broadcom/Makefile.sources @@ -9,8 +9,6 @@ BROADCOM_GENXML_GENERATED_FILES = \ BROADCOM_GENXML_XML_FILES = \ cle/v3d_packet_v21.xml \ cle/v3d_packet_v33.xml \ - cle/v3d_packet_v41.xml \ - cle/v3d_packet_v42.xml \ $() BROADCOM_FILES = \ diff --git a/src/broadcom/cle/meson.build b/src/broadcom/cle/meson.build index a45538c986f..983896737a7 100644 --- a/src/broadcom/cle/meson.build +++ b/src/broadcom/cle/meson.build @@ -18,19 +18,24 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. +# [version, cle XML version] v3d_versions = [ - 21, - 33, - 41, - 42, + [21, 21], + [33, 33], + [41, 33], + [42, 33] ] v3d_xml_files = [] v3d_xml_pack = [] -foreach v : v3d_versions - f = 'v3d_packet_v@0@.xml'.format(v) - _name = '@0@_pack.h'.format(f.split('.')[0]) - v3d_xml_files += f +foreach _v : v3d_versions + v = _v[0] + xmlver = _v[1] + f = 'v3d_packet_v@0@.xml'.format(xmlver) + _name = 'v3d_packet_v@0@_pack.h'.format(v) + if not v3d_xml_files.contains(f) + v3d_xml_files += f + endif v3d_xml_pack += custom_target( _name, input : ['gen_pack_header.py', f], diff --git a/src/broadcom/cle/v3d_packet_v33.xml b/src/broadcom/cle/v3d_packet_v33.xml index 2e112f4bac3..5fa5ddd530b 100644 --- a/src/broadcom/cle/v3d_packet_v33.xml +++ b/src/broadcom/cle/v3d_packet_v33.xml @@ -1,4 +1,4 @@ - + @@ -69,7 +69,7 @@ - + @@ -92,6 +92,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -138,6 +168,13 @@ + + + + + + + @@ -244,9 +287,9 @@ - + - + @@ -258,15 +301,22 @@ - + + + + + + + + - + @@ -287,7 +337,41 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -304,7 +388,38 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -320,7 +435,22 @@ - + + + + + + + + + + + + + + + + @@ -336,6 +466,21 @@ + + + + + + + + + + + + + + + @@ -357,6 +502,11 @@ + + + + + @@ -374,11 +524,22 @@ - + + + + + + + + + + + + @@ -403,8 +564,23 @@ - + + + + + + + + + + + + + + + + @@ -428,6 +604,20 @@ + + + + + + + + + + + + + + @@ -461,6 +651,15 @@ + + + + + + + + + @@ -469,7 +668,14 @@ - + + + + + + + + @@ -482,11 +688,18 @@ - + + + + + + + + @@ -502,7 +715,11 @@ - + + + + + @@ -528,14 +745,42 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -564,7 +809,33 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -586,7 +857,30 @@ - + + + + + + + + + + + + + + + + + + + + + + + + @@ -605,7 +899,7 @@ - + @@ -614,7 +908,16 @@ - + + + + + + + + + + @@ -623,7 +926,16 @@ - + + + + + + + + + + @@ -632,7 +944,16 @@ - + + + + + + + + + + @@ -643,6 +964,17 @@ + + + + + + + + + + + @@ -680,7 +1012,7 @@ - + @@ -716,7 +1048,111 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -738,6 +1174,7 @@ + @@ -776,7 +1213,7 @@ - + @@ -827,12 +1264,53 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -885,6 +1363,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/broadcom/cle/v3d_packet_v42.xml b/src/broadcom/cle/v3d_packet_v42.xml deleted file mode 100644 index 8bad4c533b6..00000000000 --- a/src/broadcom/cle/v3d_packet_v42.xml +++ /dev/null @@ -1,1059 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- 2.30.2