Added Vivado , removed some old tools (a3c8f614) · Commits · Elphel / vdt-plugin

tools/BasicInterface.xml

+4 −0

Original line number	Original line	Diff line number	Diff line
	@@ -6,6 +6,10 @@
	<interface name = "BasicInterface">		<interface name = "BasicInterface">

	<!-- Basic types -->		<!-- Basic types -->
			<typedef name = "Boolean">
			<paramtype kind="bool" formatTrue="true" formatFalse="false" />
			</typedef>

	<typedef name = "BoolYesNo">		<typedef name = "BoolYesNo">
	<paramtype kind="bool" formatTrue="YES" formatFalse="NO" />		<paramtype kind="bool" formatTrue="YES" formatFalse="NO" />
	</typedef>		</typedef>

tools/DesignMenu.xml

+35 −74

Original line number	Original line	Diff line number	Diff line
	@@ -9,37 +9,20 @@
	<menu name="Verilog"		<menu name="Verilog"
	label="Verilog Development Tools"		label="Verilog Development Tools"
	icon="newmod_wiz.gif">		icon="newmod_wiz.gif">

	<menuitem name="cver"
	label="CVer simulator"
	icon="cver.gif"
	call="cver"/>

	<menuitem name="modelsim"
	label="ModelSIM simulator"
	icon="modelsim.gif"
	call="ModelSIM"/>

	<menuitem name="xst"
	label="XST (Synthesis)"
	icon="xst.gif"
	call="XST"/>

	<menuitem name="IVerilog"		<menuitem name="IVerilog"
	label="Icarus Verilog Simulator"		label="Icarus Verilog Simulator"
	icon="iverilog.ico"		icon="iverilog.ico"
	call="iverilog"/>		call="iverilog"/>

	<menuitem name="IVerilog Debug"
	label="Icarus Verilog (Debugging TSL)"
	icon="iverilog.ico"
	call="iverilog_dbg"/>

	<menuitem name="GTKWave"		<menuitem name="GTKWave"
	label="GTKWave (Waves viewer)"		label="GTKWave (Waves viewer)"
	icon="gtkwave.ico"		icon="gtkwave.ico"
	call="iverilog"/>		call="iverilog"/>
	</menu>		</menu>
			<menu name="Python tests"
			label="Tests with remote Python console"
			icon="python.png">

	<menuitem name="RemotePython"		<menuitem name="RemotePython"
	label="Run remote Python session"		label="Run remote Python session"
	icon="python.png"		icon="python.png"
	@@ -48,8 +31,11 @@
	label="Send a command to the remote Python session"		label="Send a command to the remote Python session"
	icon="my_tool.gif"		icon="my_tool.gif"
	call="RemotePythonCommand"/>		call="RemotePythonCommand"/>
			</menu>
	<menuitem name="Vivado"		<menu name="Vivado"
			label="Vivado Tools"
			icon="xilinx.png">
			<menuitem name="Vivado Server"
	label="Run remote Vivado session"		label="Run remote Vivado session"
	icon="xilinx.png"		icon="xilinx.png"
	call="Vivado"/>		call="Vivado"/>
	@@ -57,41 +43,18 @@
	label="Send a command to the remote Vivado session"		label="Send a command to the remote Vivado session"
	icon="my_tool.gif"		icon="my_tool.gif"
	call="VivadoTest"/>		call="VivadoTest"/>
	<menuitem name="VivadoLoadSource"		<menuitem name="VivadoSynthesis"
	label="Load source files to Vivado"		label="Run Vivado synthesis"
	icon="xilinx.png"		icon="xilinx.png"
	call="VivadoLoadSource"/>		call="VivadoSynthesis"/>

	<menu name="XDS"
	label="Demo XDS Tools"
	icon="xds.gif">

	<menu name="menuXC"
	label="Native Complilation"
	icon="xds.gif">

	<menuitem name="toolXDS-XC"
	label="Run XDS Native Compiler"
	icon="xds.gif"
	call="toolXDS-XC"/>
	</menu>		</menu>

	<menu name="menuXM"
	label="Via C Complilation"
	icon="xds.gif">

	<menuitem name="toolXDS-XM"
	label="Run XDS Convertor"
	visible="false"
	icon="xds.gif"
	call="toolXDS-XM"/>
	</menu>		</menu>

	<menuitem name="toolXDS-XD"		<menu name="MainDesignMenu2"
	label="Run XDS Debugger"		label="Design Menu 2"
	icon="xds.gif"		icon="sample.gif"
	call="toolXDS-XD"/>		tip="This is an user menu"
	</menu>		inherits="MainDesignMenu">

	<menu name="OtherStuff"		<menu name="OtherStuff"
	label="Various Sample Tools">		label="Various Sample Tools">
	@@ -114,21 +77,6 @@

	</menu>		</menu>

	<menu name="MainDesignMenu2"
	label="Design Menu 2"
	icon="sample.gif"
	tip="This is an user menu"
	inherits="MainDesignMenu">

	<menu name="OtherStuff">
	<menuitem name="tool4"
	label="Run My Tool (4)"
	icon="my_tool.gif"
	call="MyTool"/>
	</menu>

	</menu>

	<menu name="MainDesignMenu3"		<menu name="MainDesignMenu3"
	label="Design Menu 3"		label="Design Menu 3"
	icon="sample.gif"		icon="sample.gif"
	@@ -139,11 +87,24 @@
	label="Just Another Stuff"		label="Just Another Stuff"
	icon="sample.gif"		icon="sample.gif"
	inherits="MainDesignMenu2"		inherits="MainDesignMenu2"
	after="XDS"/>		after="Python tests"/>

	<menuitem name="GREP"		<menuitem name="GREP"
	label="Run GREP"		label="Run GREP"
	call="grep"/>		call="grep"/>
			<menu name="Python tests"
			label="Tests with remote Python console"
			icon="python.png">

			<menuitem name="RemotePython"
			label="Run remote Python session"
			icon="python.png"
			call="RemotePython"/>
			<menuitem name="RemotePythonCommand"
			label="Send a command to the remote Python session"
			icon="my_tool.gif"
			call="RemotePythonCommand"/>
			</menu>

	</menu>		</menu>

