nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-12 19:48:33 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

arch/risc-v: Refactor LLVM CPU type handling in Toolchain.cmake

Browse source 
- Replace direct string comparisons with regex pattern matching for ARCHCPUEXTFLAGS
- Change from using LLVM_CPUFLAGS list to setting LLVM_CPUTYPE directly
- Simplify CPU type detection logic while maintaining same functionality
- Use more consistent string variable naming convention

This change makes the CPU type detection more flexible and maintainable
while keeping the same behavior for supported RISC-V configurations.

Signed-off-by: Huang Qi <huangqi3@xiaomi.com>
This commit is contained in:
Huang Qi 2025-01-08 19:25:54 +08:00 committed by Xiang Xiao
parent 70489fe56b
commit 1b8d5a4367
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
arch/risc-v/src/cmake/Toolchain.cmake
View file

@ -343,21 +343,19 @@ if(CONFIG_RISCV_TOOLCHAIN STREQUAL GNU_RVG)
# These models can't cover all implementation of RISCV, but it's enough for
# most cases.
set(LLVM_CPUFLAGS)
if(CONFIG_ARCH_RV32)
if(${ARCHCPUEXTFLAGS} STREQUAL imc)
list(APPEND LLVM_CPUFLAGS -mcpu=sifive-e20)
elseif(${ARCHCPUEXTFLAGS} STREQUAL imac)
list(APPEND LLVM_CPUFLAGS -mcpu=sifive-e31)
elseif(${ARCHCPUEXTFLAGS} STREQUAL imafc)
list(APPEND LLVM_CPUFLAGS -mcpu=sifive-e76)
if(${ARCHCPUEXTFLAGS} MATCHES "^imc")
set(LLVM_CPUTYPE "sifive-e20")
elseif(${ARCHCPUEXTFLAGS} MATCHES "^imac")
set(LLVM_CPUTYPE "sifive-e31")
elseif(${ARCHCPUEXTFLAGS} MATCHES "^imafc")
set(LLVM_CPUTYPE "sifive-e76")
endif()
else()
if(${ARCHCPUEXTFLAGS} STREQUAL imac)
list(APPEND LLVM_CPUFLAGS -mcpu=sifive-s51)
elseif(${ARCHCPUEXTFLAGS} STREQUAL imafdc)
list(APPEND LLVM_CPUFLAGS -mcpu=sifive-u54)
if(${ARCHCPUEXTFLAGS} MATCHES "^imac")
set(LLVM_CPUTYPE "sifive-s51")
elseif(${ARCHCPUEXTFLAGS} MATCHES "^imafdc")
set(LLVM_CPUTYPE "sifive-u54")
endif()
endif()