1. Patchew
  2. QEMU
  3. [PATCH 0/8] hexagon system emu, part 3/3
  4. View patch

[PATCH 6/8] target/hexagon: add build config for softmmu

Brian Cain posted 8 patches 3 days, 9 hours ago
[PATCH 6/8] target/hexagon: add build config for softmmu
Posted by Brian Cain 3 days, 9 hours ago 
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
 MAINTAINERS                                 | 1 +
 configs/devices/hexagon-softmmu/default.mak | 7 +++++++
 configs/targets/hexagon-softmmu.mak         | 6 ++++++
 target/Kconfig                              | 1 +
 target/hexagon/Kconfig                      | 2 ++
 target/hexagon/meson.build                  | 9 +++++++++
 6 files changed, 26 insertions(+)
 create mode 100644 configs/devices/hexagon-softmmu/default.mak
 create mode 100644 configs/targets/hexagon-softmmu.mak
 create mode 100644 target/hexagon/Kconfig

diff --git a/MAINTAINERS b/MAINTAINERS
index 0fb5711184..deeb7878c8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -241,6 +241,7 @@ F: linux-user/hexagon/
 F: tests/tcg/hexagon/
 F: disas/hexagon.c
 F: configs/targets/hexagon-linux-user/default.mak
+F: configs/devices/hexagon-softmmu/default.mak
 F: docker/dockerfiles/debian-hexagon-cross.docker
 F: gdb-xml/hexagon*.xml
 F: docs/system/target-hexagon.rst
diff --git a/configs/devices/hexagon-softmmu/default.mak b/configs/devices/hexagon-softmmu/default.mak
new file mode 100644
index 0000000000..08e709aea7
--- /dev/null
+++ b/configs/devices/hexagon-softmmu/default.mak
@@ -0,0 +1,7 @@
+# Default configuration for hexagon-softmmu
+
+# Uncomment the following lines to disable these optional devices:
+
+# Boards are selected by default, uncomment to keep out of the build.
+# CONFIG_HEX_DSP=y
+# CONFIG_L2VIC=y
diff --git a/configs/targets/hexagon-softmmu.mak b/configs/targets/hexagon-softmmu.mak
new file mode 100644
index 0000000000..8c208bf468
--- /dev/null
+++ b/configs/targets/hexagon-softmmu.mak
@@ -0,0 +1,6 @@
+# Default configuration for hexagon-softmmu
+
+TARGET_ARCH=hexagon
+TARGET_SUPPORTS_MTTCG=y
+TARGET_XML_FILES=gdb-xml/hexagon-core.xml gdb-xml/hexagon-hvx.xml gdb-xml/hexagon-sys.xml
+TARGET_LONG_BITS=32
diff --git a/target/Kconfig b/target/Kconfig
index d0c7b59d9c..37781146b9 100644
--- a/target/Kconfig
+++ b/target/Kconfig
@@ -16,6 +16,7 @@ source sh4/Kconfig
 source sparc/Kconfig
 source tricore/Kconfig
 source xtensa/Kconfig
+source hexagon/Kconfig
 
 config TARGET_BIG_ENDIAN
     bool
diff --git a/target/hexagon/Kconfig b/target/hexagon/Kconfig
new file mode 100644
index 0000000000..7e556f3506
--- /dev/null
+++ b/target/hexagon/Kconfig
@@ -0,0 +1,2 @@
+config HEXAGON
+    bool
diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build
index aa729a3683..d2b56b9e65 100644
--- a/target/hexagon/meson.build
+++ b/target/hexagon/meson.build
@@ -245,6 +245,7 @@ decodetree_trans_funcs_generated = custom_target(
     command: [python, files('gen_trans_funcs.py'), semantics_generated, '@OUTPUT@'],
 )
 hexagon_ss.add(decodetree_trans_funcs_generated)