tools/FPGA_project.xml

+26 −7

Original line number	Original line	Diff line number	Diff line
	@@ -4,7 +4,7 @@
	<syntax name="RemoteRootSyntax" format="%%ParamValue/%%ProjectName" />		<syntax name="RemoteRootSyntax" format="%%ParamValue/%%ProjectName" />
	<syntax name="SourceListSyntax" format="%(%%SourceList%\| %)" />		<syntax name="SourceListSyntax" format="%(%%SourceList%\| %)" />
	<syntax name="FilteredSourceListSyntax" format="%(%%FilteredSourceList%\| %)" />		<syntax name="FilteredSourceListSyntax" format="%(%%FilteredSourceList%\| %)" />
			<!-- typedef -->
	</interface>		</interface>
	<package name="FPGA_package"		<package name="FPGA_package"
	label="Common parameters for all FPGA projects"		label="Common parameters for all FPGA projects"
	@@ -38,7 +38,9 @@
	<parameter id="VivadoConsole" default="Vivado" label="Vivado console name"		<parameter id="VivadoConsole" default="Vivado" label="Vivado console name"
	type="String" format="CopyValue" visible="true" readonly="false"/>		type="String" format="CopyValue" visible="true" readonly="false"/>

			<!--

			-->

	<input>		<input>
	<group name="VivadoServer" label="Vivado server setup">		<group name="VivadoServer" label="Vivado server setup">
	@@ -66,37 +68,54 @@
	readonly="false" />		readonly="false" />
	<parameter id="SimulationTopModule" label="Project top simulation module"		<parameter id="SimulationTopModule" label="Project top simulation module"
	type="String" default="" format="CopyValue" readonly="false" />		type="String" default="" format="CopyValue" readonly="false" />
	<parameter id="BuildDir" label="project build directory"		<parameter id="SimulDir" label="project simulation directory"
	type="Pathname" default="simulation" format="CopyValue" readonly="false" />		type="Pathname" default="simulation" format="CopyValue" readonly="false" />
	<!-- Vivado parameters -->		<!-- Vivado parameters -->

	<parameter id="VivadoProjectRoot" label="Relative (to user home directory) path of the workspace on Vivado server"		<parameter id="VivadoProjectRoot" label="Relative (to user home directory) path of the workspace on Vivado server"
	type="String" default="vdt" format="RemoteRootSyntax" readonly="false" />		type="String" default="vdt" format="RemoteRootSyntax" readonly="false" />

			<parameter id="VivadoLocalDir" label="Project subdirectroy for Vivado files"
			type="Pathname" default="vivado" format="CopyValue" readonly="false" />

	<parameter id="VivadoIgnoreSource" label="Ignore source files that match this regular expression"		<parameter id="VivadoIgnoreSource" label="Ignore source files that match this regular expression"
	type="String" default=".unisims." format="CopyValue" readonly="false" />		type="String" default=".unisims." format="CopyValue" readonly="false" />
	<!-- Calculated -->		<!-- Calculated -->
	<parameter id="VivadoProjectRoot" label="Relative (to user home directory) path of the project on Vivado server"		<parameter id="VivadoProjectRoot" label="Relative (to user home directory) path of the project on Vivado server"
	type="String" default="vdt" format="RemoteRootSyntax" readonly="false" />		type="String" default="vdt" format="RemoteRootSyntax" readonly="false" />

			<parameter id="SnapshotSynth"
			label="name of Vivado snapshot archive after synthesis"
			default="%%ProjectName-synth.dcp"
			type="String" format="CopyValue" />

	<!-- Invisible (calculated) project-wide parameters -->		<!-- Invisible (calculated) project-wide parameters -->
	<parameter id="BuildDirSlash" type="Pathname" visible="false"		<parameter id="SimulDirSlash" type="Pathname" visible="false"
	default="?%BuildDir=:,%BuildDir/" format="CopyValue"/>		default="?%SimulDir=:,%SimulDir/" format="CopyValue"/>
			<parameter id="SedPaths" type="String" format="CopyValue"
			label="Remote file prefix to be removed for the local error parser"
			default="sed -u 's@/home/%RemoteUser/%VivadoProjectRoot/%%ProjectName/@@'"/>


	<input>		<input>
	<group name="Simulation" label="Simulation properties">		<group name="Simulation" label="Simulation properties">
	"SimulationTopFile"		"SimulationTopFile"
	"SimulationTopModule"		"SimulationTopModule"
	"BuildDir"		"SimulDir"
	</group>		</group>
	<group name="Vivado" label="Vivado general properties">		<group name="Vivado" label="Vivado general properties">
	"VivadoProjectRoot"		"VivadoProjectRoot"
			"VivadoLocalDir"
	"VivadoIgnoreSource"		"VivadoIgnoreSource"
			"SedPaths"
			</group>
			<!-- TODO: make time-stamped and "latest" for snapshots -->
			<group name="VivadoSnapshots" label="Vivado snapshot archive names">
			"SnapshotSynth"
	</group>		</group>
	</input>		</input>
	<output>		<output>
	</output>		</output>
	</project>		</project>
	</vdt-project>		</vdt-project>
			<!-- "\| sed -u 's@/home/xilinx/vdt/npmtest/@@'" -->
			No newline at end of file

