From 529be4cbd31b2e214dc1da69b302402f8f14ba48 Mon Sep 17 00:00:00 2001 From: Stanca Pop Date: Wed, 6 Dec 2023 10:38:39 +0200 Subject: [PATCH] Set vivado 2023.1, Matlab R2022b, HDL main branch --- +adi/Contents.m | 2 +- +adi/Version.m | 2 +- CI/gen_doc/Makefile | 6 +- CI/gen_doc/docs/_pages/install.md | 4 +- CI/gen_doc/docs/_pages/targeting.md | 6 +- CI/scripts/build_bsp.sh | 2 +- CI/scripts/synth_designs.sh | 4 +- Jenkinsfile | 2 +- JenkinsfileCron | 2 +- Jenkinsfile_dev | 110 ---------------------------- info.xml | 2 +- 11 files changed, 16 insertions(+), 126 deletions(-) delete mode 100644 Jenkinsfile_dev diff --git a/+adi/Contents.m b/+adi/Contents.m index 7e4b46cd..052026c2 100644 --- a/+adi/Contents.m +++ b/+adi/Contents.m @@ -1,5 +1,5 @@ % Analog Devices, Inc. High Speed Converter Toolbox -% Version 21.1.1 (R2021a) +% Version 21.1.1 (R2022b) % % ==== Table of Contents (TOC) ==== % diff --git a/+adi/Version.m b/+adi/Version.m index 6fc17fbd..e5e8b1e1 100644 --- a/+adi/Version.m +++ b/+adi/Version.m @@ -3,7 +3,7 @@ % BSP Version information properties(Constant) HDL = 'hdl_2021_r2'; - Vivado = '2022.2'; + Vivado = '2023.1'; MATLAB = 'R2022b'; Release = '22.2.1'; AppName = 'Analog Devices, Inc. High-Speed Converter Toolbox'; diff --git a/CI/gen_doc/Makefile b/CI/gen_doc/Makefile index dd6b1af3..bc21b12a 100644 --- a/CI/gen_doc/Makefile +++ b/CI/gen_doc/Makefile @@ -8,15 +8,15 @@ SHELL := /bin/bash MLFLAGS := -nodisplay -nodesktop -nosplash ifeq ($(MLRELEASE),) -MLRELEASE := R2021a +MLRELEASE := R2022b endif ifeq ($(VIVADORELEASE),) -VIVADORELEASE := 2022.2 +VIVADORELEASE := 2023.1 endif ifeq ($(HDLBRANCH),) -HDLBRANCH := hdl_2018_r2 +HDLBRANCH := main endif ifeq ($(OS),Windows_NT) diff --git a/CI/gen_doc/docs/_pages/install.md b/CI/gen_doc/docs/_pages/install.md index 18280a26..c2dcafe7 100644 --- a/CI/gen_doc/docs/_pages/install.md +++ b/CI/gen_doc/docs/_pages/install.md @@ -35,8 +35,8 @@ The base dependencies for the toolbox requires libiio and the libiio MATLAB bind To leverage HDL-Coder and the reference designs with the toolbox requires the following components: -- Xilinx Vivado 2021.1 -- Xilinx SDK 2021.1 +- Xilinx Vivado 2023.1 +- Xilinx SDK 2023.1 - Simulink - [HDL-Coder™](https://www.mathworks.com/products/hdl-coder.html) - [HDL Coder™ Support Package for Xilinx Zynq Platform](https://www.mathworks.com/matlabcentral/fileexchange/40447-hdl-coder-support-package-for-xilinx-zynq-platform) diff --git a/CI/gen_doc/docs/_pages/targeting.md b/CI/gen_doc/docs/_pages/targeting.md index d6016a92..6d69f867 100644 --- a/CI/gen_doc/docs/_pages/targeting.md +++ b/CI/gen_doc/docs/_pages/targeting.md @@ -11,18 +11,18 @@ High-Speed Converter Toolbox supports the IP Core generation flow from MathWorks ## Getting Started -To perform targeting will require FPGA vendor tools for the FPGA system. For Xilinx this will be Vivado and the toolbox will require specific versions for each release. For the current release this is Vivado 2022.2. Using other versions are not supported. To build the necessary BOOT.BIN files will require the Xilinx Vitis as well. +To perform targeting will require FPGA vendor tools for the FPGA system. For Xilinx this will be Vivado and the toolbox will require specific versions for each release. For the current release this is Vivado 2023.1. Using other versions are not supported. To build the necessary BOOT.BIN files will require the Xilinx Vitis as well. Once you have the installed the necessary 3rd party tools MATLAB needs to be told where they are installed by use of the [hdlsetuptoolpath](https://www.mathworks.com/help/hdlcoder/ref/hdlsetuptoolpath.html) command. For Windows the following MATLAB command can be used: ```matlab -hdlsetuptoolpath('ToolName', 'Xilinx Vivado', 'ToolPath', 'C:\Xilinx\Vivado\2022.2\bin\vivado.bat'); +hdlsetuptoolpath('ToolName', 'Xilinx Vivado', 'ToolPath', 'C:\Xilinx\Vivado\2023.1\bin\vivado.bat'); ``` or Linux: ```matlab -hdlsetuptoolpath('ToolName', 'Xilinx Vivado', 'ToolPath', '/opt/Xilinx/Vivado/2022.2/bin/vivado'); +hdlsetuptoolpath('ToolName', 'Xilinx Vivado', 'ToolPath', '/opt/Xilinx/Vivado/2023.1/bin/vivado'); ``` Please change the tool path if it is different on your system. diff --git a/CI/scripts/build_bsp.sh b/CI/scripts/build_bsp.sh index f717c7ed..81fc45b7 100644 --- a/CI/scripts/build_bsp.sh +++ b/CI/scripts/build_bsp.sh @@ -2,7 +2,7 @@ set -x if [ -z "${HDLBRANCH}" ]; then -HDLBRANCH='hdl_2021_r2' +HDLBRANCH='main' fi # Script is designed to run from specific location diff --git a/CI/scripts/synth_designs.sh b/CI/scripts/synth_designs.sh index 93dc3ac1..0b09194d 100644 --- a/CI/scripts/synth_designs.sh +++ b/CI/scripts/synth_designs.sh @@ -4,14 +4,14 @@ BOARD=$1 MLFLAGS="-nodisplay -nodesktop -nosplash" if [ -z "$MLRELEASE" ] then - MLRELEASE=R2022a + MLRELEASE=R2022b fi MLPATH=/usr/local/MATLAB if [ -z "$VIVADORELEASE" ] then - VIVADORELEASE=2022.2 + VIVADORELEASE=2023.1 fi cd ../.. diff --git a/Jenkinsfile b/Jenkinsfile index 286d7fc8..b5834e84 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ flags = gitParseFlags() dockerConfig = getDockerConfig(['MATLAB','Vivado'], matlabHSPro=false) dockerConfig.add("-e MLRELEASE=R2022b") -dockerConfig.add("-e VIVADORELEASE=2022.2") +dockerConfig.add("-e VIVADORELEASE=2023.1") dockerHost = 'docker' //////////////////////////// diff --git a/JenkinsfileCron b/JenkinsfileCron index d687289f..6c3f69f7 100644 --- a/JenkinsfileCron +++ b/JenkinsfileCron @@ -2,7 +2,7 @@ dockerConfig = getDockerConfig(['MATLAB','Vivado'], matlabHSPro=false) dockerConfig.add("-e MLRELEASE=R2022b") -dockerConfig.add("-e VIVADORELEASE=2022.2") +dockerConfig.add("-e VIVADORELEASE=2023.1") dockerHost = 'docker' //////////////////////////// diff --git a/Jenkinsfile_dev b/Jenkinsfile_dev deleted file mode 100644 index 010360b6..00000000 --- a/Jenkinsfile_dev +++ /dev/null @@ -1,110 +0,0 @@ -@Library('tfc-lib') _ - -dockerConfig = getDockerConfig(['MATLAB','Vivado'], matlabHSPro=false) -dockerConfig.add("-e MLRELEASE=R2022b") -dockerConfig.add("-e VIVADORELEASE=2022.2") -dockerHost = 'docker' - -//////////////////////////// - -hdlBranches = ['main'] - -stage("Build Toolbox") { - dockerParallelBuild(hdlBranches, dockerHost, dockerConfig) { - branchName -> - try { - withEnv(['HDLBRANCH='+branchName]) { - checkout scm - sh 'git submodule update --init' - sh 'pip3 install -r ./CI/gen_doc/requirements_doc.txt' - sh 'make -C ./CI/gen_doc doc_ml' - sh 'make -C ./CI/scripts build' - sh 'make -C ./CI/scripts gen_tlbx' - } - } catch(Exception ex) { - if (branchName == 'main') { - error('Production Toolbox Build Failed') - } - else { - unstable('Development Build Failed') - } - } - if (branchName == 'main') { - archiveArtifacts artifacts: '*.mltbx' - stash includes: '**', name: 'builtSources', useDefaultExcludes: false - } - } -} - -///////////////////////////////////////////////////// - -boardNames = ['daq2','ad9081'] -dockerConfig.add("-e HDLBRANCH=main") - -stage("HDL Tests") { - dockerParallelBuild(boardNames, dockerHost, dockerConfig) { - branchName -> - withEnv(['BOARD='+branchName]) { - stage("Source") { - unstash "builtSources" - sh 'make -C ./CI/scripts test' - junit testResults: 'test/*.xml', allowEmptyResults: true - archiveArtifacts artifacts: 'test/logs/*', followSymlinks: false, allowEmptyArchive: true - } - stage("Installer") { - unstash "builtSources" - sh 'make -C ./CI/scripts test_installer' - junit testResults: 'test/*.xml', allowEmptyResults: true - archiveArtifacts artifacts: 'test/logs/*', followSymlinks: false, allowEmptyArchive: true - } - } - } -} - -///////////////////////////////////////////////////// - -boardNames = ['NonHW'] - -stage("NonHW Tests") { - dockerParallelBuild(boardNames, dockerHost, dockerConfig) { - branchName -> - withEnv(['BOARD='+branchName]) { - stage("NonHW") { - unstash "builtSources" - sh 'make -C ./CI/scripts run_NonHWTests' - } - } - } -} - - -///////////////////////////////////////////////////// - -classNames = ['DAQ2'] - -stage("Hardware Streaming Tests") { - dockerParallelBuild(classNames, dockerHost, dockerConfig) { - branchName -> - withEnv(['HW='+branchName]) { - unstash "builtSources" - sh 'echo ${HW}' - // sh 'make -C ./CI/scripts test_streaming' - } - } -} - -////////////////////////////////////////////////////// - -node { - stage('Deploy Development') { - unstash "builtSources" - uploadArtifactory('HighSpeedConverterToolbox','*.mltbx') - } - if (env.BRANCH_NAME == 'main') { - stage('Deploy Production') { - unstash "builtSources" - uploadFTP('HighSpeedConverterToolbox','*.mltbx') - } - } -} - diff --git a/info.xml b/info.xml index 7e3b3a6c..35038946 100644 --- a/info.xml +++ b/info.xml @@ -8,7 +8,7 @@ - R2021a + R2022b Analog Devices, Inc. High Speed Converter Toolbox