[PATCH v2 0/3] single-binary: compile some top level files once

[PATCH v2 0/3] single-binary: compile some top level files once

[Pierrick Bouvier]

We still have some files left on top files that are compiled per target. Start
with the ones included in this series.

v2
--

- rebase cleanly on top of master
- remove empty page-target.c file

Pierrick Bouvier (3):
  cpu-target: build compilation unit once for user/system
  include/exec/target_page.h: move page-target.c to header
  system/main.c: compile only once

 meson.build                |  9 +++++----
 include/exec/target_page.h | 11 ++++++++++-
 cpu-target.c               |  5 -----
 page-target.c              | 21 ---------------------
 target-info-stub.c         |  4 ++++
 system/meson.build         |  1 +
 6 files changed, 20 insertions(+), 31 deletions(-)
 delete mode 100644 page-target.c

-- 
2.47.2

[PATCH v2 1/3] cpu-target: build compilation unit once for user/system

[Pierrick Bouvier]

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 meson.build        | 3 ++-
 cpu-target.c       | 5 -----
 target-info-stub.c | 4 ++++
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meson.build b/meson.build
index e53cd5b4138..218a9ad203e 100644
--- a/meson.build
+++ b/meson.build
@@ -3874,7 +3874,8 @@ if have_block
 endif
 
 common_ss.add(files('cpu-common.c'))
-specific_ss.add(files('cpu-target.c'))
+user_ss.add(files('cpu-target.c'))
+system_ss.add(files('cpu-target.c'))
 
 subdir('system')
 
diff --git a/cpu-target.c b/cpu-target.c
index 772e35495b8..f030e2c642e 100644
--- a/cpu-target.c
+++ b/cpu-target.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "cpu.h"
 #include "accel/accel-cpu-ops.h"
 #include "system/cpus.h"
 #include "exec/cpu-common.h"
@@ -27,10 +26,6 @@
 #include "hw/core/cpu.h"
 #include "trace/trace-root.h"
 
-/* Validate correct placement of CPUArchState. */
-QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) != 0);
-QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) != sizeof(CPUState));
-
 /* enable or disable single step mode. EXCP_DEBUG is returned by the
    CPU loop after each instruction */
 void cpu_single_step(CPUState *cpu, int enabled)
diff --git a/target-info-stub.c b/target-info-stub.c
index ca0caa3686c..d96d8249c1d 100644
--- a/target-info-stub.c
+++ b/target-info-stub.c
@@ -12,6 +12,10 @@
 #include "hw/boards.h"
 #include "cpu.h"
 
+/* Validate correct placement of CPUArchState. */
+QEMU_BUILD_BUG_ON(offsetof(ArchCPU, parent_obj) != 0);
+QEMU_BUILD_BUG_ON(offsetof(ArchCPU, env) != sizeof(CPUState));
+
 static const TargetInfo target_info_stub = {
     .target_name = TARGET_NAME,
     .target_arch = SYS_EMU_TARGET__MAX,
-- 
2.47.2

[PATCH v2 2/3] include/exec/target_page.h: move page-target.c to header

[Pierrick Bouvier]

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 meson.build                |  2 +-
 include/exec/target_page.h | 11 ++++++++++-
 page-target.c              | 21 ---------------------
 3 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 page-target.c

diff --git a/meson.build b/meson.build
index 218a9ad203e..f94209bb301 100644
--- a/meson.build
+++ b/meson.build
@@ -3897,7 +3897,7 @@ if get_option('b_lto')
   pagevary = declare_dependency(link_with: pagevary)
 endif
 common_ss.add(pagevary)
-specific_ss.add(files('page-target.c', 'page-vary-target.c'))
+specific_ss.add(files('page-vary-target.c'))
 
 common_ss.add(files('target-info.c'))
 specific_ss.add(files('target-info-stub.c'))
diff --git a/include/exec/target_page.h b/include/exec/target_page.h
index ca0ebbc8bbd..813591c9b51 100644
--- a/include/exec/target_page.h
+++ b/include/exec/target_page.h
@@ -62,6 +62,15 @@ static inline int qemu_target_page_bits(void)
     return TARGET_PAGE_BITS;
 }
 
