diff --git a/bin/parseHPMC.py b/bin/parseHPMC.py index c0137916f..c9d9b8ffc 100755 --- a/bin/parseHPMC.py +++ b/bin/parseHPMC.py @@ -256,7 +256,7 @@ def ReportAsText(benchmarkDict): if(args.summary): mean = benchmarkDict['Mean'] print('Mean') - for (name, typ, entries. size, val) in mean: + for (name, typ, entries, size, val) in mean: sys.stdout.write('%s %s %0.2f\n' % (name, entries if not args.size else size, val if not args.invert else 100 - val)) if(not args.summary): diff --git a/tests/coverage/dcache1.py b/tests/coverage/dcache1.py index d8740bdda..12196a1b3 100644 --- a/tests/coverage/dcache1.py +++ b/tests/coverage/dcache1.py @@ -78,7 +78,7 @@ if __name__ == "__main__": for i in range(dcache_num_ways): wl(comment=f"start way test #{i+1}") wl(f'li t0, {hex(mem_addr)}') - wl(f'.align 6') # start at i$ set boundary. 6 lsb bits are zero. + wl('.align 6') # start at i$ set boundary. 6 lsb bits are zero. wl(comment=f"i$ boundary, way test #{i+1}") write_repro_instrs() mem_addr += dcache_way_size_in_bytes # so that we excercise a new D$ way. diff --git a/tests/riscof/sail_cSim/riscof_sail_cSim.py b/tests/riscof/sail_cSim/riscof_sail_cSim.py index 557d1af04..b2e18d8ac 100644 --- a/tests/riscof/sail_cSim/riscof_sail_cSim.py +++ b/tests/riscof/sail_cSim/riscof_sail_cSim.py @@ -1,17 +1,10 @@ import os import re import shutil -import subprocess -import shlex import logging -import random -import string -from string import Template import riscof.utils as utils from riscof.pluginTemplate import pluginTemplate -import riscof.constants as constants -from riscv_isac.isac import isac logger = logging.getLogger() @@ -72,11 +65,11 @@ class sail_cSim(pluginTemplate): self.sailargs += "--enable-zcb" if "Q" in ispec["ISA"]: self.isa += 'q' - objdump = "riscv64-unknown-elf-objdump".format(self.xlen) + objdump = "riscv64-unknown-elf-objdump" if shutil.which(objdump) is None: logger.error(objdump+": executable not found. Please check environment setup.") raise SystemExit(1) - compiler = "riscv64-unknown-elf-gcc".format(self.xlen) + compiler = "riscv64-unknown-elf-gcc" if shutil.which(compiler) is None: logger.error(compiler+": executable not found. Please check environment setup.") raise SystemExit(1) diff --git a/tests/riscof/spike/riscof_spike.py b/tests/riscof/spike/riscof_spike.py index 2d3eb2a37..581cabe84 100644 --- a/tests/riscof/spike/riscof_spike.py +++ b/tests/riscof/spike/riscof_spike.py @@ -1,16 +1,8 @@ import os import re -import shutil -import subprocess -import shlex import logging -import random -import string -from string import Template -import sys import riscof.utils as utils -import riscof.constants as constants from riscof.pluginTemplate import pluginTemplate logger = logging.getLogger()