Skip to contentSkip to conversation

meson: use the more specific cpu arch in cross file

PATCH In review Ruslan Babayev 5 participants 8 messages Jul 26, 2020 – Jul 30, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson: use the more specific cpu arch in cross file

'cpu' unlike 'cpu_family' must be a more specific subtype for the CPU.

---
 meta/classes/meson.bbclass                         | 14 ++++++++++++--
 .../meson/nativesdk-meson_0.53.2.bb                | 12 +++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)
meta/classes/meson.bbclass +12 -2
index ff52d20e56..0caa7a37c2 100644
@@ -62,6 +62,16 @@ def meson_cpu_family(var, d):
     else:
         return arch
 
+def meson_cpu(prefix, d):
+    import re
+    arch = d.getVar(prefix + "_ARCH")
+    tune_ccargs = d.getVar("TUNE_CCARGS")
+    m = re.search(r"(?<=-march=)\w+|(?<=-mcpu=)\w+", tune_ccargs)
+    if m:
+        return m.group(0)
+    else:
+        return arch
+
 # Map our OS values to what Meson expects:
 # https://mesonbuild.com/Reference-tables.html#operating-system-names
 def meson_operating_system(var, d):
@@ -110,13 +120,13 @@ gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
 [host_machine]
 system = '${@meson_operating_system('HOST_OS', d)}'
 cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}'
-cpu = '${HOST_ARCH}'
+cpu = '${@meson_cpu('HOST', d)}'
 endian = '${@meson_endian('HOST', d)}'
 
 [target_machine]
 system = '${@meson_operating_system('TARGET_OS', d)}'
 cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}'
-cpu = '${TARGET_ARCH}'
+cpu = '${@meson_cpu('TARGET', d)}'
 endian = '${@meson_endian('TARGET', d)}'
 EOF
 }
meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb +11 -1
index 67add2c25e..021bff0992 100644
@@ -6,6 +6,16 @@ inherit siteinfo
 SRC_URI += "file://meson-setup.py \
             file://meson-wrapper"
 
+def meson_cpu(var, d):
+    import re
+    arch = d.getVar(var)
+    tune_ccargs = d.getVar("TUNE_CCARGS")
+    m = re.search(r"(?<=-march=)\w+|(?<=-mcpu=)\w+", tune_ccargs)
+    if m:
+        return m.group(0)
+    else:
+        return arch
+
 def meson_endian(prefix, d):
     arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS")
     sitedata = siteinfo_data_for_machine(arch, os, d)
@@ -44,7 +54,7 @@ cpp_link_args = @LDFLAGS
 [host_machine]
 system = '${SDK_OS}'
 cpu_family = '${SDK_ARCH}'
-cpu = '${SDK_ARCH}'
+cpu = '${@meson_cpu("SDK_ARCH", d)}'
 endian = '${@meson_endian("SDK", d)}'
 EOF
 
Signature · 1 line
2.25.1
#1 lore raw

✗ patchtest: failure for meson: use the more specific cpu arch in cross file

== Series Details ==

Series: meson: use the more specific cpu arch in cross file
Revision: 1
URL : https://patchwork.openembedded.org/series/25306/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at ffa4fa35e1)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#3 lore raw

Hi Ross,

According to https://mesonbuild.com/Cross-compilation.html

There are two different values for the CPU. The first one is cpu_family. It is a general type of the CPU. This should have a value from the CPU Family table <https://mesonbuild.com/Reference-tables.html#cpu-families>. *Note* that meson does not add el to end cpu_family value for little endian systems. Big endian and little endian mips are both just mips, with the endian field set approriately.

The second value is cpu which is a more specific subtype for the CPU. Typical values for a x86 CPU family might include i386 or i586 and for arm
family armv5 or armv7hl. Note that CPU type strings are very system
dependent. You might get a different value if you check its value on the same machine but with different operating systems.
At the moment both 'cpu_family' and 'cpu' are being set to TARGET_ARCH (like x86_64) in meson cross file.

TUNE_CCARSG usually contains the exact subfamily either as -march= or -mcpu=

The meson_cpu function will use regex to search for -march and if that's missing for -mcpu value. If both flags are missing it defaults to TARGET_ARCH.

Ruslan

Quoted 7 lines · Ross Burton
Quoted 1 line · Ruslan Babayev

'cpu' unlike 'cpu_family' must be a more specific subtype for the CPU.

Can you elaborate here some more?

Ross

#4 lore raw

Hi Ross,