-size_t qemu_target_pages_to_MiB(size_t pages);
+/* Convert target pages to MiB (2**20). */
+static inline size_t qemu_target_pages_to_MiB(size_t pages)
+{
+    int page_bits = TARGET_PAGE_BITS;
+
+    /* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */
+    g_assert(page_bits < 20);
+
+    return pages >> (20 - page_bits);
+}
 
 #endif
diff --git a/page-target.c b/page-target.c
deleted file mode 100644
index 8fcd5443b52..00000000000
--- a/page-target.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * QEMU page values getters (target independent)
- *
- *  Copyright (c) 2003 Fabrice Bellard
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include "qemu/osdep.h"
-#include "exec/target_page.h"
-
-/* Convert target pages to MiB (2**20). */
-size_t qemu_target_pages_to_MiB(size_t pages)
-{
-    int page_bits = TARGET_PAGE_BITS;
-
-    /* So far, the largest (non-huge) page size is 64k, i.e. 16 bits. */
-    g_assert(page_bits < 20);
-
-    return pages >> (20 - page_bits);
-}
-- 
2.47.2

[PATCH v2 3/3] system/main.c: compile only once

[Pierrick Bouvier]

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
---
 meson.build        | 4 ++--
 system/meson.build | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index f94209bb301..b72d4ce8618 100644
--- a/meson.build
+++ b/meson.build
@@ -4420,14 +4420,14 @@ foreach target : target_dirs
     execs = [{
       'name': 'qemu-system-' + target_name,
       'win_subsystem': 'console',
-      'sources': files('system/main.c'),
+      'sources': [],
       'dependencies': [sdl]
     }]
     if host_os == 'windows' and (sdl.found() or gtk.found())
       execs += [{
         'name': 'qemu-system-' + target_name + 'w',
         'win_subsystem': 'windows',
-        'sources': files('system/main.c'),
+        'sources': [],
         'dependencies': [sdl]
       }]
     endif
