Skip to content

modified simulation apps to export MEM files, CR 863753 #546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ncimino wants to merge 4 commits into from
Closed

modified simulation apps to export MEM files, CR 863753 #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
803bba5
modified simulation apps to export MEM files, CR 863753
ncimino Mar 10, 2016
2bb0ebe
modified simulation apps to export MEM files, CR 863753
ncimino Mar 10, 2016
5bf6f93
added error message to export_simulation command when top is not set,…
ncimino Mar 10, 2016
6b75d84
modified the simulation compile step to be compile and analyze step, …
ncimino Mar 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tclapp/xilinx/ies/helpers.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ proc usf_init_vars {} {

# data file extension types
variable s_data_files_filter
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory File\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""

# embedded file extension types
variable s_embedded_files_filter
Expand Down Expand Up @@ -1396,7 +1396,11 @@ proc usf_launch_script { simulator step } {
set faulty_run 0
set cwd [pwd]
cd $::tclapp::xilinx::ies::a_sim_vars(s_launch_dir)
send_msg_id USF-IES-063 INFO "Executing '[string toupper $step]' step in '$run_dir'"
set display_step [string toupper $step]
if { "$display_step" == "COMPILE" } {
set display_step "${display_step} and ANALYZE"
}
send_msg_id USF-IES-063 INFO "Executing '${display_step}' step in '$run_dir'"
set results_log {}
switch $step {
{compile} -
Expand Down
8 changes: 6 additions & 2 deletions tclapp/xilinx/modelsim/helpers.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ proc usf_init_vars {} {

# data file extension types
variable s_data_files_filter
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory File\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""

# embedded file extension types
variable s_embedded_files_filter
Expand Down Expand Up @@ -1223,7 +1223,11 @@ proc usf_launch_script { simulator step } {
set faulty_run 0
set cwd [pwd]
cd $::tclapp::xilinx::modelsim::a_sim_vars(s_launch_dir)
send_msg_id USF-ModelSim-069 INFO "Executing '[string toupper $step]' step in '$run_dir'"
set display_step [string toupper $step]
if { "$display_step" == "COMPILE" } {
set display_step "${display_step} and ANALYZE"
}
send_msg_id USF-ModelSim-069 INFO "Executing '${display_step}' step in '$run_dir'"
set results_log {}
switch $step {
{compile} -
Expand Down
7 changes: 5 additions & 2 deletions tclapp/xilinx/projutils/export_simulation.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ proc xps_init_vars {} {
set l_valid_ip_extns [list ".xci" ".bd" ".slx"]

variable s_data_files_filter
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory File\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""

variable s_embedded_files_filter
set s_embedded_files_filter "FILE_TYPE == \"BMM\" || FILE_TYPE == \"ElF\""
Expand Down Expand Up @@ -1654,7 +1654,10 @@ proc xps_write_sim_script { run_dir data_files filename } {
set a_sim_vars(s_top) [get_property top [get_filesets $tcl_obj]]
#send_msg_id exportsim-Tcl-027 INFO "Inspecting design source files for '$a_sim_vars(s_top)' in fileset '$tcl_obj'...\n"
if {[string length $a_sim_vars(s_top)] == 0} {
set a_sim_vars(s_top) "unknown"
send_msg_id exportsim-Tcl-070 ERROR \
"A simulation top was not set. Before running export_simulation a top must be set on the simulation\
fileset. The top can be set on the simulation fileset by running: set_property top <top_module> \[current_fileset -simset\]\n"
#set a_sim_vars(s_top) "unknown"
}
if {[xps_write_script $simulator $dir $filename]} {
return 1
Expand Down
8 changes: 6 additions & 2 deletions tclapp/xilinx/questa/helpers.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ proc usf_init_vars {} {

# data file extension types
variable s_data_files_filter
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory File\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""

# embedded file extension types
variable s_embedded_files_filter
Expand Down Expand Up @@ -1219,7 +1219,11 @@ proc usf_launch_script { simulator step } {
set faulty_run 0
set cwd [pwd]
cd $::tclapp::xilinx::questa::a_sim_vars(s_launch_dir)
send_msg_id USF-Questa-069 INFO "Executing '[string toupper $step]' step in '$run_dir'"
set display_step [string toupper $step]
if { "$display_step" == "COMPILE" } {
set display_step "${display_step} and ANALYZE"
}
send_msg_id USF-Questa-069 INFO "Executing '${display_step}' step in '$run_dir'"
set results_log {}
switch $step {
{compile} -
Expand Down
8 changes: 6 additions & 2 deletions tclapp/xilinx/vcs/helpers.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ proc usf_init_vars {} {

# data file extension types
variable s_data_files_filter
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory File\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""

# embedded file extension types
variable s_embedded_files_filter
Expand Down Expand Up @@ -1398,7 +1398,11 @@ proc usf_launch_script { simulator step } {
set faulty_run 0
set cwd [pwd]
cd $::tclapp::xilinx::vcs::a_sim_vars(s_launch_dir)
send_msg_id USF-VCS-062 INFO "Executing '[string toupper $step]' step in '$run_dir'"
set display_step [string toupper $step]
if { "$display_step" == "COMPILE" } {
set display_step "${display_step} and ANALYZE"
}
send_msg_id USF-VCS-062 INFO "Executing '${display_step}' step in '$run_dir'"
set results_log {}
switch $step {
{compile} -
Expand Down
8 changes: 6 additions & 2 deletions tclapp/xilinx/xsim/helpers.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ proc usf_init_vars {} {

# data file extension types
variable s_data_files_filter
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""
set s_data_files_filter "FILE_TYPE == \"Data Files\" || FILE_TYPE == \"Memory File\" || FILE_TYPE == \"Memory Initialization Files\" || FILE_TYPE == \"Coefficient Files\""

# embedded file extension types
variable s_embedded_files_filter
Expand Down Expand Up @@ -1175,7 +1175,11 @@ proc usf_launch_script { simulator step } {
set faulty_run 0
set cwd [pwd]
cd $::tclapp::xilinx::xsim::a_sim_vars(s_launch_dir)
send_msg_id USF-XSim-061 INFO "Executing '[string toupper $step]' step in '$run_dir'"
set display_step [string toupper $step]
if { "$display_step" == "COMPILE" } {
set display_step "${display_step} and ANALYZE"
}
send_msg_id USF-XSim-061 INFO "Executing '${display_step}' step in '$run_dir'"
set results_log {}
switch $step {
{compile} -
Expand Down