From 600b476f753c849fd07af0adc3c6e17ae26c427a Mon Sep 17 00:00:00 2001
From: Szymon Dolecki <147648237+SzymonHitachi@users.noreply.github.com>
Date: Wed, 18 Dec 2024 11:48:13 +0100
Subject: [PATCH] feat: compile order includes block diagrams

---
 vunit/vivado/tcl/extract_compile_order.tcl | 35 +++++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/vunit/vivado/tcl/extract_compile_order.tcl b/vunit/vivado/tcl/extract_compile_order.tcl
index a087e744a..296b88d45 100644
--- a/vunit/vivado/tcl/extract_compile_order.tcl
+++ b/vunit/vivado/tcl/extract_compile_order.tcl
@@ -4,12 +4,45 @@ set output_file [lindex $argv 1]
 open_project ${project_file}
 
 set file_out [open ${output_file} w]
+
+# Generate block designs, and any IPs contained by the block designs
+generate_target {simulation synthesis} [get_files *.bd]
+
+# Open all block designs otherwise they are not visible through get_bd_designs
+foreach bd [get_files *.bd] {
+    open_bd_design ${bd}
+}
+
+# Generate all IPs not contained in a block design
 foreach ip [get_ips -filter {SCOPE == ""}] {
     generate_target {simulation synthesis} ${ip}
+}
+
+# Build compilation order for all ips
+foreach ip [get_ips] {
     foreach src_file [get_files -used_in simulation -compile_order sources -of_objects ${ip}] {
         set library [get_property LIBRARY ${src_file}]
         set file_type [get_property FILE_TYPE ${src_file}]
         puts ${file_out} "${library},${file_type},${src_file}"
     }
 }
-close ${file_out}
+
+# Build compilation order for all block designs
+set current_simset [current_fileset -simset]
+set current_sim_top [get_property top [get_filesets $current_simset]]
+set current_sim_top_lib [get_property top_lib [get_filesets $current_simset]]
+# -quiet is required otherwise get_bd_designs will error if there are no block designs
+foreach bd [get_bd_designs -quiet] {
+    set_property top ${bd} [get_filesets $current_simset];
+    update_compile_order -fileset $current_simset
+    foreach src_file [get_files -used_in simulation -compile_order sources *${bd}*] {
+        set library [get_property LIBRARY ${src_file}]
+        set file_type [get_property FILE_TYPE ${src_file}]
+        puts ${file_out} "${library},${file_type},${src_file}"
+    }
+}
+set_property top ${current_sim_top} [get_filesets $current_simset]
+set_property top_lib ${current_sim_top_lib} [get_filesets $current_simset]
+update_compile_order -fileset $current_simset
+
+close ${file_out}
\ No newline at end of file