yuzu-mirror/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-mirror/unicorn.git synced 2026-04-04 14:07:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include less of the generated modular QAPI headers

Browse source 
In my "build everything" tree, a change to the types in
qapi-schema.json triggers a recompile of about 4800 out of 5100
objects.

The previous commit split up qmp-commands.h, qmp-event.h, qmp-visit.h,
qapi-types.h. Each of these headers still includes all its shards.
Reduce compile time by including just the shards we actually need.

To illustrate the benefits: adding a type to qapi/migration.json now
recompiles some 2300 instead of 4800 objects. The next commit will
improve it further.

Backports commit 9af2398977a78d37bf184d6ff6bd04c72bfbf006 from qemu
This commit is contained in:
Markus Armbruster 2018-03-09 10:00:47 -05:00 • committed by Lioncash
parent fe90858609
commit 5500a5e912
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
9 changed files with 26 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

11
qemu/scripts/qapi/events.py
View file

@ -165,23 +165,26 @@ class QAPISchemaGenEventVisitor(QAPISchemaModularCVisitor):
return basename
def _begin_module(self, name):
types = self._module_basename('qapi-types', name)
visit = self._module_basename('qapi-visit', name)
self._genc.add(mcgen('''
#include "qemu-common.h"
#include "%(prefix)sqapi-event.h"
#include "%(prefix)sqapi-visit.h"
#include "%(visit)s.h"
#include "qapi/error.h"
#include "qapi/qmp/qdict.h"
#include "qapi/qobject-output-visitor.h"
#include "qapi/qmp-event.h"
''',
prefix=self._prefix))
visit=visit, prefix=self._prefix))
self._genh.add(mcgen('''
#include "%(prefix)sqapi-types.h"
/* #include "qapi/util.h" */
#include "%(types)s.h"
''',
prefix=self._prefix))
types=types))
def visit_end(self):
self._genh.add(gen_enum(self._enum_name, self._event_names))

8
qemu/scripts/qapi/types.py
View file

@ -185,13 +185,15 @@ class QAPISchemaGenTypeVisitor(QAPISchemaModularCVisitor):
'''))
def _begin_module(self, name):
types = self._module_basename('qapi-types', name)
visit = self._module_basename('qapi-visit', name)
self._genc.preamble_add(mcgen('''
#include "qemu/osdep.h"
#include "qapi/dealloc-visitor.h"
#include "%(prefix)sqapi-types.h"
#include "%(prefix)sqapi-visit.h"
#include "%(types)s.h"
#include "%(visit)s.h"
''',
prefix=self._prefix))
types=types, visit=visit))
self._genh.preamble_add(mcgen('''
#include "qapi-builtin-types.h"
'''))

10
qemu/scripts/qapi/visit.py
View file

@ -284,20 +284,22 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor):
prefix=prefix))
def _begin_module(self, name):
types = self._module_basename('qapi-types', name)
visit = self._module_basename('qapi-visit', name)
self._genc.preamble_add(mcgen('''
#include "qemu/osdep.h"
#include "qemu-common.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
#include "%(prefix)sqapi-visit.h"
#include "%(visit)s.h"
''',
prefix=self._prefix))
visit=visit, prefix=self._prefix))
self._genh.preamble_add(mcgen('''
#include "qapi-builtin-visit.h"
#include "%(prefix)sqapi-types.h"
#include "%(types)s.h"
''',
prefix=self._prefix))
types=types))
def visit_enum_type(self, name, info, values, prefix):
self._genh.add(gen_visit_decl(name, scalar=True))