Skip to content

eessi_archdetect.sh: Allow for a default vendor fallback for ARM CPUs #173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bedroge merged 1 commit into from
Mar 6, 2026
Merged

eessi_archdetect.sh: Allow for a default vendor fallback for ARM CPUs #173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 22 additions & 9 deletions init/eessi_archdetect.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ cpupath(){
# Identify the best matching CPU architecture from a list of supported specifications for the host CPU
# Return the path to the installation files in EESSI of the best matching architecture
local cpu_arch_spec=()

# Identify the host CPU architecture
local machine_type=${EESSI_MACHINE_TYPE:-$(uname -m)}
log "DEBUG" "cpupath: Host CPU architecture identified as '$machine_type'"

# Populate list of supported specs for this architecture
case $machine_type in
"x86_64") local spec_file="eessi_arch_x86.spec";;
Expand All @@ -109,14 +109,28 @@ cpupath(){
# spec files are located in a subfolder with this script
local base_dir=$(dirname $(readlink -f $0))
update_arch_specs "$base_dir/arch_specs/${spec_file}"

# Identify the host CPU vendor
local cpu_vendor=$(get_cpuinfo "vendor[ _]id")
if [ "${cpu_vendor}" == "" ]; then
cpu_vendor=$(get_cpuinfo "cpu[ _]implementer")
fi
log "DEBUG" "cpupath: CPU vendor of host system: '$cpu_vendor'"

# Construct a list of known cpu vendors
local cpu_vendors=()
for spec in "${cpu_arch_spec[@]}"; do
eval "cols=$spec"
cpu_vendors+=("${cols[1]}")
done
log "DEBUG" "cpupath: Known CPU vendors: ${cpu_vendors[*]}"
# For ARM, if CPU vendor is as-yet-unknown fall back to a default ARM vendor 0x41
if [ "${machine_type}" == "aarch64" ]; then
if [[ " ${cpu_vendors[*]} " != *" $cpu_vendor "* ]]; then
log "DEBUG" "cpupath: Unknown ARM CPU vendor '$cpu_vendor', falling back to '0x41'"
cpu_vendor="0x41"
fi
fi

# Identify the host CPU flags or features
# cpuinfo systems print different line identifiers, eg features, instead of flags
local cpu_flag_tag;
Expand All @@ -132,14 +146,14 @@ cpupath(){
else
cpu_flag_tag='flags'
fi

local cpu_flags=$(get_cpuinfo "$cpu_flag_tag")
log "DEBUG" "cpupath: CPU flags of host system: '$cpu_flags'"

# Default to generic CPU
local best_arch_match="$machine_type/generic"
local all_arch_matches=$best_arch_match

# Iterate over the supported CPU specifications to find the best match for host CPU
# Order of the specifications matters, the last one to match will be selected
for arch in "${cpu_arch_spec[@]}"; do
Expand All @@ -151,7 +165,7 @@ cpupath(){
log "DEBUG" "cpupath: host CPU best match updated to $best_arch_match"
fi
done

if [ "allx" == "${CPUPATH_RESULT}x" ]; then
log "INFO" "cpupath: all matches for host CPU: $all_arch_matches"
echo "$all_arch_matches"
Expand Down Expand Up @@ -219,4 +233,3 @@ case "$ARGUMENT" in
"accelpath") accelpath; exit;;
*) echo "$USAGE"; log "ERROR" "Missing <action> argument (possible actions: 'cpupath', 'accelpath')";;
esac