diff --git a/system/meson.build b/system/meson.build
index 6d21ff9faa7..f358c2c446d 100644
--- a/system/meson.build
+++ b/system/meson.build
@@ -18,6 +18,7 @@ system_ss.add(files(
   'globals.c',
   'ioport.c',
   'ram-block-attributes.c',
+  'main.c',
   'memory_mapping.c',
   'memory.c',
   'physmem.c',
-- 
2.47.2

Re: [PATCH v2 0/3] single-binary: compile some top level files once

[Pierrick Bouvier]

On 2025-07-30 15:05, Pierrick Bouvier wrote:
> We still have some files left on top files that are compiled per target. Start
> with the ones included in this series.
> 
> v2
> --
> 
> - rebase cleanly on top of master
> - remove empty page-target.c file
> 
> Pierrick Bouvier (3):
>    cpu-target: build compilation unit once for user/system
>    include/exec/target_page.h: move page-target.c to header
>    system/main.c: compile only once
> 
>   meson.build                |  9 +++++----
>   include/exec/target_page.h | 11 ++++++++++-
>   cpu-target.c               |  5 -----
>   page-target.c              | 21 ---------------------
>   target-info-stub.c         |  4 ++++
>   system/meson.build         |  1 +
>   6 files changed, 20 insertions(+), 31 deletions(-)
>   delete mode 100644 page-target.c
> 

Ping on this series.
I'll be out next week, but it should be ready to be pulled once the 
trunk reopens.

Regards,
Pierrick

Re: [PATCH v2 0/3] single-binary: compile some top level files once

[Philippe Mathieu-Daudé]

On 31/7/25 00:05, Pierrick Bouvier wrote:
> We still have some files left on top files that are compiled per target. Start
> with the ones included in this series.


> Pierrick Bouvier (3):
>    cpu-target: build compilation unit once for user/system
>    include/exec/target_page.h: move page-target.c to header
>    system/main.c: compile only once

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>

and queued, thanks!

Re: [PATCH v2 3/3] system/main.c: compile only once

[Philippe Mathieu-Daudé]

Hi,

On 31/7/25 00:05, Pierrick Bouvier wrote:
> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
> ---
>   meson.build        | 4 ++--
>   system/meson.build | 1 +
>   2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/meson.build b/meson.build
> index f94209bb301..b72d4ce8618 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -4420,14 +4420,14 @@ foreach target : target_dirs
>       execs = [{
>         'name': 'qemu-system-' + target_name,
>         'win_subsystem': 'console',
> -      'sources': files('system/main.c'),
> +      'sources': [],
>         'dependencies': [sdl]
>       }]
>       if host_os == 'windows' and (sdl.found() or gtk.found())
>         execs += [{
>           'name': 'qemu-system-' + target_name + 'w',
>           'win_subsystem': 'windows',
> -        'sources': files('system/main.c'),
> +        'sources': [],
>           'dependencies': [sdl]
>         }]
>       endif
> diff --git a/system/meson.build b/system/meson.build
> index 6d21ff9faa7..f358c2c446d 100644
> --- a/system/meson.build
> +++ b/system/meson.build
> @@ -18,6 +18,7 @@ system_ss.add(files(
>     'globals.c',
>     'ioport.c',
>     'ram-block-attributes.c',
> +  'main.c',
>     'memory_mapping.c',
>     'memory.c',
>     'physmem.c',

This makes the build-oss-fuzz job to fail:

FAILED: qemu-fuzz-i386
clang -m64 @qemu-fuzz-i386.rsp
/usr/bin/ld: libsystem.a.p/system_main.c.o: in function `main':
/builds/philmd/qemu/build-oss-fuzz/../system/main.c:70: multiple 
definition of `main'; 
/usr/bin/../lib/clang/18/lib/x86_64-redhat-linux-gnu/libclang_rt.fuzzer.a(FuzzerMain.cpp.o):(.text+0x0): 
first defined here
/usr/bin/ld: qemu-fuzz-i386.p/tests_qtest_fuzz_fuzz.c.o:(.bss+0x0): 
multiple definition of `__odr_asan_gen_qemu_main'; 
libsystem.a.p/system_main.c.o:(.bss+0x0): first defined here
clang: error: linker command failed with exit code 1 (use -v to see 
invocation)
ninja: build stopped: subcommand failed.
make: *** [Makefile:168: run-ninja] Error 1
Error : Build failed. Please specify a compiler with fuzzing support 
using the $CC and $CXX environment variables \nFor example: CC=clang 
CXX=clang++ ./scripts/oss-fuzz/build.sh, exiting.

https://gitlab.com/philmd/qemu/-/jobs/11205571060

Re: [PATCH v2 3/3] system/main.c: compile only once

[Philippe Mathieu-Daudé]

On 1/9/25 17:07, Philippe Mathieu-Daudé wrote:
> Hi,
> 
> On 31/7/25 00:05, Pierrick Bouvier wrote:
>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>> ---
>>   meson.build        | 4 ++--
>>   system/meson.build | 1 +
>>   2 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/meson.build b/meson.build
>> index f94209bb301..b72d4ce8618 100644
>> --- a/meson.build
>> +++ b/meson.build
>> @@ -4420,14 +4420,14 @@ foreach target : target_dirs
>>       execs = [{
>>         'name': 'qemu-system-' + target_name,
>>         'win_subsystem': 'console',
>> -      'sources': files('system/main.c'),
>> +      'sources': [],
>>         'dependencies': [sdl]
>>       }]
>>       if host_os == 'windows' and (sdl.found() or gtk.found())
>>         execs += [{
>>           'name': 'qemu-system-' + target_name + 'w',
>>           'win_subsystem': 'windows',
>> -        'sources': files('system/main.c'),
>> +        'sources': [],
>>           'dependencies': [sdl]
>>         }]
>>       endif
>> diff --git a/system/meson.build b/system/meson.build
>> index 6d21ff9faa7..f358c2c446d 100644
>> --- a/system/meson.build
>> +++ b/system/meson.build
>> @@ -18,6 +18,7 @@ system_ss.add(files(
>>     'globals.c',
>>     'ioport.c',
>>     'ram-block-attributes.c',
>> +  'main.c',
>>     'memory_mapping.c',
>>     'memory.c',
>>     'physmem.c',
> 
> This makes the build-oss-fuzz job to fail:
> 
> FAILED: qemu-fuzz-i386
> clang -m64 @qemu-fuzz-i386.rsp
> /usr/bin/ld: libsystem.a.p/system_main.c.o: in function `main':
> /builds/philmd/qemu/build-oss-fuzz/../system/main.c:70: multiple 
> definition of `main'; /usr/bin/../lib/clang/18/lib/x86_64-redhat-linux- 
> gnu/libclang_rt.fuzzer.a(FuzzerMain.cpp.o):(.text+0x0): first defined here
> /usr/bin/ld: qemu-fuzz-i386.p/tests_qtest_fuzz_fuzz.c.o:(.bss+0x0): 
> multiple definition of `__odr_asan_gen_qemu_main'; libsystem.a.p/ 
> system_main.c.o:(.bss+0x0): first defined here
> clang: error: linker command failed with exit code 1 (use -v to see 
> invocation)
> ninja: build stopped: subcommand failed.
> make: *** [Makefile:168: run-ninja] Error 1
> Error : Build failed. Please specify a compiler with fuzzing support 
> using the $CC and $CXX environment variables \nFor example: CC=clang 
> CXX=clang++ ./scripts/oss-fuzz/build.sh, exiting.
> 
> https://gitlab.com/philmd/qemu/-/jobs/11205571060

FYI I'm dropping this single patch from my queue (but keeping the
other two).

Re: [PATCH v2 3/3] system/main.c: compile only once

[Pierrick Bouvier]

On 2025-09-01 22:51, Philippe Mathieu-Daudé wrote:
> On 1/9/25 17:07, Philippe Mathieu-Daudé wrote:
>> Hi,
>>
>> On 31/7/25 00:05, Pierrick Bouvier wrote:
>>> Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
>>> Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
>>> ---
>>>    meson.build        | 4 ++--
>>>    system/meson.build | 1 +
>>>    2 files changed, 3 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/meson.build b/meson.build
>>> index f94209bb301..b72d4ce8618 100644
>>> --- a/meson.build
>>> +++ b/meson.build
>>> @@ -4420,14 +4420,14 @@ foreach target : target_dirs
>>>        execs = [{
>>>          'name': 'qemu-system-' + target_name,
>>>          'win_subsystem': 'console',
>>> -      'sources': files('system/main.c'),
>>> +      'sources': [],
>>>          'dependencies': [sdl]
>>>        }]
>>>        if host_os == 'windows' and (sdl.found() or gtk.found())
>>>          execs += [{
>>>            'name': 'qemu-system-' + target_name + 'w',
>>>            'win_subsystem': 'windows',
>>> -        'sources': files('system/main.c'),
>>> +        'sources': [],
>>>            'dependencies': [sdl]
>>>          }]
>>>        endif
>>> diff --git a/system/meson.build b/system/meson.build
>>> index 6d21ff9faa7..f358c2c446d 100644
>>> --- a/system/meson.build
>>> +++ b/system/meson.build
>>> @@ -18,6 +18,7 @@ system_ss.add(files(
>>>      'globals.c',
>>>      'ioport.c',
>>>      'ram-block-attributes.c',
>>> +  'main.c',
>>>      'memory_mapping.c',
>>>      'memory.c',
>>>      'physmem.c',
>>
>> This makes the build-oss-fuzz job to fail:
>>
>> FAILED: qemu-fuzz-i386
>> clang -m64 @qemu-fuzz-i386.rsp
>> /usr/bin/ld: libsystem.a.p/system_main.c.o: in function `main':
>> /builds/philmd/qemu/build-oss-fuzz/../system/main.c:70: multiple
>> definition of `main'; /usr/bin/../lib/clang/18/lib/x86_64-redhat-linux-
>> gnu/libclang_rt.fuzzer.a(FuzzerMain.cpp.o):(.text+0x0): first defined here
>> /usr/bin/ld: qemu-fuzz-i386.p/tests_qtest_fuzz_fuzz.c.o:(.bss+0x0):
>> multiple definition of `__odr_asan_gen_qemu_main'; libsystem.a.p/
>> system_main.c.o:(.bss+0x0): first defined here
>> clang: error: linker command failed with exit code 1 (use -v to see
>> invocation)
>> ninja: build stopped: subcommand failed.
>> make: *** [Makefile:168: run-ninja] Error 1
>> Error : Build failed. Please specify a compiler with fuzzing support
>> using the $CC and $CXX environment variables \nFor example: CC=clang
>> CXX=clang++ ./scripts/oss-fuzz/build.sh, exiting.
>>
>> https://gitlab.com/philmd/qemu/-/jobs/11205571060
> 
> FYI I'm dropping this single patch from my queue (but keeping the
> other two).
> 

Thanks, you did well.
Nothing critical on this specific patch.