Merge pull request #262 from slaclab/pre-release

Release Candidate v4.3.4

.gitattributes

@@ -16,3 +16,4 @@
 *.slabtimeproj filter=lfs diff=lfs merge=lfs -text
 *.pptx filter=lfs diff=lfs merge=lfs -text
 *.xlsx filter=lfs diff=lfs merge=lfs -text
+*.h5 filter=lfs diff=lfs merge=lfs -text

.gitignore

@@ -16,6 +16,10 @@
 *.ld
 *.dat
 
+# Matlab
+*.autosave
+*.slxc
+
 # OS files
 .DS_Store
 .DS_Store?

system_vitis_hls.mk

@@ -24,7 +24,7 @@ export OUT_DIR  = $(abspath $(TOP_DIR)/build/$(PROJECT))
 endif
 
 # Synthesis Variables
-export VIVADO_VERSION   = $(shell vivado -version | grep -Po "(\d+\.)+\d+")
+export VIVADO_VERSION   = $(shell vivado -version | grep -Po "v(\d+\.)+\d+" | cut -c2-)
 export RUCKUS_DIR       = $(TOP_DIR)/submodules/ruckus
 export SOURCE_DEPEND    = $(OUT_DIR)/$(PROJECT)_sources.txt
 

system_vivado.mk

@@ -77,7 +77,7 @@ export VIVADO_PROJECT_SIM_TIME = 1000 ns
 endif
 
 # Synthesis Variables
-export VIVADO_VERSION   = $(shell vivado -version | grep -Po "(\d+\.)+\d+")
+export VIVADO_VERSION   = $(shell vivado -version | grep -Po "v(\d+\.)+\d+" | cut -c2-)
 export VIVADO_INSTALL   = $(abspath  $(shell which vivado)/../..)
 export VIVADO_DIR       = $(abspath $(PROJ_DIR)/vivado)
 export VIVADO_PROJECT   = $(PROJECT)_project

vivado/messages.tcl

@@ -117,7 +117,6 @@ set_msg_config -id {Vivado 12-1008}     -new_severity INFO;# Design Init: No clo
 set_msg_config -id {Power 33-332}       -new_severity INFO;# Route: Found switching activity that implies high-fanout reset nets being asserted for excessive periods of time which may result in inaccurate power analysis.
 
 # Messages: Change from WARNING to ERROR
-set_msg_config -id {Synth 8-614}      -new_severity ERROR;# SYNTH: Signal not in the sensitivity list
 set_msg_config -id {Synth 8-3512}     -new_severity ERROR;# SYNTH: Assigned value in logic is out of range
 set_msg_config -id {VRFC 10-664}      -new_severity ERROR;# SIM:   expression has XXX elements ; expected XXX
 set_msg_config -id {filemgmt 20-1318} -new_severity ERROR;# FILEMGMT: Duplicate entities/files found in the same library
@@ -210,6 +209,15 @@ if { [info exists ::env(ALLOW_LATCH)] != 1 || $::env(ALLOW_LATCH) == 1 } {
     set_msg_config -id {Synth 8-327} -new_severity ERROR; # SYNTH: Inferred latch
 }
 
+###################################################################
+# Check if "Signal not in the sensitivity list" are **NOT** allowed
+###################################################################
+if { [info exists ::env(ALLOW_PARTIAL_SENSE_LIST)] != 1 || $::env(ALLOW_PARTIAL_SENSE_LIST) == 1 } {
+    set_msg_config -id {Synth 8-614} -new_severity "CRITICAL WARNING";# SYNTH: Signal not in the sensitivity list
+} else {
+    set_msg_config -id {Synth 8-614} -new_severity ERROR;# SYNTH: Signal not in the sensitivity list
+}
+
 ########################################################
 # Target specific messages script
 ########################################################

vivado/proc/code_loading.tcl

@@ -97,6 +97,7 @@ proc loadSource args {
               ${fileExt} eq {.v}   ||
               ${fileExt} eq {.vh}  ||
               ${fileExt} eq {.sv}  ||
+              ${fileExt} eq {.svh} ||
               ${fileExt} eq {.dat} ||
               ${fileExt} eq {.coe} ||
               ${fileExt} eq {.mem} ||
@@ -134,7 +135,7 @@ proc loadSource args {
             }
          } else {
             puts "\n\n\n\n\n********************************************************"
-            puts "loadSource: $params(path) does not have a \[.vhd,.vhdl,.v,.vh,.sv,.dat,.coe,.mem,.edif,.dcp\] file extension"
+            puts "loadSource: $params(path) does not have a \[.vhd,.vhdl,.v,.vh,.sv,.svh,.dat,.coe,.mem,.edif,.dcp\] file extension"
             puts "********************************************************\n\n\n\n\n"
             exit -1
          }
@@ -151,7 +152,7 @@ proc loadSource args {
          # Get a list of all RTL files
          set list ""
          set list_rc [catch {
-            set list [glob -directory $params(dir) *.vhd *.vhdl *.v *.vh *.sv *.dat *.coe *.mem *.edif *.dcp]
+            set list [glob -directory $params(dir) *.vhd *.vhdl *.v *.vh *.sv *.svh *.dat *.coe *.mem *.edif *.dcp]
          } _RESULT]
          # Load all the RTL files
          if { ${list} != "" } {
@@ -190,7 +191,7 @@ proc loadSource args {
             }
          } else {
             puts "\n\n\n\n\n********************************************************"
-            puts "loadSource: $params(dir) directory does not have any \[.vhd,.vhdl,.v,.vh,.sv,.dat,.coe,.mem,.edif,.dcp\] files"
+            puts "loadSource: $params(dir) directory does not have any \[.vhd,.vhdl,.v,.vh,.sv,.svh,.dat,.coe,.mem,.edif,.dcp\] files"
             puts "********************************************************\n\n\n\n\n"
             exit -1
          }

vivado/proc/project_management.tcl

@@ -32,7 +32,7 @@ proc CheckVivadoVersion { } {
       return -code error
    }
    # Check if version is newer than what official been tested
-   if { [VersionCompare 2021.2.0] > 0 } {
+   if { [VersionCompare 2022.1.0] > 0 } {
       puts "\n\n\n\n\n********************************************************"
       puts "ruckus has NOT been regression tested with this Vivado $::env(VIVADO_VERSION) release yet"
       puts "https://confluence.slac.stanford.edu/x/n4-jCg"