Skip to content

Commit 35e6225

Browse files
shtaxxxshtaxxx
committed
Fundamental options are added for all items in dataflow
1 parent c5ad80a commit 35e6225

File tree

8 files changed

+74
-14
lines changed

8 files changed

+74
-14
lines changed

‎pyverilog/dataflow/bindvisitor.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,8 +1142,8 @@ def resolveBlockingAssign(self, tree, scope):
11421142
return reorder.insertPointer(resolved_var, resolved_ptr)
11431143
return DFPointer(resolved_var, resolved_ptr)
11441144

1145-
raise verror.FormartError("unsupported DFNode type: %s %s" %
1146-
(str(type(tree)), str(tree)))
1145+
raise verror.FormatError("unsupported DFNode type: %s %s" %
1146+
(str(type(tree)), str(tree)))
11471147

11481148
def getFitTree(self, bindlist, msb, lsb):
11491149
optimized_msb = self.optimize(msb)
@@ -1265,8 +1265,8 @@ def getDst(self, left, scope):
12651265
return (name, None, None, ptr)
12661266
return (name, ptr, copy.deepcopy(ptr), None)
12671267

1268-
raise verror.FormartError("unsupported AST node type: %s %s" %
1269-
(str(type(left)), str(left)))
1268+
raise verror.FormatError("unsupported AST node type: %s %s" %
1269+
(str(type(left)), str(left)))
12701270

12711271
############################################################################
12721272
def setDataflow(self, dst, raw_tree, condlist, flowlist,

‎pyverilog/dataflow/codegen.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,16 @@ def showVersion():
192192
optparser = OptionParser()
193193
optparser.add_option("-v","--version",action="store_true",dest="showversion",
194194
default=False,help="Show the version")
195+
optparser.add_option("-I","--include",dest="include",action="append",
196+
default=[],help="Include path")
197+
optparser.add_option("-D",dest="define",action="append",
198+
default=[],help="Macro Definition")
195199
optparser.add_option("-t","--top",dest="topmodule",
196200
default="TOP",help="Top module, Default=TOP")
201+
optparser.add_option("--nobind",action="store_true",dest="nobind",
202+
default=False,help="No binding traversal, Default=False")
203+
optparser.add_option("--noreorder",action="store_true",dest="noreorder",
204+
default=False,help="No reordering of binding dataflow, Default=False")
197205
optparser.add_option("-s","--search",dest="searchtarget",action="append",
198206
default=[],help="Search Target Signal")
199207
optparser.add_option("-o","--output",dest="outputfile",
@@ -218,7 +226,11 @@ def showVersion():
218226
if len(filelist) == 0:
219227
showVersion()
220228

221-
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule)
229+
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule,
230+
noreorder=options.noreorder,
231+
nobind=options.nobind,
232+
preprocess_include=options.include,
233+
preprocess_define=options.define)
222234
analyzer.generate()
223235

224236
directives = analyzer.get_directives()

‎pyverilog/dataflow/dataflow_analyzer.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,16 @@ def showVersion():
105105
optparser = OptionParser()
106106
optparser.add_option("-v","--version",action="store_true",dest="showversion",
107107
default=False,help="Show the version")
108+
optparser.add_option("-I","--include",dest="include",action="append",
109+
default=[],help="Include path")
110+
optparser.add_option("-D",dest="define",action="append",
111+
default=[],help="Macro Definition")
108112
optparser.add_option("-t","--top",dest="topmodule",
109113
default="TOP",help="Top module, Default=TOP")
110114
optparser.add_option("--nobind",action="store_true",dest="nobind",
111115
default=False,help="No binding traversal, Default=False")
112116
optparser.add_option("--noreorder",action="store_true",dest="noreorder",
113117
default=False,help="No reordering of binding dataflow, Default=False")
114-
optparser.add_option("-I","--include",dest="include",action="append",
115-
default=[],help="Include path")
116-
optparser.add_option("-D",dest="define",action="append",
117-
default=[],help="Macro Definition")
118118
(options, args) = optparser.parse_args()
119119

120120
filelist = args

‎pyverilog/dataflow/graphgen.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,16 @@ def showVersion():
206206
optparser = OptionParser()
207207
optparser.add_option("-v","--version",action="store_true",dest="showversion",
208208
default=False,help="Show the version")
209+
optparser.add_option("-I","--include",dest="include",action="append",
210+
default=[],help="Include path")
211+
optparser.add_option("-D",dest="define",action="append",
212+
default=[],help="Macro Definition")
209213
optparser.add_option("-t","--top",dest="topmodule",
210214
default="TOP",help="Top module, Default=TOP")
215+
optparser.add_option("--nobind",action="store_true",dest="nobind",
216+
default=False,help="No binding traversal, Default=False")
217+
optparser.add_option("--noreorder",action="store_true",dest="noreorder",
218+
default=False,help="No reordering of binding dataflow, Default=False")
211219
optparser.add_option("-s","--search",dest="searchtarget",action="append",
212220
default=[],help="Search Target Signal")
213221
optparser.add_option("-o","--output",dest="outputfile",
@@ -234,7 +242,11 @@ def showVersion():
234242
if len(filelist) == 0:
235243
showVersion()
236244

237-
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule)
245+
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule,
246+
noreorder=options.noreorder,
247+
nobind=options.nobind,
248+
preprocess_include=options.include,
249+
preprocess_define=options.define)
238250
analyzer.generate()
239251

240252
directives = analyzer.get_directives()

‎pyverilog/dataflow/merge.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,16 @@ def showVersion():
519519
optparser = OptionParser()
520520
optparser.add_option("-v","--version",action="store_true",dest="showversion",
521521
default=False,help="Show the version")
522+
optparser.add_option("-I","--include",dest="include",action="append",
523+
default=[],help="Include path")
524+
optparser.add_option("-D",dest="define",action="append",
525+
default=[],help="Macro Definition")
522526
optparser.add_option("-t","--top",dest="topmodule",
523527
default="TOP",help="Top module, Default=TOP")
528+
optparser.add_option("--nobind",action="store_true",dest="nobind",
529+
default=False,help="No binding traversal, Default=False")
530+
optparser.add_option("--noreorder",action="store_true",dest="noreorder",
531+
default=False,help="No reordering of binding dataflow, Default=False")
524532
optparser.add_option("-s","--search",dest="searchtarget",action="append",
525533
default=[],help="Search Target Signal")
526534
(options, args) = optparser.parse_args()
@@ -535,7 +543,11 @@ def showVersion():
535543
if len(filelist) == 0:
536544
showVersion()
537545

538-
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule)
546+
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule,
547+
noreorder=options.noreorder,
548+
nobind=options.nobind,
549+
preprocess_include=options.include,
550+
preprocess_define=options.define)
539551
analyzer.generate()
540552

541553
directives = analyzer.get_directives()

‎pyverilog/dataflow/optimizer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ def optimizeHierarchy(self, tree):
424424
if isinstance(tree, DFSyscall):
425425
return DFSyscall(tree.syscall, tuple([ self.optimizeHierarchy(n) for n in tree.nextnodes ]))
426426

427-
raise FormartError('Can not merge due to unrecognized type of tree')
427+
raise FormatError('Can not merge due to unrecognized type of tree')
428428

429429
def takePoint(self, nextnodes, ptr):
430430
return self.takePart(nextnodes, ptr, ptr)

‎pyverilog/dataflow/subset.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,16 @@ def showVersion():
148148
optparser = OptionParser()
149149
optparser.add_option("-v","--version",action="store_true",dest="showversion",
150150
default=False,help="Show the version")
151+
optparser.add_option("-I","--include",dest="include",action="append",
152+
default=[],help="Include path")
153+
optparser.add_option("-D",dest="define",action="append",
154+
default=[],help="Macro Definition")
151155
optparser.add_option("-t","--top",dest="topmodule",
152156
default="TOP",help="Top module, Default=TOP")
157+
optparser.add_option("--nobind",action="store_true",dest="nobind",
158+
default=False,help="No binding traversal, Default=False")
159+
optparser.add_option("--noreorder",action="store_true",dest="noreorder",
160+
default=False,help="No reordering of binding dataflow, Default=False")
153161
optparser.add_option("-s","--search",dest="searchtarget",action="append",
154162
default=[],help="Search Target Signal")
155163
optparser.add_option("--clockname",dest="clockname",
@@ -172,7 +180,11 @@ def showVersion():
172180
if len(filelist) == 0:
173181
showVersion()
174182

175-
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule)
183+
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule,
184+
noreorder=options.noreorder,
185+
nobind=options.nobind,
186+
preprocess_include=options.include,
187+
preprocess_define=options.define)
176188
analyzer.generate()
177189

178190
directives = analyzer.get_directives()

‎pyverilog/dataflow/walker.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,16 @@ def showVersion():
152152
optparser = OptionParser()
153153
optparser.add_option("-v","--version",action="store_true",dest="showversion",
154154
default=False,help="Show the version")
155+
optparser.add_option("-I","--include",dest="include",action="append",
156+
default=[],help="Include path")
157+
optparser.add_option("-D",dest="define",action="append",
158+
default=[],help="Macro Definition")
155159
optparser.add_option("-t","--top",dest="topmodule",
156160
default="TOP",help="Top module, Default=TOP")
161+
optparser.add_option("--nobind",action="store_true",dest="nobind",
162+
default=False,help="No binding traversal, Default=False")
163+
optparser.add_option("--noreorder",action="store_true",dest="noreorder",
164+
default=False,help="No reordering of binding dataflow, Default=False")
157165
optparser.add_option("-s","--search",dest="searchtarget",action="append",
158166
default=[],help="Search Target Signal")
159167
(options, args) = optparser.parse_args()
@@ -168,7 +176,11 @@ def showVersion():
168176
if len(filelist) == 0:
169177
showVersion()
170178

171-
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule)
179+
analyzer = VerilogDataflowAnalyzer(filelist, options.topmodule,
180+
noreorder=options.noreorder,
181+
nobind=options.nobind,
182+
preprocess_include=options.include,
183+
preprocess_define=options.define)
172184
analyzer.generate()
173185

174186
directives = analyzer.get_directives()

0 commit comments

Comments
 (0)