Skip to content
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

Add support for GCC optimized builds in RISCV SiFive u74mc architecture #4641

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

Add support for GCC optimized builds in RISCV SiFive u74mc architecture #4641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9e8864d
Add support for GCC optimized builds in RISCV SiFive u74mc architecture
julianmorillo Sep 16, 2024
db08dd8
Deleted trailing whitespace
julianmorillo Sep 16, 2024
2eec226
Merge branch 'easybuilders:develop' into develop
julianmorillo Oct 14, 2024
19a68bd
Fine-grained detection. Now SIFIVE constant is SIFIVE_u74mc, meaning …
julianmorillo Oct 14, 2024
da9d4da
Merge branch 'develop' of github.com:julianmorillo/easybuild-framewor…
julianmorillo Oct 14, 2024
398760f
Fixed a couple of "line too long"
julianmorillo Oct 14, 2024
2640bff
Solve a "continuation line under-indented for visual indent"
julianmorillo Oct 14, 2024
b28159b
Solve formatting issues
julianmorillo Oct 14, 2024
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
1 change: 1 addition & 0 deletions easybuild/toolchains/compiler/gcc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ class Gcc(Compiler):
(systemtools.POWER, systemtools.POWER_LE): 'mcpu=native',
(systemtools.X86_64, systemtools.AMD): 'march=native', # implies -mtune=native
(systemtools.X86_64, systemtools.INTEL): 'march=native', # implies -mtune=native
(systemtools.RISCV64, systemtools.SIFIVE_u74mc): 'march=rv64gc mtune=sifive-7-series', # archspec
}
# used with --optarch=GENERIC
COMPILER_GENERIC_OPTION = {
Expand Down
23 changes: 20 additions & 3 deletions easybuild/tools/systemtools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,8 @@
MOTOROLA = 'Motorola/Freescale'
NVIDIA = 'NVIDIA'
QUALCOMM = 'Qualcomm'
SIFIVE_u74mc = 'SiFive U74-MC'
THEAD = 'T-HEAD'

# Family constants
POWER_LE = 'POWER little-endian'
Expand All @@ -133,7 +135,8 @@

CPU_ARCHITECTURES = [AARCH32, AARCH64, POWER, RISCV32, RISCV64, X86_64]
CPU_FAMILIES = [AMD, ARM, INTEL, POWER, POWER_LE, RISCV]
CPU_VENDORS = [AMD, APM, APPLE, ARM, BROADCOM, CAVIUM, DEC, IBM, INTEL, MARVELL, MOTOROLA, NVIDIA, QUALCOMM]
CPU_VENDORS = [AMD, APM, APPLE, ARM, BROADCOM, CAVIUM, DEC, IBM, INTEL, MARVELL, MOTOROLA, NVIDIA, QUALCOMM,
SIFIVE_u74mc, THEAD]
# ARM implementer IDs (i.e., the hexadeximal keys) taken from ARMv8-A Architecture Reference Manual
# (ARM DDI 0487A.j, Section G6.2.102, Page G6-4493)
VENDOR_IDS = {
Expand All @@ -154,6 +157,10 @@
# IBM POWER9
'8335-GTH': IBM,
'8335-GTX': IBM,
# RISCV
'sifive,u74-mc': SIFIVE_u74mc,
# Following id comes from Linux (arch/riscv/include/asm/vendorid_list.h)
'0x5b7': THEAD,
}
# ARM Cortex part numbers from the corresponding ARM Processor Technical Reference Manuals,
# see http://infocenter.arm.com - Cortex-A series processors, Section "Main ID Register"
Expand Down Expand Up @@ -380,15 +387,18 @@ def get_cpu_vendor():
vendor_regex = re.compile(r"model\s+:\s*((\w|-)+)")
elif arch in [AARCH32, AARCH64]:
vendor_regex = re.compile(r"CPU implementer\s+:\s*(\S+)")

elif arch == RISCV64:
if get_cpu_arch_name() == 'u74mc':
vendor_regex = re.compile(r"uarch\s+:\s*(\S+)\s*")
else:
vendor_regex = re.compile(r"mvendorid\s+:\s*(\S+)")
if vendor_regex and is_readable(PROC_CPUINFO_FP):
vendor_id = None

proc_cpuinfo = read_file(PROC_CPUINFO_FP)
res = vendor_regex.search(proc_cpuinfo)
if res:
vendor_id = res.group(1)

if vendor_id in VENDOR_IDS:
vendor = VENDOR_IDS[vendor_id]
_log.debug("Determined CPU vendor on Linux as being '%s' via regex '%s' in %s",
Expand Down Expand Up @@ -496,6 +506,13 @@ def get_cpu_model():
model = vendor + ' ' + ' + '.join(id_list)
_log.debug("Determined CPU model on Linux using regex '%s' in %s: %s",
model_regex.pattern, PROC_CPUINFO_FP, model)
elif arch == RISCV64:
model_regex = re.compile(r"uarch\s+:\s*(\S+)\s*")
res = model_regex.search(proc_cpuinfo)
if res is not None:
model = res.group(1)
_log.debug("Determined CPU model on Linux using regex '%s' in %s: %s",
model_regex.pattern, PROC_CPUINFO_FP, model)
else:
# we need 'model name' on Linux/x86, but 'model' is there first with different info
# 'model name' is not there for Linux/POWER, but 'model' has the right info
Expand Down