From 18e04d2265b55341b4ac4c272c8af7f2813ca338 Mon Sep 17 00:00:00 2001 From: hemanthkumar17 Date: Tue, 18 Jan 2022 14:57:18 +0530 Subject: [PATCH 1/3] FEATURE: Added Zfh support --- riscof/framework/test.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/riscof/framework/test.py b/riscof/framework/test.py index 82be490..70dec61 100644 --- a/riscof/framework/test.py +++ b/riscof/framework/test.py @@ -261,7 +261,7 @@ def isa_set(string): def canonicalise(isa): all_ext = ["M","A","F","D","Q","L","C","B","J","K","T","P","V","N","S","H","U","Zicsr", "Zifencei","Zihintpause","Zmmul","Zam","Zbc","Zbb","Zbp","Zbm","Zbe","Zbf","Zkne", - "Zknd","Zknh","Zkse","Zksh","Zkg","Zkb","Zkr","Zks","Zkn","Ztso"] + "Zknd","Zknh","Zkse","Zksh","Zkg","Zkb","Zkr","Zks","Zkn","Ztso", "Zfh"] canonical_string = "" switch = False for ext in all_ext: @@ -371,6 +371,8 @@ def generate_test_pool(ispec, pspec, workdir, dbfile = None): macros.append("FLEN=64") elif re.match(r"^[^(Z,z)]+F.*$",isa): macros.append("FLEN=32") + elif re.match(r"^[^(Z,z)]+Zfh.*$",isa): + macros.append("FLEN=16") test_pool.append( (file, db[file]['commit_id'], macros,isa,cov_labels)) logger.info("Selecting Tests.") From a8c1642ef86d8cac71feb0d408885173fb8ba50e Mon Sep 17 00:00:00 2001 From: hemanthkumar17 Date: Thu, 3 Feb 2022 13:57:01 +0530 Subject: [PATCH 2/3] Temporary fix for freg error --- riscof/framework/test.py | 6 +++--- riscof/requirements.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/riscof/framework/test.py b/riscof/framework/test.py index 70dec61..f3948a3 100644 --- a/riscof/framework/test.py +++ b/riscof/framework/test.py @@ -367,12 +367,12 @@ def generate_test_pool(ispec, pspec, workdir, dbfile = None): elif '128' in isa: xlen = '128' macros.append("XLEN=" + xlen) - if re.match(r"^[^(Z,z)]+D.*$",isa): + if re.match(r"^[^(Z,z)]+Zfh.*$",isa): + macros.append("FLEN=16") + elif re.match(r"^[^(Z,z)]+D.*$",isa): macros.append("FLEN=64") elif re.match(r"^[^(Z,z)]+F.*$",isa): macros.append("FLEN=32") - elif re.match(r"^[^(Z,z)]+Zfh.*$",isa): - macros.append("FLEN=16") test_pool.append( (file, db[file]['commit_id'], macros,isa,cov_labels)) logger.info("Selecting Tests.") diff --git a/riscof/requirements.txt b/riscof/requirements.txt index e0e8ad2..e3e96fb 100644 --- a/riscof/requirements.txt +++ b/riscof/requirements.txt @@ -3,4 +3,4 @@ click>=7.1.2 Jinja2>=2.10.1 pytz>=2019.1 riscv-config>=2.10.1 -riscv_isac>=0.7.2 +riscv_isac>=0.7.0 From 3e103a46602a098769f7b9fd15b84cf3e2043ac3 Mon Sep 17 00:00:00 2001 From: hemanthkumar17 Date: Tue, 8 Feb 2022 18:31:49 +0530 Subject: [PATCH 3/3] Revert Freg temp fix --- riscof/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/riscof/requirements.txt b/riscof/requirements.txt index e3e96fb..e0e8ad2 100644 --- a/riscof/requirements.txt +++ b/riscof/requirements.txt @@ -3,4 +3,4 @@ click>=7.1.2 Jinja2>=2.10.1 pytz>=2019.1 riscv-config>=2.10.1 -riscv_isac>=0.7.0 +riscv_isac>=0.7.2