Commit 180a1d4f authored by Andrey Filippov's avatar Andrey Filippov

using new features

parent e0514a27
...@@ -38,24 +38,25 @@ ...@@ -38,24 +38,25 @@
<menuitem name="CopyUnisims" <menuitem name="CopyUnisims"
label="Copy Xilinx primitives library to the local project" label="Copy Xilinx primitives library to the local project"
icon="xilinx.png" icon="copy.png"
call="VivadoUnisims"/> call="VivadoUnisims"/>
<menuitem name="Vivado Server" <menuitem name="Vivado Server"
label="Start remote Vivado session" label="Start remote Vivado session"
icon="xilinx.png" icon="door_in.png"
call="Vivado"/> call="Vivado"/>
<menuitem name="Vivado Test"
label="Send a 'Hello World' command to the remote Vivado session"
icon="my_tool.gif"
call="VivadoTest"/>
<menuitem name="VivadoSynthesis" <menuitem name="VivadoSynthesis"
label="Synthesize design" label="Synthesize design"
icon="xilinx.png" icon="Retort.png"
call="VivadoSynthesis"/> call="VivadoSynthesis"/>
<menuitem name="VivadoOptPlace" <menuitem name="VivadoOptPlace"
label="Optimize and place design" label="Optimize and place design"
icon="xilinx.png" icon="mondrian2x2.png"
call="VivadoOptPlace"/> call="VivadoOptPlace"/>
<menuitem name="Vivado Test"
label="Send a 'Hello World' command to the remote Vivado session"
icon="my_tool.gif"
call="VivadoTest"/>
</menu> </menu>
<menuitem name="Test VDT" <menuitem name="Test VDT"
label="Testing some VDT features" label="Testing some VDT features"
......
...@@ -7,28 +7,33 @@ ...@@ -7,28 +7,33 @@
package="FPGA_package" package="FPGA_package"
shell="/bin/bash" interface="VivadoInterface" description="Launching remote Xilinx Vivado in console"> shell="/bin/bash" interface="VivadoInterface" description="Launching remote Xilinx Vivado in console">
<action-menu> <action-menu>
<action label="Launch Vivado" resource="" icon="xilinx.png" /> <action label="Launch Vivado" resource="" icon="door_in.png" />
<action label="Generate public key" resource="" icon="gnu.png" /> <action label="Generate public key" resource="" icon="gnu.png" />
<action label="Setup connection to" resource="%RemoteUser@%RemoteHost" <action label="Setup connection to" resource="%RemoteUser@%RemoteHost"
check-extension="false" check-existence="false" icon="gnu.png" /> check-extension="false" check-existence="false" icon="gnu.png" />
<action label="Launch shell on remote" resource="" icon="xilinx.png" />
</action-menu> </action-menu>
<!--
<parameter id="command" label="Command" default="" <parameter id="command" label="Shell command" default=""
type="String" format="CopyValue" visible="true" readonly="false" /> --> type="String" format="CopyValue" visible="true" readonly="false" />
<parameter id="actionIndex" default="%%ChosenActionIndex" <parameter id="actionIndex" default="%%ChosenActionIndex"
type="String" format="CopyValue" visible="false" /> type="String" format="CopyValue" visible="false" />
<input> <input>
<group name="General"> <group name="General">
<!-- "command" --> "RemoteCommand"
"RemoteCommand" </group>
<group name="Shell">
- "command"
</group> </group>
</input> </input>
<output> <output>
<if actionIndex="0"> <if actionIndex="0">
<line name="Vivado"> <line name="Vivado"
timeout="1"
keep-open= "true">
"%ShellSwitches" "%ShellSwitches"
"%PreSSH" "%PreSSH"
"ssh" "ssh"
...@@ -50,6 +55,18 @@ ...@@ -50,6 +55,18 @@
"echo 'the remote server (currently set as %RemoteUser@%RemoteHost)';" "echo 'the remote server (currently set as %RemoteUser@%RemoteHost)';"
"exit 1; } ;" "exit 1; } ;"
</line> </line>
<line name="vivado_check"
dest="VivadoConsole"
mark="``"
sep=""
success="Finished parsing RTL primitives"
prompt="@@FINISH@@">
<!-- "cd ~/%VivadoProjectRoot\n"
"set outputDir ~/%VivadoProjectRoot/build\n"-->
"puts \"@@FINISH@@\"\n"
</line>
</if> </if>
<if actionIndex="1"> <if actionIndex="1">
<line name="Keygen"> <line name="Keygen">
...@@ -91,6 +108,31 @@ ...@@ -91,6 +108,31 @@
"ssh-copy-id %RemoteUser@%RemoteHost;" "ssh-copy-id %RemoteUser@%RemoteHost;"
</line> </line>
</if> </if>
<if actionIndex="3">
<line name="Vivado">
"%ShellSwitches"
"%PreSSH"
"ssh"
"-oBatchMode=yes"
<if TerminalMode = "true">
"-t -t"
</if>
"%SSHSwitches"
"-l"
"%RemoteUser"
"%RemoteHost"
"'"
"%command"
"'"
"%SSHExtra"
"|| { echo '*** ssh connection to the server %RemoteUser@%RemoteHost failed ***';"
"echo 'You may need to configure connection - it is done in \"Package Setup\"';"
"echo 'Then generate a public key (if it is not done already), and post it to';"
"echo 'the remote server (currently set as %RemoteUser@%RemoteHost)';"
"exit 1; } ;"
</line>
</if>
</output> </output>
</tool> </tool>
</vdt-project> </vdt-project>
...@@ -53,9 +53,10 @@ ...@@ -53,9 +53,10 @@
interface="VivadoOptPlaceInterface" interface="VivadoOptPlaceInterface"
package="FPGA_package" package="FPGA_package"
shell="/bin/bash" shell="/bin/bash"
description="Vivado optimize, power optimize, place and physical optimize design"> description="Vivado optimize, power optimize, place and physical optimize design"
log-dir="vivado_logs">
<action-menu> <action-menu>
<action label="Optimize and Place" resource="" icon="xilinx.png" /> <action label="Optimize and Place" resource="" icon="mondrian2x2.png" />
</action-menu> </action-menu>
<parameter id="FromMemory" label="Run from memory" tooltip="Do not load snapshot created after synthesis" <parameter id="FromMemory" label="Run from memory" tooltip="Do not load snapshot created after synthesis"
default="false" type= "Boolean" format="None"/> default="false" type= "Boolean" format="None"/>
...@@ -322,7 +323,9 @@ ...@@ -322,7 +323,9 @@
dest="VivadoConsole" dest="VivadoConsole"
mark="``" mark="``"
sep="" sep=""
prompt="@@FINISH@@" prompt="@@FINISH@@"
success="phys_opt_design completed successfully"
log=""
stdout="parser_VivadoOpt"> stdout="parser_VivadoOpt">
"cd ~/%VivadoProjectRoot\n" "cd ~/%VivadoProjectRoot\n"
"set outputDir ~/%VivadoProjectRoot/build\n" "set outputDir ~/%VivadoProjectRoot/build\n"
......
...@@ -55,7 +55,9 @@ ...@@ -55,7 +55,9 @@
package="FPGA_package" package="FPGA_package"
shell="/bin/bash" shell="/bin/bash"
ignore="%VivadoIgnoreSource" ignore="%VivadoIgnoreSource"
description="Vivado Synthesis"> description="Vivado Synthesis"
log-dir="vivado_logs">
<extensions-list> <extensions-list>
<extension mask="v" /> <extension mask="v" />
<extension mask="tf" /> <extension mask="tf" />
...@@ -63,9 +65,9 @@ ...@@ -63,9 +65,9 @@
<action-menu> <action-menu>
<action label="Synthesize with Vivado:" resource="%ImplementationTopFile" <action label="Synthesize with Vivado:" resource="%ImplementationTopFile"
check-extension="false" check-existence="true" icon="xilinx.png" /> check-extension="false" check-existence="true" icon="Retort.png" />
<action label="Check by Vivado Synthesis:" resource="%%SelectedFile" <action label="Check by Vivado Synthesis:" resource="%%SelectedFile"
check-extension="true" check-existence="true" icon="sample.gif" /> check-extension="true" check-existence="true" icon="IconTestTube.png" />
</action-menu> </action-menu>
<parameter id="ConstraintsFiles" type="Filelist" format="ParamListSyntax" <parameter id="ConstraintsFiles" type="Filelist" format="ParamListSyntax"
...@@ -255,8 +257,11 @@ ...@@ -255,8 +257,11 @@
dest="VivadoConsole" dest="VivadoConsole"
mark="``" mark="``"
sep="" sep=""
prompt="@@FINISH@@" prompt="@@FINISH@@"
success="synth_design completed successfully"
log=""
stdout="parser_VivadoSynth"> stdout="parser_VivadoSynth">
<!-- synth_design completed successfully -->
"cd ~/%VivadoProjectRoot\n" "cd ~/%VivadoProjectRoot\n"
"set outputDir ~/%VivadoProjectRoot/build\n" "set outputDir ~/%VivadoProjectRoot/build\n"
<if ResetProject="true"> <if ResetProject="true">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
shell="/bin/bash" shell="/bin/bash"
description="Copy unisims library to the project directory"> description="Copy unisims library to the project directory">
<action-menu> <action-menu>
<action label="Copy unisims" resource="" icon="xilinx.png" /> <action label="Copy unisims" resource="" icon="door_in.png" />
</action-menu> </action-menu>
<input> <input>
<group name="General"> <group name="General">
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
interface="VDTTestInterface" interface="VDTTestInterface"
description="Testing VDT features"> description="Testing VDT features">
<action-menu> <action-menu>
<action label="Test VDT" resource="" icon="sample.gif" /> <action label="Test VDT" resource="" icon="obj16/spinning.gif" />
</action-menu> </action-menu>
<parameter id="file1" label="File1 (for list)" default="" <parameter id="file1" label="File1 (for list)" default=""
......
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