@@ -122,15 +122,16 @@ task_label = [
122122]
123123
124124// Put the latest version last
125- def xilinx_versions = [ ' 2017.4' , ' 2018.2' , ' 2018.3' ]
125+ def xilinx_versions = [ ' 2017.4' , ' 2018.2' , ' 2018.3' , ' 2019.1 ' ]
126126
127127// We want the default to be the latest.
128128def default_xilinx_version = xilinx_versions. last()
129129
130130def dsa_map = [
131131 ' 2017.4' : [ ' DYNAMIC_5_0' : ' dyn' ],
132132 ' 2018.2' : [ ' DYNAMIC_5_0' : ' dyn' ],
133- ' 2018.3' : [ ' DYNAMIC_5_0' : ' dyn' ]
133+ ' 2018.3' : [ ' DYNAMIC_5_0' : ' dyn' ],
134+ ' 2019.1' : [ ' DYNAMIC_5_0' : ' dyn' ]
134135]
135136
136137def sdaccel_example_default_map = [
@@ -153,6 +154,12 @@ def sdaccel_example_default_map = [
153154 ' Gmem_2Banks_2ddr' : ' SDAccel/examples/xilinx/getting_started/kernel_to_gmem/gmem_2banks_ocl' ,
154155 ' Kernel_Global_Bw_4ddr' : ' SDAccel/examples/xilinx/getting_started/kernel_to_gmem/kernel_global_bandwidth' ,
155156 ' RTL_Vadd_Debug' : ' SDAccel/examples/xilinx/getting_started/rtl_kernel/rtl_vadd_hw_debug'
157+ ],
158+ ' 2019.1' : [
159+ ' Hello_World_1ddr' : ' SDAccel/examples/xilinx/getting_started/hello_world/helloworld_ocl' ,
160+ ' Gmem_2Banks_2ddr' : ' SDAccel/examples/xilinx/getting_started/kernel_to_gmem/gmem_2banks_ocl_5.0_shell' ,
161+ ' Kernel_Global_Bw_4ddr' : ' SDAccel/examples/xilinx/getting_started/kernel_to_gmem/kernel_global_bandwidth_5.0_shell' ,
162+ ' RTL_Vadd_Debug' : ' SDAccel/examples/xilinx/getting_started/rtl_kernel/rtl_vadd_hw_debug'
156163 ]
157164]
158165
@@ -174,6 +181,12 @@ def simulator_tool_default_map = [
174181 ' vcs' : ' synopsys/vcs-mx/N-2017.12-SP2' ,
175182 ' questa' : ' questa/10.6c_1' ,
176183 ' ies' : ' incisive/15.20.063'
184+ ],
185+ ' 2019.1' : [
186+ ' vivado' : ' xilinx/SDx/2019.1.op2552052' ,
187+ ' vcs' : ' synopsys/vcs-mx/N-2017.12-SP2' ,
188+ ' questa' : ' questa/10.6c_1' ,
189+ ' ies' : ' incisive/15.20.063'
177190 ]
178191]
179192
@@ -270,7 +283,7 @@ def test_run_py_bindings() {
270283 try {
271284 sh """
272285 set -e
273- source $WORKSPACE /shared/tests/bin/setup_test_sdk_env_al2 .sh "py_bindings"
286+ source $WORKSPACE /shared/tests/bin/setup_test_sdk_env .sh "py_bindings"
274287 python2.7 -m pytest -v $WORKSPACE /${ test} --junit-xml $WORKSPACE /${ report_file}
275288 """
276289 } catch (exc) {
@@ -368,7 +381,7 @@ def test_fpga_all_slots() {
368381 }
369382 catch (exception) {
370383 echo " Test FPGA Tools All Slots failed"
371- input message : " 1 slot FPGA Tools test failed. Click Proceed or Abort when you are done debugging on the instance."
384+ input message : " All slot FPGA Tools test failed. Click Proceed or Abort when you are done debugging on the instance."
372385 throw exception
373386 }
374387 finally {
@@ -396,7 +409,6 @@ def test_run_non_root_access() {
396409 source $WORKSPACE /shared/tests/bin/setup_test_sdk_env.sh
397410 newgrp fpgauser
398411 export SDK_DIR="${ WORKSPACE} /sdk"
399- source $WORKSPACE /shared/tests/bin/setup_test_env.sh
400412 python2.7 -m pytest -v $WORKSPACE /${ test} --junit-xml $WORKSPACE /${ report_file}
401413 """
402414 } catch (exc) {
@@ -599,15 +611,15 @@ if (test_xdma) {
599611// =============================================================================
600612// Python Binding Test
601613// =============================================================================
602- if (test_py_bindings) {
603- all_tests[' Test Python Bindings' ] = {
604- stage(' Test Python Bindings' ) {
605- node(' f1.2xl_runtime_test_al2' ) {
606- test_run_py_bindings()
607- }
608- }
609- }
610- }
614+ // if (test_py_bindings) {
615+ // all_tests['Test Python Bindings'] = {
616+ // stage('Test Python Bindings') {
617+ // node('f1.2xl_runtime_test_al2') {
618+ // test_run_py_bindings()
619+ // }
620+ // }
621+ // }
622+ // }
611623
612624// =============================================================================
613625// Precompiled Runtime Tests
@@ -873,34 +885,34 @@ if (test_hdk_fdf) {
873885// SDAccel Tests
874886// =============================================================================
875887
876- if (test_sdaccel_scripts) {
877- all_tests[' Test SDAccel Scripts' ] = {
878- stage(' Test SDAccel Scripts' ) {
879- def nodes = [:]
880- for (def xilinx_version in xilinx_versions) {
881-
882- String node_label = get_task_label(task : ' source_scripts' , xilinx_version : xilinx_version)
883- String node_name = " Test SDAccel Scripts ${ xilinx_version} "
884- nodes[node_name] = {
885- node(node_label) {
886- String report_file = " test_sdaccel_scripts_${ xilinx_version} .xml"
887- checkout scm
888- try {
889- sh """
890- set -e
891- source $WORKSPACE /shared/tests/bin/setup_test_env.sh
892- python2.7 -m pytest -v $WORKSPACE /SDAccel/tests/test_sdaccel_scripts.py --junit-xml $WORKSPACE /${ report_file}
893- """
894- } finally {
895- run_junit(report_file)
896- }
897- }
898- }
899- }
900- parallel nodes
901- }
902- }
903- }
888+ // if (test_sdaccel_scripts) {
889+ // all_tests['Test SDAccel Scripts'] = {
890+ // stage('Test SDAccel Scripts') {
891+ // def nodes = [:]
892+ // for (def xilinx_version in xilinx_versions) {
893+ //
894+ // String node_label = get_task_label(task: 'source_scripts', xilinx_version: xilinx_version)
895+ // String node_name = "Test SDAccel Scripts ${xilinx_version}"
896+ // nodes[node_name] = {
897+ // node(node_label) {
898+ // String report_file = "test_sdaccel_scripts_${xilinx_version}.xml"
899+ // checkout scm
900+ // try {
901+ // sh """
902+ // set -e
903+ // source $WORKSPACE/shared/tests/bin/setup_test_env.sh
904+ // python2.7 -m pytest -v $WORKSPACE/SDAccel/tests/test_sdaccel_scripts.py --junit-xml $WORKSPACE/${report_file}
905+ // """
906+ // } finally {
907+ // run_junit(report_file)
908+ // }
909+ // }
910+ // }
911+ // }
912+ // parallel nodes
913+ // }
914+ // }
915+ // }
904916
905917if (test_helloworld_sdaccel_example_fdf || test_all_sdaccel_examples_fdf) {
906918 all_tests[' Run SDAccel Tests' ] = {
@@ -995,6 +1007,7 @@ if (test_helloworld_sdaccel_example_fdf || test_all_sdaccel_examples_fdf) {
9951007 }
9961008
9971009 boolean test_sw_emu_supported = true
1010+ boolean test_hw_emu_supported = true
9981011
9991012 if (description_json[" targets" ]) {
10001013 if (description_json[" targets" ]. contains(" sw_emu" )) {
@@ -1004,6 +1017,13 @@ if (test_helloworld_sdaccel_example_fdf || test_all_sdaccel_examples_fdf) {
10041017 test_sw_emu_supported = false
10051018 echo " Description file ${ description_file} does not have target sw_emu"
10061019 }
1020+ if (description_json[" targets" ]. contains(" hw_emu" )) {
1021+ test_hw_emu_supported = true
1022+ echo " Description file ${ description_file} has target sw_emu"
1023+ } else {
1024+ test_hw_emu_supported = false
1025+ echo " Description file ${ description_file} does not have target sw_emu"
1026+ }
10071027 } else {
10081028 echo " Description json did not have a 'target' key"
10091029 }
@@ -1032,23 +1052,25 @@ if (test_helloworld_sdaccel_example_fdf || test_all_sdaccel_examples_fdf) {
10321052 }
10331053 }
10341054
1035- stage(hw_emu_stage_name) {
1036- node(get_task_label(task : ' sdaccel_builds' , xilinx_version : xilinx_version)) {
1037- checkout scm
1038- try {
1039- sh """
1040- set -e
1041- source $WORKSPACE /shared/tests/bin/setup_test_build_sdaccel_env.sh
1042- export AWS_PLATFORM=\$ AWS_PLATFORM_${ dsa_name}
1043- python2.7 -m pytest -v $WORKSPACE /SDAccel/tests/test_build_sdaccel_example.py::TestBuildSDAccelExample::test_hw_emu --examplePath ${ example_path} --junit-xml $WORKSPACE /${ hw_emu_report_file} --timeout=21600 --rteName ${ dsa_rte_name} --xilinxVersion ${ xilinx_version}
1044- """
1045- } catch (error) {
1046- echo " ${ hw_emu_stage_name} HW EMU Build generation failed"
1047- archiveArtifacts artifacts : " ${ example_path} /**" , fingerprint : true
1048- throw error
1049- } finally {
1050- run_junit(hw_emu_report_file)
1051- git_cleanup()
1055+ if (test_hw_emu_supported) {
1056+ stage(hw_emu_stage_name) {
1057+ node(get_task_label(task : ' sdaccel_builds' , xilinx_version : xilinx_version)) {
1058+ checkout scm
1059+ try {
1060+ sh """
1061+ set -e
1062+ source $WORKSPACE /shared/tests/bin/setup_test_build_sdaccel_env.sh
1063+ export AWS_PLATFORM=\$ AWS_PLATFORM_${ dsa_name}
1064+ python2.7 -m pytest -v $WORKSPACE /SDAccel/tests/test_build_sdaccel_example.py::TestBuildSDAccelExample::test_hw_emu --examplePath ${ example_path} --junit-xml $WORKSPACE /${ hw_emu_report_file} --timeout=21600 --rteName ${ dsa_rte_name} --xilinxVersion ${ xilinx_version}
1065+ """
1066+ } catch (error) {
1067+ echo " ${ hw_emu_stage_name} HW EMU Build generation failed"
1068+ archiveArtifacts artifacts : " ${ example_path} /**" , fingerprint : true
1069+ throw error
1070+ } finally {
1071+ run_junit(hw_emu_report_file)
1072+ git_cleanup()
1073+ }
10521074 }
10531075 }
10541076 }
0 commit comments