github/verilator
1
0
Fork 1
mirror of https://github.com/verilator/verilator.git synced 2025-04-05 12:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup python code style issues. No functional change intended.

Browse Source
This commit is contained in:
Wilson Snyder 2021-03-05 22:52:39 -05:00
parent 81ef8fb201
commit de774ac4d8
14 changed files with 88 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.in
View File

@ -504,8 +504,12 @@ FLAKE8_FLAGS = \
--extend-exclude=fastcov.py \ --extend-exclude=fastcov.py \
--ignore=E123,E129,E251,E501,W503,W504,E701 --ignore=E123,E129,E251,E501,W503,W504,E701
PYLINT = pylint
PYLINT_FLAGS = --disable=R0801
lint-py: lint-py:
$(FLAKE8) $(FLAKE8_FLAGS) $(PY_PROGRAMS) $(FLAKE8) $(FLAKE8_FLAGS) $(PY_PROGRAMS)
$(PYLINT) $(PYLINT_FLAGS) $(PY_PROGRAMS)
format-pl-exec: format-pl-exec:
-chmod a+x test_regress/t/*.pl -chmod a+x test_regress/t/*.pl

11
examples/xml_py/vl_file_copy
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- Python -*- See copyright, etc below # -*- Python -*- See copyright, etc below
# pylint: disable=C0114,C0115,R0903
###################################################################### ######################################################################
import argparse import argparse
@ -26,15 +27,15 @@ class VlFileCopy:
xml_temp = tempfile.NamedTemporaryFile() xml_temp = tempfile.NamedTemporaryFile()
args = [ vargs = [
'--xml-output', '--xml-output',
xml_temp.name, xml_temp.name,
'--bbox-sys', # Parse some stuff can't translate '--bbox-sys', # Parse some stuff can't translate
'--bbox-unsup', '--bbox-unsup',
'--prefix vlxml' '--prefix vlxml'
] # So we know name of .xml output ] # So we know name of .xml output
args += verilator_args vargs += verilator_args
self.run_verilator(args) self.run_verilator(vargs)
self.tree = ET.parse(xml_temp.name) self.tree = ET.parse(xml_temp.name)
os.makedirs(output_dir, 0o777, True) os.makedirs(output_dir, 0o777, True)
@ -49,13 +50,13 @@ class VlFileCopy:
print("\tcp %s %s" % (filename, output_dir)) print("\tcp %s %s" % (filename, output_dir))
copy2(filename, output_dir) copy2(filename, output_dir)
def run_verilator(self, args): def run_verilator(self, vargs):
"""Run Verilator command, check errors""" """Run Verilator command, check errors"""
if os.getenv("VERILATOR_ROOT"): if os.getenv("VERILATOR_ROOT"):
command = os.getenv("VERILATOR_ROOT") + "/bin/verilator" command = os.getenv("VERILATOR_ROOT") + "/bin/verilator"
else: else:
command = "verilator" command = "verilator"
command += ' ' + ' '.join(args) command += ' ' + ' '.join(vargs)
if self.debug: if self.debug:
print("\t%s " % command) print("\t%s " % command)
status = subprocess.call(command, shell=True) status = subprocess.call(command, shell=True)

11
examples/xml_py/vl_hier_graph
View File

@ -1,5 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- Python -*- See copyright, etc below # -*- Python -*- See copyright, etc below
# pylint: disable=C0103,C0114,C0115,C0115,C0116,R0914
###################################################################### ######################################################################
import argparse import argparse
@ -25,15 +26,15 @@ class VlHierGraph:
xml_temp = tempfile.NamedTemporaryFile() xml_temp = tempfile.NamedTemporaryFile()
args = [ vargs = [
'--xml-output', '--xml-output',
xml_temp.name, xml_temp.name,
'--bbox-sys', # Parse some stuff can't translate '--bbox-sys', # Parse some stuff can't translate
'--bbox-unsup', '--bbox-unsup',
'--prefix vlxml' '--prefix vlxml'
] # So we know name of .xml output ] # So we know name of .xml output
args += verilator_args vargs += verilator_args
self.run_verilator(args) self.run_verilator(vargs)
self.tree = ET.parse(xml_temp.name) self.tree = ET.parse(xml_temp.name)
with open(output_filename, "w") as fh: with open(output_filename, "w") as fh:
@ -72,13 +73,13 @@ class VlHierGraph:
self.name_to_number[name] = self.next_vertex_number self.name_to_number[name] = self.next_vertex_number
return self.name_to_number[name] return self.name_to_number[name]
def run_verilator(self, args): def run_verilator(self, vargs):
"""Run Verilator command, check errors""" """Run Verilator command, check errors"""
if os.getenv("VERILATOR_ROOT"): if os.getenv("VERILATOR_ROOT"):
command = os.getenv("VERILATOR_ROOT") + "/bin/verilator" command = os.getenv("VERILATOR_ROOT") + "/bin/verilator"
else: else:
command = "verilator" command = "verilator"
command += ' ' + ' '.join(args) command += ' ' + ' '.join(vargs)
if self.debug: if self.debug:
print("\t%s " % command) print("\t%s " % command)
status = subprocess.call(command, shell=True) status = subprocess.call(command, shell=True)

3
nodist/code_coverage
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0115,C0116,R0912,R0914,R0915,W0125,W0621,exec-used
###################################################################### ######################################################################
import argparse import argparse
@ -398,7 +399,7 @@ if True:
elif match_from: elif match_from:
start = int(match_from.group(1)) start = int(match_from.group(1))
else: else:
os.exit("%Error: --stages not understood: " + Args.stages) sys.exit("%Error: --stages not understood: " + Args.stages)
for n in range(0, 100): for n in range(0, 100):
Args.stage_enabled[n] = False Args.stage_enabled[n] = False
for n in range(start, end + 1): for n in range(start, end + 1):

1
nodist/dot_importer
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0115,C0116,C0301
###################################################################### ######################################################################
import argparse import argparse

1
nodist/fuzzer/actual_fail
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0115,C0116,C0321,R0911
###################################################################### ######################################################################
# DESCRIPTION: Fuzzer result checker # DESCRIPTION: Fuzzer result checker
# #

5
nodist/fuzzer/generate_dictionary
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0115,C0116,C0321
###################################################################### ######################################################################
# DESCRIPTION: Fuzzer dictionary generator # DESCRIPTION: Fuzzer dictionary generator
# #
@ -50,7 +51,7 @@ def write_file(filename, contents):
def parse_line(s): def parse_line(s):
# str->maybe str # str->maybe str
if len(s) == 0: return if len(s) == 0: return None
part = skip_while(lambda x: x != '"', s) part = skip_while(lambda x: x != '"', s)
if len(part) == 0 or part[0] != '"': return None if len(part) == 0 or part[0] != '"': return None
literal_part = take_while(lambda x: x != '"', part[1:]) literal_part = take_while(lambda x: x != '"', part[1:])
@ -67,7 +68,7 @@ def main():
dirname = 'dictionary' dirname = 'dictionary'
r = system('mkdir -p ' + dirname) r = system('mkdir -p ' + dirname)
assert (r == 0) assert r == 0
for i, token in enumerate(tokens): for i, token in enumerate(tokens):
write_file(dirname + '/' + str(i), token) write_file(dirname + '/' + str(i), token)

39
nodist/install_test
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0115,C0116,R0801,R0915
###################################################################### ######################################################################
import argparse import argparse
@ -52,43 +53,43 @@ def test():
# run a test using just the path # run a test using just the path
if Args.stage <= 2: if Args.stage <= 2:
print("== stage 2") print("== stage 2")
dir = testdirp odir = testdirp
run("/bin/rm -rf " + dir) run("/bin/rm -rf " + odir)
run("/bin/mkdir -p " + dir) run("/bin/mkdir -p " + odir)
path = prefix + "/bin" + ":" + prefix + "/share/bin" path = prefix + "/bin" + ":" + prefix + "/share/bin"
write_verilog(dir) write_verilog(odir)
run("cd " + dir + " && PATH=" + path + run("cd " + odir + " && PATH=" + path +
":$PATH verilator --cc top.v --exe sim_main.cpp") ":$PATH verilator --cc top.v --exe sim_main.cpp")
run("cd " + dir + "/obj_dir && PATH=" + path + run("cd " + odir + "/obj_dir && PATH=" + path +
":$PATH make -f Vtop.mk") ":$PATH make -f Vtop.mk")
run("cd " + dir + " && PATH=" + path + ":$PATH obj_dir/Vtop") run("cd " + odir + " && PATH=" + path + ":$PATH obj_dir/Vtop")
# run a test using exact path to binary # run a test using exact path to binary
if Args.stage <= 3: if Args.stage <= 3:
print("== stage 3") print("== stage 3")
dir = testdirn odir = testdirn
run("/bin/rm -rf " + dir) run("/bin/rm -rf " + odir)
run("/bin/mkdir -p " + dir) run("/bin/mkdir -p " + odir)
write_verilog(dir) write_verilog(odir)
bin1 = prefix + "/bin" bin1 = prefix + "/bin"
run("cd " + dir + " && " + bin1 + run("cd " + odir + " && " + bin1 +
"/verilator --cc top.v --exe sim_main.cpp") "/verilator --cc top.v --exe sim_main.cpp")
run("cd " + dir + "/obj_dir && make -f Vtop.mk") run("cd " + odir + "/obj_dir && make -f Vtop.mk")
run("cd " + dir + "/obj_dir && ./Vtop") run("cd " + odir + "/obj_dir && ./Vtop")
if Args.stage <= 9: if Args.stage <= 9:
print("*-* All Finished *-*") print("*-* All Finished *-*")
def write_verilog(dir): def write_verilog(odir):
shutil.copy2("examples/make_hello_c/top.v", dir + "/top.v") shutil.copy2("examples/make_hello_c/top.v", odir + "/top.v")
shutil.copy2("examples/make_hello_c/sim_main.cpp", dir + "/sim_main.cpp") shutil.copy2("examples/make_hello_c/sim_main.cpp", odir + "/sim_main.cpp")
def cleanenv(): def cleanenv():
for var in os.environ: for var in os.environ:
if (var == "VERILATOR_ROOT" or var == "VERILATOR_INCLUDE" if var in ('VERILATOR_ROOT', 'VERILATOR_INCLUDE',
or var == "VERILATOR_NO_OPT_BUILD"): 'VERILATOR_NO_OPT_BUILD'):
print("unset %s # Was '%s'" % (var, os.environ[var])) print("unset %s # Was '%s'" % (var, os.environ[var]))
del os.environ[var] del os.environ[var]

24
src/astgen
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0115,C0116,C0123,C0301,R0902,R0913,R0914,R0912,R0915,W0621
###################################################################### ######################################################################
import argparse import argparse
@ -17,10 +18,13 @@ Stages = {}
class Cpt: class Cpt:
def __init__(self): def __init__(self):
self.did_out_tree = False self.did_out_tree = False
self.out_lines = [] self.in_filename = ""
self.in_linenum = 1
self.out_filename = ""
self.out_linenum = 1 self.out_linenum = 1
self.treeop = {} self.out_lines = []
self.tree_skip_visit = {} self.tree_skip_visit = {}
self.treeop = {}
self._exec_nsyms = 0 self._exec_nsyms = 0
self._exec_syms = {} self._exec_syms = {}
@ -169,9 +173,9 @@ class Cpt:
self.error("Unknown astgen op: " + func) self.error("Unknown astgen op: " + func)
@staticmethod @staticmethod
def add_nodep(str): def add_nodep(strg):
str = re.sub(r'\$([a-zA-Z0-9]+)', r'nodep->\1()', str) strg = re.sub(r'\$([a-zA-Z0-9]+)', r'nodep->\1()', strg)
return str return strg
def _exec_syms_recurse(self, aref): def _exec_syms_recurse(self, aref):
for sym in aref: for sym in aref:
@ -213,9 +217,9 @@ class Cpt:
argtext = func + "\000" # EOF character argtext = func + "\000" # EOF character
for tok in argtext: for tok in argtext:
if tok == "\000": if tok == "\000":
None None # pylint: disable=pointless-statement
elif re.match(r'\s+', tok): elif re.match(r'\s+', tok):
None None # pylint: disable=pointless-statement
elif tok == "{": elif tok == "{":
newref = [forming] newref = [forming]
if not aref: if not aref:
@ -258,7 +262,7 @@ class Cpt:
elif func == "NEVER": elif func == "NEVER":
out += "nodep->v3fatalSrc(\"Executing transform that was NEVERed\");" out += "nodep->v3fatalSrc(\"Executing transform that was NEVERed\");"
elif func == "DONE": elif func == "DONE":
None None # pylint: disable=pointless-statement
else: else:
self.error("Unknown execution function format: " + func + "\n") self.error("Unknown execution function format: " + func + "\n")
return out return out
@ -305,7 +309,7 @@ class Cpt:
" if (" + typefunc['match_func'] + " if (" + typefunc['match_func'] +
"(nodep)) return;\n" "(nodep)) return;\n"
] ]
if (typefunc['short_circuit']): # short-circuit match fn if typefunc['short_circuit']: # short-circuit match fn
out_for_type_sc.extend(lines) out_for_type_sc.extend(lines)
else: # Standard match fn else: # Standard match fn
if typefunc[ if typefunc[
@ -471,7 +475,7 @@ def write_report(filename):
if subclass != 'Node': if subclass != 'Node':
fh.write("Ast%-12s " % subclass) fh.write("Ast%-12s " % subclass)
fh.write("\n") fh.write("\n")
if ("Ast" + typen) in ClassRefs: if ("Ast" + typen) in ClassRefs: # pylint: disable=superfluous-parens
refs = ClassRefs["Ast" + typen] refs = ClassRefs["Ast" + typen]
fh.write(" newed: ") fh.write(" newed: ")
for stage in sorted(refs['newed'].keys(), for stage in sorted(refs['newed'].keys(),

26
src/bisonpre
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0115,C0116,R0912,R0914,R0915,R1702,W0125
###################################################################### ######################################################################
import argparse import argparse
@ -55,8 +56,7 @@ def output_prefix():
if Args.output: if Args.output:
o = re.sub(r'\.[^.]*$', '', Args.output) o = re.sub(r'\.[^.]*$', '', Args.output)
return o return o
else: return Args.file_prefix + ".tab"
return Args.file_prefix + ".tab"
def unlink_ok(filename): def unlink_ok(filename):
@ -90,7 +90,7 @@ def bison_version_check():
if v < 1.875: if v < 1.875:
sys.exit("bisonpre: %Error: '" + Args.yacc + "' is version " + v + sys.exit("bisonpre: %Error: '" + Args.yacc + "' is version " + v +
"; version 1.875 or newer is required\n") "; version 1.875 or newer is required\n")
global Bison_Version global Bison_Version # pylint: disable=global-variable-undefined
Bison_Version = v Bison_Version = v
return return
@ -182,7 +182,7 @@ def warning_check(filename):
def clean_input(filename, outname): def clean_input(filename, outname):
print(" edit " + filename + " " + outname) print(" edit " + filename + " " + outname)
global Filename global Filename # pylint: disable=global-variable-undefined
Filename = filename Filename = filename
with open(filename) as fh: with open(filename) as fh:
@ -190,7 +190,7 @@ def clean_input(filename, outname):
# Find "%tokens<type>:" # Find "%tokens<type>:"
# Find "rule<type>:" and replace with just "rule:" # Find "rule<type>:" and replace with just "rule:"
global Rules global Rules # pylint: disable=global-variable-undefined
Rules = {} Rules = {}
types = {} types = {}
@ -240,7 +240,7 @@ def clean_input(filename, outname):
last_rule = name last_rule = name
elif matchb: elif matchb:
name = matchb.group(1) name = matchb.group(1)
if name != 'public' and name != 'private': if name not in ('public', 'private'):
if name in Rules: if name in Rules:
sys.exit("%Error: " + filename + ":" + str(lineno) + sys.exit("%Error: " + filename + ":" + str(lineno) +
": Redeclaring '" + name + "': " + line) ": Redeclaring '" + name + "': " + line)
@ -332,7 +332,7 @@ def clean_input(filename, outname):
": Can't find definition for token: " + etok + ": Can't find definition for token: " + etok +
"\n") "\n")
# Push it all onto one line to avoid error messages changing # Push it all onto one line to avoid error messages changing
bar = "" pipe = ""
for tok in sorted(tokens.keys()): for tok in sorted(tokens.keys()):
hit = False hit = False
for etok in endtoks: for etok in endtoks:
@ -340,8 +340,8 @@ def clean_input(filename, outname):
hit = True hit = True
break break
if not hit and endtok != tok: if not hit and endtok != tok:
line += "\t" + bar + " " + tok + " " + action line += "\t" + pipe + " " + tok + " " + action
bar = "|" pipe = "|"
line += "\n" line += "\n"
lines.append(line) lines.append(line)
@ -376,11 +376,11 @@ def clean_input(filename, outname):
lineno += 1 lineno += 1
if _enaline(line) and re.search(r'//BISONPRE_TYPES', line): if _enaline(line) and re.search(r'//BISONPRE_TYPES', line):
lines.append(line) lines.append(line)
for type in sorted(types.keys()): for typen in sorted(types.keys()):
if not type: if not typen:
continue continue
line = "%type<" + type + ">\t" line = "%type<" + typen + ">\t"
for rule in sorted(types[type].keys()): for rule in sorted(types[typen].keys()):
line += " " + rule line += " " + rule
line += "\n" line += "\n"
lines.append(line) lines.append(line)

1
src/config_rev
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114
###################################################################### ######################################################################
# #
# Copyright 2005-2021 by Wilson Snyder. This program is free software; you # Copyright 2005-2021 by Wilson Snyder. This program is free software; you

27
src/cppcheck_filtered
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0115,C0116,R0911,R0912,R0915,W0621
###################################################################### ######################################################################
import argparse import argparse
@ -88,8 +89,8 @@ def process(cppcheck_args):
file = match.group(1) file = match.group(1)
linenum = match.group(2) linenum = match.group(2)
match = re.search(r' id="([^"]+)"', last_error) match = re.search(r' id="([^"]+)"', last_error)
id = match.group(1) if match else '?' eid = match.group(1) if match else '?'
if _suppress(file, linenum, id): if _suppress(file, linenum, eid):
suppress = True suppress = True
if file == "*": if file == "*":
suppress = True suppress = True
@ -109,9 +110,9 @@ def process(cppcheck_args):
###################################################################### ######################################################################
def _suppress(filename, linenum, id): def _suppress(filename, linenum, eid):
if Args.debug: if Args.debug:
print("-Suppression search %s %s %s" % (filename, linenum, id)) print("-Suppression search %s %s %s" % (filename, linenum, eid))
if filename == "*": if filename == "*":
return False return False
@ -120,17 +121,17 @@ def _suppress(filename, linenum, id):
filename = re.sub(r'^\.\./(.*)', r'src/\1', filename) filename = re.sub(r'^\.\./(.*)', r'src/\1', filename)
# Specific suppressions # Specific suppressions
if id == 'missingInclude' and re.search(r'systemc.h', filename): if eid == 'missingInclude' and re.search(r'systemc.h', filename):
return True return True
if id == 'missingInclude' and re.search(r'svdpi.h', filename): if eid == 'missingInclude' and re.search(r'svdpi.h', filename):
return True return True
if id == 'unusedFunction' and re.search(r'verilated_dpi.cpp', filename): if eid == 'unusedFunction' and re.search(r'verilated_dpi.cpp', filename):
return True return True
if id == 'unusedFunction' and re.search(r'verilated_vpi.cpp', filename): if eid == 'unusedFunction' and re.search(r'verilated_vpi.cpp', filename):
return True return True
if id == 'unreachableCode' and re.search(r'V3ParseBison.c', filename): if eid == 'unreachableCode' and re.search(r'V3ParseBison.c', filename):
return True return True
if id == 'variableScope' and re.search(r'fstapi.c', filename): if eid == 'variableScope' and re.search(r'fstapi.c', filename):
return True return True
if not os.path.exists(filename): if not os.path.exists(filename):
@ -142,12 +143,12 @@ def _suppress(filename, linenum, id):
lineno = 0 lineno = 0
for line in fh: for line in fh:
lineno += 1 lineno += 1
if (lineno + 1 == linenum): if lineno + 1 == linenum:
match = re.search(r'cppcheck-suppress((\s+\S+)+)', line) match = re.search(r'cppcheck-suppress((\s+\S+)+)', line)
if match: if match:
for supid in match.group(1).split(): for supid in match.group(1).split():
if (supid == id or if (supid == eid or (eid in SuppressMap
(id in SuppressMap and supid == SuppressMap[id])): and supid == SuppressMap[eid])):
return True return True
return False return False

1
src/flexfix
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0114,C0301
###################################################################### ######################################################################
# #
# Copyright 2002-2021 by Wilson Snyder. This program is free software; you # Copyright 2002-2021 by Wilson Snyder. This program is free software; you

5
src/vlcovgen
View File

@ -1,4 +1,5 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# pylint: disable=C0103,C0114,C0116,eval-used
###################################################################### ######################################################################
import argparse import argparse
@ -64,9 +65,7 @@ def write_keys(filename):
elif re.search(r'VLCOVGEN_.*AUTO_EDIT_END', line): elif re.search(r'VLCOVGEN_.*AUTO_EDIT_END', line):
deleting = False deleting = False
out.append(line) out.append(line)
elif deleting: elif not deleting:
None
else:
out.append(line) out.append(line)
ok = "".join(out) == "".join(orig) ok = "".join(out) == "".join(orig)