modified tools for ISE, added reportgen

tools/DesignMenu.xml

@@ -88,6 +88,10 @@
                           label="Report post-implementation timing"
                           icon="clock.png"
                           call="ISETracePAR"/>
+               	<menuitem name="ISEReportGen"
+                          label="Generate reports"
+                          icon="source_attach_attrib.gif"
+                          call="ISEReportGen"/>
                	<menuitem name="ISEBitgen"
                           label="Generate bitstream file(s)n"
                           icon="bitstream.png"

tools/Xilinx_ISE/ise_bitgen.xml

@@ -153,7 +153,7 @@
 			      sep=" "
 			      prompt="@@FINISH@@"
 			      success="@@FINISH@@"
-			      failure="ERROR"
+			      failure="ERROR:"
 			      log=""
 			      stdout="parser_ISE">
 			      "mkdir -p"

tools/Xilinx_ISE/ise_interface.xml

@@ -100,7 +100,7 @@
 			      dest="ISEConsole"
 			      mark="``" 
 			      sep=" "
-			      failure="ERROR"
+			      failure="ERROR:"
 			      prompt="@@FINISH@@"
 			      log="">
 			      "cd ~/%ISEWorkspace\n"
@@ -134,7 +134,7 @@
 			      mark="``" 
 			      sep=" "
 			      prompt="@@FINISH@@"
-			      failure="ERROR"
+			      failure="ERROR:"
 			      log="">
 			      "cd ~/%ISEWorkspace\n"
 			<!-- Remove old snapshot if it exists (unlikely as it includes timestamp?) -->

tools/Xilinx_ISE/ise_map.xml

@@ -312,7 +312,7 @@
 			      sep=" "
 			      prompt="@@FINISH@@"
 			      success="@@FINISH@@"
-			      failure="ERROR"
+			      failure="ERROR:"
 			      log=""
 			      stdout="parser_ISE">
 			      "mkdir -p"
@@ -341,7 +341,8 @@
 			      "%pack_registers_iob"
 			      "%register_duplication"
 			      "%register_ordering"
-			      "%smartguide"
+			      "%smartguide"
+<!-- 			      "%speed_grade"  -->
 			      "%placer_cost_table"
 			      "%timing"
 			      "%do_not_remove_unused"

tools/Xilinx_ISE/ise_ngdbuild.xml

@@ -180,7 +180,7 @@
 			      sep=" "
 			      prompt="@@FINISH@@"
 			      success="@@FINISH@@"
-			      failure="ERROR"
+			      failure="ERROR:"
 			      log=""
 			      stdout="parser_ISE">
 			      "mkdir -p"

tools/Xilinx_ISE/ise_par.xml

@@ -210,7 +210,7 @@
 			      sep=" "
 			      prompt="@@FINISH@@"
 			      success="@@FINISH@@"
-			      failure="ERROR"
+			      failure="ERROR:"
 			      log=""
 			      stdout="parser_ISE">
 			      "mkdir -p"
@@ -231,7 +231,8 @@
 			      "%power"
 			      "%no_routing"
 			      "%router_effor_level"
-			      "%smartguide"
+			      "%smartguide"
+<!-- 			      "%speed_grade"  -->
 			      "%placer_cost_table"
 			      "%overwrite"
 			      "%performance_evaluation"

tools/Xilinx_ISE/ise_partgen.xml

@@ -105,7 +105,7 @@
 			      sep=" "
 			      prompt="@@FINISH@@"
 			      success="@@FINISH@@"
-			      failure="ERROR"
+			      failure="ERROR:"
 			      log=""
 			      stdout="parser_ISE">
 			      "mkdir -p"

