Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
FORMUS3IC_LAS3
/
embb
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
4692cef0
authored
Feb 22, 2016
by
Marcus Winter
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'embb452_dataflow_stream_operators' into development
parents
01100d6a
314b7e7c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
15 additions
and
9 deletions
+15
-9
dataflow_cpp/include/embb/dataflow/internal/process.h
+2
-1
dataflow_cpp/include/embb/dataflow/internal/select.h
+2
-1
dataflow_cpp/include/embb/dataflow/internal/source.h
+2
-1
dataflow_cpp/include/embb/dataflow/internal/switch.h
+2
-1
dataflow_cpp/test/dataflow_cpp_test_simple.cc
+6
-3
doc/examples/dataflow/dataflow_connect-snippet.h
+1
-2
No files found.
dataflow_cpp/include/embb/dataflow/internal/process.h
View file @
4692cef0
...
@@ -102,8 +102,9 @@ class Process< Slices, Serial, Inputs<Slices, I1, I2, I3, I4, I5>,
...
@@ -102,8 +102,9 @@ class Process< Slices, Serial, Inputs<Slices, I1, I2, I3, I4, I5>,
}
}
template
<
typename
T
>
template
<
typename
T
>
void
operator
>>
(
T
&
target
)
{
T
&
operator
>>
(
T
&
target
)
{
GetOutput
<
0
>
()
>>
target
.
template
GetInput
<
0
>
();
GetOutput
<
0
>
()
>>
target
.
template
GetInput
<
0
>
();
return
target
;
}
}
virtual
void
OnClock
(
int
clock
)
{
virtual
void
OnClock
(
int
clock
)
{
...
...
dataflow_cpp/include/embb/dataflow/internal/select.h
View file @
4692cef0
...
@@ -105,8 +105,9 @@ class Select
...
@@ -105,8 +105,9 @@ class Select
}
}
template
<
typename
T
>
template
<
typename
T
>
void
operator
>>
(
T
&
target
)
{
T
&
operator
>>
(
T
&
target
)
{
GetOutput
<
0
>
()
>>
target
.
template
GetInput
<
0
>
();
GetOutput
<
0
>
()
>>
target
.
template
GetInput
<
0
>
();
return
target
;
}
}
virtual
void
OnClock
(
int
clock
)
{
virtual
void
OnClock
(
int
clock
)
{
...
...
dataflow_cpp/include/embb/dataflow/internal/source.h
View file @
4692cef0
...
@@ -83,8 +83,9 @@ class Source< Slices, Outputs<Slices, O1, O2, O3, O4, O5> >
...
@@ -83,8 +83,9 @@ class Source< Slices, Outputs<Slices, O1, O2, O3, O4, O5> >
}
}
template
<
typename
T
>
template
<
typename
T
>
void
operator
>>
(
T
&
target
)
{
T
&
operator
>>
(
T
&
target
)
{
GetOutput
<
0
>
()
>>
target
.
template
GetInput
<
0
>
();
GetOutput
<
0
>
()
>>
target
.
template
GetInput
<
0
>
();
return
target
;
}
}
private
:
private
:
...
...
dataflow_cpp/include/embb/dataflow/internal/switch.h
View file @
4692cef0
...
@@ -103,8 +103,9 @@ class Switch
...
@@ -103,8 +103,9 @@ class Switch
}
}
template
<
typename
T
>
template
<
typename
T
>
void
operator
>>
(
T
&
target
)
{
T
&
operator
>>
(
T
&
target
)
{
GetOutput
<
0
>
()
>>
target
.
template
GetInput
<
0
>
();
GetOutput
<
0
>
()
>>
target
.
template
GetInput
<
0
>
();
return
target
;
}
}
virtual
void
OnClock
(
int
clock
)
{
virtual
void
OnClock
(
int
clock
)
{
...
...
dataflow_cpp/test/dataflow_cpp_test_simple.cc
View file @
4692cef0
...
@@ -188,11 +188,14 @@ void SimpleTest::TestBasic() {
...
@@ -188,11 +188,14 @@ void SimpleTest::TestBasic() {
source
.
GetOutput
<
0
>
()
>>
sw
.
GetInput
<
1
>
();
source
.
GetOutput
<
0
>
()
>>
sw
.
GetInput
<
1
>
();
source
.
GetOutput
<
0
>
()
>>
pred
.
GetInput
<
0
>
();
// connection chain representing the commented single connections below
pred
.
GetOutput
<
0
>
()
>>
sw
.
GetInput
<
0
>
();
source
>>
pred
>>
sw
>>
filter
;
//source.GetOutput<0>() >> pred.GetInput<0>();
//pred.GetOutput<0>() >> sw.GetInput<0>();
pred
.
GetOutput
<
0
>
()
>>
sel
.
GetInput
<
0
>
();
pred
.
GetOutput
<
0
>
()
>>
sel
.
GetInput
<
0
>
();
sw
.
GetOutput
<
0
>
()
>>
filter
.
GetInput
<
0
>
();
//
sw.GetOutput<0>() >> filter.GetInput<0>();
filter
.
GetOutput
<
0
>
()
>>
sel
.
GetInput
<
1
>
();
filter
.
GetOutput
<
0
>
()
>>
sel
.
GetInput
<
1
>
();
constant
.
GetOutput
<
0
>
()
>>
mult
.
GetInput
<
0
>
();
constant
.
GetOutput
<
0
>
()
>>
mult
.
GetInput
<
0
>
();
...
...
doc/examples/dataflow/dataflow_connect-snippet.h
View file @
4692cef0
read
>>
replace
;
read
>>
replace
>>
write
;
replace
>>
write
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment