Python updates

.github/workflows/lint.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

.ruff.toml

@@ -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
+]

README.md

@@ -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
 

benchmarks/coremark/coremark_sweep.py

@@ -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)

benchmarks/embench/embench_arch_sweep.py

@@ -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)

benchmarks/graphGen.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