Move to 2023.1 from 2022.2 (#1549)

Abhishek Medhekar · GitHub Enterprise · commit 96613bba0d98 · 2023-05-22T15:34:34.000+05:30
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,4 +1,4 @@
 @Library('pipeline-library')_
 
 VitisLibPipeline (branch: 'master', libname: 'Vitis_Accel_Examples', run_sw_in_pr: 'true', TARGETS: 'vitis_sw_emu:vitis_hw_emu',
-                  email: 'heeran@xilinx.com', devtest: 'RunDeploy.sh', TOOLVERSION: '2022.2_released')
+                  email: 'heeran@xilinx.com', devtest: 'RunDeploy.sh', TOOLVERSION: '2023.1_released')
diff --git a/aie_kernels/single_aie_gmio_xrt/makefile_versal_ps.mk b/aie_kernels/single_aie_gmio_xrt/makefile_versal_ps.mk
@@ -45,7 +45,7 @@ TARGET := hw
 SYSROOT := $(EDGE_COMMON_SW)/sysroots/aarch64-xilinx-linux/
 SD_IMAGE_FILE := $(EDGE_COMMON_SW)/Image
 CXX :=aarch64-linux-gnu-g++
-PLATFORM_REPO_PATHS = /proj/xbuilds/2022.2_daily_latest/internal_platforms
+PLATFORM_REPO_PATHS = /proj/xbuilds/2023.1_daily_latest/internal_platforms
 PLATFORM = $(PLATFORM_REPO_PATHS)/xilinx_vck190_base_202220_1/xilinx_vck190_base_202220_1.xpfm
 XPFM	 = vck190_xpfm
 
diff --git a/common/utility/io_page_maker.sh b/common/utility/io_page_maker.sh
@@ -89,10 +89,10 @@
 	git checkout \-b update_gh
 
 	#copy build/html from internal clone to master/html in gh-pages
-	cp -rf ../../internal/Vitis_Accel_Examples/build/html ./2022.2
+	cp -rf ../../internal/Vitis_Accel_Examples/build/html ./2023.1
 	
 	#add files for commit
-	git add ./2022.2
+	git add ./2023.1
 	git commit -m "updated gh_pages"
 	
 	#push to origin
diff --git a/common/utility/reference.json b/common/utility/reference.json
@@ -76,9 +76,9 @@
         "xrt::device": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Specifying-the-Device-ID-and-Loading-the-XCLBIN",
         "xrt::bo": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Writing-Host-Applications-with-XRT-API",
         "xrt::kernel": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Setting-Up-XRT-Managed-Kernels-and-Kernel-Arguments",
-        "xrt::queue": "https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue",
-        "enqueue": "https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue",
-        "wait()": "https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue", 
+        "xrt::queue": "https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue",
+        "enqueue": "https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue",
+        "wait()": "https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue", 
         "map": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Transferring-Data-between-Software-and-PL-Kernels", 
         "sync": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Transferring-Data-between-Software-and-PL-Kernels",
         "enable_memory_persistence": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/xrt.ini-File",
@@ -207,7 +207,7 @@
         "SystemC": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Working-with-SystemC-Models",
         "XRT Native API": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Setting-Up-XRT-Managed-Kernels-and-Kernel-Arguments",
         "P2P": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Special-Data-Transfer-Models",
-        "Asynchronous Programming": "https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#asynchornous-programming-with-xrt-experimental",
+        "Asynchronous Programming": "https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#asynchornous-programming-with-xrt-experimental",
         "User-Managed RTL Kernel": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Creating-User-Managed-RTL-Kernels",
         "RTL C-Model": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Software-Model-and-Host-Code-Example",
         "Compiling and Linking for x86": "https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Compiling-and-Linking-for-x86", 
diff --git a/emulation/aie_func_mode/Makefile b/emulation/aie_func_mode/Makefile
@@ -193,14 +193,14 @@ ifeq ($(TARGET),$(filter $(TARGET),sw_emu hw_emu))
 		--package.image_format=ext4 \
 		--package.boot_mode=sd \
 		--package.kernel_image $(SD_IMAGE_FILE) \
