Merge pull request #1284 from AnonymousVikram/fetch_buffer

fetch buffer updates

Author: jordancarlin

Diff for: .github/cli-space-cleanup.sh renamed to .github/scripts/cli-space-cleanup.sh

@@ -37,67 +37,57 @@ jobs:
         include:
           # Ubuntu Installations
           - name: ubuntu-20.04
-            os: ubuntu-20.04
-            container: null
+            image: ubuntu:20.04
+            imageFamily: debian
             regressionFail: true
           - name: ubuntu-22.04
-            os: ubuntu-22.04
-            container: null
+            image: ubuntu:22.04
+            imageFamily: debian
           - name: ubuntu-24.04
-            os: ubuntu-24.04
-            container: null
+            image: ubuntu:24.04
+            imageFamily: debian
           # Debian Installations
           - name: debian-12
-            os: ubuntu-latest
             image: debian:12
             imageFamily: debian
           - name: debian-11
-            os: ubuntu-latest
             image: debian:11
             imageFamily: debian
           # Red Hat Installations
           - name: rocky-8
-            os: ubuntu-latest
             image: rockylinux:8
             imageFamily: redhat
             regressionFail: true
           - name: rocky-9
-            os: ubuntu-latest
             image: rockylinux:9
             imageFamily: redhat
           - name: almalinux-8
-            os: ubuntu-latest
             image: almalinux:8
             imageFamily: redhat
             regressionFail: true
           - name: almalinux-9
-            os: ubuntu-latest
             image: almalinux:9
             imageFamily: redhat
           # SUSE Installations
           - name: opensuse-15.6
-            os: ubuntu-latest
             image: opensuse/leap:15.6
             imageFamily: suse
           # User level installation
           - name: user-install
-            os: ubuntu-latest
             image: null
             user: true
           # Custom location installation
           - name: custom-install
-            os: ubuntu-latest
             image: null
             riscv_path: /home/riscv
           # Custom location user level installation
           - name: custom-user-install
-            os: ubuntu-latest
             image: null
             user: true
             riscv_path: $HOME/riscv-toolchain
 
     # run on selected version of ubuntu or on ubuntu-latest with docker image
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     container:
       image: ${{ matrix.image }}
       options: --privileged --mount type=bind,source=/,target=/host --pid=host --entrypoint /bin/bash # Allow for connection with host
@@ -127,9 +117,9 @@ jobs:
         run: |
               df -h
               if [ -z ${{ matrix.image }} ]; then
-                ./.github/cli-space-cleanup.sh
+                ./.github/scripts/cli-space-cleanup.sh
               else
-                nsenter -t 1 -m -u -n -i bash -c "$(cat .github/cli-space-cleanup.sh)"
+                nsenter -t 1 -m -u -n -i bash -c "$(cat .github/scripts/cli-space-cleanup.sh)"
               fi
               df -h
       # Run main tool chain installation script, either as a user or system wide
@@ -159,16 +149,18 @@ jobs:
         with:
           name: installation-logs-${{ matrix.name }}
           path: ${{ env.RISCV }}/logs/
+      # Only the linux-testvectors are needed, so remove the rest of the buildroot to save space
+      # Logs have already been uploaded so they can be removed
+      - name: Clean up installation
+        run: |
+            rm -rf $RISCV/buildroot/ || sudo rm -rf $RISCV/buildroot/
+            rm -rf $RISCV/logs || sudo rm -rf $RISCV/logs
+            df -h
       # Make riscof and zsbl only as that is the only testsuite used by standard regression
       - name: make tests
         run: |
               source setup.sh
               make riscof zsbl --jobs $(nproc --ignore 1)
-      # Only the linux-testvectors are needed, so remove the rest of the buildroot to save space
-      - name: Remove Buildroot to Save Space
-        run: |
-              rm -rf $RISCV/buildroot/output/build || sudo rm -rf $RISCV/buildroot/output/build
-              df -h
       # Run standard regression, skipping distros that are known to be broken with Verilator
       - name: Regression
         if: ${{ matrix.regressionFail != true }}

Diff for: .github/workflows/install.yml

