Commit c6438e0a authored by Andrey Filippov's avatar Andrey Filippov

changed parser to python-based

parent e72c8dd2
...@@ -71,6 +71,8 @@ ...@@ -71,6 +71,8 @@
default="false" visible="true" omit="false" type="Boolean" format="DashName"/> default="false" visible="true" omit="false" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -87,6 +87,8 @@ ...@@ -87,6 +87,8 @@
<parameter id="verbose_opt" outid="verbose" label="verbose" tooltip= "Temporarily override message limits set with set_msg_config" <parameter id="verbose_opt" outid="verbose" label="verbose" tooltip= "Temporarily override message limits set with set_msg_config"
default="false" visible="true" omit="False" type="Boolean" format="DashName"/> default="false" visible="true" omit="False" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -100,6 +100,8 @@ ...@@ -100,6 +100,8 @@
default="false" visible="true" omit="false" type="Boolean" format="DashName"/> default="false" visible="true" omit="false" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -182,6 +182,8 @@ ...@@ -182,6 +182,8 @@
default="false" visible="true" omit="false" type="Boolean" format="DashName"/> default="false" visible="true" omit="false" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -56,6 +56,8 @@ ...@@ -56,6 +56,8 @@
default="false" visible="true" omit="false" type="Boolean" format="DashName"/> default="false" visible="true" omit="false" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -95,6 +95,8 @@ ...@@ -95,6 +95,8 @@
default="false" visible="true" omit="false" type="Boolean" format="DashName"/> default="false" visible="true" omit="false" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -78,9 +78,17 @@ ...@@ -78,9 +78,17 @@
type="String" format="CopyValue" type="String" format="CopyValue"
visible="true" readonly="true"/> visible="true" readonly="true"/>
<parameter id="parsers_path" label="Parsers Path" tooltip= "parsers directory in plugins"
default="%%ParsersPath" visible="true" omit="" type="String" format="CopyValue"/>
<parameter id="parser_name" label="Vivado parser name" tooltip= "Vivado output parser script path"
default="parser_vivado.py" visible="true" omit="" type="String" format="CopyValue"/>
<input> <input>
<group name="Parser" <group name="Parser"
weight="10"> weight="10">
"parsers_path"
"parser_name"
"---"
"ShowWarnings" "ShowWarnings"
"ShowInfo" "ShowInfo"
"GrepEWI" "GrepEWI"
...@@ -109,6 +117,7 @@ ...@@ -109,6 +117,7 @@
warnings= "PatternWarnings" warnings= "PatternWarnings"
info= "PatternInfo"> info= "PatternInfo">
"-c" "-c"
"python -u %parsers_path%parser_name %%ToolName | "
"%GrepEWI" "%GrepEWI"
"| %VivadoSedPaths" "| %VivadoSedPaths"
<if NoBabyTalk="true"> <if NoBabyTalk="true">
......
...@@ -100,6 +100,8 @@ ...@@ -100,6 +100,8 @@
default="false" visible="true" omit="false" type="Boolean" format="DashName"/> default="false" visible="true" omit="false" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -173,6 +173,8 @@ ...@@ -173,6 +173,8 @@
type="String" format="CopyValue" visible="false" /> type="String" format="CopyValue" visible="false" />
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
...@@ -270,6 +272,8 @@ ...@@ -270,6 +272,8 @@
<if ResetProject="true"> <if ResetProject="true">
"reset_project -quiet\n" "reset_project -quiet\n"
</if> </if>
<!-- Increase number of warning lines, filter them separately. TODO: add configuration parameter -->
"set_msg_config -severity WARNING -limit 1000\n"
"file mkdir $outputDir\n" "file mkdir $outputDir\n"
"read_verilog " "read_verilog "
"%FilteredSourceListPar\n" "%FilteredSourceListPar\n"
......
...@@ -52,6 +52,8 @@ ...@@ -52,6 +52,8 @@
<parameter id="file" default="%VivadoRemoteDir/%rawfile" visible="false" omit="" type="String" format="Dash"/> <parameter id="file" default="%VivadoRemoteDir/%rawfile" visible="false" omit="" type="String" format="Dash"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -198,6 +198,8 @@ ...@@ -198,6 +198,8 @@
default="false" visible="true" omit="false" type="Boolean" format="DashName"/> default="false" visible="true" omit="false" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
inherits="VivadoReportTimingSummary" inherits="VivadoReportTimingSummary"
shell="/bin/bash" shell="/bin/bash"
description="Report post-implementation timimg summary" description="Report post-implementation timimg summary"
disable="DisableVivadoTimingSummary"
> >
<depends-list> <depends-list>
<depends state="SnapshotRoute"/> <depends state="SnapshotRoute"/>
...@@ -35,8 +34,7 @@ ...@@ -35,8 +34,7 @@
<action-menu> <action-menu>
<action label="Report post-implementation timing summary" resource="" icon="clock_sum.png" /> <action label="Report post-implementation timing summary" resource="" icon="clock_sum.png" />
</action-menu> </action-menu>
<parameter id="DisableVivadoTimingSummary" label="Disable" tooltip="Disable post-implementation timing summary report" <parameter id="DisableVivadoTimingSummary"/>
default="false" type= "Boolean" format="None"/>
<!-- TODO Add (copy from proto) parameters that should be different for post and pre routing. <!-- TODO Add (copy from proto) parameters that should be different for post and pre routing.
Or add more derivative reports. --> Or add more derivative reports. -->
......
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
description="Report timing summary" description="Report timing summary"
log-dir="VivadoLogDir" log-dir="VivadoLogDir"
state-dir="VivadoLocalDir" state-dir="VivadoLocalDir"
disable="DisableVivadoTimingSummary"
abstract="true" abstract="true"
inherits="VivadoToolPrototype" inherits="VivadoToolPrototype"
priority="0.4" priority="0.4"
...@@ -59,6 +60,9 @@ ...@@ -59,6 +60,9 @@
<action label="Report timing summary" resource="" icon="clock_sum.png" /> <action label="Report timing summary" resource="" icon="clock_sum.png" />
</action-menu> </action-menu>
<parameter id="DisableVivadoTimingSummary" label="Disable" tooltip="Disable timing report"
default="false" type= "Boolean" format="None"/>
<parameter id="SkipTCL" label="Skip TCL commands" tooltip="Do not run pre-timing summary TCL commands" <parameter id="SkipTCL" label="Skip TCL commands" tooltip="Do not run pre-timing summary TCL commands"
default="false" type= "Boolean" format="None"/> default="false" type= "Boolean" format="None"/>
...@@ -119,6 +123,8 @@ ...@@ -119,6 +123,8 @@
default="false" visible="true" omit="false" type="Boolean" format="DashName"/> default="false" visible="true" omit="false" type="Boolean" format="DashName"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
...@@ -147,6 +153,7 @@ ...@@ -147,6 +153,7 @@
<input> <input>
<group name="General"> <group name="General">
"DisableVivadoTimingSummary"
"SkipTCL" "SkipTCL"
</group> </group>
<group name="TCL commands"> <group name="TCL commands">
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
inherits="VivadoReportTimingSummary" inherits="VivadoReportTimingSummary"
shell="/bin/bash" shell="/bin/bash"
description="Report post-synthesis timimg summary" description="Report post-synthesis timimg summary"
disable="DisableVivadoTimingSummary"
> >
<depends-list> <depends-list>
<depends state="SnapshotSynth"/> <depends state="SnapshotSynth"/>
...@@ -35,6 +34,7 @@ ...@@ -35,6 +34,7 @@
<action-menu> <action-menu>
<action label="Report post-synthesis timing summary" resource="" icon="clock_sum.png" /> <action label="Report post-synthesis timing summary" resource="" icon="clock_sum.png" />
</action-menu> </action-menu>
<parameter id="DisableVivadoTimingSummary"/>
<parameter id="DisableVivadoTimingSummary" label="Disable" tooltip="Disable post-synthesis timing summary report" <parameter id="DisableVivadoTimingSummary" label="Disable" tooltip="Disable post-synthesis timing summary report"
default="false" type= "Boolean" format="None"/> default="false" type= "Boolean" format="None"/>
......
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
<parameter id="file" default="%VivadoRemoteDir/%rawfile" visible="false" omit="" type="String" format="Dash"/> <parameter id="file" default="%VivadoRemoteDir/%rawfile" visible="false" omit="" type="String" format="Dash"/>
<!-- parser parameters - will have different values than the base tool --> <!-- parser parameters - will have different values than the base tool -->
<parameter id="parsers_path"/>
<parameter id="parser_name"/>
<parameter id="PatternErrors"/> <parameter id="PatternErrors"/>
<parameter id="PatternWarnings"/> <parameter id="PatternWarnings"/>
<parameter id="PatternInfo"/> <parameter id="PatternInfo"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment