Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
PaddlePaddle
Paddle-Lite
提交
64f67aa6
P
Paddle-Lite
项目概览
PaddlePaddle
/
Paddle-Lite
通知
331
Star
4
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
271
列表
看板
标记
里程碑
合并请求
78
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
P
Paddle-Lite
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
271
Issue
271
列表
看板
标记
里程碑
合并请求
78
合并请求
78
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
64f67aa6
编写于
11月 26, 2019
作者:
qnqinan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add interupt clear operation before op compute in FPGA V2 track, test=develop
上级
7100f6a8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
13 addition
and
12 deletion
+13
-12
mobile/src/fpga/V2/image.cpp
mobile/src/fpga/V2/image.cpp
+1
-6
mobile/src/fpga/V2/pe.cpp
mobile/src/fpga/V2/pe.cpp
+12
-6
未找到文件。
mobile/src/fpga/V2/image.cpp
浏览文件 @
64f67aa6
...
...
@@ -83,11 +83,6 @@ void concat_images(int8_t **images_in, float **scales_in, void *image_out,
height
*
align_to_x
(
channel_num
[
i
]
*
width
,
IMAGE_ALIGNMENT
)
*
sizeof
(
int8_t
));
for
(
j
=
0
;
j
<
height
*
align_to_x
(
channel_num
[
i
]
*
width
,
IMAGE_ALIGNMENT
);
j
++
)
{
images_in_tmp
[
i
][
j
]
=
(
int8_t
)(
images_in
[
i
][
j
]
*
Ck
+
0.5
);
}
}
align_each_out_area_cw
=
align_to_x
(
each_out_line_channel
*
width
,
IMAGE_ALIGNMENT
);
...
...
@@ -102,7 +97,7 @@ void concat_images(int8_t **images_in, float **scales_in, void *image_out,
memcpy
(
(
int8_t
*
)
image_out
+
tmp_channel
+
// NOLINT
k
*
align_each_out_area_cw_differ
,
images_in
_tmp
[
i
]
+
j
*
channel_num
[
i
]
+
k
*
align_each_in_area_cw
,
images_in
[
i
]
+
j
*
channel_num
[
i
]
+
k
*
align_each_in_area_cw
,
channel_num
[
i
]
*
sizeof
(
int8_t
));
tmp_channel
+=
channel_num
[
i
];
...
...
mobile/src/fpga/V2/pe.cpp
浏览文件 @
64f67aa6
...
...
@@ -248,8 +248,8 @@ int ComputeBasicConv(const struct ConvArgs &args) {
// DLOG << " activation_type:" << active_args.activation_type
// << " leaky_relu_negative_slope:"
// << active_args.leaky_relu_negative_slope;
// DLOG << " reg_ActivationArgs:" << reg_ActivationArgs
;
DLOG
<<
" reg_ActivationArgs:"
;
uint64_t
bypass_interrupt
=
reg_readq
(
REG_INTERRUPT
);
pthread_mutex_lock
(
&
g_fpgainfo
.
pe_data
->
mutex
);
if
(
ERROR
==
g_fpgainfo
.
pe_data
->
pes
[
PE_IDX_CONV
]
->
status
)
{
ret
=
-
EIO
;
...
...
@@ -257,6 +257,10 @@ int ComputeBasicConv(const struct ConvArgs &args) {
pthread_mutex_unlock
(
&
g_fpgainfo
.
pe_data
->
mutex
);
return
ret
;
}
// reg_writeq(reg_ActivationArgs,
// REG_ACTIVATION_MODE_AND_LEAKY_RELU_FACTOR); // active functoion
reg_writeq
(
output_scale
,
REG_SCALE_PARAMETER
);
// new
reg_writeq
((
args
.
driver
.
row_padding_down
<<
45
)
|
(
args
.
driver
.
row_padding_up
<<
34
)
|
...
...
@@ -365,7 +369,7 @@ int ComputeFpgaPool(const struct PoolingArgs &args) {
uint64_t
cmd
=
0
;
uint64_t
image_physical_address
=
0
;
uint64_t
output_physical_address
=
0
;
uint64_t
bypass_interrupt
=
reg_readq
(
REG_INTERRUPT
);
image_physical_address
=
vaddr_to_paddr
(
args
.
image
.
address
);
output_physical_address
=
vaddr_to_paddr
(
args
.
output
.
address
);
uint64_t
C_paral_64
=
align_to_x
((
uint64_t
)
args
.
image
.
channels
,
64
);
...
...
@@ -440,7 +444,7 @@ int ComputeFpgaPool(const struct PoolingArgs &args) {
pthread_mutex_unlock
(
&
g_fpgainfo
.
pe_data
->
mutex
);
return
ret
;
}
reg_writeq
(
output_scale
,
REG_SCALE_PARAMETER
);
reg_writeq
(
image_physical_address
,
0x808
);
reg_writeq
(
result_addr_row
,
0x810
);
reg_writeq
(
kernel_padding_step
,
0x818
);
...
...
@@ -497,7 +501,7 @@ int ComputeFpgaEWAdd(const struct EWAddArgs &args) {
#endif
#ifdef PADDLE_MOBILE_ZU5
int
ret
=
0
;
uint64_t
bypass_interrupt
=
reg_readq
(
REG_INTERRUPT
);
pthread_mutex_lock
(
&
g_fpgainfo
.
pe_data
->
mutex
);
if
(
ERROR
==
g_fpgainfo
.
pe_data
->
pes
[
PE_IDX_EW
]
->
status
)
{
...
...
@@ -534,6 +538,7 @@ int ComputeFpgaEWAdd(const struct EWAddArgs &args) {
uint32_t
*
ew_scale
=
reinterpret_cast
<
uint32_t
*>
(
&
quantParam
);
uint64_t
ew_scale_mult_factor
=
(
*
ew_scale
)
|
((
uint64_t
)
args
.
const0
<<
32
)
|
((
uint64_t
)
args
.
const1
<<
40
);
reg_writeq
(
0ul
,
REG_SCALE_PARAMETER
);
reg_writeq
(
image_physical_address
,
0x808
);
reg_writeq
(
result_addr_row
,
0x810
);
reg_writeq
(
kernel_padding_step
,
0x818
);
...
...
@@ -928,6 +933,7 @@ int ComputeDWConv(const struct DWconvArgs &args) {
#endif
#ifdef PADDLE_MOBILE_ZU5
DLOG
<<
"DWConv"
;
uint64_t
bypass_interrupt
=
reg_readq
(
REG_INTERRUPT
);
// return 0;
uint64_t
timer_cnt
=
0
;
int
ret
=
0
;
...
...
@@ -1011,7 +1017,7 @@ int ComputeDWConv(const struct DWconvArgs &args) {
pthread_mutex_unlock
(
&
g_fpgainfo
.
pe_data
->
mutex
);
return
ret
;
}
reg_writeq
(
0ul
,
REG_SCALE_PARAMETER
);
reg_writeq
(
image_physical_address
,
0x808
);
reg_writeq
(
result_addr_row
,
0x810
);
reg_writeq
(
kernel_padding_step
,
0x818
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录