Skip to content

948081 - fixed xpm file processing for -of_objects, 948001 - fixed xsim.ini copy for windows pre-compile flow #559

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

Merged
dbmccrohan merged 2 commits into from
Mar 28, 2016
Merged

948081 - fixed xpm file processing for -of_objects, 948001 - fixed xsim.ini copy for windows pre-compile flow #559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
103167c
948081 - fixed xpm file processing for -of_objects
rajklair Mar 28, 2016
e4533a0
- update catalog
rajklair Mar 28, 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
2 changes: 1 addition & 1 deletion tclapp/xilinx/ies/app.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<catalog>
<apps>
<app>
<revision_history>add VCOM VHDL file for XPM simulation, CR:947555</revision_history>
<revision_history>support for XPM files for -of_objects</revision_history>
<name>ies</name>
<pkg_require>Vivado 2014.1</pkg_require>
<company>xilinx</company>
Expand Down
57 changes: 29 additions & 28 deletions tclapp/xilinx/ies/helpers.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1101,6 +1101,35 @@ proc usf_get_files_for_compilation_behav_sim { global_files_str_arg } {
}
}

set xpm_libraries [get_property -quiet xpm_libraries [current_project]]
set b_using_xpm_libraries false
foreach library $xpm_libraries {
foreach file [rdi::get_xpm_files -library_name $library] {
set file_type "SystemVerilog"
set g_files $global_files_str
set cmd_str [usf_get_file_cmd_str $file $file_type true $g_files l_incl_dirs_opts]
if { {} != $cmd_str } {
lappend files $cmd_str
lappend l_compile_order_files $file
set b_using_xpm_libraries true
}
}
}
if { $b_using_xpm_libraries } {
set xpm_library [xcs_get_common_xpm_library]
set common_xpm_vhdl_files [xcs_get_common_xpm_vhdl_files]
foreach file $common_xpm_vhdl_files {
set file_type "VHDL"
set g_files {}
set b_is_xpm true
set cmd_str [usf_get_file_cmd_str $file $file_type $b_is_xpm $g_files other_ver_opts $xpm_library]
if { {} != $cmd_str } {
lappend files $cmd_str
lappend l_compile_order_files $file
}
}
}

