From 4f9177d561d7a4fb064aeb2284fb6ba3b59cfe1b Mon Sep 17 00:00:00 2001 From: "Travis F. Collins" Date: Fri, 26 Apr 2024 10:50:49 -0600 Subject: [PATCH] Update all Vivado versions to 2022.2 and hdl to hdl_2022_r2 Signed-off-by: Travis F. Collins --- +adi/Version.m | 4 ++-- CI/doc/source/install.md | 4 ++-- CI/scripts/Makefile | 2 +- CI/scripts/build_bsp.sh | 2 +- CI/scripts/synth_designs.sh | 4 ++-- CI/scripts/targeting_designs.sh | 4 ++-- Jenkinsfile | 10 +++++----- JenkinsfileCron | 8 ++++---- JenkinsfileHW | 2 +- README.md | 4 ++-- hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m | 2 +- test/DemoTests.m | 10 +++++----- .../+adrv9361z7035/+common/plugin_rd.m | 2 +- .../targeting/frequency-hopping/build_kernel.sh | 2 +- trx_examples/targeting/frequency-hopping/hdlworkflow.m | 2 +- .../targeting/loopback-delay-estimation/hdlworkflow.m | 2 +- .../+adrv9361z7035/+common/plugin_rd.m | 2 +- trx_examples/targeting/tuneAGC-ad9361/hdlworkflow.m | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/+adi/Version.m b/+adi/Version.m index 43a27538..46e27b15 100644 --- a/+adi/Version.m +++ b/+adi/Version.m @@ -2,8 +2,8 @@ %Version % BSP Version information properties(Constant) - HDL = 'hdl_2021_r2'; - Vivado = '2021.2'; + HDL = 'hdl_2022_r2'; + Vivado = '2022.2'; MATLAB = 'R2023b'; Release = '23.2.1'; AppName = 'Analog Devices, Inc. Transceiver Toolbox'; diff --git a/CI/doc/source/install.md b/CI/doc/source/install.md index 7f9eef97..4be68b02 100644 --- a/CI/doc/source/install.md +++ b/CI/doc/source/install.md @@ -23,8 +23,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.2 -- Xilinx Vitis 2021.2 +- Xilinx Vivado 2022.2 +- Xilinx Vitis 2022.2 - 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/scripts/Makefile b/CI/scripts/Makefile index baebe9c8..57454215 100644 --- a/CI/scripts/Makefile +++ b/CI/scripts/Makefile @@ -12,7 +12,7 @@ MLRELEASE := R2023b endif ifeq ($(HDLBRANCH),) -HDLBRANCH := hdl_2021_r2 +HDLBRANCH := hdl_2022_r2 endif ifeq ($(OS),Windows_NT) diff --git a/CI/scripts/build_bsp.sh b/CI/scripts/build_bsp.sh index 62fe78da..b72977a9 100644 --- a/CI/scripts/build_bsp.sh +++ b/CI/scripts/build_bsp.sh @@ -2,7 +2,7 @@ set -xe if [ -z "${HDLBRANCH}" ]; then -HDLBRANCH='hdl_2021_r2' +HDLBRANCH='hdl_2022_r2' fi # Script is designed to run from specific location diff --git a/CI/scripts/synth_designs.sh b/CI/scripts/synth_designs.sh index af4fc777..e525f762 100644 --- a/CI/scripts/synth_designs.sh +++ b/CI/scripts/synth_designs.sh @@ -13,11 +13,11 @@ MLPATH=/usr/local/MATLAB cd ../.. cp hdl/vendor/AnalogDevices/hdlcoder_board_customization.m test/hdlcoder_board_customization_local.m sed -i "s/hdlcoder_board_customization/hdlcoder_board_customization_local/g" test/hdlcoder_board_customization_local.m -source /opt/Xilinx/Vivado/2021.2/settings64.sh +source /opt/Xilinx/Vivado/2022.2/settings64.sh Xvfb :77 & export DISPLAY=:77 export SWT_GTK3=0 -source /opt/Xilinx/Vivado/2021.2/settings64.sh +source /opt/Xilinx/Vivado/2022.2/settings64.sh $MLPATH/$MLRELEASE/bin/matlab $MLFLAGS -r "cd('test');runSynthTests('$BOARD');" pidof Xvfb if [ $? -eq 0 ]; then diff --git a/CI/scripts/targeting_designs.sh b/CI/scripts/targeting_designs.sh index 68006541..2c740206 100644 --- a/CI/scripts/targeting_designs.sh +++ b/CI/scripts/targeting_designs.sh @@ -15,11 +15,11 @@ echo "Testing demo: $DEMO" MLPATH=/usr/local/MATLAB cd ../.. -source /opt/Xilinx/Vivado/2021.2/settings64.sh +source /opt/Xilinx/Vivado/2022.2/settings64.sh Xvfb :77 & export DISPLAY=:77 export SWT_GTK3=0 -source /opt/Xilinx/Vivado/2021.2/settings64.sh +source /opt/Xilinx/Vivado/2022.2/settings64.sh $MLPATH/$MLRELEASE/bin/matlab $MLFLAGS -r "addpath(genpath('test'));addpath(genpath('deps'));runDemoTests('$DEMO');" pidof Xvfb if [ $? -eq 0 ]; then diff --git a/Jenkinsfile b/Jenkinsfile index 16b57225..10252428 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ dockerHost = 'docker' //////////////////////////// -hdlBranches = ['main','hdl_2021_r2'] +hdlBranches = ['main','hdl_2022_r2'] stage("Build Toolbox") { dockerParallelBuild(hdlBranches, dockerHost, dockerConfig) { @@ -24,14 +24,14 @@ stage("Build Toolbox") { sh 'make -C ./CI/scripts gen_tlbx' } } catch(Exception ex) { - if (branchName == 'hdl_2021_r2') { + if (branchName == 'hdl_2022_r2') { error('Production Toolbox Build Failed') } else { unstable('Development Build Failed') } } - if (branchName == 'hdl_2021_r2') { + if (branchName == 'hdl_2022_r2') { stash includes: '**', name: 'builtSources', useDefaultExcludes: false archiveArtifacts artifacts: 'hdl/*', followSymlinks: false, allowEmptyArchive: true } @@ -48,7 +48,7 @@ boardNames = [ 'adrv9361z7035_ccbob_cmos','adrv9361z7035_ccbob_lvds','adrv9361z7035_ccfmc_lvds','adrv9361z7035_ccpackrf_lvds', 'adrv9364z7020_ccbob_cmos','adrv9364z7020_ccbob_lvds', 'pluto'] -dockerConfig.add("-e HDLBRANCH=hdl_2021_r2") +dockerConfig.add("-e HDLBRANCH=hdl_2022_r2") cstage("HDL Tests", "", flags) { dockerParallelBuild(boardNames, dockerHost, dockerConfig) { @@ -91,7 +91,7 @@ for (int i=0; i < demoNames.size(); i++) { nodeLabel = 'baremetal && high_memory'; deployments[demo] = { node(nodeLabel) { stage("Demo Tests") { - withEnv(['DEMO='+demo,'MLRELEASE=R2023b','HDLBRANCH=hdl_2021_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) { + withEnv(['DEMO='+demo,'MLRELEASE=R2023b','HDLBRANCH=hdl_2022_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) { try { stage(demo) { echo "Node: ${env.NODE_NAME}" diff --git a/JenkinsfileCron b/JenkinsfileCron index 91a87f22..aacfc075 100644 --- a/JenkinsfileCron +++ b/JenkinsfileCron @@ -6,7 +6,7 @@ dockerHost = 'docker' //////////////////////////// -hdlBranches = ['hdl_2021_r2'] +hdlBranches = ['hdl_2022_r2'] stage("Build Toolbox") { dockerParallelBuild(hdlBranches, dockerHost, dockerConfig) { @@ -22,14 +22,14 @@ stage("Build Toolbox") { sh 'make -C ./CI/scripts gen_tlbx' } } catch(Exception ex) { - if (branchName == 'hdl_2021_r2') { + if (branchName == 'hdl_2022_r2') { error('Production Toolbox Build Failed') } else { unstable('Development Build Failed') } } - if (branchName == 'hdl_2021_r2') { + if (branchName == 'hdl_2022_r2') { stash includes: '**', name: 'builtSources', useDefaultExcludes: false archiveArtifacts artifacts: 'hdl/*', followSymlinks: false, allowEmptyArchive: true } @@ -56,7 +56,7 @@ for (int i=0; i < boardNames.size(); i++) { nodeLabel = 'baremetal && high_memory'; deployments[board] = { node(nodeLabel) { stage("Synthesis Tests") { - withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2021_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) { + withEnv(['BOARD='+board,'MLRELEASE=R2023b','HDLBRANCH=hdl_2022_r2','LC_ALL=C.UTF-8','LANG=C.UTF-8']) { try { stage("Synth") { echo "Node: ${env.NODE_NAME}" diff --git a/JenkinsfileHW b/JenkinsfileHW index 4ef5cd8e..24968066 100644 --- a/JenkinsfileHW +++ b/JenkinsfileHW @@ -3,7 +3,7 @@ lock(label: 'adgt_test_harness_boards') { @Library('sdgtt-lib@adgt-test-harness') _ // Not necessary when we turn on global libraries :) def hdlBranch = "NA" def linuxBranch = "NA" - def bootPartitionBranch = "2021_r2" + def bootPartitionBranch = "2022_r2" def firmwareVersion = 'v0.34' def bootfile_source = 'artifactory' // options: sftp, artifactory, http, local def harness = getGauntlet(hdlBranch, linuxBranch, bootPartitionBranch, firmwareVersion, bootfile_source) diff --git a/README.md b/README.md index 77ced572..5ec6e8c3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ As with many open source packages, we use [GitHub](https://github.com/analogdevi | HDL Branch | MATLAB Release | Installer Package | |:-----------------:|:--------------:|:-------------------:| -| 2021_R2 | R2023b | | +| 2022_R2 | R2023b | | If you use it, and like it - please let us know. If you use it, and hate it - please let us know that too. @@ -20,7 +20,7 @@ If you use it, and like it - please let us know. If you use it, and hate it - pl We provide support across two releases of MATLAB. This does not mean older releases will not work but they are not maintained. Currently supported tools are: - Bug fixes only: MATLAB R2022b with Vivado 2021.2 -- Bug fixes and new features: MATLAB R2023b with Vivado 2021.2 +- Bug fixes and new features: MATLAB R2023b with Vivado 2022.2 ## Support and Documentation diff --git a/hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m b/hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m index cb4a24f9..c2f7eb7a 100644 --- a/hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m +++ b/hdl/vendor/AnalogDevices/+AnalogDevices/plugin_rd.m @@ -42,7 +42,7 @@ % Tool information %hRD.SupportedToolVersion = {adi.Version.Vivado}; % FIXME -hRD.SupportedToolVersion = {'2021.2'}; +hRD.SupportedToolVersion = {'2022.2'}; % Get the root directory rootDir = fileparts(strtok(mfilename('fullpath'), '+')); diff --git a/test/DemoTests.m b/test/DemoTests.m index 77b8ffb8..31ce4a6b 100644 --- a/test/DemoTests.m +++ b/test/DemoTests.m @@ -20,7 +20,7 @@ function addpaths(testCase) methods(Test) function buildHDLLoopbackDelayEstimation(testCase) - testCase.setupVivado('2021.2'); + testCase.setupVivado('2022.2'); cd(fullfile(testCase.root,'trx_examples/targeting/loopback-delay-estimation')); hdlworkflow; if ~isempty(out) @@ -32,7 +32,7 @@ function buildHDLLoopbackDelayEstimation(testCase) end end function buildHDLFrequencyHopper(testCase) - testCase.setupVivado('2021.2'); + testCase.setupVivado('2022.2'); cd(fullfile(testCase.root,'trx_examples/targeting/frequency-hopping')); hdlworkflow; if ~isempty(out) @@ -44,7 +44,7 @@ function buildHDLFrequencyHopper(testCase) end end function buildHDLTuneAGC(testCase) - testCase.setupVivado('2021.2'); + testCase.setupVivado('2022.2'); cd(fullfile(testCase.root,'trx_examples/targeting/tuneAGC-ad9361')); hdlworkflow; if ~isempty(out) @@ -56,7 +56,7 @@ function buildHDLTuneAGC(testCase) end end function buildKernelFrequencyHopper(testCase) - testCase.setupVivado('2021.2'); + testCase.setupVivado('2022.2'); cd(fullfile(testCase.root,'trx_examples/targeting/frequency-hopping')); system('chmod +x build_kernel.sh'); system('./build_kernel.sh'); @@ -95,7 +95,7 @@ function setupVivado(vivado) case '(R2022b)' vivado = '2021.2'; case '(R2023b)' - vivado = '2021.2'; + vivado = '2022.2'; end end if ispc diff --git a/trx_examples/targeting/frequency-hopping/+AnalogDevicesDemo/+adrv9361z7035/+common/plugin_rd.m b/trx_examples/targeting/frequency-hopping/+AnalogDevicesDemo/+adrv9361z7035/+common/plugin_rd.m index 49f3148c..72486008 100644 --- a/trx_examples/targeting/frequency-hopping/+AnalogDevicesDemo/+adrv9361z7035/+common/plugin_rd.m +++ b/trx_examples/targeting/frequency-hopping/+AnalogDevicesDemo/+adrv9361z7035/+common/plugin_rd.m @@ -14,7 +14,7 @@ hRD.BoardName = sprintf('AnalogDevices ADRV9361-Z7035 Frequency Hopping'); % Tool information -hRD.SupportedToolVersion = {'2021.2'}; +hRD.SupportedToolVersion = {'2022.2'}; % DMA Configuration hRD.addParameter( ... diff --git a/trx_examples/targeting/frequency-hopping/build_kernel.sh b/trx_examples/targeting/frequency-hopping/build_kernel.sh index 3caa5199..eee82f53 100755 --- a/trx_examples/targeting/frequency-hopping/build_kernel.sh +++ b/trx_examples/targeting/frequency-hopping/build_kernel.sh @@ -1,7 +1,7 @@ #!/bin/bash # Build kernel -git clone -b 2021_R2 --depth=1 https://github.com/analogdevicesinc/linux.git +git clone -b 2022_r2 --depth=1 https://github.com/analogdevicesinc/linux.git cd linux export ARCH=arm export CROSS_COMPILE=arm-linux-gnueabihf- diff --git a/trx_examples/targeting/frequency-hopping/hdlworkflow.m b/trx_examples/targeting/frequency-hopping/hdlworkflow.m index ac5b360a..db99f6ef 100644 --- a/trx_examples/targeting/frequency-hopping/hdlworkflow.m +++ b/trx_examples/targeting/frequency-hopping/hdlworkflow.m @@ -134,7 +134,7 @@ % Specify the top level project directory hWC.ProjectFolder = 'hdl_prj'; -hWC.ReferenceDesignToolVersion = '2021.2'; +hWC.ReferenceDesignToolVersion = '2022.2'; hWC.IgnoreToolVersionMismatch = true; hWC.AllowUnsupportedToolVersion = true; diff --git a/trx_examples/targeting/loopback-delay-estimation/hdlworkflow.m b/trx_examples/targeting/loopback-delay-estimation/hdlworkflow.m index 82fa124b..750a4a2e 100644 --- a/trx_examples/targeting/loopback-delay-estimation/hdlworkflow.m +++ b/trx_examples/targeting/loopback-delay-estimation/hdlworkflow.m @@ -153,7 +153,7 @@ % Specify the top level project directory hWC.ProjectFolder = 'hdl_prj'; -hWC.ReferenceDesignToolVersion = '2021.2'; +hWC.ReferenceDesignToolVersion = '2022.2'; hWC.IgnoreToolVersionMismatch = true; hWC.AllowUnsupportedToolVersion = true; diff --git a/trx_examples/targeting/tuneAGC-ad9361/+AnalogDevicesAGCDemo/+adrv9361z7035/+common/plugin_rd.m b/trx_examples/targeting/tuneAGC-ad9361/+AnalogDevicesAGCDemo/+adrv9361z7035/+common/plugin_rd.m index ae479b6c..7778afae 100644 --- a/trx_examples/targeting/tuneAGC-ad9361/+AnalogDevicesAGCDemo/+adrv9361z7035/+common/plugin_rd.m +++ b/trx_examples/targeting/tuneAGC-ad9361/+AnalogDevicesAGCDemo/+adrv9361z7035/+common/plugin_rd.m @@ -14,7 +14,7 @@ hRD.BoardName = sprintf('AnalogDevices ADRV9361-Z7035 AGC'); % Tool information -hRD.SupportedToolVersion = {'2021.2'}; +hRD.SupportedToolVersion = {'2022.2'}; % Add AGC control hRD.addParameter( ... diff --git a/trx_examples/targeting/tuneAGC-ad9361/hdlworkflow.m b/trx_examples/targeting/tuneAGC-ad9361/hdlworkflow.m index 767339cf..1bfe2513 100644 --- a/trx_examples/targeting/tuneAGC-ad9361/hdlworkflow.m +++ b/trx_examples/targeting/tuneAGC-ad9361/hdlworkflow.m @@ -150,7 +150,7 @@ % Specify the top level project directory hWC.ProjectFolder = 'hdl_prj'; -hWC.ReferenceDesignToolVersion = '2021.2'; +hWC.ReferenceDesignToolVersion = '2022.2'; hWC.IgnoreToolVersionMismatch = true; hWC.AllowUnsupportedToolVersion = true;