Skip to content

Commit

Permalink
Merge branch 'dev' into tmp
Browse files Browse the repository at this point in the history
  • Loading branch information
UmerShahidengr authored Nov 13, 2024
2 parents b8e1646 + cd94912 commit 6e968f2
Show file tree
Hide file tree
Showing 112 changed files with 21,397 additions and 140 deletions.
3 changes: 0 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,9 @@
- [ ] Ran the new tests on RISCOF with SAIL/Spike as reference model successfully ?
- [ ] Ran the new tests on RISCOF in [coverage mode](https://riscof.readthedocs.io/en/stable/commands.html#coverage)
- [ ] Link to Google-Drive folder containing the new coverage reports ([See this](https://github.com/riscv-non-isa/riscv-arch-test/blob/main/CONTRIBUTION.md#uploading-test-stats) for more info): < SPECIFY HERE >
- [ ] Link to PR in RISCV-ISAC from which the reports were generated : < SPECIFY HERE >
- [ ] Changelog entry created with a minor patch

### Optional Checklist:

- [ ] RISCV-V CTG PR link if tests were generated using it : < SPECIFY HERE >
- [ ] Were the tests hand-written/modified ?
- [ ] Have you run these on any hard DUT model ? Please specify name and provide link if possible in the description
- [ ] If you have modified arch\_test.h Please provide a detailed description of the changes in the Description section above.
52 changes: 31 additions & 21 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
ACT-sail-spike:
name: ACT-sail-spike (RV${{ matrix.xlen }})
runs-on: ubuntu-22.04
# Set a 15-minute time limit for this job
timeout-minutes: 30
# Set a 60-minute time limit for this job
timeout-minutes: 60
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -137,30 +137,40 @@ jobs:
cd riscof-plugins/rv${{ matrix.xlen }}
riscof run --config config.ini --suite ../../riscv-test-suite/rv${{ matrix.xlen }}i_m/ --env ../../riscv-test-suite/env
- name: Check size of riscof_work folder
#Check the existance of the riscof work folder, and add the PATH to environment variable
- name: Check size and determine upload path
if: always()
id: check_size
run: |
folder_size=$(du -sm /home/runner/work/riscv-arch-test/riscv-arch-test/riscof-plugins/rv${{ matrix.xlen }}/riscof_work | cut -f1)
echo "Folder size: ${folder_size} MB"
if [ "$folder_size" -gt 1000 ]; then
echo "Size exceeds 1 GB. Skipping upload."
echo "upload=false" >> $GITHUB_ENV # Set an environment variable to skip upload
work_folder="${{ github.workspace }}/riscof-plugins/rv${{ matrix.xlen }}/riscof_work/"
report_file="$work_folder/report.html"
if [ -d "$work_folder" ]; then
folder_size=$(du -sm "$work_folder" | cut -f1)
echo "Folder size: ${folder_size} MB"
if [ "$folder_size" -gt 1000 ]; then
echo "Size exceeds 1 GB. Checking if report exists."
if [ -f "$report_file" ]; then
echo "Uploading RISCOF generated report only."
echo "upload_path=$report_file" >> $GITHUB_ENV
else
echo "No report found. Skipping upload."
echo "upload_path=" >> $GITHUB_ENV
fi
else
echo "Size is within limit. Uploading complete RISCOF_WORK Folder."
echo "upload_path=$work_folder" >> $GITHUB_ENV
fi
else
echo "Size is within limit. Proceeding with upload."
echo "upload=true" >> $GITHUB_ENV # Set an environment variable to proceed with upload
echo "Folder does not exist. Skipping upload."
echo "upload_path=" >> $GITHUB_ENV
fi
# Upload the riscof_work for rv${{ matrix.xlen }} folder if size check passes
- name: Upload the riscof_work for rv${{ matrix.xlen }} folder
# Proceed with upload only if the size is within limit
if: ${{ env.upload == 'true' }}
# Upload the appropriate artifact (folder or report) and skip in case not exists
- name: Upload riscof artifact for rv${{ matrix.xlen }}
if: always() && env.upload_path != ''
uses: actions/upload-artifact@v4
with:
name: riscof-test-report-rv${{ matrix.xlen }}
path: /home/runner/work/riscv-arch-test/riscv-arch-test/riscof-plugins/rv${{ matrix.xlen }}/riscof_work/
if-no-files-found: warn
retention-days: 3
name: riscof-artifact-rv${{ matrix.xlen }}
path: ${{ env.upload_path }}
compression-level: 6
overwrite: true
include-hidden-files: false
overwrite: true
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,9 @@
*.DS_Store

riscv-target/

#ignore venv
riscv-isac/riscv-env

__pycache__
riscof_work
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# CHANGELOG

## [3.10.0] - 2024-11-04
- Add support for Zvk* extensions
- Split float and double test cases into smaller ones
- Merged riscv-ctg and riscv-isac into riscv-arch-test, and updated README
- Updates crypto scalar instructions
- Physical Memory Protection (32/64) Tests and Covergroups
- CI updates: and updated Sail and Spike in CI
- Bug fixes


## [3.9.1] - 2024-07-01
- Converted one of the CANARY words to a delta instret count (there is a variable that will enable that)
- Converted CODE/DATA/SIG_BEGIN/END to include all the little incidental code, so the tests template improves
Expand Down
Loading

0 comments on commit 6e968f2

Please sign in to comment.