@@ -0,0 +1,36 @@
+name: Lint
+
+on:
+  push:
+    paths:
+      - '**/*.py'
+      - 'bin/*'
+      - 'sim/vcs/run_vcs'
+      - '.ruff.toml'
+      - '!addins/*'
+      - '!tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/Q/*'
+      - '!tests/fp/quad/fpdatasetgen.py'
+  pull_request:
+    paths:
+      - '**/*.py'
+      - 'bin/*'
+      - 'sim/vcs/run_vcs'
+      - '.ruff.toml'
+      - '!addins/*'
+      - '!tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/Q/*'
+      - '!tests/fp/quad/fpdatasetgen.py'
+
+jobs:
+  lint:
+    name: Python ${{matrix.version}} lint
+    strategy:
+      matrix:
+        version: [39, 312] # Test on oldest and newest verions used in wally-package-install.sh
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set Python version
+      run: sed -i '/^target-version/c\target-version = "py${{matrix.version}}"' .ruff.toml
+    - name: Run ruff
+      uses: astral-sh/ruff-action@v3

Diff for: .github/workflows/lint.yml

@@ -161,6 +161,12 @@ examples/asm/sumtest/sumtest
 examples/asm/example/example
 examples/asm/trap/trap
 examples/asm/etc/pause
+examples/C/fmul
+examples/exercises/fma16/fma16.sv
+examples/exercises/fma16/fma16_testgen
+examples/exercises/fma16/sol 
+examples/exercises/riscvsoc_solutions
+
 
 # Other
 external

Diff for: .gitignore

@@ -0,0 +1,31 @@
+# Lint all .py files and extra python scripts without extensions
+include = ["*.py", "bin/wsim", "bin/regression-wally", "bin/iterelf", "sim/vcs/run_vcs"]
+exclude = ["addins/*", "tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/Q/*", "tests/fp/quad/fpdatasetgen.py"]
+
+# Target oldest version of Python used (Python 3.9 for Ubuntu 20.04 LTS)
+target-version = "py39"
+
+line-length=250
+
+[lint]
+select = [
+  "F",    # various basic rules
+  "E101", # indentation contains mixed spaces and tabs
+  "E4",   # imports
+  "E7",   # various improvements
+  "E9",   # error
+  "W1",   # tabs used instead of spaces
+  "W292", # no newline at end of file
+  "UP",   # Upgraded version available in newer Python
+  "EXE",  # Executable file shebangs
+  "Q003", # Avoidable escaped quotes
+  "Q004", # Unnecessary esacpe character
+  "RUF",  # Ruff specific rules
+]
+
+ignore = [
+  "E701", "E702",   # multiple statements on one line
+  "E722",           # do not use bare 'except'
+  "E74",            # ambiguous name
+  "RUF005",         # iterable unpacking in list
+]

Diff for: .ruff.toml

@@ -1,4 +1,4 @@
-// Copyright (C) 2021-23 Harvey Mudd College & Oklahoma State University
+// Copyright (C) 2021-25 Harvey Mudd College & Oklahoma State University
 //
 // SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1
 //

Diff for: LICENSE

@@ -8,7 +8,7 @@ SIM = ${WALLY}/sim
 
 .PHONY: all riscof testfloat combined_IF_vectors zsbl benchmarks coremark embench coverage cvw-arch-verif clean
 
-all: riscof	testfloat combined_IF_vectors zsbl coverage cvw-arch-verif # benchmarks
+all: riscof	testfloat combined_IF_vectors zsbl coverage # cvw-arch-verif benchmarks
 
 # riscof builds the riscv-arch-test and wally-riscv-arch-test suites
 riscof:

Diff for: Makefile

