From: Cahit <c.ugur@gsi.de>
Date: Wed, 16 Apr 2014 19:29:52 +0000 (+0200)
Subject: better reporting in compile scripts
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=5bcd3235c57a5fcbb25f139dd507b6133587fcfa;p=trb3.git

better reporting in compile scripts
---

diff --git a/32PinAddOn/compile_periph_gsi.pl b/32PinAddOn/compile_periph_gsi.pl
index 3cceff2..0d1b968 100755
--- a/32PinAddOn/compile_periph_gsi.pl
+++ b/32PinAddOn/compile_periph_gsi.pl
@@ -183,21 +183,22 @@ if($map==1 || $all==1){
 	    print "#        !!!Possible Placement Errors!!!        #\n";
 	    print "#################################################\n\n";
 	    
-	    my $c="egrep \"WARNING|FC_|HitInvert|ff_en_\" par.log";
+	    my $c="egrep 'WARNING.*hitBuf_|Channels/hit_buf_RNO|WARNING.*FC_|Channels/Channel200/SimAdderNo_FC|WARNING.*ff_en_|Channels/Channel200/ff_array_en_i_1_i'"." $TOPNAME"."_mrp.html";
 	    system($c);
 	    last;
 	}
     }
 }
 
-
 if($par==1 || $all==1){
     system("rm $TOPNAME.ncd");
     #$c=qq|mpartrce -p "../$TOPNAME.p2t" -log "$TOPNAME.log" -o "$TOPNAME.rpt" -pr "$TOPNAME.prf" -tf "$TOPNAME.pt" "|.$TOPNAME.qq|_map.ncd" "$TOPNAME.ncd"|;
     #$c=qq|$lattice_path/ispfpga/bin/lin/multipar -pr "$TOPNAME.prf" -o "mpar_$TOPNAME.rpt" -log "mpar_$TOPNAME.log" -p "../$TOPNAME.p2t" "$tpmap.ncd" "$TOPNAME.ncd"|;
     if ($isMultiPar)
     {
-	$c=qq|par -m ../nodes_lxhadeb07.txt -n $nrNodes -stopzero -w -l 5 -i 6 -t 1 -c 0 -e 0 -exp parDisablePgroup=0:parUseNBR=1:parCDP=0:parCDR=0:parPathBased=ON $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
+	#$c=qq|par -m ../nodes_lxhadeb07.txt -n $nrNodes -stopzero -w -l 5 -t 1 -e 100 -exp parDisablePgroup=0:parUseNBR=1:parCDP=1:parPathBased=ON $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
+	#$c=qq|par -m ../nodes_lxhadeb07.txt -n $nrNodes -stopzero -w -l 5 -i 6 -t 1 -c 0 -e 0 -exp parDisablePgroup=0:parUseNBR=1:parCDP=0:parCDR=0:parPathBased=ON $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
+	$c=qq|par -m ../nodes_lxhadeb07.txt -n $nrNodes -w -l 5 -t 1 $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
 	execute($c);
         # find and copy the .ncd file which has met the timing constraints
 	$fh = new FileHandle("<$TOPNAME".".par");
@@ -231,17 +232,19 @@ if($par==1 || $all==1){
     }
     else
     {
-	$c=qq|par -w -l 5 -i 6 -t 1 -c 0 -e 0 -exp parUseNBR=1:parCDP=0:parCDR=0:parPathBased=ON $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
+	#$c=qq|par -w -l 5 -i 6 -t 1 -c 0 -e 0 -exp parUseNBR=1:parCDP=0:parCDR=0:parPathBased=ON $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
+	$c=qq|par -w -l 5 -t 1 $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
 	execute($c);
 	my $c="cp $TOPNAME.dir/5_1.ncd $TOPNAME.ncd";
 	system($c);
     }
     my $c="cat $TOPNAME.par";
     system($c);
+
 }
 
 
-if($timing==1){
+if($timing==1 || $all==1){
     # IOR IO Timing Report
     $c=qq|iotiming -s "$TOPNAME.ncd" "$TOPNAME.prf"|;
     execute($c);
@@ -258,6 +261,7 @@ if($timing==1){
     
     my $c="cat $TOPNAME.par";
     system($c);
+
 }
 
 if($bitgen==1 || $all==1){
@@ -266,6 +270,12 @@ if($bitgen==1 || $all==1){
     execute($c);
 }
 
+$c=qq|htmlrpt -mrp $TOPNAME.mrp -mtwr $TOPNAME.twr.hold -ptwr $TOPNAME.twr.setup $TOPNAME|;
+execute($c);
+
+$c=qq|firefox $TOPNAME.html|;
+execute($c);
+
 chdir "..";
 exit;
 
diff --git a/cbmtof/compile_cbmtof_gsi.pl b/cbmtof/compile_cbmtof_gsi.pl
index 7a4dd58..4917432 100755
--- a/cbmtof/compile_cbmtof_gsi.pl
+++ b/cbmtof/compile_cbmtof_gsi.pl
@@ -183,7 +183,7 @@ if($map==1 || $all==1){
 	    print "#        !!!Possible Placement Errors!!!        #\n";
 	    print "#################################################\n\n";
 	    
-	    my $c="egrep 'WARNING.*hitBuf_|Channels/hit_buf_RNO|WARNING.*FC_|Channels/Channel200/SimAdderNo_FC|WARNING.*ff_en_|Channels/Channel200/ff_array_en_i_1_i' trb3_periph_padiwa_mrp.html";
+	    my $c="egrep 'WARNING.*hitBuf_|Channels/hit_buf_RNO|WARNING.*FC_|Channels/Channel200/SimAdderNo_FC|WARNING.*ff_en_|Channels/Channel200/ff_array_en_i_1_i'"." $TOPNAME"."_mrp.html";
 	    system($c);
 	    last;
 	}
@@ -232,7 +232,8 @@ if($par==1 || $all==1){
     }
     else
     {
-	$c=qq|par -w -l 5 -i 6 -t 1 -c 0 -e 0 -exp parUseNBR=1:parCDP=0:parCDR=0:parPathBased=ON $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
+	#$c=qq|par -w -l 5 -i 6 -t 1 -c 0 -e 0 -exp parUseNBR=1:parCDP=0:parCDR=0:parPathBased=ON $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
+	$c=qq|par -w -l 5 -t 1 $tpmap.ncd $TOPNAME.dir $TOPNAME.prf|;
 	execute($c);
 	my $c="cp $TOPNAME.dir/5_1.ncd $TOPNAME.ncd";
 	system($c);
@@ -269,7 +270,7 @@ if($bitgen==1 || $all==1){
     execute($c);
 }
 
-$c=qq|htmlrpt -mrp $TOPNAME.mrp -ptwr $TOPNAME.twr.setup $TOPNAME|;
+$c=qq|htmlrpt -mrp $TOPNAME.mrp -mtwr $TOPNAME.twr.hold -ptwr $TOPNAME.twr.setup $TOPNAME|;
 execute($c);
 
 $c=qq|firefox $TOPNAME.html|;
@@ -292,4 +293,3 @@ sub execute {
     }
     return $r;
 }
-
diff --git a/wasa/compile_periph_gsi.pl b/wasa/compile_periph_gsi.pl
index b10bd78..d3d40b1 100755
--- a/wasa/compile_periph_gsi.pl
+++ b/wasa/compile_periph_gsi.pl
@@ -243,7 +243,7 @@ if($par==1 || $all==1){
 }
 
 
-if($timing==1){
+if($timing==1 || $all==1){
     # IOR IO Timing Report
     $c=qq|iotiming -s "$TOPNAME.ncd" "$TOPNAME.prf"|;
     execute($c);
@@ -261,12 +261,6 @@ if($timing==1){
     my $c="cat $TOPNAME.par";
     system($c);
 
-    $c=qq|htmlrpt -ptwr $TOPNAME.twr.setup $TOPNAME|;
-    execute($c);
-
-    $c=qq|firefox $TOPNAME.html|;
-    execute($c);
-
 }
 
 if($bitgen==1 || $all==1){
@@ -275,6 +269,12 @@ if($bitgen==1 || $all==1){
     execute($c);
 }
 
+$c=qq|htmlrpt -mrp $TOPNAME.mrp -ptwr $TOPNAME.twr.setup $TOPNAME|;
+execute($c);
+
+$c=qq|firefox $TOPNAME.html|;
+execute($c);
+
 chdir "..";
 exit;