tools/Xilinx_ISE/ise_reportgen.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+ /*******************************************************************************
+ * Copyright (c) 2014 Elphel, Inc.
+ * This file is a part of VDT plug-in.
+ * VDT plug-in is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * VDT plug-in is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ *  Additional permission under GNU GPL version 3 section 7:
+ * If you modify this Program, or any covered work, by linking or combining it
+ * with Eclipse or Eclipse plugins (or a modified version of those libraries),
+ * containing parts covered by the terms of EPL/CPL, the licensors of this
+ * Program grant you additional permission to convey the resulting work.
+ * {Corresponding Source for a non-source form of such a combination shall
+ * include the source code for the parts of Eclipse or Eclipse plugins used
+ * as well as that of the covered work.}
+ *******************************************************************************/
+ -->
+<vdt-project>
+	<interface name="ISEReportInterface" extends="ISEInterface">
+		 <typedef name="PadType">
+      		<paramtype kind= "enum" base="String">
+      			<item value= "all"      label="All pads reports"/>
+      			<item value= "csv"      label="Generate CSV (spreadsheet) output file"/>
+      			<item value= "pad"      label="Generate *.pad file"/>
+      			<item value= "text"     label="Generate a plain text pad report"/>
+      		</paramtype>
+    	 </typedef>
+	
+	</interface>
+
+	<tool name="ISEReportGen" label="run ReportGen"
+	    project="FPGA_project"
+		interface="ISEReportInterface"
+		package="FPGA_package"
+		shell="/bin/bash"
+		description="Run ReportGen"
+		log-dir="ISELogDir"
+		state-dir="ISELocalDir"
+		disable="DisableISEReportGen"
+		abstract="false"
+		inherits="ISEToolPrototype"
+		priority="0.5"
+		>
+		<action-menu>
+			<action label="Generate mapping reports" resource="" icon="source_attach_attrib.gif" />
+		</action-menu>
+		<depends-list>
+<!--     	<depends state="ISESnapshotMap"/> -->
+			<depends state="ISESnapshotPAR"/>
+		</depends-list>
+		<parameter id="DisableISEReportGen" label="Disable" tooltip="Disable reports generation"
+		           default="true" type= "Boolean" format="None"/>
+		
+        <parameter	id="input_file" label="Design file name" tooltip= "Input design file name (*.ncd)"
+        			default="%%ProjectName.ncd" visible="true" type="String" format="CopyValue"/>
+        			
+<!-- ReportGen options -->
+
+
+		<parameter id="clock_regions" label="Clock regions"
+				   tooltip="Generate a clock region report"
+		           default="false" omit="false" type= "Boolean" format="DashName"/>
+		<parameter id="delay" label="Delay report"
+				   tooltip="Generate a delay report"
+		           default="false" omit="false" type= "Boolean" format="DashName"/>
+		<parameter id="pad" label="Pads report"
+				   tooltip="Generates a pad report file. You can modify this command by using padfmt and/or padsortcol."
+		           default="false" omit="false" type= "Boolean" format="DashName"/>
+		           
+        <parameter	id="padfmt" label="Pad format" tooltip= "Select report format. Requires -pad option."
+        			default="all" visible="true" omit="" type="PadType" format="Dash"/>
+		           
+        <parameter	id="padsortcol" label="Sort/columns" tooltip= "Specify which columns to show and sort order: 1, 3:5, 8 - show 3,4,5,8 sort by 1. Requiress -pad"
+        			default="" visible="true" omit="" type="String" format="Dash"/>
+		           
+		<parameter id="unrouted_nets" label="Unrouted nets"
+				   tooltip="Generates an unrouted networks report."
+		           default="false" omit="false" type= "Boolean" format="DashName"/>
+
+					
+		<input>
+		    <group name="General options">
+		        "DisableISEReportGen"
+		        "input_file"
+                "clock_regions"
+		        "delay"
+		        "pad"
+		        "padfmt"
+		        "padsortcol"
+		        "unrouted_nets"
+		    </group>
+		</input>
+		<output>
+
+			<line name="ise_run_reportgen"
+			      dest="ISEConsole"
+			      mark="``" 
+			      sep=" "
+			      prompt="@@FINISH@@"
+			      success="@@FINISH@@"
+			      failure="ERROR:"
+			      log=""
+			      stdout="parser_ISE">
+			      "mkdir -p"
+			      "~/%ISEProjectRoot/%ISERemoteDir"
+			      "\n"
+			      "cd ~/%ISEProjectRoot\n"
+			      "%ISEBinAbsolutePath/reportgen"
+			      <!-- reportgen command options -->
+                  "%clock_regions"
+	  	          "%delay"
+		          "%pad"
+				  <if pad="true">
+				    "%padfmt"
+				    "%padsortcol"
+				  </if>
+		          "%unrouted_nets"
+			      "%input_file"
+			      "\n"
+			      "echo \"@@FINISH@@\"\n"
+			</line>
+<!-- TODO: copy results -->	
+			<line name="ise_copy_after_reportgen">
+				"-c"
+				"mkdir -p %ISELocalResultDir ;"
+				"echo \" *** ignore missing files below ***\";"
+				"rsync -avr -e ssh"
+				"%RemoteUser@%RemoteHost:%ISEProjectRoot/*.dly"
+				"%RemoteUser@%RemoteHost:%ISEProjectRoot/*.pad"
+				"%RemoteUser@%RemoteHost:%ISEProjectRoot/*.csv"
+				"%RemoteUser@%RemoteHost:%ISEProjectRoot/*.txt"
+				"%ISELocalResultDir/"
+			</line>
+		</output>
+	</tool>
+	
+</vdt-project>
+

tools/Xilinx_ISE/ise_trace_proto.xml

@@ -170,7 +170,7 @@
 			      sep=" "
 			      prompt="@@FINISH@@"
 			      success="@@FINISH@@"
-			      failure="ERROR"
+			      failure="ERROR:"
 			      log=""
 			      stdout="parser_ISE">
 			      "mkdir -p"

tools/Xilinx_ISE/ise_xst.xml

@@ -694,7 +694,7 @@
 			      sep=" "
 			      prompt="@@FINISH@@"
 			      success="@@FINISH@@"
-			      failure="ERROR"
+			      failure="ERROR:"
 			      log=""
 			      stdout="parser_ISE">
 			      "mkdir -p"