# prepare command line args for fileset files
if { [xcs_is_fileset $target_obj] } {
set used_in_val "simulation"
Expand All @@ -1109,34 +1138,6 @@ proc usf_get_files_for_compilation_behav_sim { global_files_str_arg } {
"SimulationSrcs" { set used_in_val "simulation"}
"BlockSrcs" { set used_in_val "synthesis" }
}
set xpm_libraries [get_property -quiet xpm_libraries [current_project]]
set b_using_xpm_libraries false
foreach library $xpm_libraries {
foreach file [rdi::get_xpm_files -library_name $library] {
set file_type "SystemVerilog"
set g_files $global_files_str
set cmd_str [usf_get_file_cmd_str $file $file_type true $g_files l_incl_dirs_opts]
if { {} != $cmd_str } {
lappend files $cmd_str
lappend l_compile_order_files $file
set b_using_xpm_libraries true
}
}
}
if { $b_using_xpm_libraries } {
set xpm_library [xcs_get_common_xpm_library]
set common_xpm_vhdl_files [xcs_get_common_xpm_vhdl_files]
foreach file $common_xpm_vhdl_files {
set file_type "VHDL"
set g_files {}
set b_is_xpm true
set cmd_str [usf_get_file_cmd_str $file $file_type $b_is_xpm $g_files other_ver_opts $xpm_library]
if { {} != $cmd_str } {
lappend files $cmd_str
lappend l_compile_order_files $file
}
}
}
set b_add_sim_files 1
# add files from block filesets
if { {} != $linked_src_set } {
Expand Down
2 changes: 1 addition & 1 deletion tclapp/xilinx/ies/ies.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::ies {
lappend ::auto_path $home
}
}
package provide ::tclapp::xilinx::ies 2.90
package provide ::tclapp::xilinx::ies 2.91
2 changes: 1 addition & 1 deletion tclapp/xilinx/ies/pkgIndex.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.

package ifneeded ::tclapp::xilinx::ies 2.90 [list source [file join $dir ies.tcl]]
package ifneeded ::tclapp::xilinx::ies 2.91 [list source [file join $dir ies.tcl]]
1 change: 1 addition & 0 deletions tclapp/xilinx/ies/revision_history.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
2.91 support for XPM files for -of_objects
2.90 add VCOM VHDL file for XPM simulation, CR:947555
2.89 set absolute path for xpm files
2.88 pass clibs directory while checking for compiled libraries
Expand Down
2 changes: 1 addition & 1 deletion tclapp/xilinx/modelsim/app.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<catalog>
<apps>
<app>
<revision_history>add VCOM VHDL file for XPM simulation, CR:947555</revision_history>
<revision_history>support for XPM files for -of_objects</revision_history>
<name>modelsim</name>
<pkg_require>Vivado 2014.1</pkg_require>
<company>xilinx</company>
Expand Down
57 changes: 29 additions & 28 deletions tclapp/xilinx/modelsim/helpers.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,35 @@ proc usf_get_files_for_compilation_behav_sim { global_files_str_arg } {
set global_incl_files $incl_files
set global_files_str [usf_get_global_include_file_cmdstr incl_files]

set xpm_libraries [get_property -quiet xpm_libraries [current_project]]
set b_using_xpm_libraries false
foreach library $xpm_libraries {
foreach file [rdi::get_xpm_files -library_name $library] {
set file_type "SystemVerilog"
set g_files $global_files_str
set cmd_str [usf_get_file_cmd_str $file $file_type true $g_files l_incl_dirs_opts]
if { {} != $cmd_str } {
lappend files $cmd_str
lappend l_compile_order_files $file
set b_using_xpm_libraries true
}
}
}
if { $b_using_xpm_libraries } {
set xpm_library [xcs_get_common_xpm_library]
set common_xpm_vhdl_files [xcs_get_common_xpm_vhdl_files]
foreach file $common_xpm_vhdl_files {
set file_type "VHDL"
set g_files {}
set b_is_xpm true
set cmd_str [usf_get_file_cmd_str $file $file_type $b_is_xpm $g_files other_ver_opts $xpm_library]
if { {} != $cmd_str } {
lappend files $cmd_str
lappend l_compile_order_files $file
}
}
}

# verilog incl dir's and verilog headers directory path if any
send_msg_id USF-ModelSim-108 INFO "Finding include directories and verilog header directory paths..."
set l_incl_dirs_opts [list]
Expand All @@ -960,34 +989,6 @@ proc usf_get_files_for_compilation_behav_sim { global_files_str_arg } {
"SimulationSrcs" { set used_in_val "simulation"}
"BlockSrcs" { set used_in_val "synthesis" }
}
set xpm_libraries [get_property -quiet xpm_libraries [current_project]]
set b_using_xpm_libraries false
foreach library $xpm_libraries {
foreach file [rdi::get_xpm_files -library_name $library] {
set file_type "SystemVerilog"
set g_files $global_files_str
set cmd_str [usf_get_file_cmd_str $file $file_type true $g_files l_incl_dirs_opts]
if { {} != $cmd_str } {
lappend files $cmd_str
lappend l_compile_order_files $file
set b_using_xpm_libraries true
}
}
}
if { $b_using_xpm_libraries } {
set xpm_library [xcs_get_common_xpm_library]
set common_xpm_vhdl_files [xcs_get_common_xpm_vhdl_files]
foreach file $common_xpm_vhdl_files {
set file_type "VHDL"
set g_files {}
set b_is_xpm true
set cmd_str [usf_get_file_cmd_str $file $file_type $b_is_xpm $g_files other_ver_opts $xpm_library]
if { {} != $cmd_str } {
lappend files $cmd_str
lappend l_compile_order_files $file
}
}
}
set b_add_sim_files 1
# add files from block filesets
if { {} != $linked_src_set } {
Expand Down
2 changes: 1 addition & 1 deletion tclapp/xilinx/modelsim/modelsim.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ namespace eval ::tclapp::xilinx::modelsim {
lappend ::auto_path $home
}
}
package provide ::tclapp::xilinx::modelsim 2.100
package provide ::tclapp::xilinx::modelsim 2.101
2 changes: 1 addition & 1 deletion tclapp/xilinx/modelsim/pkgIndex.tcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# script is sourced, the variable $dir must contain the
# full path name of this file's directory.

package ifneeded ::tclapp::xilinx::modelsim 2.100 [list source [file join $dir modelsim.tcl]]
package ifneeded ::tclapp::xilinx::modelsim 2.101 [list source [file join $dir modelsim.tcl]]
1 change: 1 addition & 0 deletions tclapp/xilinx/modelsim/revision_history.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
2.101 support for XPM files for -of_objects
2.100 add VCOM VHDL file for XPM simulation, CR:947555
2.99 set absolute path for xpm files
2.98 pass clibs directory while checking for compiled libraries
Expand Down
2 changes: 1 addition & 1 deletion tclapp/xilinx/projutils/app.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<catalog>
<apps>
<app>
<revision_history>do not refetch ipstatic file while iterating over files already returned from get_files</revision_history>
<revision_history>support for XPM files for -of_objects</revision_history>
<name>projutils</name>
<pkg_require>Vivado 2014.1</pkg_require>
<company>xilinx</company>
Expand Down
Loading