ci: remove redundant drivers enabling

Message ID 20220226183651.2165304-1-thomas@monjalon.net (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series ci: remove redundant drivers enabling |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-abi-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS

Commit Message

Thomas Monjalon Feb. 26, 2022, 6:36 p.m. UTC
  No need to explicitly enable drivers bus/vdev and mempool/ring.

bus/vdev is always enabled since
commit 2e33309ebe03 ("config: enable/disable drivers in Arm builds")

mempool/ring is always enabled since
commit 81c2337e044d ("build: make ring mempool driver mandatory")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 .ci/linux-build.sh            | 2 +-
 devtools/test-meson-builds.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
  

Comments

Bruce Richardson Feb. 28, 2022, 9:46 a.m. UTC | #1
On Sat, Feb 26, 2022 at 07:36:51PM +0100, Thomas Monjalon wrote:
> No need to explicitly enable drivers bus/vdev and mempool/ring.
> 
> bus/vdev is always enabled since
> commit 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
> 
> mempool/ring is always enabled since
> commit 81c2337e044d ("build: make ring mempool driver mandatory")
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

One comment inline below.

Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  .ci/linux-build.sh            | 2 +-
>  devtools/test-meson-builds.sh | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
> index 67d68535e0..77c0d1976b 100755
> --- a/.ci/linux-build.sh
> +++ b/.ci/linux-build.sh
> @@ -89,7 +89,7 @@ OPTS="$OPTS --default-library=$DEF_LIB"
>  OPTS="$OPTS --buildtype=debugoptimized"
>  OPTS="$OPTS -Dcheck_includes=true"
>  if [ "$MINI" = "true" ]; then
> -    OPTS="$OPTS -Denable_drivers=bus/vdev,mempool/ring,net/null"
> +    OPTS="$OPTS -Denable_drivers=net/null"
>      OPTS="$OPTS -Ddisable_libs=*"
>  fi
>  meson build --werror $OPTS
> diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
> index c07fd16fdc..a653b253cb 100755
> --- a/devtools/test-meson-builds.sh
> +++ b/devtools/test-meson-builds.sh
> @@ -221,7 +221,7 @@ for c in gcc clang ; do
>  done
>  
>  build build-mini cc skipABI $use_shared -Ddisable_libs=* \
> -	-Denable_drivers=bus/vdev,mempool/ring,net/null
> +	-Denable_drivers=net/null

Do we even need this enabled for a mini-build. Would disable_drivers=*/*
not work better to truly have a minimal build?

>  
>  # test compilation with minimal x86 instruction set
>  # Set the install path for libraries to "lib" explicitly to prevent problems
> -- 
> 2.34.1
>
  
David Marchand Feb. 28, 2022, 10:17 a.m. UTC | #2
On Mon, Feb 28, 2022 at 10:46 AM Bruce Richardson
<bruce.richardson@intel.com> wrote:
>
> On Sat, Feb 26, 2022 at 07:36:51PM +0100, Thomas Monjalon wrote:
> > No need to explicitly enable drivers bus/vdev and mempool/ring.
> >
> > bus/vdev is always enabled since
> > commit 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
> >
> > mempool/ring is always enabled since
> > commit 81c2337e044d ("build: make ring mempool driver mandatory")
> >
> > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
>
> One comment inline below.
>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> >  .ci/linux-build.sh            | 2 +-
> >  devtools/test-meson-builds.sh | 2 +-
> >  2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
> > index 67d68535e0..77c0d1976b 100755
> > --- a/.ci/linux-build.sh
> > +++ b/.ci/linux-build.sh
> > @@ -89,7 +89,7 @@ OPTS="$OPTS --default-library=$DEF_LIB"
> >  OPTS="$OPTS --buildtype=debugoptimized"
> >  OPTS="$OPTS -Dcheck_includes=true"
> >  if [ "$MINI" = "true" ]; then
> > -    OPTS="$OPTS -Denable_drivers=bus/vdev,mempool/ring,net/null"
> > +    OPTS="$OPTS -Denable_drivers=net/null"
> >      OPTS="$OPTS -Ddisable_libs=*"
> >  fi
> >  meson build --werror $OPTS
> > diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
> > index c07fd16fdc..a653b253cb 100755
> > --- a/devtools/test-meson-builds.sh
> > +++ b/devtools/test-meson-builds.sh
> > @@ -221,7 +221,7 @@ for c in gcc clang ; do
> >  done
> >
> >  build build-mini cc skipABI $use_shared -Ddisable_libs=* \
> > -     -Denable_drivers=bus/vdev,mempool/ring,net/null
> > +     -Denable_drivers=net/null
>
> Do we even need this enabled for a mini-build. Would disable_drivers=*/*
> not work better to truly have a minimal build?

In GHA, for native builds, test-null.sh is called, and it uses net/null ports.
https://git.dpdk.org/dpdk/tree/.ci/linux-build.sh#n101
  
Bruce Richardson Feb. 28, 2022, 10:19 a.m. UTC | #3
On Mon, Feb 28, 2022 at 11:17:07AM +0100, David Marchand wrote:
> On Mon, Feb 28, 2022 at 10:46 AM Bruce Richardson
> <bruce.richardson@intel.com> wrote:
> >
> > On Sat, Feb 26, 2022 at 07:36:51PM +0100, Thomas Monjalon wrote:
> > > No need to explicitly enable drivers bus/vdev and mempool/ring.
> > >
> > > bus/vdev is always enabled since
> > > commit 2e33309ebe03 ("config: enable/disable drivers in Arm builds")
> > >
> > > mempool/ring is always enabled since
> > > commit 81c2337e044d ("build: make ring mempool driver mandatory")
> > >
> > > Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> >
> > One comment inline below.
> >
> > Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> > > ---
> > >  .ci/linux-build.sh            | 2 +-
> > >  devtools/test-meson-builds.sh | 2 +-
> > >  2 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
> > > index 67d68535e0..77c0d1976b 100755
> > > --- a/.ci/linux-build.sh
> > > +++ b/.ci/linux-build.sh
> > > @@ -89,7 +89,7 @@ OPTS="$OPTS --default-library=$DEF_LIB"
> > >  OPTS="$OPTS --buildtype=debugoptimized"
> > >  OPTS="$OPTS -Dcheck_includes=true"
> > >  if [ "$MINI" = "true" ]; then
> > > -    OPTS="$OPTS -Denable_drivers=bus/vdev,mempool/ring,net/null"
> > > +    OPTS="$OPTS -Denable_drivers=net/null"
> > >      OPTS="$OPTS -Ddisable_libs=*"
> > >  fi
> > >  meson build --werror $OPTS
> > > diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
> > > index c07fd16fdc..a653b253cb 100755
> > > --- a/devtools/test-meson-builds.sh
> > > +++ b/devtools/test-meson-builds.sh
> > > @@ -221,7 +221,7 @@ for c in gcc clang ; do
> > >  done
> > >
> > >  build build-mini cc skipABI $use_shared -Ddisable_libs=* \
> > > -     -Denable_drivers=bus/vdev,mempool/ring,net/null
> > > +     -Denable_drivers=net/null
> >
> > Do we even need this enabled for a mini-build. Would disable_drivers=*/*
> > not work better to truly have a minimal build?
> 
> In GHA, for native builds, test-null.sh is called, and it uses net/null ports.
> https://git.dpdk.org/dpdk/tree/.ci/linux-build.sh#n101
> 

Ok, thanks for clarifying, all good so.

/Bruce
  

Patch

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 67d68535e0..77c0d1976b 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -89,7 +89,7 @@  OPTS="$OPTS --default-library=$DEF_LIB"
 OPTS="$OPTS --buildtype=debugoptimized"
 OPTS="$OPTS -Dcheck_includes=true"
 if [ "$MINI" = "true" ]; then
-    OPTS="$OPTS -Denable_drivers=bus/vdev,mempool/ring,net/null"
+    OPTS="$OPTS -Denable_drivers=net/null"
     OPTS="$OPTS -Ddisable_libs=*"
 fi
 meson build --werror $OPTS
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index c07fd16fdc..a653b253cb 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -221,7 +221,7 @@  for c in gcc clang ; do
 done
 
 build build-mini cc skipABI $use_shared -Ddisable_libs=* \
-	-Denable_drivers=bus/vdev,mempool/ring,net/null
+	-Denable_drivers=net/null
 
 # test compilation with minimal x86 instruction set
 # Set the install path for libraries to "lib" explicitly to prevent problems