| Message ID | 20210113190542.223445-1-thomas@monjalon.net (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Thomas Monjalon |
| Headers | show |
| Series | [v2,1/1] devtools: avoid installing static binaries | expand |
| Context | Check | Description |
|---|---|---|
| ci/iol-testing | success | Testing PASS |
| ci/iol-abi-testing | success | Testing PASS |
| ci/intel-Testing | success | Testing PASS |
| ci/iol-intel-Performance | success | Performance Testing PASS |
| ci/iol-intel-Functional | success | Functional Testing PASS |
| ci/iol-broadcom-Functional | success | Functional Testing PASS |
| ci/Intel-compilation | success | Compilation OK |
| ci/checkpatch | warning | coding style issues |
13/01/2021 20:05, Thomas Monjalon: > When testing compilation and checking ABI compatibility, > there is no real need of static binaries eating disks. > > The static linkage of applications was already well tested, > though the static examples tested with meson were limited to "l3fwd" only. > The static build test with make is limited to "helloworld" example. > > The ABI compatibility is checked on shared libraries, > and there is no need to test again on similar builds. > A new parameter is added to the function "build", > so the ABI check is enabled only for native gcc and clang shared builds, > 32-bit, generic armv8 and ppc cross compilations. > In other words, it is disabled for some static builds and some Arm ones. > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net> > --- > v2: > - separate ABI check enablement from default library > - disable ABI check in specific Arm builds > --- [...] > -build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared > +build build-x86-default cc ABI \ > + -Dlibdir=lib -Dmachine=$default_machine $use_shared After a second thought, I think this one should be "skipABI".
On Wed, Jan 13, 2021 at 11:01 PM Thomas Monjalon <thomas@monjalon.net> wrote: > > 13/01/2021 20:05, Thomas Monjalon: > > When testing compilation and checking ABI compatibility, > > there is no real need of static binaries eating disks. > > > > The static linkage of applications was already well tested, > > though the static examples tested with meson were limited to "l3fwd" only. > > The static build test with make is limited to "helloworld" example. > > > > The ABI compatibility is checked on shared libraries, > > and there is no need to test again on similar builds. > > A new parameter is added to the function "build", > > so the ABI check is enabled only for native gcc and clang shared builds, > > 32-bit, generic armv8 and ppc cross compilations. > > In other words, it is disabled for some static builds and some Arm ones. > > > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net> > > --- > > v2: > > - separate ABI check enablement from default library > > - disable ABI check in specific Arm builds > > --- > [...] > > -build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared > > +build build-x86-default cc ABI \ > > + -Dlibdir=lib -Dmachine=$default_machine $use_shared > > After a second thought, I think this one should be "skipABI". No opinion on this one. The title might need some tweak, since you also disabled the ABI check on some ARM targets. The rest lgtm. Acked-by: David Marchand <david.marchand@redhat.com>
15/01/2021 16:24, David Marchand: > On Wed, Jan 13, 2021 at 11:01 PM Thomas Monjalon <thomas@monjalon.net> wrote: > > 13/01/2021 20:05, Thomas Monjalon: > > > When testing compilation and checking ABI compatibility, > > > there is no real need of static binaries eating disks. > > > > > > The static linkage of applications was already well tested, > > > though the static examples tested with meson were limited to "l3fwd" only. > > > The static build test with make is limited to "helloworld" example. > > > > > > The ABI compatibility is checked on shared libraries, > > > and there is no need to test again on similar builds. > > > A new parameter is added to the function "build", > > > so the ABI check is enabled only for native gcc and clang shared builds, > > > 32-bit, generic armv8 and ppc cross compilations. > > > In other words, it is disabled for some static builds and some Arm ones. > > > > > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net> > > > --- > > > v2: > > > - separate ABI check enablement from default library > > > - disable ABI check in specific Arm builds > > > --- > > [...] > > > -build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared > > > +build build-x86-default cc ABI \ > > > + -Dlibdir=lib -Dmachine=$default_machine $use_shared > > > > After a second thought, I think this one should be "skipABI". > > No opinion on this one. > > The title might need some tweak, since you also disabled the ABI check > on some ARM targets. Yes, you're right. Disabling some ABI checks is a way to reduce the number of static binaries, but it should be visible in the title. > The rest lgtm. > > Acked-by: David Marchand <david.marchand@redhat.com> Applied with title "devtools: reduce ABI checks and static binaries"
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index 00e3d0b443..0e79e1b2bd 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -146,13 +146,15 @@ install_target () # <builddir> <installdir> DESTDIR=$2 $ninja_cmd -C $1 install >&$veryverbose } -build () # <directory> <target compiler | cross file> <meson options> +build () # <directory> <target cc | cross file> <ABI check> [meson options] { targetdir=$1 shift crossfile= [ -r $1 ] && crossfile=$1 || targetcc=$1 shift + abicheck=$1 + shift # skip build if compiler not available command -v ${CC##* } >/dev/null 2>&1 || return 0 if [ -n "$crossfile" ] ; then @@ -165,7 +167,7 @@ build () # <directory> <target compiler | cross file> <meson options> load_env $targetcc || return 0 config $srcdir $builds_dir/$targetdir $cross --werror $* compile $builds_dir/$targetdir - if [ -n "$DPDK_ABI_REF_VERSION" ]; then + if [ -n "$DPDK_ABI_REF_VERSION" -a "$abicheck" = ABI ] ; then abirefdir=${DPDK_ABI_REF_DIR:-reference}/$DPDK_ABI_REF_VERSION if [ ! -d $abirefdir/$targetdir ]; then # clone current sources @@ -207,8 +209,13 @@ build () # <directory> <target compiler | cross file> <meson options> for c in gcc clang ; do command -v $c >/dev/null 2>&1 || continue for s in static shared ; do + if [ $s = shared ] ; then + abicheck=ABI + else + abicheck=skipABI # save time and disk space + fi export CC="$CCACHE $c" - build build-$c-$s $c --default-library=$s + build build-$c-$s $c $abicheck --default-library=$s unset CC done done @@ -220,7 +227,8 @@ default_machine='nehalem' if ! check_cc_flags "-march=$default_machine" ; then default_machine='corei7' fi -build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared +build build-x86-default cc ABI \ + -Dlibdir=lib -Dmachine=$default_machine $use_shared # 32-bit with default compiler if check_cc_flags '-m32' ; then @@ -235,29 +243,32 @@ if check_cc_flags '-m32' ; then export PKG_CONFIG_LIBDIR='/usr/lib/pkgconfig' fi target_override='i386-pc-linux-gnu' - build build-32b cc -Dc_args='-m32' -Dc_link_args='-m32' + build build-32b cc ABI -Dc_args='-m32' -Dc_link_args='-m32' target_override= unset PKG_CONFIG_LIBDIR fi # x86 MinGW -build build-x86-mingw $srcdir/config/x86/cross-mingw -Dexamples=helloworld +build build-x86-mingw $srcdir/config/x86/cross-mingw skipABI \ + -Dexamples=helloworld # generic armv8a with clang as host compiler f=$srcdir/config/arm/arm64_armv8_linux_gcc export CC="clang" -build build-arm64-host-clang $f $use_shared +build build-arm64-host-clang $f ABI $use_shared unset CC # some gcc/arm configurations for f in $srcdir/config/arm/arm64_[bdo]*gcc ; do export CC="$CCACHE gcc" - build build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) $f $use_shared + targetdir=build-$(basename $f | tr '_' '-' | cut -d'-' -f-2) + build $targetdir $f skipABI $use_shared unset CC done # ppc configurations for f in $srcdir/config/ppc/ppc* ; do - build build-$(basename $f | cut -d'-' -f-2) $f $use_shared + targetdir=build-$(basename $f | cut -d'-' -f-2) + build $targetdir $f ABI $use_shared done # Test installation of the x86-default target, to be used for checking @@ -279,7 +290,8 @@ if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then export PKGCONF="pkg-config --define-prefix" for example in $examples; do echo "## Building $example" + [ $example = helloworld ] && static=static || static= # save disk space $MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example \ - clean shared static >&$veryverbose + clean shared $static >&$veryverbose done fi
When testing compilation and checking ABI compatibility, there is no real need of static binaries eating disks. The static linkage of applications was already well tested, though the static examples tested with meson were limited to "l3fwd" only. The static build test with make is limited to "helloworld" example. The ABI compatibility is checked on shared libraries, and there is no need to test again on similar builds. A new parameter is added to the function "build", so the ABI check is enabled only for native gcc and clang shared builds, 32-bit, generic armv8 and ppc cross compilations. In other words, it is disabled for some static builds and some Arm ones. Signed-off-by: Thomas Monjalon <thomas@monjalon.net> --- v2: - separate ABI check enablement from default library - disable ABI check in specific Arm builds --- devtools/test-meson-builds.sh | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)