Skip to content

Commit 6572001

Browse files
SDA USRsdausr
authored and
GitHub Enterprise
committed
Squashed 'hpc' changes from ec6b817..850ee7b (#1006)
850ee7b Merge pull request #187 from liyuanz/next d8c757d update 248e6d6 Merge pull request #184 from lavanyad/next b28291b Merge pull request #186 from changg/plat_opt1 6b2cab6 deprecate u280 c831e4d Editorial and rebranding changes 9a94651 change 2023.2_stable_latest to 2024.1_stable_latest Co-authored-by: sdausr <[email protected]>
1 parent b273c4f commit 6572001

File tree

214 files changed

+1287
-13826
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

214 files changed

+1287
-13826
lines changed

‎hpc/Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@Library('pipeline-library')_
22

33
VitisLibPipeline (branch: 'next', libname: 'xf_hpc', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vitis_sw_emu:vitis_hw_emu:vitis_hw_build',
4-
upstream_dependencies: 'xf_blas,next,../blas;xf_sparse,next,../sparse', devtest: 'RunDeploy.sh', TOOLVERSION: '2023.2_stable_latest', mail_on:'daily:PR')
4+
upstream_dependencies: 'xf_blas,next,../blas;xf_sparse,next,../sparse', devtest: 'RunDeploy.sh', TOOLVERSION: '2024.1_stable_latest', mail_on:'daily:PR')

‎hpc/L1/tests/hw/cgSolver/test_gemv/description.json

+36-37
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,58 @@
11
{
2-
"name": "Xilinx HPC CG Test",
3-
"clock": "3.3333",
4-
"description": "Xilinx HPC CG Update Vector Values",
5-
"flow": "hls",
6-
"part_blocklist": [],
7-
"part_allowlist": [],
8-
"platform_blocklist": [],
2+
"name": "Xilinx HPC CG Test",
3+
"clock": "3.3333",
4+
"description": "Xilinx HPC CG Update Vector Values",
5+
"flow": "hls",
6+
"part_blocklist": [],
7+
"part_allowlist": [],
8+
"platform_blocklist": [],
99
"platform_allowlist": [
10-
"u280",
11-
"aws-vu9p-f1",
10+
"aws-vu9p-f1",
1211
"vck190"
13-
],
14-
"project": "cg_test_gemv_test",
15-
"solution": "sol",
16-
"topfunction": "top",
12+
],
13+
"project": "cg_test_gemv_test",
14+
"solution": "sol",
15+
"topfunction": "top",
1716
"top": {
18-
"cflags": "-I${XF_PROJ_ROOT}/L1/include -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/test_gemv -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw",
17+
"cflags": "-I${XF_PROJ_ROOT}/L1/include -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/test_gemv -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw",
1918
"source": [
2019
"${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/test_gemv/top.cpp"
2120
]
22-
},
21+
},
2322
"testbench": {
24-
"argv": {},
25-
"cflags": "-std=c++14 -I${XF_PROJ_ROOT}/L1/include -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/tests/sw/include",
26-
"ldflags": "",
23+
"argv": {},
24+
"cflags": "-std=c++14 -I${XF_PROJ_ROOT}/L1/include -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/tests/sw/include",
25+
"ldflags": "",
2726
"source": [
2827
"${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/test_gemv/main.cpp"
29-
],
28+
],
3029
"stdmath": false
31-
},
30+
},
3231
"testinfo": {
33-
"category": "canary",
34-
"disable": false,
32+
"category": "canary",
33+
"disable": false,
3534
"jobs": [
3635
{
37-
"cmd": "",
38-
"dependency": [],
39-
"env": "",
40-
"index": 0,
36+
"cmd": "",
37+
"dependency": [],
38+
"env": "",
39+
"index": 0,
4140
"max_memory_MB": {
42-
"vivado_syn": 32768,
43-
"hls_csim": 10240,
44-
"hls_cosim": 16384,
45-
"vivado_impl": 16384,
41+
"vivado_syn": 32768,
42+
"hls_csim": 10240,
43+
"hls_cosim": 16384,
44+
"vivado_impl": 16384,
4645
"hls_csynth": 10240
47-
},
46+
},
4847
"max_time_min": 300
4948
}
50-
],
49+
],
5150
"targets": [
52-
"hls_csim",
53-
"hls_csynth",
54-
"hls_cosim",
55-
"vivado_syn",
51+
"hls_csim",
52+
"hls_csynth",
53+
"hls_cosim",
54+
"vivado_syn",
5655
"vivado_impl"
5756
]
5857
}
59-
}
58+
}

‎hpc/L1/tests/hw/cgSolver/update_pk/description.json