-		--package.sd_dir /proj/xbuilds/2022.2_daily_latest/internal_platforms/sw/versal/xrt  \
+		--package.sd_dir /proj/xbuilds/2023.1_daily_latest/internal_platforms/sw/versal/xrt  \
 		--package.sd_file $(RUN_APP_SCRIPT) \
 		--package.sd_file aie_func_mode $(LINK_OUTPUT) $(GRAPH_O) -o $(XCLBIN)
 	@echo "COMPLETE: emulation package created."
 else
 ifeq ($(dfx_hw), true)
 	v++ $(VPP_FLAGS) -t hw --platform $(PLATFORM) -p $(LINK_OUTPUT) --package.defer_aie_run -o $(XCLBIN) 
-	v++ $(VPP_PFLAGS) -t hw --platform $(PLATFORM) -p --package.out_dir $(PACKAGE_OUT) --package.rootfs $(EDGE_COMMON_SW)/rootfs.ext4 --package.image_format=ext4 --package.boot_mode=sd --package.kernel_image=$(SD_IMAGE_FILE) --package.sd_dir /proj/xbuilds/2022.2_daily_latest/internal_platforms/sw/versal/xrt --package.sd_file $(RUN_APP_SCRIPT) --package.sd_file aie_adder --package.sd_file $(XCLBIN) --package.sd_file $(GRAPH_O)
+	v++ $(VPP_PFLAGS) -t hw --platform $(PLATFORM) -p --package.out_dir $(PACKAGE_OUT) --package.rootfs $(EDGE_COMMON_SW)/rootfs.ext4 --package.image_format=ext4 --package.boot_mode=sd --package.kernel_image=$(SD_IMAGE_FILE) --package.sd_dir /proj/xbuilds/2023.1_daily_latest/internal_platforms/sw/versal/xrt --package.sd_file $(RUN_APP_SCRIPT) --package.sd_file aie_adder --package.sd_file $(XCLBIN) --package.sd_file $(GRAPH_O)
 else
 	v++ $(VPP_PFLAGS) -p -t hw \
 		--platform $(PLATFORM) \
@@ -210,7 +210,7 @@ else
 		--package.boot_mode=sd \
 		--package.kernel_image=$(SD_IMAGE_FILE) \
 		--package.defer_aie_run \
-		--package.sd_dir /proj/xbuilds/2022.2_daily_latest/internal_platforms/sw/versal/xrt  \
+		--package.sd_dir /proj/xbuilds/2023.1_daily_latest/internal_platforms/sw/versal/xrt  \
 		--package.sd_file $(RUN_APP_SCRIPT) \
 		--package.sd_file aie_adder $(LINK_OUTPUT) $(GRAPH_O) -o $(XCLBIN)
 
diff --git a/host_xrt/README.rst b/host_xrt/README.rst
@@ -16,12 +16,12 @@ XRT Native API's for optimized interfacing with Xilinx Devices.
       **Key Concepts**
 
       * `XRT Native API <https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Setting-Up-XRT-Managed-Kernels-and-Kernel-Arguments>`__
-      * `Asynchronous Programming <https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#asynchornous-programming-with-xrt-experimental>`__
+      * `Asynchronous Programming <https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#asynchornous-programming-with-xrt-experimental>`__
       **Keywords**
 
-      * `xrt::queue <https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__
-      * `enqueue <https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__
-      * `wait() <https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__
+      * `xrt::queue <https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__
+      * `enqueue <https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__
+      * `wait() <https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__
 
   * - `copy_buffer_xrt <copy_buffer_xrt>`_
     - This Copy Buffer example demonstrate how one buffer can be copied from another buffer.
