Merge branch 'master' into secure-yosys0.49

Author: eder-matheus

flow/designs/asap7/mock-array/power.tcl

@@ -1,26 +1,68 @@
+source $::env(SCRIPTS_DIR)/util.tcl
+
 foreach libFile $::env(LIB_FILES) {
   if {[lsearch -exact $::env(ADDITIONAL_LIBS) $libFile] == -1} {
     read_liberty $libFile
   }
 }
 
-read_verilog results/asap7/mock-array_Element/base/6_final.v
-read_verilog $::env(RESULTS_DIR)/6_final.v
-read_verilog $::env(PLATFORM_DIR)/verilog/stdcell/empty.v
-
-link_design MockArray
+log_cmd read_verilog results/asap7/mock-array_Element/base/6_final.v
+log_cmd read_verilog $::env(RESULTS_DIR)/6_final.v
+log_cmd read_verilog $::env(PLATFORM_DIR)/verilog/stdcell/empty.v
+log_cmd link_design MockArray
 
-read_sdc $::env(RESULTS_DIR)/6_final.sdc
-read_spef $::env(RESULTS_DIR)/6_final.spef
+log_cmd read_sdc $::env(RESULTS_DIR)/6_final.sdc
+log_cmd read_spef $::env(RESULTS_DIR)/6_final.spef
+puts "read_spef for ces_*_* macros"
 for {set x 0} {$x < 8} {incr x} {
   for {set y 0} {$y < 8} {incr y} {
     read_spef -path ces_${x}_${y} results/asap7/mock-array_Element/base/6_final.spef
   }
 }
 
-report_parasitic_annotation
-report_power
-read_vcd -scope TOP/MockArray $::env(RESULTS_DIR)/MockArrayTestbench.vcd
+log_cmd report_power
+
+set vcd_file $::env(RESULTS_DIR)/MockArrayTestbench.vcd
+log_cmd read_vcd -scope TOP/MockArray $vcd_file
+
+puts "Total number of pins to be annotated: [llength [get_pins -hierarchical *]]"
+set no_vcd_activity {}
+set pins [get_pins -hierarchical *]
+foreach pin $pins {
+  set activity [get_property $pin activity]
+  set activity_origin [lindex $activity 2]
+  if {$activity_origin == "vcd"} {
+    continue
+  }
+  if {$activity_origin == "constant"} {
+    continue
+  }
+  if {$activity_origin == "unknown"} {
+    continue
+  }
+  if {[get_property $pin is_hierarchical]} {
+    continue
+  }
+  if {$activity_origin == "clock"} {
+    continue
+  }
+  set direction [get_property $pin direction]
+  if {$direction == "internal"} {
+    continue
+  }
+  lappend no_vcd_activity "[get_full_name $pin] $activity $direction"
+  if {[llength $no_vcd_activity] >= 10} {
+    break
+  }
+}
+
+if {[llength $no_vcd_activity] > 0} {
+  puts "Error: Listing [llength $no_vcd_activity] pins without activity from $vcd_file:"
+  foreach pin $no_vcd_activity {
+    puts $pin
+  }
+  exit 1
+}
 
 set ces {}
 for {set x 0} {$x < 8} {incr x} {
@@ -29,5 +71,9 @@ for {set x 0} {$x < 8} {incr x} {
   }
 }
 
+puts {report_power -instances [get_cells $ces]}
 report_power -instances [get_cells $ces]
-report_power
+log_cmd report_power
+
+log_cmd report_parasitic_annotation
+log_cmd report_activity_annotation -report_unannotated

flow/designs/asap7/mock-array/simulate.sh

@@ -22,8 +22,6 @@ verilator -Wall --cc \
   -Wno-DECLFILENAME \
   -Wno-UNUSEDSIGNAL \
   -Wno-PINMISSING \
-  --coverage-toggle \
-  --coverage-underscore \
   --Mdir $OBJ_DIR \
   --top-module MockArray \
   --trace \
@@ -33,8 +31,8 @@ verilator -Wall --cc \
   $PLATFORM_DIR/verilog/stdcell/asap7sc7p5t_SIMPLE_RVT_TT_201020.v \
   $PLATFORM_DIR/verilog/stdcell/dff.v \
   $PLATFORM_DIR/verilog/stdcell/empty.v \
-  $POST_DIR/MockArrayFinal.v \
-  $POST_DIR/MockArrayElement.v \
+  $FLOW_HOME/results/asap7/mock-array/base/6_final.v \
+  $FLOW_HOME/results/asap7/mock-array_Element/base/6_final.v \
   --exe \
   $FLOW_HOME/designs/src/mock-array/simulate.cpp
 
@@ -43,4 +41,3 @@ make -j16 -C $OBJ_DIR -f VMockArray.mk
 
 # Run the simulation
 $OBJ_DIR/VMockArray
-verilator_coverage $RESULTS_DIR/coverage.dat --annotate $REPORTS_DIR/

flow/designs/src/mock-array/simulate.cpp

@@ -89,9 +89,6 @@ int main(int argc, char** argv) {
     vcd->flush();
     vcd->close();
 
-    std::string coverage_file = std::string(getenv("RESULTS_DIR")) + "/coverage.dat";
-    Verilated::threadContextp()->coveragep()->write(coverage_file.c_str());
-
     top->final();
     delete top;
     return 0;

flow/scripts/util.tcl

@@ -1,13 +1,15 @@
 proc log_cmd {cmd args} {
   # log the command, escape arguments with spaces
-  puts -nonewline "$cmd[join [lmap arg $args {expr {[string match {* *} $arg] ? " \"$arg\"" : " $arg"}}] ""]"
+  set log_cmd "$cmd[join [lmap arg $args {format " %s" [expr {[string match {* *} $arg] ? "\"$arg\"" : "$arg"}]}] ""]"
+  puts $log_cmd
   set start [clock seconds]
   $cmd {*}$args
   set time [expr {[clock seconds] - $start}]
   if {$time >= 5} {
-    puts -nonewline " ($time seconds)"
+    # Ideally we'd use a single line, but the command can output text
+    # and we don't want to mix it with the log, so output the time it took afterwards.
+    puts "Took $time seconds: $log_cmd"
   }
-  puts ""
 }
 
 proc fast_route {} {