+35-36
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,57 @@
11
{
2-
"name": "Xilinx HPC CG Test",
3-
"clock": "3.3333",
4-
"description": "Xilinx HPC CG Update Vector Values",
5-
"flow": "hls",
6-
"part_blocklist": [],
7-
"part_allowlist": [],
8-
"platform_blocklist": [],
2+
"name": "Xilinx HPC CG Test",
3+
"clock": "3.3333",
4+
"description": "Xilinx HPC CG Update Vector Values",
5+
"flow": "hls",
6+
"part_blocklist": [],
7+
"part_allowlist": [],
8+
"platform_blocklist": [],
99
"platform_allowlist": [
10-
"u280",
11-
"aws-vu9p-f1",
10+
"aws-vu9p-f1",
1211
"vck190"
13-
],
14-
"project": "cg_update_pk_test",
15-
"solution": "sol",
16-
"topfunction": "top",
12+
],
13+
"project": "cg_update_pk_test",
14+
"solution": "sol",
15+
"topfunction": "top",
1716
"top": {
18-
"cflags": "-I${XF_PROJ_ROOT}/L1/include -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/update_pk -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw",
17+
"cflags": "-I${XF_PROJ_ROOT}/L1/include -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/update_pk -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw",
1918
"source": [
2019
"${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/update_pk/top.cpp"
2120
]
22-
},
21+
},
2322
"testbench": {
24-
"argv": {},
25-
"cflags": "-std=c++14 -I${XF_PROJ_ROOT}/L1/include -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/tests/sw/include",
26-
"ldflags": "",
23+
"argv": {},
24+
"cflags": "-std=c++14 -I${XF_PROJ_ROOT}/L1/include -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/tests/sw/include",
25+
"ldflags": "",
2726
"source": [
2827
"${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/update_pk/main.cpp"
29-
],
28+
],
3029
"stdmath": false
31-
},
30+
},
3231
"testinfo": {
33-
"category": "canary",
34-
"disable": false,
32+
"category": "canary",
33+
"disable": false,
3534
"jobs": [
3635
{
37-
"cmd": "",
38-
"dependency": [],
39-
"env": "",
40-
"index": 0,
36+
"cmd": "",
37+
"dependency": [],
38+
"env": "",
39+
"index": 0,
4140
"max_memory_MB": {
42-
"vivado_syn": 32768,
43-
"hls_csim": 10240,
44-
"hls_cosim": 16384,
45-
"vivado_impl": 16384,
41+
"vivado_syn": 32768,
42+
"hls_csim": 10240,
43+
"hls_cosim": 16384,
44+
"vivado_impl": 16384,
4645
"hls_csynth": 10240
47-
},
46+
},
4847
"max_time_min": 300
4948
}
50-
],
49+
],
5150
"targets": [
52-
"hls_csim",
53-
"hls_csynth",
54-
"hls_cosim",
55-
"vivado_syn",
51+
"hls_csim",
52+
"hls_csynth",
53+
"hls_cosim",
54+
"vivado_syn",
5655
"vivado_impl"
5756
]
5857
}

‎hpc/L1/tests/hw/cgSolver/update_rk_jacobi/description.json

+35-36
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,57 @@
11
{
2-
"name": "Xilinx HPC CG Test",
3-
"clock": "3.3333",
4-
"description": "Xilinx HPC CG Update Vector Values",
5-
"flow": "hls",
6-
"part_blocklist": [],
7-
"part_allowlist": [],
8-
"platform_blocklist": [],
2+
"name": "Xilinx HPC CG Test",
3+
"clock": "3.3333",
4+
"description": "Xilinx HPC CG Update Vector Values",
5+
"flow": "hls",
6+
"part_blocklist": [],
7+
"part_allowlist": [],
8+
"platform_blocklist": [],
99
"platform_allowlist": [
10-
"u280",
11-
"aws-vu9p-f1",
10+
"aws-vu9p-f1",
1211
"vck190"
13-
],
14-
"project": "cg_update_rk_jacobi_test",
15-
"solution": "sol",
16-
"topfunction": "top",
12+
],
13+
"project": "cg_update_rk_jacobi_test",
14+
"solution": "sol",
15+
"topfunction": "top",
1716
"top": {
18-
"cflags": "-I${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/update_rk_jacobi -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/include/ -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw",
17+
"cflags": "-I${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/update_rk_jacobi -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/include/ -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/../blas/L1/include/hw",
1918
"source": [
2019
"${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/update_rk_jacobi/top.cpp"
2120
]
22-
},
21+
},
2322
"testbench": {
24-
"argv": {},
25-
"cflags": "-std=c++14 -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/include/ -I${XF_PROJ_ROOT}/../blas/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/tests/sw/include",
26-
"ldflags": "",
23+
"argv": {},
24+
"cflags": "-std=c++14 -I${XF_PROJ_ROOT}/L1/include/hw/cgSolver -I${XF_PROJ_ROOT}/L1/include/hw/ -I${XF_PROJ_ROOT}/L1/include/ -I${XF_PROJ_ROOT}/../blas/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/tests/sw/include",
25+
"ldflags": "",
2726
"source": [
2827
"${XF_PROJ_ROOT}/L1/tests/hw/cgSolver/update_rk_jacobi/main.cpp"
29-
],
28+
],
3029
"stdmath": false
31-
},
30+
},
3231
"testinfo": {
33-
"category": "canary",
34-
"disable": false,
32+
"category": "canary",
33+
"disable": false,
3534
"jobs": [
3635
{
37-
"cmd": "",
38-
"dependency": [],
39-
"env": "",
40-
"index": 0,
36+
"cmd": "",
37+
"dependency": [],
38+
"env": "",
39+
"index": 0,
4140
"max_memory_MB": {
42-
"vivado_syn": 32768,
43-
"hls_csim": 10240,
44-
"hls_cosim": 16384,
45-
"vivado_impl": 16384,
41+
"vivado_syn": 32768,
42+
"hls_csim": 10240,
43+
"hls_cosim": 16384,
44+
"vivado_impl": 16384,
4645
"hls_csynth": 10240
47-
},
46+
},
4847
"max_time_min": 300
4948
}
50-
],
49+
],
5150
"targets": [
52-
"hls_csim",
53-
"hls_csynth",
54-
"hls_cosim",
55-
"vivado_syn",
51+
"hls_csim",
52+
"hls_csynth",
53+
"hls_cosim",
54+
"vivado_syn",
5655
"vivado_impl"
5756
]
5857
}

