Skip to content

Commit 5fdbd09

Browse files
SDA USRsdausr
authored and
GitHub Enterprise
committed
Squashed 'ultrasound' changes from ab1ff3d..d5c1b1c (#905)
d5c1b1c Merge pull request #165 from yuanqian/fix_api_meta-2 0d165fe update 3120f1e add visble and target_domain 32f9bf9 [fix bug]1.fix abs path in makefile of imagepoint 2. api.json of L2 visible=false 3cc0a3f [doc]add L2 features and tutorial 90a6c05 [doc]leagal 6bbe7d5 Merge pull request #163 from yunleiz/next 1c9d082 [doc] refine tutorial 4f7d0c1 [format] L3 2a9463b Merge branch 'next' of https://gitenterprise.xilinx.com/FaaSApps/xf_ultrasound into next b67854f [doc]features/details_L2.rst add delay sample mult scanline cc64796 [format] L3 858df2d [L3] refine accuracy beb874b Merge pull request #160 from congt/next cfae80f Merge pull request #162 from yunleiz/next ddfcd7b [L3] remove small test 9c8b25c Merge pull request #161 from yunleiz/next cec21dd [L3] refine makefile 8e5fff5 Merge branch 'next' of gitenterprise.xilinx.com:FaaSApps/xf_ultrasound into next 0cff04d [L2]add description for graph_imagepoints and graph_focusing 293dad7 [L2] fixed bugs a0d89b4 [L2]correct description.json for L2 graph_scanline 9a8a73f [L2] fixed a makefile bug df8f760 [L2]description.json for L2 mult delay sample and scanline 72b3403 [L2]add graph_delay.json ef3dc2f [L2 tutorial] abef6b4 [meta data] 331686f Merge pull request #159 from yunleiz/next 454ffab [remove] data2png move to models ceff96b [doc] L3 doc update 0856fa7 Merge pull request #158 from yunleiz/next d94c36e [L3] refine meta data and description c322805 [L3] update meta and format json.hpp df5048e [refine]L2 imagepoint remove hardnumber 0d5169f [L1 legal]add header for us_example_parameter daf6f6d [L3] add license c25e8e1 [L3] refine makefile aa28f20 [L3] refine makefile 234ce6e [L3] refine api.json 67b4d83 Merge pull request #157 from yunleiz/next 4a2592c [model] format b6bff22 [L3] scanline AllinAIE pl freq change to 400 a55e4d7 Merge pull request #152 from changg/aie_cli 085fdc4 Merge pull request #156 from yunleiz/next db9a639 Merge branch 'next' into aie_cli 0fa1b41 [L1 L3] move dev branch 46a1491 Merge pull request #155 from yunleiz/next 0d9fdae [L3] move models from dev branch 38df5eb [L3] move models from dev branch 346a48e Merge pull request #154 from congt/next af30489 [L3] move from dev branch 4225747 [L2]add data/ for graph_scanline b0ce2b3 resolve conflict 8e4cd3a resolve conflict 4196533 resolve conflict f672081 [standlization] 3263251 fix f65de04 ad fix 189e34c format json, and add config file 2ee80ac Revert "convert to config" 2b5a833 convert to config 11298bc port to unified command for aie apis 1724ce1 Merge pull request #147 from yunleiz/next b2aa8b0 [clean] merge mult e02354e Merge branch 'next' of gitenterprise.xilinx.com:FaaSApps/xf_ultrasound into next e7cfa29 Merge pull request #150 from congt/next c934c58 [models] format 1d3e3ab [L3] add scanline_AllinAIE 8d64da9 [add file]L2/include delay sample and mult cb8bf65 Merge branch 'next' of https://gitenterprise.xilinx.com/FaaSApps/xf_ultrasound into next c542d5f [standlization]clang-format and legal of makefile 9af2c9f [add L2] graph imagepoint, focusing, scanline 459d38c Merge pull request #148 from congt/next ff73213 remove unused files d52f71b [update] interpolation 1968881 [format] apodi and interp b868bee [E2E]fix coding style of L2/tests/graph_delay/aie_graph/graph.cpp 10fd877 [E2E]add L1 4aafd8f [refine] api.json 9c1d672 [standlization]add L1 L2 of delay sample mult c7cb72a [api.json] refine api.json ad3e52d [E2E] add apodization and interpolation unit test 41f76ab Merge pull request #104 from liyuanz/revert-103-next 2f3827b Revert "set visible=False in api.json" 9c88301 Merge pull request #103 from liyuanz/next 3daf775 update 741f03e update a5bb4e3 Merge pull request #98 from changg/fix_target_domain 211e922 update a545cf3 fix target domain 42480c3 change 2023.1_stable_latest to 2023.2_stable_latest f925024 Merge pull request #95 from changg/fix_copyright d0bf220 fix copyright Co-authored-by: sdausr <[email protected]>
1 parent dd4227c commit 5fdbd09

File tree

546 files changed

+4024224
-1654
lines changed

Some content is hidden

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

546 files changed

+4024224
-1654
lines changed

‎ultrasound/Jenkinsfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ VitisLibPipeline (branch: 'next',
55
TARGETS: 'hls_csim:hls_csynth:hls_cosim:vitis_sw_emu:vitis_hw_emu:vitis_hw_build:vitis_hw_run:vitis_aie_sim:vitis_aie_x86sim',
66
upstream_dependencies: '',
77
devtest: 'RunDeploy.sh',
8-
TOOLVERSION: '2023.1_stable_latest')
8+
TOOLVERSION: '2023.2_stable_latest')

