Features/Meson

From QEMU
Revision as of 14:06, 8 September 2020 by Paolo Bonzini (talk | contribs)

For the rationale behind the conversion and the development notes, see Features/Meson/Design.

Summary of changes

New system requirements
  • GNU Make 3.82
  • Python setuptools
  • Meson 0.55.1 (in order to use the system-wide install).
Source code changes
  • You cannot #include "config-target.h" and "config-devices.h". Instead, you #include CONFIG_TARGET and CONFIG_DEVICES (i.e. filenames are specified via macros; meson.build takes care of defining the macros).
  • .c files (including .inc.c files) cannot be #included. They have been renamed to .c.inc, for consistency with existing .rst.inc files.
  • The name of files produced by decodetree is fixed (the C code for XYZ.decode ends up in decode-XYZ.c.inc).
  • Subdirectories with trace events require a forwarding header file; see hw/scsi/trace.h for an example.
Build layout changes
  • The Makefile is not recursive anymore. You don't make aarch64-softmmu/all or make arm-linux-user/all, you make qemu-system-aarch64 or make qemu-arm.
  • Emulator binaries have moved to the root of the build directory. For now, paths such as cris-softmmu/qemu-system-cris are preserved for backwards compatibility through symlinks (created by configure). They are just a user convenience however. You cannot "rm" them to force a rebuild, for example.
  • Other binaries have moved to the directory where they reside in the source tree. For example, "virtiofsd" has moved to "tools/virtiofsd/virtiofsd".
  • Most binaries are built by default by make all, including several in contrib/ that weren't built before. Currently, vhost-user-blk and rdmacm-mux are not because they fail on 32-bit and big-endian platforms respectively.
  • Sphinx manuals are only built if their constituent files are changed, therefore "make sphinxdocs" will be plenty fast when you've only modified a file or two.
  • Dependencies added to libqemuutil.a will propagate to all programs that link to it. If util/ code has dependencies, it should be conditional on have_system or have_block if applicable (this was a bug in the Makefiles).
  • For bisection: incremental builds across the conversion work fine in the forwards direction. They probably don't work at all backwards across the conversion, so you'll need to throw away your build tree when bisection moves you backwards across the conversion. This is mitigated by the fact that bisection usually starts at a release, and the patches have been applied on top of the 5.1.0 tag.
New conventions
  • New configure options should also be added to meson_options.txt so that dependencies are tested in meson.build rather than configure. How to do so is documented in docs/devel.
Impact to developers
  • If you were already using out-of-tree (VPATH) builds, nothing changes; an incremental pull of these changes should still build.
  • If you are used to in-tree builds, you'll want to do make distclean prior to merging in these changes (if you forget, git will remind you about various trace.h files that still exist as built files in your in-tree build vs. checked-in files post-patch). After that one-time clean, you can then proceed to do ./configure && make as before, but things will now automatically create a subdirectory build/ on your behalf where the actual build is performed.

CI holes

The following issues were _not_ found by GitLab CI:

  • SDL 2.0.8 requires -Wno-undef
  • s390x-softmmu is special for cross-compilation, because it is the only target to use the host C compiler.
  • There is special code in configure to handle a C++ compiler that does not play well with the C compiler.
  • Not all linux-user TCG tests are covered.
  • Big endian platforms are not covered.
  • ARM host platforms are not covered.
  • 32-bit POSIX platforms are not covered.
  • SystemTap is not covered.
  • daxctl is not covered.
  • --disable-tools --enable-system builds are not covered.
  • Peter uses Ubuntu+MXE instead of Fedora-mingw to build cross compilers. docker-test-mingw only works for Fedora and should be made more generic. Also container images for Fedora-mingw should be prepared in the same way as the existing container images for Debian+MXE.

Reported and unfixed bugs

  • meson.build files are missing copyright/license header comments
  • scripts/ninjatool.py is missing license statement