@@ -1,4 +1,4 @@
-![Installation CI](https://github.com/openhwgroup/cvw/actions/workflows/install.yml/badge.svg?branch=main)
+[![Installation CI](https://github.com/openhwgroup/cvw/actions/workflows/install.yml/badge.svg?branch=main)](https://github.com/openhwgroup/cvw/actions/workflows/install.yml)
 
 # core-v-wally
 

Diff for: README.md

@@ -65,10 +65,7 @@
 
     # Loop through each architecture and run the make commands
     for arch in arch_list:
-        if(str in arch):
-            xlen_value='32'
-        else:
-            xlen_value='64'
+        xlen_value = "32" if str in arch else "64"
         os.system("make clean")
         make_all = f"make all XLEN={xlen_value} ARCH={arch}"
         os.system(make_all)

Diff for: addins/cvw-arch-verif

@@ -30,21 +30,17 @@ def tabulate_arch_sweep(directory):
             file = case+"_"+arch+".json"
             file_path = os.path.join(directory, file)
             lines = []
-            try:
-                f = open(file_path, "r")
+            with open(file_path) as f:
                 lines = f.readlines()
-            except:
-                f.close()
-                #print(file_path+" does not exist")
             for line in lines:
                 #print("File: "+file+" Line: "+line)
                 #p = re.compile('".*" : .*,')
                 p = r'"([^"]*)" : ([^,\n]+)'
                 match = re.search(p, line)
                 if match:
                     prog = match.group(1)
-                    result = match.group(2);
-                    d[arch][prog] = result;
+                    result = match.group(2)
+                    d[arch][prog] = result
                     #print(match.group(1)+" " + match.group(2))
             f.close()
         for arch in [""] + archs:
@@ -53,7 +49,7 @@ def tabulate_arch_sweep(directory):
         for prog in d[archs[0]]:
             print(prog, end="\t")
             for arch in archs:
-                entry = d[arch].get(prog, "n/a");
+                entry = d[arch].get(prog, "n/a")
                 print (entry, end="\t")
             print("")
         print("New geo mean", end="\t")
@@ -84,4 +80,4 @@ def run_arch_sweep():
 
 directory = run_arch_sweep()
 #directory = "run_20231120_072037-caches"
-tabulate_arch_sweep(directory)
+tabulate_arch_sweep(directory)

Diff for: benchmarks/coremark/coremark_sweep.py

@@ -10,13 +10,13 @@
 
 debug = True
 
-def loadCoremark():
+def loadCoremark(coremarkData):
     """loads the coremark data dictionary"""
     coremarkPath = "riscv-coremark/work/coremark.sim.log"
 
     keywordlist = ["CoreMark 1.0", "CoreMark Size", "MTIME", "MINSTRET", "Branches Miss Predictions", "BTB Misses"]
     for keyword in keywordlist:
-        bashInst = "cat " + coremarkPath + " | grep \"" + keyword +  "\" | cut -d \':\' -f 2 | cut -d \" \" -f 2 | tail -1"
+        bashInst = "cat " + coremarkPath + ' | grep "' + keyword +  "\" | cut -d ':' -f 2 | cut -d \" \" -f 2 | tail -1"
         result = subprocess.run(bashInst, stdout=subprocess.PIPE, shell=True)
         if (debug): print(result)
         coremarkData[keyword] = int(result.stdout)
@@ -25,8 +25,8 @@ def loadCoremark():
 
 def loadEmbench(embenchPath, embenchData):
     """loads the embench data dictionary"""
-    f = open(embenchPath)
-    embenchData = json.load(f)
+    with open(embenchPath) as f:
+        embenchData = json.load(f)
     if (debug): print(embenchData)
     return embenchData
 
@@ -93,7 +93,7 @@ def main():
     embenchSpeedOpt_SpeedData = {}
     embenchSizeOpt_SizeData = {}
     embenchSpeedOpt_SizeData = {}
-    # coremarkData = loadCoremark()
+    coremarkData = loadCoremark(coremarkData)
     embenchSpeedOpt_SpeedData = loadEmbench("embench/wallySpeedOpt_speed.json", embenchSpeedOpt_SpeedData)
     embenchSizeOpt_SpeedData = loadEmbench("embench/wallySizeOpt_speed.json", embenchSizeOpt_SpeedData)
     embenchSpeedOpt_SizeData = loadEmbench("embench/wallySpeedOpt_size.json", embenchSpeedOpt_SizeData)
@@ -104,4 +104,4 @@ def main():
 if __name__ == '__main__':
     sys.exit(main())
 
-# "ls -Art ../addins/embench-iot/logs/*speed* | tail -n 1 " # gets most recent embench speed log
+# "ls -Art ../addins/embench-iot/logs/*speed* | tail -n 1 " # gets most recent embench speed log