From f565bec7f17a7f9d920776686e1bbdfd4161a845 Mon Sep 17 00:00:00 2001 From: Dolu1990 Date: Fri, 18 Mar 2022 15:39:58 +0100 Subject: [PATCH] cpu/naxriscv fix xlen not being hashed, improve RV64 performances --- litex/soc/cores/cpu/naxriscv/core.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/litex/soc/cores/cpu/naxriscv/core.py b/litex/soc/cores/cpu/naxriscv/core.py index cc78bf90a..211e54fb4 100644 --- a/litex/soc/cores/cpu/naxriscv/core.py +++ b/litex/soc/cores/cpu/naxriscv/core.py @@ -184,6 +184,7 @@ class NaxRiscv(CPU): def generate_netlist_name(reset_address): md5_hash = hashlib.md5() md5_hash.update(str(reset_address).encode('utf-8')) + md5_hash.update(str(NaxRiscv.xlen).encode('utf-8')) for file in NaxRiscv.scala_paths: a_file = open(file, "rb") content = a_file.read() @@ -213,8 +214,8 @@ class NaxRiscv(CPU): ndir = os.path.join(vdir, "ext", "NaxRiscv") sdir = os.path.join(vdir, "ext", "SpinalHDL") - NaxRiscv.git_setup("NaxRiscv", ndir, "https://github.com/SpinalHDL/NaxRiscv.git" , "main", "52e6a5a1") - NaxRiscv.git_setup("SpinalHDL", sdir, "https://github.com/SpinalHDL/SpinalHDL.git", "dev" , "d6ba3b6d") + NaxRiscv.git_setup("NaxRiscv", ndir, "https://github.com/SpinalHDL/NaxRiscv.git" , "main", "67389bd0") + NaxRiscv.git_setup("SpinalHDL", sdir, "https://github.com/SpinalHDL/SpinalHDL.git", "dev" , "62531c60") gen_args = [] gen_args.append(f"--netlist-name={NaxRiscv.netlist_name}")