‎ultrasound/L1/README.md

+16
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
# Copyright (C) 2019-2022, Xilinx, Inc.
2+
# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
3+
#
4+
# Licensed under the Apache License, Version 2.0 (the "License");
5+
# you may not use this file except in compliance with the License.
6+
# You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
10+
# Unless required by applicable law or agreed to in writing, software
11+
# distributed under the License is distributed on an "AS IS" BASIS,
12+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
# See the License for the specific language governing permissions and
14+
# limitations under the License.
15+
# vitis makefile-generator v2.0.8
16+
117
## Ultrasound Library - Level 1 (L1)
218

319
The level 1 of Vitis Ultrasound Library contains the aie kernels. For more details information, please reference to L1 User Guide in the document for usage and design information.

‎ultrasound/L1/include/absV/absV.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2022 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/cosV/cosV.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2022 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/cosV/cos_lut.hpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2022 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/dataMover/dataMover.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2022 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/diffMV/diffMV.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2022 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/diffSV/diffSV.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2022 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/diffVS/diffVS.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2022 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/divVS/divVS.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2022 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/equalS/equalS.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
2-
* Copyright 2021 Xilinx, Inc.
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
34
*
45
* Licensed under the Apache License, Version 2.0 (the "License");
56
* you may not use this file except in compliance with the License.

‎ultrasound/L1/include/kernel_apodization.hpp

