Added trce tools, fixed outid inheritance (81b6ef67) · Commits · Elphel / vdt-plugin

src/com/elphel/vdt/core/tools/params/Parameter.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -558,7 +558,8 @@ public class Parameter implements Cloneable, Updateable {
	if(id == null)		if(id == null)
	throw new NullPointerException("id == null");		throw new NullPointerException("id == null");

	if(outid == null)		//outid is never null - it is set to id in that case just when parameter is constructed
			if((outid == null) \|\| outid.equals(id))
	outid = param.outid;		outid = param.outid;

	if(typeName == null)		if(typeName == null)

tools/DesignMenu.xml

+60 −44

Original line number	Original line	Diff line number	Diff line
	@@ -18,36 +18,27 @@
	label="GTKWave (Waves viewer)"		label="GTKWave (Waves viewer)"
	icon="gtkwave.ico"		icon="gtkwave.ico"
	call="iverilog"/>		call="iverilog"/>
	</menu>
	<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 name="ISE"		<menu name="ISE"
	label="ISE Tools"		label="ISE Tools"
	icon="xilinx.png">		icon="xilinx.png">
			<menu name="ISE_utils"
			label="ISE utilities"
			icon="setup.png">
	<menuitem name="ISECopyUnisims"		<menuitem name="ISECopyUnisims"
	label="Copy Xilinx ISE primitives library to the local project"		label="Copy Xilinx ISE primitives library to the local project"
	icon="copy.png"		icon="copy.png"
	call="ISEUnisims"/>		call="ISEUnisims"/>
	<menuitem name="ISE Server"
	label="Start remote ISE session"
	icon="door_in.png"
	call="ISE"/>
	<menuitem name="ISEPartgen"		<menuitem name="ISEPartgen"
	label="Run ISE partgen"		label="Run ISE partgen"
	icon="bitstream.png"		icon="bitstream.png"
	call="ISEPartgen"/>		call="ISEPartgen"/>
			</menu>

			<menuitem name="ISE Server"
			label="Start remote ISE session"
			icon="door_in.png"
			call="ISE"/>
	<menuitem name="ISESynthesis"		<menuitem name="ISESynthesis"
	label="Synthesize design"		label="Synthesize design"
	icon="Retort.png"		icon="Retort.png"
	@@ -60,10 +51,18 @@
	label="Map design"		label="Map design"
	icon="map_icon.png"		icon="map_icon.png"
	call="ISEMap"/>		call="ISEMap"/>
			<menuitem name="ISETraceMap"
			label="Report post-map timing"
			icon="clock.png"
			call="ISETraceMap"/>
	<menuitem name="ISEPAR"		<menuitem name="ISEPAR"
	label="Place & route design"		label="Place & route design"
	icon="route66.png"		icon="route66.png"
	call="ISEPAR"/>		call="ISEPAR"/>
			<menuitem name="ISETracePAR"
			label="Report post-implementation timing"
			icon="clock.png"
			call="ISETracePAR"/>
	<menuitem name="ISEBitgen"		<menuitem name="ISEBitgen"
	label="Generate bitstream file(s)n"		label="Generate bitstream file(s)n"
	icon="bitstream.png"		icon="bitstream.png"
	@@ -73,11 +72,19 @@
	<menu name="Vivado"		<menu name="Vivado"
	label="Vivado Tools"		label="Vivado Tools"
	icon="xilinx.png">		icon="xilinx.png">
			<menu name="VivadoUtils"
			label="Vivado utilities"
			icon="setup.png">
	<menuitem name="CopyUnisims"		<menuitem name="CopyUnisims"
	label="Copy Xilinx Vivado primitives library to the local project"		label="Copy Xilinx Vivado primitives library to the local project"
	icon="copy.png"		icon="copy.png"
	call="VivadoUnisims"/>		call="VivadoUnisims"/>
			<menuitem name="Vivado Test"
			label="Send a 'Hello World' command to the remote Vivado session"
			icon="my_tool.gif"
			call="VivadoTest"/>
			</menu>

	<menuitem name="Vivado Server"		<menuitem name="Vivado Server"
	label="Start remote Vivado session"		label="Start remote Vivado session"
	icon="door_in.png"		icon="door_in.png"
	@@ -146,27 +153,8 @@
	icon="bitstream.png"		icon="bitstream.png"
	call="VivadoBitstream"/>		call="VivadoBitstream"/>

	<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"
	label="Testing some VDT features"
	icon="sample.gif"
	call="VDTTest"/>
	<!--
	<menuitem name="Test VDT-A"
	label="Testing some VDT features"
	icon="sample.gif"
	tool-instance="VDTTest_inst2"
	call="VDTTest"/>
	-->
	<menuitem name="Test VDT1"
	label="Testing some VDT features - variant 1"
	icon="sample.gif"
	call="VDTTest1"/>

	</menu>		</menu>

	@@ -175,6 +163,19 @@
	icon="sample.gif"		icon="sample.gif"
	tip="This is an user menu"		tip="This is an user menu"
	inherits="MainDesignMenu">		inherits="MainDesignMenu">
			<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 name="OtherStuff"		<menu name="OtherStuff"
	label="Various Sample Tools">		label="Various Sample Tools">
	@@ -193,6 +194,21 @@
	label="MyTool"		label="MyTool"
	icon="my_tool.gif"		icon="my_tool.gif"
	call="MyTool"/>		call="MyTool"/>
			<menuitem name="Test VDT"
			label="Testing some VDT features"
			icon="sample.gif"
			call="VDTTest"/>
			<!--
			<menuitem name="Test VDT-A"
			label="Testing some VDT features"
			icon="sample.gif"
			tool-instance="VDTTest_inst2"
			call="VDTTest"/>
			-->
			<menuitem name="Test VDT1"
			label="Testing some VDT features - variant 1"
			icon="sample.gif"
			call="VDTTest1"/>
	</menu>		</menu>

	</menu>		</menu>

tools/Xilinx_ISE/ise_bitgen.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -141,7 +141,7 @@
	<line name="ise_copy_after_bitgen">		<line name="ise_copy_after_bitgen">
	"-c"		"-c"
	"mkdir -p %ISELocalResultDir ;"		"mkdir -p %ISELocalResultDir ;"
	"echo \" * ignore missing files below *\""		"echo \" * ignore missing files below *\";"
	"rsync -avr -e ssh"		"rsync -avr -e ssh"
	"%RemoteUser@%RemoteHost:%ISEProjectRoot/*.bgn"		"%RemoteUser@%RemoteHost:%ISEProjectRoot/*.bgn"
	"%RemoteUser@%RemoteHost:%ISEProjectRoot/*.drc"		"%RemoteUser@%RemoteHost:%ISEProjectRoot/*.drc"

tools/Xilinx_ISE/ise_par.xml

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -46,7 +46,6 @@

	<depends-list>		<depends-list>
	<depends state="ISESnapshotMap"/>		<depends state="ISESnapshotMap"/>
	<!-- <depends files="constraints"/>-->
	</depends-list>		</depends-list>

	<parameter id="SkipSnapshotPAR" label="Skip snapshot" tooltip="Do not create snapshot after PAR"		<parameter id="SkipSnapshotPAR" label="Skip snapshot" tooltip="Do not create snapshot after PAR"

tools/Xilinx_ISE/ise_trace_map.xml

0 → 100644

+50 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="UTF-8"?>

			<vdt-project>
			<tool name="ISETraceMap" label="Report post-map timing"
			project="FPGA_project"
			interface="ISETraceInterface"
			package="FPGA_package"
			shell="/bin/bash"
			description="Report post-map timing"
			log-dir="ISELogDir"
			state-dir="ISELocalDir"
			disable="DisableISETiming"
			inherits="ISETrace"
			>
			<action-menu>
			<action label="Report post-map static timing" resource="" icon="clock.png" />
			</action-menu>
			<depends-list>
			<depends state="ISESnapshotMap"/>
			</depends-list>
			<parameter id="DisableISETiming"/>
			<parameter id="input_file"/>
			<parameter id="physical_constraints_file"/>
			<parameter id="extra_input_files"/>
			<!-- Trace options -->
			<parameter id="advanced_analysis"/>
			<parameter id="error_report"/>
			<parameter id="fastpath"/>
			<parameter id="limit_per_endpoint"/>
			<parameter id="nodatasheet"/>
			<parameter id="noflight"/>
			<parameter id="output_file" default="%%ProjectName-map.twr"/>
			<parameter id="stamp"/>
			<parameter id="timegroups"/>
			<parameter id="timing_specification_interaction"/>
			<parameter id="uncovered_paths"/>
			<parameter id="verbose"/>
			<parameter id="output_xml" default="%%ProjectName-map.twx"/>
			<!-- common parameters from the base tool -->
			<parameter id="intstyle"/>
			<parameter id="command_files"/>
			<parameter id="speed_grade"/>
			<!-- calculated parameters -->
			<parameter id="ISETraceActionIndex" default="%%ChosenActionIndex"
			type="String" format="CopyValue" visible="false" />
			<parameter id="rawStamp" default="%stamp" visible="false" type="String" format="CopyValue"/>
			</tool>

			</vdt-project>

Admin message