+hexagon_softmmu_ss = ss.source_set()
 
 hexagon_ss.add(files(
     'cpu.c',
@@ -264,6 +265,13 @@ hexagon_ss.add(files(
     'mmvec/system_ext_mmvec.c',
 ))
 
+hexagon_softmmu_ss.add(files(
+    'hex_mmu.c',
+    'hex_interrupts.c',
+    'hexswi.c',
+    'machine.c',
+))
+
 #
 # Step 4.5
 # We use flex/bison based idef-parser to generate TCG code for a lot
@@ -401,3 +409,4 @@ analyze_funcs_generated = custom_target(
 hexagon_ss.add(analyze_funcs_generated)
 
 target_arch += {'hexagon': hexagon_ss}
+target_system_arch += {'hexagon': hexagon_softmmu_ss}
-- 
2.34.1
Re: [PATCH 6/8] target/hexagon: add build config for softmmu
Posted by Philippe Mathieu-Daudé 11 hours ago 
Hi Brian,

On 1/3/25 18:20, Brian Cain wrote:
> Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
> ---
>   MAINTAINERS                                 | 1 +
>   configs/devices/hexagon-softmmu/default.mak | 7 +++++++
>   configs/targets/hexagon-softmmu.mak         | 6 ++++++
>   target/Kconfig                              | 1 +
>   target/hexagon/Kconfig                      | 2 ++
>   target/hexagon/meson.build                  | 9 +++++++++
>   6 files changed, 26 insertions(+)
>   create mode 100644 configs/devices/hexagon-softmmu/default.mak
>   create mode 100644 configs/targets/hexagon-softmmu.mak
>   create mode 100644 target/hexagon/Kconfig
> 
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 0fb5711184..deeb7878c8 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -241,6 +241,7 @@ F: linux-user/hexagon/
>   F: tests/tcg/hexagon/
>   F: disas/hexagon.c
>   F: configs/targets/hexagon-linux-user/default.mak
> +F: configs/devices/hexagon-softmmu/default.mak
>   F: docker/dockerfiles/debian-hexagon-cross.docker
>   F: gdb-xml/hexagon*.xml
>   F: docs/system/target-hexagon.rst
> diff --git a/configs/devices/hexagon-softmmu/default.mak b/configs/devices/hexagon-softmmu/default.mak
> new file mode 100644
> index 0000000000..08e709aea7
> --- /dev/null
> +++ b/configs/devices/hexagon-softmmu/default.mak
> @@ -0,0 +1,7 @@
> +# Default configuration for hexagon-softmmu
> +
> +# Uncomment the following lines to disable these optional devices:
> +
> +# Boards are selected by default, uncomment to keep out of the build.
> +# CONFIG_HEX_DSP=y
> +# CONFIG_L2VIC=y
> diff --git a/configs/targets/hexagon-softmmu.mak b/configs/targets/hexagon-softmmu.mak
> new file mode 100644
> index 0000000000..8c208bf468
> --- /dev/null
> +++ b/configs/targets/hexagon-softmmu.mak
> @@ -0,0 +1,6 @@
> +# Default configuration for hexagon-softmmu
> +
> +TARGET_ARCH=hexagon
> +TARGET_SUPPORTS_MTTCG=y
> +TARGET_XML_FILES=gdb-xml/hexagon-core.xml gdb-xml/hexagon-hvx.xml gdb-xml/hexagon-sys.xml
> +TARGET_LONG_BITS=32
> diff --git a/target/Kconfig b/target/Kconfig
> index d0c7b59d9c..37781146b9 100644
> --- a/target/Kconfig
> +++ b/target/Kconfig
> @@ -16,6 +16,7 @@ source sh4/Kconfig
>   source sparc/Kconfig
>   source tricore/Kconfig
>   source xtensa/Kconfig
> +source hexagon/Kconfig
>   
>   config TARGET_BIG_ENDIAN
>       bool
> diff --git a/target/hexagon/Kconfig b/target/hexagon/Kconfig
> new file mode 100644
> index 0000000000..7e556f3506
> --- /dev/null
> +++ b/target/hexagon/Kconfig
> @@ -0,0 +1,2 @@
> +config HEXAGON
> +    bool
> diff --git a/target/hexagon/meson.build b/target/hexagon/meson.build
> index aa729a3683..d2b56b9e65 100644
> --- a/target/hexagon/meson.build
> +++ b/target/hexagon/meson.build
> @@ -245,6 +245,7 @@ decodetree_trans_funcs_generated = custom_target(
>       command: [python, files('gen_trans_funcs.py'), semantics_generated, '@OUTPUT@'],
>   )
>   hexagon_ss.add(decodetree_trans_funcs_generated)
> +hexagon_softmmu_ss = ss.source_set()
>   
>   hexagon_ss.add(files(
>       'cpu.c',
> @@ -264,6 +265,13 @@ hexagon_ss.add(files(
>       'mmvec/system_ext_mmvec.c',
>   ))
>   
> +hexagon_softmmu_ss.add(files(
> +    'hex_mmu.c',
> +    'hex_interrupts.c',
> +    'hexswi.c',
> +    'machine.c',
> +))
> +
>   #
>   # Step 4.5
>   # We use flex/bison based idef-parser to generate TCG code for a lot

Expanding diff:

     bison = generator(
         find_program('bison', version: '>=3.0'),
         output: ['@BASENAME@.tab.c', '@BASENAME@.tab.h'],
         arguments: ['@INPUT@', '--defines=@OUTPUT1@', '--output=@OUTPUT0@']
     )

On default macOS I get:

   Program bison found: NO found 2.3 but need: '>=3.0' (/usr/bin/bison)

Fixed by installing via brew and:

   export PATH=/opt/homebrew/opt/bison/bin:$PATH

> @@ -401,3 +409,4 @@ analyze_funcs_generated = custom_target(
>   hexagon_ss.add(analyze_funcs_generated)
>   
>   target_arch += {'hexagon': hexagon_ss}
> +target_system_arch += {'hexagon': hexagon_softmmu_ss}

But then I get:
[1/1980] Generating target/hexagon/idef_parser_input.preprocessed.h.inc 
with a custom command
FAILED: target/hexagon/idef_parser_input.preprocessed.h.inc
target/hexagon/idef-parser/prepare 
target/hexagon/idef_parser_input.h.inc -Itarget/hexagon/idef-parser -o 
target/hexagon/idef_parser_input.preprocessed.h.inc
target/hexagon/idef_parser_input.h.inc:1:10: fatal error: 'macros.h.inc' 
file not found
     1 | #include "macros.h.inc"
       |          ^~~~~~~~~~~~~~
# 1 "target/hexagon/idef_parser_input.h.inc"
# 1 "<built-in>" 1
# 1 "<built-in>" 3
# 423 "<built-in>" 3
# 1 "<command line>" 1
# 1 "<built-in>" 2
# 1 "target/hexagon/idef_parser_input.h.inc" 2


J4_hintjumpr(in RsV) {
     {fHINTJR(RsV);}
}

J2_loop0r(in RsV, riV) {
     { fIMMEXT(riV); fPCALIGN(riV); fWRITE_LOOP_REGS0( fREAD_PC()+riV, 
RsV); fSET_LPCFG(0); }
}
[...]

$ find . -name macros.h.inc
./target/hexagon/idef-parser/macros.h.inc

$ cat target/hexagon/idef-parser/prepare
#!/usr/bin/env bash
...
# Run the preprocessor and drop comments
cpp "$@"

$ which cpp
/usr/bin/cpp

$ cpp --version
Apple clang version 16.0.0 (clang-1600.0.26.6)

Since this works on Linux for user emulation, I suppose this is a
macOS vs Linux issue with default cpp command line arguments...
Re: [PATCH 6/8] target/hexagon: add build config for softmmu
Posted by Anton Johansson via 10 hours ago 
On 04/03/25, Philippe Mathieu-Daudé wrote:
>
> On default macOS I get:
> 
>   Program bison found: NO found 2.3 but need: '>=3.0' (/usr/bin/bison)
> 
> Fixed by installing via brew and:
> 
>   export PATH=/opt/homebrew/opt/bison/bin:$PATH
> 
> > @@ -401,3 +409,4 @@ analyze_funcs_generated = custom_target(
> >   hexagon_ss.add(analyze_funcs_generated)
> >   target_arch += {'hexagon': hexagon_ss}
> > +target_system_arch += {'hexagon': hexagon_softmmu_ss}
> 
> But then I get:
> [1/1980] Generating target/hexagon/idef_parser_input.preprocessed.h.inc with
> a custom command
> FAILED: target/hexagon/idef_parser_input.preprocessed.h.inc
> target/hexagon/idef-parser/prepare target/hexagon/idef_parser_input.h.inc
> -Itarget/hexagon/idef-parser -o
> target/hexagon/idef_parser_input.preprocessed.h.inc
> target/hexagon/idef_parser_input.h.inc:1:10: fatal error: 'macros.h.inc'
> file not found
>     1 | #include "macros.h.inc"
>       |          ^~~~~~~~~~~~~~
> # 1 "target/hexagon/idef_parser_input.h.inc"
> # 1 "<built-in>" 1
> # 1 "<built-in>" 3
> # 423 "<built-in>" 3
> # 1 "<command line>" 1
> # 1 "<built-in>" 2
> # 1 "target/hexagon/idef_parser_input.h.inc" 2
> 
> 
> J4_hintjumpr(in RsV) {
>     {fHINTJR(RsV);}
> }
> 
> J2_loop0r(in RsV, riV) {
>     { fIMMEXT(riV); fPCALIGN(riV); fWRITE_LOOP_REGS0( fREAD_PC()+riV, RsV);
> fSET_LPCFG(0); }
> }
> [...]
> 
> $ find . -name macros.h.inc
> ./target/hexagon/idef-parser/macros.h.inc
> 
> $ cat target/hexagon/idef-parser/prepare
> #!/usr/bin/env bash
> ...
> # Run the preprocessor and drop comments
> cpp "$@"
> 
> $ which cpp
> /usr/bin/cpp
> 
> $ cpp --version
> Apple clang version 16.0.0 (clang-1600.0.26.6)
> 
> Since this works on Linux for user emulation, I suppose this is a
> macOS vs Linux issue with default cpp command line arguments...


Hi Phil,

yes this is an issue of default arguments added by cpp on mac, I ran
into this a little while ago on a downstream fork.

cpp on mac expands  clang ... -traditional-cpp which alsos break
macro concatenation..

I carry a patch which:

* Removes indent pass on idef-parser output, as indent is not available
  on mac;
* Replaces cpp with ${compiler} ... -E ... where compiler is gotten from
  meson.

I'm a bit sad about the default meson version being outdated though..:(

-- 
Anton Johansson
rev.ng Labs Srl.

Patchew 2.1-devel-b67e4c2

© 2016 - 2025 Red Hat, Inc.