+101
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
/*
2+
* Copyright (C) 2019-2022, Xilinx, Inc.
3+
* Copyright (C) 2022-2023, Advanced Micro Devices, Inc.
4+
*
5+
* Licensed under the Apache License, Version 2.0 (the "License");
6+
* you may not use this file except in compliance with the License.
7+
* You may obtain a copy of the License at
8+
*
9+
* http://www.apache.org/licenses/LICENSE-2.0
10+
*
11+
* Unless required by applicable law or agreed to in writing, software
12+
* distributed under the License is distributed on an "AS IS" BASIS,
13+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
* See the License for the specific language governing permissions and
15+
* limitations under the License.
16+
*/
17+
18+
#ifndef __KERNEL_APODIZATION_H__
19+
#define __KERNEL_APODIZATION_H__
20+
21+
#include <adf.h>
22+
#include <kernels.hpp>
23+
24+
namespace us {
25+
namespace L1 {
26+
27+
// declare param
28+
template <class T>
29+
struct para_Apodization {
30+
int iter_line;
31+
int iter_element;
32+
int iter_seg;
33+
int num_line;
34+
int num_element;
35+
int num_seg;
36+
int num_dep_seg; // = num_depth / num_seg = 512
37+
T f_num;
38+
T tileVApo_x;
39+
T tileVApo_z;
40+
T ref_point_x;
41+
T ref_point_z;
42+
void print() {
43+
printf("apo: <%d/%d lines, %d/%d elements, %d/%d segments>\n", iter_line, num_line, iter_element, num_element,
44+
iter_seg, num_seg);
45+
}
46+
void update() {
47+
if (iter_seg != num_seg - 1)
48+
iter_seg++;
49+
else {
50+
iter_seg = 0;
51+
if (iter_element != num_element - 1)
52+
iter_element++;
53+
else {
54+
iter_element = 0;
55+
iter_line++;
56+
}
57+
}
58+
}
59+
};
60+
61+
//----------------------------------------------------
62+
// brief
63+
// apodization_preprocess
64+
//---1.top function to switch between vector and scaler version
65+
//---2.top function to test top graph connection only, no calculation
66+
// apodization_main_precess
67+
//---3.top function to switch between vector and scaler version
68+
//---4.top function to test top graph connection only, no calculation
69+
//----------------------------------------------------
70+
71+
template <typename T, int LEN_OUT, int LEN_IN, int VECDIM, int APODI_PRE_LEN32b_PARA>
72+
void kfun_apodization_pre(adf::output_buffer<T, adf::extents<LEN_OUT> >& __restrict p_invD_out,
73+
adf::input_buffer<T, adf::extents<LEN_IN> >& __restrict p_points_x_in,
74+
adf::input_buffer<T, adf::extents<LEN_IN> >& __restrict p_points_z_in,
75+
const int (&para_const)[APODI_PRE_LEN32b_PARA]);
76+
77+
template <typename T, int LEN_OUT, int LEN_IN, int VECDIM, int APODI_PRE_LEN32b_PARA>
78+
void kfun_apodization_pre_shell(adf::output_buffer<T, adf::extents<LEN_OUT> >& __restrict p_invD_out,
79+
adf::input_buffer<T, adf::extents<LEN_IN> >& __restrict p_points_x_in,
80+
adf::input_buffer<T, adf::extents<LEN_IN> >& __restrict p_points_z_in,
81+
const int (&para_const)[APODI_PRE_LEN32b_PARA]);
82+
83+
template <typename T, int LEN_OUT, int LEN_IN_F, int LEN_IN_D, int VECDIM, int APODI_PRE_LEN32b_PARA>
84+
void __attribute__((noinline))
85+
kfun_apodization_main(adf::output_buffer<T, adf::extents<LEN_OUT> >& __restrict p_apodization_out,
86+
adf::input_buffer<T, adf::extents<LEN_IN_F> >& __restrict p_focal_in,
87+
adf::input_buffer<T, adf::extents<LEN_IN_D> >& __restrict p_invD_in,
88+
const int (&para_const)[APODI_PRE_LEN32b_PARA]);
89+
90+
template <typename T, int LEN_OUT, int LEN_IN_F, int LEN_IN_D, int VECDIM, int APODI_PRE_LEN32b_PARA>
91+
void kfun_apodization_main_shell(
92+
// output_stream<T>* p_apodization_out,
93+
adf::output_buffer<T, adf::extents<LEN_OUT> >& __restrict p_apodization_out,
94+
adf::input_buffer<T, adf::extents<LEN_IN_F> >& __restrict p_focal_in,
95+
adf::input_buffer<T, adf::extents<LEN_IN_D> >& __restrict p_invD_in,
96+
const int (&para_const)[APODI_PRE_LEN32b_PARA]);
97+
98+
} // namespace L1
99+
} // namespace us
100+
101+
#endif //__KERNEL_APODIZATION_H__

0 commit comments

Comments
 (0)