| Message ID | 20250325160031.2390504-5-jean-philippe@linaro.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: Change the default QEMU CPU type to "max" | expand |
Hi Jean-Philippe, On Tue, Mar 25, 2025 at 04:00:30PM +0000, Jean-Philippe Brucker wrote: > From: Alexandru Elisei <alexandru.elisei@arm.com> > > The help text for the --processor option displays the architecture name as > the default processor type. But the default for arm is cortex-a15, and for > arm64 is cortex-a57. Teach configure to display the correct default > processor type for these two architectures. Looks good to me: Reviewed-by: Alexandru Elisei <alexandru.elisei@arm.com> Thanks, Alex > > Signed-off-by: Alexandru Elisei <alexandru.elisei@arm.com> > Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org> > --- > configure | 30 ++++++++++++++++++++++-------- > 1 file changed, 22 insertions(+), 8 deletions(-) > > diff --git a/configure b/configure > index 010c68ff..b4875ef3 100755 > --- a/configure > +++ b/configure > @@ -5,6 +5,24 @@ if [ -z "${BASH_VERSINFO[0]}" ] || [ "${BASH_VERSINFO[0]}" -lt 4 ] ; then > exit 1 > fi > > +# Return the default CPU type to compile for > +function get_default_processor() > +{ > + local arch="$1" > + > + case "$arch" in > + "arm") > + echo "cortex-a15" > + ;; > + "arm64") > + echo "cortex-a57" > + ;; > + *) > + echo "$arch" > + ;; > + esac > +} > + > srcdir=$(cd "$(dirname "$0")"; pwd) > prefix=/usr/local > cc=gcc > @@ -44,13 +62,14 @@ fi > > usage() { > [ "$arch" = "aarch64" ] && arch="arm64" > + [ -z "$processor" ] && processor=$(get_default_processor $arch) > cat <<-EOF > Usage: $0 [options] > > Options include: > --arch=ARCH architecture to compile for ($arch). ARCH can be one of: > arm, arm64, i386, ppc64, riscv32, riscv64, s390x, x86_64 > - --processor=PROCESSOR processor to compile for ($arch) > + --processor=PROCESSOR processor to compile for ($processor) > --target=TARGET target platform that the tests will be running on (qemu or > kvmtool, default is qemu) (arm/arm64 only) > --cross-prefix=PREFIX cross compiler prefix > @@ -326,13 +345,8 @@ if [ "$earlycon" ]; then > fi > fi > > -[ -z "$processor" ] && processor="$arch" > - > -if [ "$processor" = "arm64" ]; then > - processor="cortex-a57" > -elif [ "$processor" = "arm" ]; then > - processor="cortex-a15" > -fi > +# $arch will have changed when cross-compiling. > +[ -z "$processor" ] && processor=$(get_default_processor $arch) > > if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then > testdir=x86 > -- > 2.49.0 >
diff --git a/configure b/configure index 010c68ff..b4875ef3 100755 --- a/configure +++ b/configure @@ -5,6 +5,24 @@ if [ -z "${BASH_VERSINFO[0]}" ] || [ "${BASH_VERSINFO[0]}" -lt 4 ] ; then exit 1 fi +# Return the default CPU type to compile for +function get_default_processor() +{ + local arch="$1" + + case "$arch" in + "arm") + echo "cortex-a15" + ;; + "arm64") + echo "cortex-a57" + ;; + *) + echo "$arch" + ;; + esac +} + srcdir=$(cd "$(dirname "$0")"; pwd) prefix=/usr/local cc=gcc @@ -44,13 +62,14 @@ fi usage() { [ "$arch" = "aarch64" ] && arch="arm64" + [ -z "$processor" ] && processor=$(get_default_processor $arch) cat <<-EOF Usage: $0 [options] Options include: --arch=ARCH architecture to compile for ($arch). ARCH can be one of: arm, arm64, i386, ppc64, riscv32, riscv64, s390x, x86_64 - --processor=PROCESSOR processor to compile for ($arch) + --processor=PROCESSOR processor to compile for ($processor) --target=TARGET target platform that the tests will be running on (qemu or kvmtool, default is qemu) (arm/arm64 only) --cross-prefix=PREFIX cross compiler prefix @@ -326,13 +345,8 @@ if [ "$earlycon" ]; then fi fi -[ -z "$processor" ] && processor="$arch" - -if [ "$processor" = "arm64" ]; then - processor="cortex-a57" -elif [ "$processor" = "arm" ]; then - processor="cortex-a15" -fi +# $arch will have changed when cross-compiling. +[ -z "$processor" ] && processor=$(get_default_processor $arch) if [ "$arch" = "i386" ] || [ "$arch" = "x86_64" ]; then testdir=x86