From a4037993c1f69ffda5629b61168310345f42e569 Mon Sep 17 00:00:00 2001 From: S Pawan Kumar Date: Wed, 23 Nov 2022 16:31:14 +0530 Subject: [PATCH 1/4] =?UTF-8?q?Bump=20version:=200.10.2=20=E2=86=92=200.10?= =?UTF-8?q?.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- riscv_ctg/__init__.py | 2 +- setup.cfg | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/riscv_ctg/__init__.py b/riscv_ctg/__init__.py index 9fb1ba66..464d62bb 100644 --- a/riscv_ctg/__init__.py +++ b/riscv_ctg/__init__.py @@ -4,5 +4,5 @@ __author__ = """InCore Semiconductors Pvt Ltd""" __email__ = 'incorebot@gmail.com' -__version__ = '0.10.2' +__version__ = '0.10.3' diff --git a/setup.cfg b/setup.cfg index f9bd804f..773bec36 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.10.2 +current_version = 0.10.3 commit = True tag = True diff --git a/setup.py b/setup.py index e61e668e..ba590a8a 100644 --- a/setup.py +++ b/setup.py @@ -26,7 +26,7 @@ def read_requires(): setup( name='riscv_ctg', - version='0.10.2', + version='0.10.3', description="RISC-V CTG", long_description=readme + '\n\n', classifiers=[ From 278aa4c46cbf73122b50bd3ed12b4d72140cadf4 Mon Sep 17 00:00:00 2001 From: S Pawan Kumar Date: Wed, 23 Nov 2022 16:34:35 +0530 Subject: [PATCH 2/4] Fix sigalign definition. --- riscv_ctg/env/arch_test.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/riscv_ctg/env/arch_test.h b/riscv_ctg/env/arch_test.h index b05b5147..993e7679 100644 --- a/riscv_ctg/env/arch_test.h +++ b/riscv_ctg/env/arch_test.h @@ -92,14 +92,16 @@ #define FLREG flw #define FSREG fsw #define FREGWIDTH 4 - #if XLEN==64 - #define SIGALIGN 8 - #else - #define SIGALIGN 4 - #endif #endif #endif +#if FLEN>XLEN + #define SIGALIGN FREGWIDTH +#else + #define SIGALIGN REGWIDTH +#endif + + #if SIGALIGN==8 #define CANARY \ .dword 0x6F5CA309E7D4B281 From bd9bb5690d3f938654c13dcbefea15d80cbcd5ca Mon Sep 17 00:00:00 2001 From: S Pawan Kumar Date: Wed, 23 Nov 2022 16:36:54 +0530 Subject: [PATCH 3/4] Update workflow to verify that changelog and init files have the same version. --- .github/workflows/test.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 99338d25..1f627212 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -37,6 +37,24 @@ jobs: run: riscv_ctg -r -d rv32i -bi rv32i -cf sample_cgfs/dataset.cgf -cf sample_cgfs/rv32i.cgf -v debug -p $(nproc) check-version: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: version check + run: | + export CHNGVER=$(grep -P -o '(?<=## \[).*(?=\])' -m1 CHANGELOG.md); + echo "CHANGELOG VERSION: $CHNGVER" + export INITVER=$(grep -P "__version__ = '.*?'" riscof/__init__.py | awk '{print $3}'|sed "s/'//g"); + echo "INIT VERSION: $INITVER" + if [ "$CHNGVER" = "$INITVER" ]; then + echo "Versions are equal in Changelog and init.py." + else + echo "Versions are not equal in Changelog and init.py." + exit 1 + fi + + check-version-changelog: runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 From 9ff0f42842e9d93aa499386c97c44149839500ad Mon Sep 17 00:00:00 2001 From: S Pawan Kumar Date: Wed, 23 Nov 2022 16:39:07 +0530 Subject: [PATCH 4/4] Fix package name --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1f627212..174651c2 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -45,7 +45,7 @@ jobs: run: | export CHNGVER=$(grep -P -o '(?<=## \[).*(?=\])' -m1 CHANGELOG.md); echo "CHANGELOG VERSION: $CHNGVER" - export INITVER=$(grep -P "__version__ = '.*?'" riscof/__init__.py | awk '{print $3}'|sed "s/'//g"); + export INITVER=$(grep -P "__version__ = '.*?'" riscv_ctg/__init__.py | awk '{print $3}'|sed "s/'//g"); echo "INIT VERSION: $INITVER" if [ "$CHNGVER" = "$INITVER" ]; then echo "Versions are equal in Changelog and init.py."