procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

RISC-V: Fix wrong expansion for arch-canonicalize

Browse source 
rv64gcv should exapnd into:

rv64imafdcv_zicsr_zifencei_zve32f_zve32x_zve64d_zve64f_zve64x_zvl128b_zvl32b_zvl64b

but we exapnd fd twice for now:

rv64imafdfdcv_zicsr_zifencei_zve32f_zve32x_zve64d_zve64f_zve64x_zvl128b_zvl32b_zvl64b

gcc/ChangeLog:

	* config/riscv/arch-canonicalize: Handle g correctly.
This commit is contained in:
Kito Cheng 2022-05-09 11:44:30 +08:00
parent 15f0099b21
commit 27239e13b1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/config/riscv/arch-canonicalize
View file

@ -70,8 +70,10 @@ def arch_canonicalize(arch, isa_spec):
is_isa_spec_2p2 = isa_spec == '2.2'
new_arch = ""
extra_long_ext = []
std_exts = []
if arch[:5] in ['rv32e', 'rv32i', 'rv32g', 'rv64i', 'rv64g']:
new_arch = arch[:5].replace("g", "imafd")
new_arch = arch[:5].replace("g", "i")
std_exts = ['m', 'a', 'f', 'd']
if arch[:5] in ['rv32g', 'rv64g']:
if not is_isa_spec_2p2:
extra_long_ext = ['zicsr', 'zifencei']
@ -86,10 +88,10 @@ def arch_canonicalize(arch, isa_spec):
if long_ext_prefixes_idx:
first_long_ext_idx = min(long_ext_prefixes_idx)
long_exts = arch[first_long_ext_idx:].split("_")
std_exts = list(arch[5:first_long_ext_idx])
std_exts += list(arch[5:first_long_ext_idx])
else:
long_exts = []
std_exts = list(arch[5:])
std_exts += list(arch[5:])
long_exts += extra_long_ext