‎hpc/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/description.json

+37-38
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,61 @@
11
{
2-
"clock": "3.3333",
3-
"description": "",
4-
"flow": "hls",
5-
"name": "Xilinx HPC RTM backward.data_h128_w128_t10_pe2",
6-
"part_blocklist": [],
7-
"part_allowlist": [],
8-
"platform_blocklist": [],
2+
"clock": "3.3333",
3+
"description": "",
4+
"flow": "hls",
5+
"name": "Xilinx HPC RTM backward.data_h128_w128_t10_pe2",
6+
"part_blocklist": [],
7+
"part_allowlist": [],
8+
"platform_blocklist": [],
99
"platform_allowlist": [
10-
"u280",
11-
"aws-vu9p-f1",
10+
"aws-vu9p-f1",
1211
"vck190"
13-
],
14-
"project": "backward_data_h128_w128_t10_pe2_test",
15-
"solution": "sol",
12+
],
13+
"project": "backward_data_h128_w128_t10_pe2_test",
14+
"solution": "sol",
1615
"testbench": {
1716
"argv": {
18-
"hls_cosim": "${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/data/",
17+
"hls_cosim": "${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/data/",
1918
"hls_csim": "${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/data/"
20-
},
21-
"cflags": "-std=c++14 -I${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2 -I${XF_PROJ_ROOT}/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/tests/sw/include",
22-
"ldflags": "",
19+
},
20+
"cflags": "-std=c++14 -I${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2 -I${XF_PROJ_ROOT}/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/tests/sw/include",
21+
"ldflags": "",
2322
"source": [
2423
"${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/../../main.cpp"
25-
],
24+
],
2625
"stdmath": false
27-
},
26+
},
2827
"testinfo": {
29-
"category": "canary",
30-
"disable": false,
28+
"category": "canary",
29+
"disable": false,
3130
"jobs": [
3231
{
33-
"cmd": "",
34-
"dependency": [],
35-
"env": "",
36-
"index": 0,
32+
"cmd": "",
33+
"dependency": [],
34+
"env": "",
35+
"index": 0,
3736
"max_memory_MB": {
38-
"vivado_syn": 32768,
39-
"hls_csim": 10240,
40-
"hls_cosim": 16384,
41-
"vivado_impl": 16384,
37+
"vivado_syn": 32768,
38+
"hls_csim": 10240,
39+
"hls_cosim": 16384,
40+
"vivado_impl": 16384,
4241
"hls_csynth": 10240
43-
},
42+
},
4443
"max_time_min": 300
4544
}
46-
],
45+
],
4746
"targets": [
48-
"hls_csim",
49-
"hls_csynth",
50-
"hls_cosim",
51-
"vivado_syn",
47+
"hls_csim",
48+
"hls_csynth",
49+
"hls_cosim",
50+
"vivado_syn",
5251
"vivado_impl"
5352
]
54-
},
53+
},
5554
"top": {
56-
"cflags": "-I${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2 -I${XF_PROJ_ROOT}/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/include/hw",
55+
"cflags": "-I${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2 -I${XF_PROJ_ROOT}/L1/include/hw -I${XF_PROJ_ROOT}/../blas/L1/include/hw",
5756
"source": [
5857
"${XF_PROJ_ROOT}/L1/tests/hw/rtm2d/backward/tests/data_h128_w128_t10_pe2/../../backward.cpp"
5958
]
60-
},
59+
},
6160
"topfunction": "top"
62-
}
61+
}

0 commit comments

Comments
 (0)