Update rtl designs where manual kernel.xml file usage is removed (#400)

Bhaskar VishnuVardhan Chebrolu · heeran-xilinx · commit 29cca74ddf86 · 2020-06-09T18:59:53.000+05:30
diff --git a/rtl_kernels/rtl_adder_streams/scripts/gen_adder_xo.tcl b/rtl_kernels/rtl_adder_streams/scripts/gen_adder_xo.tcl
@@ -14,7 +14,7 @@ if {[file exists "kernel_2.xo"]} {
     file delete -force "kernel_2.xo"
 }
 
-package_xo -xo_path kernel_2.xo -kernel_name krnl_adder_stage_rtl -ip_directory src/ip/ip_2 -kernel_xml src/kernel_adder_stage.xml
+package_xo -xo_path kernel_2.xo -kernel_name krnl_adder_stage_rtl -ip_directory src/ip/ip_2
 
 set xo_path [file join [pwd] ${xo_pathname}]
 if {[file exists "kernel_2.xo"]} {
diff --git a/rtl_kernels/rtl_adder_streams/scripts/gen_input_xo.tcl b/rtl_kernels/rtl_adder_streams/scripts/gen_input_xo.tcl
@@ -14,7 +14,7 @@ if {[file exists "kernel_1.xo"]} {
     file delete -force "kernel_1.xo"
 }
 
-package_xo -xo_path kernel_1.xo -kernel_name krnl_input_stage_rtl -ip_directory src/ip/ip_1 -kernel_xml src/kernel_input_stage.xml
+package_xo -xo_path kernel_1.xo -kernel_name krnl_input_stage_rtl -ip_directory src/ip/ip_1
 
 set xo_path [file join [pwd] ${xo_pathname}]
 if {[file exists "kernel_1.xo"]} {
diff --git a/rtl_kernels/rtl_adder_streams/scripts/gen_output_xo.tcl b/rtl_kernels/rtl_adder_streams/scripts/gen_output_xo.tcl
@@ -14,7 +14,7 @@ if {[file exists "kernel_3.xo"]} {
     file delete -force "kernel_3.xo"
 }
 
-package_xo -xo_path kernel_3.xo -kernel_name krnl_output_stage_rtl -ip_directory src/ip/ip_3 -kernel_xml src/kernel_output_stage.xml
+package_xo -xo_path kernel_3.xo -kernel_name krnl_output_stage_rtl -ip_directory src/ip/ip_3
 
 set xo_path [file join [pwd] ${xo_pathname}]
 if {[file exists "kernel_3.xo"]} {
diff --git a/rtl_kernels/rtl_adder_streams/src/kernel_adder_stage.xml b/rtl_kernels/rtl_adder_streams/src/kernel_adder_stage.xml
diff --git a/rtl_kernels/rtl_adder_streams/src/kernel_input_stage.xml b/rtl_kernels/rtl_adder_streams/src/kernel_input_stage.xml
diff --git a/rtl_kernels/rtl_adder_streams/src/kernel_output_stage.xml b/rtl_kernels/rtl_adder_streams/src/kernel_output_stage.xml
diff --git a/rtl_kernels/rtl_vadd/README.md b/rtl_kernels/rtl_vadd/README.md
@@ -17,7 +17,6 @@ src/hdl/krnl_vadd_rtl_control_s_axi.v
 src/hdl/krnl_vadd_rtl_counter.sv
 src/hdl/krnl_vadd_rtl_int.sv
 src/host.cpp
-src/kernel.xml
 ```
 
 ##  COMMAND LINE ARGUMENTS
diff --git a/rtl_kernels/rtl_vadd/config.mk b/rtl_kernels/rtl_vadd/config.mk
@@ -1,4 +1,4 @@
 VIVADO := $(XILINX_VIVADO)/bin/vivado
-$(TEMP_DIR)/vadd.xo: src/kernel.xml scripts/package_kernel.tcl scripts/gen_xo.tcl src/hdl/*.sv src/hdl/*.v 
+$(TEMP_DIR)/vadd.xo: scripts/package_kernel.tcl scripts/gen_xo.tcl src/hdl/*.sv src/hdl/*.v 
 	mkdir -p $(TEMP_DIR)
-	$(VIVADO) -mode batch -source scripts/gen_xo.tcl -tclargs $(TEMP_DIR)/vadd.xo vadd $(TARGET) $(DEVICE) $(XSA)
+	$(VIVADO) -mode batch -source scripts/gen_xo.tcl -tclargs $(TEMP_DIR)/vadd.xo vadd $(TARGET) $(DEVICE) $(XSA)
diff --git a/rtl_kernels/rtl_vadd/details.md b/rtl_kernels/rtl_vadd/details.md
@@ -9,5 +9,4 @@ C/C++ kernels. That is, they are seen by the host application as functions with
 arguments. 
 
 The RTL Kernel Wizard automates some of the steps that need to be taken to ensure that the RTL IP is packaged into a kernel that can be 
-integrated into a system in Vitis environment. A `kernel.xml` file is generated to match the software function prototype and behavior
-specified in the wizard.
+integrated into a system in Vitis environment.
diff --git a/rtl_kernels/rtl_vadd/scripts/gen_xo.tcl b/rtl_kernels/rtl_vadd/scripts/gen_xo.tcl
@@ -52,4 +52,4 @@ if {[file exists "${xoname}"]} {
     file delete -force "${xoname}"
 }
 
-package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl -ip_directory ./packaged_kernel_${suffix} -kernel_xml ./src/kernel.xml
+package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl -ip_directory ./packaged_kernel_${suffix}
diff --git a/rtl_kernels/rtl_vadd/scripts/package_kernel.tcl b/rtl_kernels/rtl_vadd/scripts/package_kernel.tcl
@@ -148,8 +148,7 @@ set reg      [::ipx::add_register -quiet "c" $addr_block]
 
 set reg      [::ipx::add_register -quiet "length_r" $addr_block]
   set_property address_offset 0x034 $reg
-  set_property size           [expr {8*8}]   $reg
-
+  set_property size           [expr {4*8}]   $reg
 
 set_property slave_memory_map_ref "s_axi_control" [::ipx::get_bus_interfaces -of $core "s_axi_control"]
 
diff --git a/rtl_kernels/rtl_vadd/src/kernel.xml b/rtl_kernels/rtl_vadd/src/kernel.xml
diff --git a/rtl_kernels/rtl_vadd_2clks/README.md b/rtl_kernels/rtl_vadd_2clks/README.md
@@ -19,7 +19,6 @@ src/hdl/krnl_vadd_2clk_rtl_control_s_axi.v
 src/hdl/krnl_vadd_2clk_rtl_counter.sv
 src/hdl/krnl_vadd_2clk_rtl_int.sv
 src/host.cpp
-src/kernel.xml
 ```
 
 ##  COMMAND LINE ARGUMENTS
diff --git a/rtl_kernels/rtl_vadd_2clks/config.mk b/rtl_kernels/rtl_vadd_2clks/config.mk
@@ -1,4 +1,4 @@
 VIVADO := $(XILINX_VIVADO)/bin/vivado
-$(TEMP_DIR)/vadd.xo: src/kernel.xml scripts/package_kernel.tcl scripts/gen_xo.tcl src/hdl/*.sv src/hdl/*.v
+$(TEMP_DIR)/vadd.xo: scripts/package_kernel.tcl scripts/gen_xo.tcl src/hdl/*.sv src/hdl/*.v
 	mkdir -p $(TEMP_DIR)
-	$(VIVADO) -mode batch -source scripts/gen_xo.tcl -tclargs $(TEMP_DIR)/vadd.xo vadd $(TARGET) $(DEVICE) $(XSA)
+	$(VIVADO) -mode batch -source scripts/gen_xo.tcl -tclargs $(TEMP_DIR)/vadd.xo vadd $(TARGET) $(DEVICE) $(XSA)
diff --git a/rtl_kernels/rtl_vadd_2clks/scripts/gen_xo.tcl b/rtl_kernels/rtl_vadd_2clks/scripts/gen_xo.tcl
@@ -52,4 +52,4 @@ if {[file exists "${xoname}"]} {
     file delete -force "${xoname}"
 }
 
-package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl -ip_directory ./packaged_kernel_${suffix} -kernel_xml ./src/kernel.xml
+package_xo -xo_path ${xoname} -kernel_name krnl_vadd_2clk_rtl -ip_directory ./packaged_kernel_${suffix}
diff --git a/rtl_kernels/rtl_vadd_2clks/scripts/package_kernel.tcl b/rtl_kernels/rtl_vadd_2clks/scripts/package_kernel.tcl
@@ -160,7 +160,7 @@ set reg      [::ipx::add_register -quiet "c" $addr_block]
 
 set reg      [::ipx::add_register -quiet "length_r" $addr_block]
   set_property address_offset 0x034 $reg
-  set_property size           [expr {8*8}]   $reg
+  set_property size           [expr {4*8}]   $reg
 
 
 set_property slave_memory_map_ref "s_axi_control" [::ipx::get_bus_interfaces -of $core "s_axi_control"]
diff --git a/rtl_kernels/rtl_vadd_2clks/src/host.cpp b/rtl_kernels/rtl_vadd_2clks/src/host.cpp
@@ -88,7 +88,7 @@ int main(int argc, char **argv) {
       std::cout << "Failed to program device[" << i << "] with xclbin file!\n";
     } else {
       std::cout << "Device[" << i << "]: program successful!\n";
-      OCL_CHECK(err, krnl_vadd = cl::Kernel(program, "krnl_vadd_rtl", &err));
+      OCL_CHECK(err, krnl_vadd = cl::Kernel(program, "krnl_vadd_2clk_rtl", &err));
       valid_device++;
       break; // we break because we found a valid device
     }
diff --git a/rtl_kernels/rtl_vadd_2clks/src/kernel.xml b/rtl_kernels/rtl_vadd_2clks/src/kernel.xml
diff --git a/rtl_kernels/rtl_vadd_2kernels/README.md b/rtl_kernels/rtl_vadd_2kernels/README.md
@@ -24,8 +24,6 @@ src/ip_1/hdl/krnl_vadd_rtl_axi_write_master.sv
 src/ip_1/hdl/krnl_vadd_rtl_control_s_axi.v
 src/ip_1/hdl/krnl_vadd_rtl_counter.sv
 src/ip_1/hdl/krnl_vadd_rtl_int.sv
-src/kernel_0.xml
-src/kernel_1.xml
 ```
 
 ##  COMMAND LINE ARGUMENTS
diff --git a/rtl_kernels/rtl_vadd_2kernels/config.mk b/rtl_kernels/rtl_vadd_2kernels/config.mk
@@ -1,7 +1,7 @@
 VIVADO := $(XILINX_VIVADO)/bin/vivado
-$(TEMP_DIR)/vadd0.xo: src/kernel_0.xml scripts/package_kernel_0.tcl scripts/gen_vadd0_xo.tcl src/ip_0/hdl/*.sv src/ip_0/hdl/*.v 
+$(TEMP_DIR)/vadd0.xo: scripts/package_kernel_0.tcl scripts/gen_vadd0_xo.tcl src/ip_0/hdl/*.sv src/ip_0/hdl/*.v 
 	mkdir -p $(TEMP_DIR)
 	$(VIVADO) -mode batch -source scripts/gen_vadd0_xo.tcl -tclargs $(TEMP_DIR)/vadd0.xo vadd $(TARGET) $(DEVICE) $(XSA)
-$(TEMP_DIR)/vadd1.xo: src/kernel_1.xml scripts/package_kernel_1.tcl scripts/gen_vadd1_xo.tcl src/ip_1/hdl/*.sv src/ip_1/hdl/*.v
+$(TEMP_DIR)/vadd1.xo: scripts/package_kernel_1.tcl scripts/gen_vadd1_xo.tcl src/ip_1/hdl/*.sv src/ip_1/hdl/*.v
 	mkdir -p $(TEMP_DIR)
-	$(VIVADO) -mode batch -source scripts/gen_vadd1_xo.tcl -tclargs $(TEMP_DIR)/vadd1.xo vadd $(TARGET) $(DEVICE) $(XSA)
+	$(VIVADO) -mode batch -source scripts/gen_vadd1_xo.tcl -tclargs $(TEMP_DIR)/vadd1.xo vadd $(TARGET) $(DEVICE) $(XSA)
diff --git a/rtl_kernels/rtl_vadd_2kernels/details.md b/rtl_kernels/rtl_vadd_2kernels/details.md
@@ -8,5 +8,4 @@ RTL kernels can be integrated to Vitis using `RTL Kernel Wizard`. These kernels
 kernels. That is, they are seen by the host application as functions with a void return value, scalar arguments, and pointer arguments.
 
 The RTL Kernel Wizard automates some of the steps that need to be taken to ensure that the RTL IP is packaged into a kernel that can be
-integrated into a system in Vitis environment. A `kernel.xml` file is generated to match the software function prototype and behavior
-specified in the wizard.
+integrated into a system in Vitis environment. 
diff --git a/rtl_kernels/rtl_vadd_2kernels/scripts/gen_vadd0_xo.tcl b/rtl_kernels/rtl_vadd_2kernels/scripts/gen_vadd0_xo.tcl
@@ -52,4 +52,4 @@ if {[file exists "${xoname}"]} {
     file delete -force "${xoname}"
 }
 
-package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl_0 -ip_directory ./packaged_kernel/ip_0_${suffix} -kernel_xml ./src/kernel_0.xml
+package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl_0 -ip_directory ./packaged_kernel/ip_0_${suffix}
diff --git a/rtl_kernels/rtl_vadd_2kernels/scripts/gen_vadd1_xo.tcl b/rtl_kernels/rtl_vadd_2kernels/scripts/gen_vadd1_xo.tcl
@@ -52,4 +52,4 @@ if {[file exists "${xoname}"]} {
     file delete -force "${xoname}"
 }
 
-package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl_1 -ip_directory ./packaged_kernel/ip_1_${suffix} -kernel_xml ./src/kernel_1.xml
+package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl_1 -ip_directory ./packaged_kernel/ip_1_${suffix}
diff --git a/rtl_kernels/rtl_vadd_2kernels/scripts/package_kernel_0.tcl b/rtl_kernels/rtl_vadd_2kernels/scripts/package_kernel_0.tcl
@@ -148,7 +148,7 @@ set reg      [::ipx::add_register -quiet "c" $addr_block]
 
 set reg      [::ipx::add_register -quiet "length_r" $addr_block]
   set_property address_offset 0x034 $reg
-  set_property size           [expr {8*8}]   $reg
+  set_property size           [expr {4*8}]   $reg
 
 
 set_property slave_memory_map_ref "s_axi_control" [::ipx::get_bus_interfaces -of $core "s_axi_control"]
diff --git a/rtl_kernels/rtl_vadd_2kernels/scripts/package_kernel_1.tcl b/rtl_kernels/rtl_vadd_2kernels/scripts/package_kernel_1.tcl
@@ -148,7 +148,7 @@ set reg      [::ipx::add_register -quiet "c" $addr_block]
 
 set reg      [::ipx::add_register -quiet "length_r" $addr_block]
   set_property address_offset 0x034 $reg
-  set_property size           [expr {8*8}]   $reg
+  set_property size           [expr {4*8}]   $reg
 
 
 set_property slave_memory_map_ref "s_axi_control" [::ipx::get_bus_interfaces -of $core "s_axi_control"]
diff --git a/rtl_kernels/rtl_vadd_2kernels/src/kernel_0.xml b/rtl_kernels/rtl_vadd_2kernels/src/kernel_0.xml
diff --git a/rtl_kernels/rtl_vadd_2kernels/src/kernel_1.xml b/rtl_kernels/rtl_vadd_2kernels/src/kernel_1.xml
diff --git a/rtl_kernels/rtl_vadd_hw_debug/README.md b/rtl_kernels/rtl_vadd_hw_debug/README.md
@@ -28,7 +28,6 @@ src/hdl/krnl_vadd_rtl_control_s_axi.v
 src/hdl/krnl_vadd_rtl_counter.sv
 src/hdl/krnl_vadd_rtl_int.sv
 src/host.cpp
-src/kernel.xml
 ```
 
 ##  COMMAND LINE ARGUMENTS
diff --git a/rtl_kernels/rtl_vadd_hw_debug/config.mk b/rtl_kernels/rtl_vadd_hw_debug/config.mk
@@ -1,4 +1,4 @@
 VIVADO := $(XILINX_VIVADO)/bin/vivado
-$(TEMP_DIR)/vadd.xo: src/kernel.xml scripts/package_kernel.tcl scripts/gen_xo.tcl src/hdl/*.sv src/hdl/*.v 
+$(TEMP_DIR)/vadd.xo: scripts/package_kernel.tcl scripts/gen_xo.tcl src/hdl/*.sv src/hdl/*.v 
 	mkdir -p $(TEMP_DIR)
-	$(VIVADO) -mode batch -source scripts/gen_xo.tcl -tclargs $(TEMP_DIR)/vadd.xo vadd $(TARGET) $(DEVICE) $(XSA)
+	$(VIVADO) -mode batch -source scripts/gen_xo.tcl -tclargs $(TEMP_DIR)/vadd.xo vadd $(TARGET) $(DEVICE) $(XSA)
diff --git a/rtl_kernels/rtl_vadd_hw_debug/scripts/gen_xo.tcl b/rtl_kernels/rtl_vadd_hw_debug/scripts/gen_xo.tcl
@@ -52,4 +52,4 @@ if {[file exists "${xoname}"]} {
     file delete -force "${xoname}"
 }
 
-package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl -ip_directory ./packaged_kernel_${suffix} -kernel_xml ./src/kernel.xml
+package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl -ip_directory ./packaged_kernel_${suffix}
diff --git a/rtl_kernels/rtl_vadd_hw_debug/scripts/package_kernel.tcl b/rtl_kernels/rtl_vadd_hw_debug/scripts/package_kernel.tcl
@@ -153,7 +153,7 @@ set reg      [::ipx::add_register -quiet "c" $addr_block]
 
 set reg      [::ipx::add_register -quiet "length_r" $addr_block]
   set_property address_offset 0x034 $reg
-  set_property size           [expr {8*8}]   $reg
+  set_property size           [expr {4*8}]   $reg
 
 
 set_property slave_memory_map_ref "s_axi_control" [::ipx::get_bus_interfaces -of $core "s_axi_control"]
diff --git a/rtl_kernels/rtl_vadd_hw_debug/src/kernel.xml b/rtl_kernels/rtl_vadd_hw_debug/src/kernel.xml
diff --git a/rtl_kernels/rtl_vadd_mixed_c_vadd/README.md b/rtl_kernels/rtl_vadd_mixed_c_vadd/README.md
@@ -17,7 +17,6 @@ src/hdl/krnl_vadd_rtl_control_s_axi.v
 src/hdl/krnl_vadd_rtl_counter.sv
 src/hdl/krnl_vadd_rtl_int.sv
 src/host.cpp
-src/kernel.xml
 src/krnl_vadd.cpp
 ```
 
diff --git a/rtl_kernels/rtl_vadd_mixed_c_vadd/config.mk b/rtl_kernels/rtl_vadd_mixed_c_vadd/config.mk
@@ -1,5 +1,5 @@
 VIVADO := $(XILINX_VIVADO)/bin/vivado
-$(TEMP_DIR)/rtl_vadd.xo: src/kernel.xml scripts/package_kernel.tcl scripts/gen_rtl_vadd_xo.tcl src/hdl/*.sv src/hdl/*.v
+$(TEMP_DIR)/rtl_vadd.xo: scripts/package_kernel.tcl scripts/gen_rtl_vadd_xo.tcl src/hdl/*.sv src/hdl/*.v
 	mkdir -p $(TEMP_DIR)
 	$(VIVADO) -mode batch -source scripts/gen_rtl_vadd_xo.tcl -tclargs $(TEMP_DIR)/rtl_vadd.xo vadd $(TARGET) $(DEVICE) $(XSA)
 $(TEMP_DIR)/krnl_vadd.xo: ./src/krnl_vadd.cpp
diff --git a/rtl_kernels/rtl_vadd_mixed_c_vadd/details.md b/rtl_kernels/rtl_vadd_mixed_c_vadd/details.md
diff --git a/rtl_kernels/rtl_vadd_mixed_c_vadd/scripts/gen_rtl_vadd_xo.tcl b/rtl_kernels/rtl_vadd_mixed_c_vadd/scripts/gen_rtl_vadd_xo.tcl
diff --git a/rtl_kernels/rtl_vadd_mixed_c_vadd/scripts/package_kernel.tcl b/rtl_kernels/rtl_vadd_mixed_c_vadd/scripts/package_kernel.tcl
diff --git a/rtl_kernels/rtl_vadd_mixed_c_vadd/src/kernel.xml b/rtl_kernels/rtl_vadd_mixed_c_vadd/src/kernel.xml

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ if {[file exists "kernel_2.xo"]} {`
`14`	`14`	`file delete -force "kernel_2.xo"`
`15`	`15`	`}`
`16`	`16`
`17`		`-package_xo -xo_path kernel_2.xo -kernel_name krnl_adder_stage_rtl -ip_directory src/ip/ip_2 -kernel_xml src/kernel_adder_stage.xml`
	`17`	`+package_xo -xo_path kernel_2.xo -kernel_name krnl_adder_stage_rtl -ip_directory src/ip/ip_2`
`18`	`18`
`19`	`19`	`set xo_path [file join [pwd] ${xo_pathname}]`
`20`	`20`	`if {[file exists "kernel_2.xo"]} {`
Original file line number	Diff line number	Diff line change
`@@ -52,4 +52,4 @@ if {[file exists "${xoname}"]} {`
`52`	`52`	`file delete -force "${xoname}"`
`53`	`53`	`}`
`54`	`54`
`55`		`-package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl -ip_directory ./packaged_kernel_${suffix} -kernel_xml ./src/kernel.xml`
	`55`	`+package_xo -xo_path ${xoname} -kernel_name krnl_vadd_rtl -ip_directory ./packaged_kernel_${suffix}`