From c858fb47ce0b3856bee5c1a711a17491c3af8f56 Mon Sep 17 00:00:00 2001 From: hugo meiland Date: Wed, 18 Jan 2023 22:22:00 +0100 Subject: [PATCH] clarify cpu part identification for ARM --- init/arch_specs/eessi_arch_arm_part.spec | 2 +- init/eessi_archdetect.sh | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/init/arch_specs/eessi_arch_arm_part.spec b/init/arch_specs/eessi_arch_arm_part.spec index 7a56b222ba..1dee340771 100755 --- a/init/arch_specs/eessi_arch_arm_part.spec +++ b/init/arch_specs/eessi_arch_arm_part.spec @@ -1,5 +1,5 @@ # ARM CPU architecture specifications -# Software path in EESSI | Vendor ID | List of defining CPU features +# Software path in EESSI | Vendor ID | CPU part (ARM uarch identification) "aarch64/arm/cortex-a72" "" "0xd08" # Raspberry Pi 4 "aarch64/arm/neoverse-n1" "" "0xd0c" # AWS Graviton2 "aarch64/arm/neoverse-v1" "" "0xd40" # AWS Graviton3 diff --git a/init/eessi_archdetect.sh b/init/eessi_archdetect.sh index 5458028d15..049399c233 100755 --- a/init/eessi_archdetect.sh +++ b/init/eessi_archdetect.sh @@ -83,7 +83,7 @@ cpupath(){ local cpu_vendor=$(get_cpuinfo "$cpu_vendor_tag") log "DEBUG" "cpupath: CPU vendor of host system: '$cpu_vendor'" - # Identify the host CPU part + # Identify the host CPU part local cpu_part_tag="cpu[ _]part" local cpu_part=$(get_cpuinfo "$cpu_part_tag") log "DEBUG" "cpupath: CPU part of host system: '$cpu_part'" @@ -92,6 +92,7 @@ cpupath(){ case $machine_type in "x86_64") local spec_file="eessi_arch_x86.spec";; "aarch64") + # look for ARM core identification through cpu part when available, otherwise fall back to features local spec_file="eessi_arch_arm.spec" [ ! "${cpu_part}x" == "x" ] && local spec_file="eessi_arch_arm_part.spec" ;;