tools/SimpleSamples/Remote.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -79,7 +79,7 @@
	</tool>		</tool>
	<tool name="RemotePythonCommand" project="FPGA_project" label="RemotePythonCommand"		<tool name="RemotePythonCommand" project="FPGA_project" label="RemotePythonCommand"
	package="FPGA_package"		package="FPGA_package"
	shell="/bin/bash" interface="RemoteInterface"		shell="bash" interface="RemoteInterface"
	description="Sending command to a ermote Python session" errors="(.):([0-9]+): [a-z ]error: (.*)"		description="Sending command to a ermote Python session" errors="(.):([0-9]+): [a-z ]error: (.*)"
	warnings="(.):([0-9]+): warning: (.)" info="(.):([0-9]+): info: (.)"> <!--does not actually exist -->		warnings="(.):([0-9]+): warning: (.)" info="(.):([0-9]+): info: (.)"> <!--does not actually exist -->
	<extensions-list>		<extensions-list>

tools/SimpleSamples/Tools.xml

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -44,13 +44,13 @@
	<item value="25"/>		<item value="25"/>
	</paramtype>		</paramtype>
	</typedef>		</typedef>
			<!--
	<typedef name="Boolean">		<typedef name="Boolean">
	<paramtype kind="bool"		<paramtype kind="bool"
	formatTrue="TRUE"		formatTrue="TRUE"
	formatFalse="FALSE"/>		formatFalse="FALSE"/>
	</typedef>		</typedef>
			-->
	<typedef name="MyType4">		<typedef name="MyType4">
	<paramtype kind="string"		<paramtype kind="string"
	maxlength="40"		maxlength="40"
	@@ -167,7 +167,7 @@
	<tool name = "MyTool"		<tool name = "MyTool"
	project = "SampleProject"		project = "SampleProject"
	label = "My Tool"		label = "My Tool"
	shell = "?%%OS: Windows=, Linux=/bin/bash"		shell = "?%%OS: Windows=, Linux=bash"
	interface = "MyControlInterface"		interface = "MyControlInterface"
	description = "Tool that does small minor things"		description = "Tool that does small minor things"
	errors = "(.):([0-9]+): [a-z ]error: (.*)"		errors = "(.):([0-9]+): [a-z ]error: (.*)"

Admin message