What do you think of the patch? Any objections to merging it? Do you have any feedback?

Thanks,
Ruslan

Quoted 39 lines · Ruslan Babayev

Hi Ross,

According to https://mesonbuild.com/Cross-compilation.html

There are two different values for the CPU. The first one is cpu_family. It is a general type of the CPU. This should have a value from the CPU Family table <https://mesonbuild.com/Reference-tables.html#cpu-families>.
*Note* that meson does not add el to end cpu_family value for little endian systems. Big endian and little endian mips are both just mips, with the endian field set approriately.

The second value is cpu which is a more specific subtype for the CPU. Typical values for a x86 CPU family might include i386 or i586 and for arm
family armv5 or armv7hl. Note that CPU type strings are very system
dependent. You might get a different value if you check its value on the same machine but with different operating systems.
At the moment both 'cpu_family' and 'cpu' are being set to TARGET_ARCH (like x86_64) in meson cross file.

TUNE_CCARSG usually contains the exact subfamily either as -march= or -mcpu=

The meson_cpu function will use regex to search for -march and if that's missing for -mcpu value. If both flags are missing it defaults to TARGET_ARCH.

Ruslan

Quoted 7 lines · Ross Burton
Quoted 1 line · Ruslan Babayev

'cpu' unlike 'cpu_family' must be a more specific subtype for the CPU.

Can you elaborate here some more?

Ross

#5 lore raw
In reply to Ruslan Babayev
Quoted 2 lines · Ruslan Babayev

'cpu' unlike 'cpu_family' must be a more specific subtype for the CPU.

since mcpu/march should provide the right values already, do we need this additional logic in meson? dont we get needed settings to meson already?

perhaps you can describe some missing cases this would address will help understand the usecase

Quoted 77 lines
---
  meta/classes/meson.bbclass                         | 14 ++++++++++++--
  .../meson/nativesdk-meson_0.53.2.bb                | 12 +++++++++++-
  2 files changed, 23 insertions(+), 3 deletions(-)
meta/classes/meson.bbclass +12 -2
index ff52d20e56..0caa7a37c2 100644
@@ -62,6 +62,16 @@ def meson_cpu_family(var, d):
      else:
          return arch
 
+def meson_cpu(prefix, d):
+    import re
+    arch = d.getVar(prefix + "_ARCH")
+    tune_ccargs = d.getVar("TUNE_CCARGS")
+    m = re.search(r"(?<=-march=)\w+|(?<=-mcpu=)\w+", tune_ccargs)
+    if m:
+        return m.group(0)
+    else:
+        return arch
+
  # Map our OS values to what Meson expects:
  # https://mesonbuild.com/Reference-tables.html#operating-system-names
  def meson_operating_system(var, d):
@@ -110,13 +120,13 @@ gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
  [host_machine]
  system = '${@meson_operating_system('HOST_OS', d)}'
  cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}'
-cpu = '${HOST_ARCH}'
+cpu = '${@meson_cpu('HOST', d)}'
  endian = '${@meson_endian('HOST', d)}'
 
  [target_machine]
  system = '${@meson_operating_system('TARGET_OS', d)}'
  cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}'
-cpu = '${TARGET_ARCH}'
+cpu = '${@meson_cpu('TARGET', d)}'
  endian = '${@meson_endian('TARGET', d)}'
  EOF
  }
meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb +11 -1
index 67add2c25e..021bff0992 100644
@@ -6,6 +6,16 @@ inherit siteinfo
  SRC_URI += "file://meson-setup.py \
              file://meson-wrapper"
 
+def meson_cpu(var, d):
+    import re
+    arch = d.getVar(var)
+    tune_ccargs = d.getVar("TUNE_CCARGS")
+    m = re.search(r"(?<=-march=)\w+|(?<=-mcpu=)\w+", tune_ccargs)
+    if m:
+        return m.group(0)
+    else:
+        return arch
+
  def meson_endian(prefix, d):
      arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS")
      sitedata = siteinfo_data_for_machine(arch, os, d)
@@ -44,7 +54,7 @@ cpp_link_args = @LDFLAGS
  [host_machine]
  system = '${SDK_OS}'
  cpu_family = '${SDK_ARCH}'
-cpu = '${SDK_ARCH}'
+cpu = '${@meson_cpu("SDK_ARCH", d)}'
  endian = '${@meson_endian("SDK", d)}'
  EOF
 
#6 lore raw

Currently we have both cpu_family and cpu set to TARGET_ARCH which is wrong. As mentioned before cpu is more specific. E.g where cpu_family='x86-64' cpu='nehalem'.

Projects using Meson can query for the host_machine.cpu() and expect a more specific CPU type.
Here's one example:
https://github.com/DPDK/dpdk/blob/74f4d6424da1297bd6e83dcb7bd84444ca8c59dd/config/meson.build#L69

Quoted 92 lines · Khem Raj
Quoted 2 lines · Ruslan Babayev

'cpu' unlike 'cpu_family' must be a more specific subtype for the CPU.

since mcpu/march should provide the right values already, do we need this additional logic in meson? dont we get needed settings to meson already?

perhaps you can describe some missing cases this would address will help understand the usecase

Review

Quoted 44 lines
---
  meta/classes/meson.bbclass                         | 14 ++++++++++++--
  .../meson/nativesdk-meson_0.53.2.bb                | 12 +++++++++++-
  2 files changed, 23 insertions(+), 3 deletions(-)
meta/classes/meson.bbclass +12 -2
index ff52d20e56..0caa7a37c2 100644
@@ -62,6 +62,16 @@ def meson_cpu_family(var, d):
      else:
          return arch
 
+def meson_cpu(prefix, d):
+    import re
+    arch = d.getVar(prefix + "_ARCH")
+    tune_ccargs = d.getVar("TUNE_CCARGS")
+    m = re.search(r"(?<=-march=)\w+|(?<=-mcpu=)\w+", tune_ccargs)
+    if m:
+        return m.group(0)
+    else:
+        return arch
+
  # Map our OS values to what Meson expects:
  # https://mesonbuild.com/Reference-tables.html#operating-system-names
  def meson_operating_system(var, d):
@@ -110,13 +120,13 @@ gtkdoc_exe_wrapper = '${B}/gtkdoc-qemuwrapper'
  [host_machine]
  system = '${@meson_operating_system('HOST_OS', d)}'
  cpu_family = '${@meson_cpu_family('HOST_ARCH', d)}'
-cpu = '${HOST_ARCH}'
+cpu = '${@meson_cpu('HOST', d)}'
  endian = '${@meson_endian('HOST', d)}'
 
  [target_machine]
  system = '${@meson_operating_system('TARGET_OS', d)}'
  cpu_family = '${@meson_cpu_family('TARGET_ARCH', d)}'
-cpu = '${TARGET_ARCH}'
+cpu = '${@meson_cpu('TARGET', d)}'
  endian = '${@meson_endian('TARGET', d)}'
  EOF
  }
(quoted diff) +0 -0

b/meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb

Quoted 33 lines

index 67add2c25e..021bff0992 100644

meta/recipes-devtools/meson/nativesdk-meson_0.53.2.bb +11 -1
@@ -6,6 +6,16 @@ inherit siteinfo
  SRC_URI += "file://meson-setup.py \
              file://meson-wrapper"
 
+def meson_cpu(var, d):
+    import re
+    arch = d.getVar(var)
+    tune_ccargs = d.getVar("TUNE_CCARGS")
+    m = re.search(r"(?<=-march=)\w+|(?<=-mcpu=)\w+", tune_ccargs)
+    if m:
+        return m.group(0)
+    else:
+        return arch
+
  def meson_endian(prefix, d):
      arch, os = d.getVar(prefix + "_ARCH"), d.getVar(prefix + "_OS")
      sitedata = siteinfo_data_for_machine(arch, os, d)
@@ -44,7 +54,7 @@ cpp_link_args = @LDFLAGS
  [host_machine]
  system = '${SDK_OS}'
  cpu_family = '${SDK_ARCH}'
-cpu = '${SDK_ARCH}'
+cpu = '${@meson_cpu("SDK_ARCH", d)}'
  endian = '${@meson_endian("SDK", d)}'
  EOF
 
#7 lore raw
Quoted 8 lines · Ruslan Babayev

Currently we have both cpu_family and cpu set to TARGET_ARCH which is wrong. As mentioned before cpu is more specific. E.g where cpu_family='x86-64' cpu='nehalem'.

Projects using Meson can query for the host_machine.cpu() and expect a more specific CPU type.
Here's one example:
https://github.com/DPDK/dpdk/blob/74f4d6424da1297bd6e83dcb7bd84444ca8c59dd/config/meson.build#L69

That logic looks like its basically being used to set -march. We already set this.

Khem and Ross' question is to find out what is currently breaking that needs this fix. In general for example, we have a much better idea of what march should be set to in our uses cases.

Cheers

Richard