vivado-prj: Change bitstream file name and set device immediately

Author: m-kru

README.md

@@ -38,6 +38,9 @@ Please check the official [HBS user manual](https://github.com/m-kru/hbs/blob/ma
 ### Changed
 - Improved error messages.
 - Improved regex for errors and warnings.
+- `vivado-prj`: Part is set immediately as `hbs::SetDevice` is called.
+- `vivado-prj`: Bitstream file name changed from current project name to `hbs::Top`.
+  This is required for `write_hw_platform -include_bit` command to work without any extra actions.
 
 ### Fixed
 - Generics handling for xsim.

hbs.tcl

@@ -193,6 +193,10 @@ namespace eval hbs {
 
     hbs::Debug "setting device to '$dev'"
     set hbs::Device $dev
+
+    switch $hbs::Tool {
+      "vivado-prj" { hbs::vivado-prj::setDevice $dev }
+    }
   }
 
   # Sets name of the HDL library.
@@ -1946,6 +1950,10 @@ namespace eval hbs::nvc {
 #   - implementation.
 #   - bitstream.
 namespace eval hbs::vivado-prj {
+  proc setDevice {dev} {
+    hbs::Eval "set_property part $dev \[current_project\]"
+  }
+
   proc setTool {} {
     set prjName [regsub -all :: "$hbs::ThisCorePath\:\:$hbs::ThisTargetName" --]
     set hbs::targetDir [file join $hbs::BuildDir $prjName]
@@ -2086,9 +2094,8 @@ namespace eval hbs::vivado-prj {
     #
     hbs::evalPrePrjCbs
     if {$hbs::Device == ""} {
-      hbs::panic "cannot set part, hbs::Device not set"
+      hbs::panic "hbs::Device not set"
     }
-    hbs::Eval "set_property part $hbs::Device \[current_project\]"
 
     if {$hbs::Top == ""} {
       hbs::panic "cannot set top, hbs::Top not set"
@@ -2127,7 +2134,7 @@ namespace eval hbs::vivado-prj {
     #
     hbs::evalPreBitCbs
     hbs::Eval "open_run impl_1"
-    hbs::Eval "write_bitstream $hbs::ArgsPrefix \[get_property DIRECTORY \[current_run\]\]/\[current_project\].bit $hbs::ArgsSuffix"
+    hbs::Eval "write_bitstream $hbs::ArgsPrefix \[get_property DIRECTORY \[current_run\]\]/$hbs::Top.bit $hbs::ArgsSuffix"
     hbs::evalPostBitCbs
   }
 }

tests/dry-run/vivado-prj/cmd.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-echo "read_vhdl -library lib_a -vhdl2008 $HBS_TESTS_DIR/dry-run/vivado-prj/a.vhd
+echo "set_property part xc7z020clg400-1 [current_project]
+read_vhdl -library lib_a -vhdl2008 $HBS_TESTS_DIR/dry-run/vivado-prj/a.vhd
 read_vhdl -library lib_b -vhdl2008 $HBS_TESTS_DIR/dry-run/vivado-prj/b.vhd
 read_verilog -library xil_defaultlib -sv $HBS_TESTS_DIR/dry-run/vivado-prj/c.sv
 set_property generic GEN=64 [current_fileset]
-set_property part xc7z020clg400-1 [current_project]
 set_property top TopEntity [current_fileset]
 launch_runs SynthArgsPrefix synth_1 SynthArgsSuffix
 wait_on_run synth_1
@@ -17,7 +17,7 @@ if {[get_property PROGRESS [get_runs impl_1]] != \"100%\"} {
   error \"impl_1 failed\"
 }
 open_run impl_1
-write_bitstream BitArgsPrefix [get_property DIRECTORY [current_run]]/[current_project].bit BitArgsSuffix" > golden.txt
+write_bitstream BitArgsPrefix [get_property DIRECTORY [current_run]]/TopEntity.bit BitArgsSuffix" > golden.txt
 
 export HBS_TOOL=vivado-prj
 ../../../hbs dry-run core-c::src > output.txt