Known issues

  • Meson does not like outputs of custom_target (e.g. tracetool and qapi-gen.py) to be in multiple directories. Right now this is only a problem for the QAPI tests. The plan is to "underscorify" the outputs so that they are all in the same directory.
  • There is one Make issue that might happen when switching branches: if the command line changes, the files are not rebuilt. This is always a problem with Make, but it may become more common now due to the use of statically-linked libraries. One fix in Meson could be to make link_whole use the object files directly.

Easy

Diagnose "make is too old" in configure (or in the makefile?)
In particular OSX system make is too old, so we'll get a lot of confused users there otherwise, because the error message is pretty obscure ("multiple target patterns"). Possibly checking in the makefile itself would be nicer, to catch the situation where the user forgets and runs 'make' when they meant 'gmake'.
Proposal can be found here
Move pkg-config tests to meson.build
Replace declare_dependency statements with dependency statements. This can only be done for dependencies that are not used by tests (or after tests have been converted from Make to Meson).
Benefit: allows removing *_CFLAGS and *_LIBS variables from config-host.mak. Allows using dependency objects instead of CONFIG_* symbols when declaring sourcesets.
Change simple config-host.mak symbols to Meson options
Some symbols (e.g. CONFIG_PARALLELS) are not anymore used in the Makefiles, and are only placed in config-host.mak to be read from Meson. Instead pass them through -D... command-line options
Benefit: allows removing CONFIG_* variables from config-host.mak.

Medium

Include config-target.mak files in the source tree
Remove the configuration loop in configure and just include the content of the .mak files directly in the tree, for example in a target/configs/ directory. (There are some small complications because config-target.mak file currently includes the host disassembler symbols too, e.g. CONFIG_I386_DIS).
Benefit: remove large swaths of imperative code, remove *-linux-user and *-softmmu directories from the build tree.
Move other compile tests from configure to meson.build

Hard(er)

Complete moving build rules to meson.build
Here you can find old patches to convert the build rules in roms/ and pc-bios/
tests/ conversion posted
Create configure help and command line parsing code from meson_options.txt.
Use the output of "meson introspect --buildoptions" to initialize variables, parse command line options, print the help and create -D command line options for meson. PoC here (requires developers to install "jq").
Benefit: remove code duplication, centralize command line handling

TBD

Get rid of ninjatool and just require Ninja
Benefit: 1000 lines of code go away, can use things such as ninja -t clean <TARGET>
Disadvantage: recursive build re-enters through the window

Posted

Relocatable install
Benefit: on Windows only /usr/share/qemu is relocatable, everything else (icons etc.) is not. POSIX is currently not relocatable and would get it for free.
Posted

Done

"Handle (faked-up) in-tree build
Benefit: simpler upgrade path
Complete moving installation rules to meson.build
Benefit: allows removing parts of Makefile, leaving it as just an orchestrator for submodules, Makefile.ninja and Makefile.mtest
Complete moving tests/Makefile.include build rules to meson.build
Benefit: allows removing CFLAGS, LDFLAGS, LIBS and LIBS_SOFTMMU, as well as almost all of rules.mak.
Remove pkg-config variables from QEMU_CFLAGS and LIBS
All Meson executables should specify their dependencies explicitly, either directly or indirectly via declare_dependency. Makefiles instead did not propagate dependencies correctly from static libraries, for example. Therefore, flags for dependencies need not be included in QEMU_CFLAGS and LIBS.
Benefit: allows moving pkg-config dependencies to Meson.

Meson changes

Prefix should follow the path scheme of the host machine
(Not needed with relocatable install support)
"links" test with file argument should use the appropriate compiler for the source file
Needed to move C++ compiler detection
environment: use ExternalProgram to find ninja (0.55.2)
Makes --ninja work on Windows.
introspect: add target ids for executable/args/depends to test and benchmark JSON (0.56.0)
More precise dependencies for make check-*
add_global_dependency or dependency::get_compile_args
Needed to move glib detection to Meson.
Retrieved from "https://wiki.qemu.org/index.php?title=Features/Meson&oldid=9725"