diff --git a/host_xrt/asynchronous_xrt/README.rst b/host_xrt/asynchronous_xrt/README.rst
@@ -3,9 +3,9 @@ Asynchronous XRT (XRT Native API's)
 
 This is simple example which showcases asynchronous programming mechanism through the user-defined queues.
 
-**KEY CONCEPTS:** `XRT Native API <https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Setting-Up-XRT-Managed-Kernels-and-Kernel-Arguments>`__, `Asynchronous Programming <https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#asynchornous-programming-with-xrt-experimental>`__
+**KEY CONCEPTS:** `XRT Native API <https://docs.xilinx.com/r/en-US/ug1393-vitis-application-acceleration/Setting-Up-XRT-Managed-Kernels-and-Kernel-Arguments>`__, `Asynchronous Programming <https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#asynchornous-programming-with-xrt-experimental>`__
 
-**KEYWORDS:** `xrt::queue <https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__, `enqueue <https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__, `wait() <https://xilinx.github.io/XRT/2022.2/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__
+**KEYWORDS:** `xrt::queue <https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__, `enqueue <https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__, `wait() <https://xilinx.github.io/XRT/2023.1/html/xrt_native_apis.html?highlight=queue#executing-multiple-tasks-through-queue>`__
 
 .. raw:: html
 
diff --git a/validate/validate_aie2_pl/pl_kernels/Makefile b/validate/validate_aie2_pl/pl_kernels/Makefile
@@ -10,7 +10,7 @@
 #See the License for the specific language governing permissions and
 #limitations under the License.
 #
-#PLATFORM = /proj/xbuilds/Vitis_HW_EMU/2022.2/xilinx_v70_hw_emu_202220_1/2022.2_0817_2230/xilinx_v70_hw_emu_202220_1/xilinx_v70_hw_emu_202220_1.xpfm
+#PLATFORM = /proj/xbuilds/Vitis_HW_EMU/2023.1/xilinx_v70_hw_emu_202310_1/2023.1_0408_2230/xilinx_v70_hw_emu_202310_1/xilinx_v70_hw_emu_202310_1.xpfm
 PLATFORM = $(DEVICE)
 TARGET := hw
 
diff --git a/validate/validate_aie2_pl/utils.mk b/validate/validate_aie2_pl/utils.mk
@@ -103,10 +103,10 @@ ifeq ($(TARGET),hw)
 dfx_hw := on
 endif
 endif
-# 3) for embeded sw_emu flow from 2022.2
+# 3) for embeded sw_emu flow from 2023.1
 ps_on_x86 := off
 ifneq ($(HOST_ARCH), x86)
-ifeq ($(shell expr $(VITIS_VER) \>= 2022.2), 1)
+ifeq ($(shell expr $(VITIS_VER) \>= 2023.1), 1)
 ifeq ($(TARGET), sw_emu)
 ps_on_x86 := on
 endif

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 @Library('pipeline-library')_
 VitisLibPipeline (branch: 'master', libname: 'Vitis_Accel_Examples', run_sw_in_pr: 'true', TARGETS: 'vitis_sw_emu:vitis_hw_emu',
 -                  email: '[email protected]', devtest: 'RunDeploy.sh', TOOLVERSION: '2022.2_released')
 +                  email: '[email protected]', devtest: 'RunDeploy.sh', TOOLVERSION: '2023.1_released')
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`#See the License for the specific language governing permissions and`
`11`	`11`	`#limitations under the License.`
`12`	`12`	`#`
`13`		`-#PLATFORM = /proj/xbuilds/Vitis_HW_EMU/2022.2/xilinx_v70_hw_emu_202220_1/2022.2_0817_2230/xilinx_v70_hw_emu_202220_1/xilinx_v70_hw_emu_202220_1.xpfm`
	`13`	`+#PLATFORM = /proj/xbuilds/Vitis_HW_EMU/2023.1/xilinx_v70_hw_emu_202310_1/2023.1_0408_2230/xilinx_v70_hw_emu_202310_1/xilinx_v70_hw_emu_202310_1.xpfm`
`14`	`14`	`PLATFORM = $(DEVICE)`
`15`	`15`	`TARGET := hw`
`16`	`16`