Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
aml
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
27
Issues
27
List
Boards
Labels
Milestones
Merge Requests
6
Merge Requests
6
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
argo
aml
Commits
024652bd
Commit
024652bd
authored
Apr 10, 2019
by
Swann Perarnau
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[refactor] convert tiling iterator to new create
Last bit of API lacking consistency.
parent
90b8f8bb
Pipeline
#6882
passed with stages
in 10 minutes and 9 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
45 additions
and
12 deletions
+45
-12
include/aml.h
include/aml.h
+13
-3
src/tiling/tiling.c
src/tiling/tiling.c
+11
-3
src/tiling/tiling_1d.c
src/tiling/tiling_1d.c
+9
-1
src/tiling/tiling_2d.c
src/tiling/tiling_2d.c
+10
-2
tests/tiling/test_tiling.c
tests/tiling/test_tiling.c
+2
-3
No files found.
include/aml.h
View file @
024652bd
...
...
@@ -160,8 +160,10 @@ struct aml_tiling_ops {
int
flags
);
int
(
*
init_iterator
)(
struct
aml_tiling_data
*
tiling
,
struct
aml_tiling_iterator
*
iterator
,
int
flags
);
int
(
*
destroy
_iterator
)(
struct
aml_tiling_data
*
tiling
,
int
(
*
fini
_iterator
)(
struct
aml_tiling_data
*
tiling
,
struct
aml_tiling_iterator
*
iterator
);
int
(
*
destroy_iterator
)(
struct
aml_tiling_data
*
tiling
,
struct
aml_tiling_iterator
**
iterator
);
int
(
*
tileid
)(
const
struct
aml_tiling_data
*
tiling
,
va_list
coords
);
size_t
(
*
tilesize
)(
const
struct
aml_tiling_data
*
tiling
,
int
tileid
);
void
*
(
*
tilestart
)(
const
struct
aml_tiling_data
*
tiling
,
...
...
@@ -237,14 +239,22 @@ int aml_tiling_create_iterator(struct aml_tiling *tiling,
*/
int
aml_tiling_init_iterator
(
struct
aml_tiling
*
tiling
,
struct
aml_tiling_iterator
*
iterator
,
int
flags
);
/*
* Finalize an initialized tiling iterator.
* "tiling": an initialized tiling structure.
* "iterator": an initialized tiling iterator structure.
*/
void
aml_tiling_fini_iterator
(
struct
aml_tiling
*
tiling
,
struct
aml_tiling_iterator
*
iterator
);
/*
* Tears down an initialized tiling iterator.
* "tiling": an initialized tiling structure.
* "iterator": an initialized tiling iterator structure.
* Returns 0 if successful; an error code otherwise.
*/
int
aml_tiling_destroy_iterator
(
struct
aml_tiling
*
tiling
,
struct
aml_tiling_iterator
*
iterator
);
void
aml_tiling_destroy_iterator
(
struct
aml_tiling
*
tiling
,
struct
aml_tiling_iterator
*
*
iterator
);
struct
aml_tiling_iterator_ops
{
int
(
*
reset
)(
struct
aml_tiling_iterator_data
*
iterator
);
...
...
src/tiling/tiling.c
View file @
024652bd
...
...
@@ -108,10 +108,18 @@ int aml_tiling_init_iterator(struct aml_tiling *t,
return
t
->
ops
->
init_iterator
(
t
->
data
,
it
,
flags
);
}
int
aml_tiling_destroy
_iterator
(
struct
aml_tiling
*
t
,
struct
aml_tiling_iterator
*
it
)
void
aml_tiling_fini
_iterator
(
struct
aml_tiling
*
t
,
struct
aml_tiling_iterator
*
it
)
{
assert
(
t
!=
NULL
);
assert
(
it
!=
NULL
);
return
t
->
ops
->
destroy_iterator
(
t
->
data
,
it
);
t
->
ops
->
fini_iterator
(
t
->
data
,
it
);
}
void
aml_tiling_destroy_iterator
(
struct
aml_tiling
*
t
,
struct
aml_tiling_iterator
**
it
)
{
assert
(
t
!=
NULL
);
assert
(
it
!=
NULL
);
t
->
ops
->
destroy_iterator
(
t
->
data
,
it
);
}
src/tiling/tiling_1d.c
View file @
024652bd
...
...
@@ -133,15 +133,23 @@ int aml_tiling_1d_create_iterator(struct aml_tiling_data *t,
return
0
;
}
int
aml_tiling_1d_
destroy
_iterator
(
struct
aml_tiling_data
*
t
,
int
aml_tiling_1d_
fini
_iterator
(
struct
aml_tiling_data
*
t
,
struct
aml_tiling_iterator
*
it
)
{
return
0
;
}
int
aml_tiling_1d_destroy_iterator
(
struct
aml_tiling_data
*
t
,
struct
aml_tiling_iterator
**
it
)
{
free
(
*
it
);
return
0
;
}
struct
aml_tiling_ops
aml_tiling_1d_ops
=
{
aml_tiling_1d_create_iterator
,
aml_tiling_1d_init_iterator
,
aml_tiling_1d_fini_iterator
,
aml_tiling_1d_destroy_iterator
,
aml_tiling_1d_tileid
,
aml_tiling_1d_tilesize
,
...
...
src/tiling/tiling_2d.c
View file @
024652bd
...
...
@@ -153,16 +153,23 @@ int aml_tiling_2d_create_iterator(struct aml_tiling_data *t,
return
0
;
}
int
aml_tiling_2d_
destroy
_iterator
(
struct
aml_tiling_data
*
t
,
struct
aml_tiling_iterator
*
it
)
int
aml_tiling_2d_
fini
_iterator
(
struct
aml_tiling_data
*
t
,
struct
aml_tiling_iterator
*
it
)
{
return
0
;
}
int
aml_tiling_2d_destroy_iterator
(
struct
aml_tiling_data
*
t
,
struct
aml_tiling_iterator
**
it
)
{
free
(
*
it
);
return
0
;
}
struct
aml_tiling_ops
aml_tiling_2d_rowmajor_ops
=
{
aml_tiling_2d_create_iterator
,
aml_tiling_2d_init_iterator
,
aml_tiling_2d_fini_iterator
,
aml_tiling_2d_destroy_iterator
,
aml_tiling_2d_rowmajor_tileid
,
aml_tiling_2d_tilesize
,
...
...
@@ -173,6 +180,7 @@ struct aml_tiling_ops aml_tiling_2d_rowmajor_ops = {
struct
aml_tiling_ops
aml_tiling_2d_colmajor_ops
=
{
aml_tiling_2d_create_iterator
,
aml_tiling_2d_init_iterator
,
aml_tiling_2d_fini_iterator
,
aml_tiling_2d_destroy_iterator
,
aml_tiling_2d_colmajor_tileid
,
aml_tiling_2d_tilesize
,
...
...
tests/tiling/test_tiling.c
View file @
024652bd
...
...
@@ -63,9 +63,8 @@ int main(int argc, char *argv[])
doit
(
&
b
,
&
itb
);
/* delete the iterators */
aml_tiling_destroy_iterator
(
a
,
ita
);
aml_tiling_destroy_iterator
(
&
b
,
&
itb
);
free
(
ita
);
aml_tiling_destroy_iterator
(
a
,
&
ita
);
aml_tiling_fini_iterator
(
&
b
,
&
itb
);
/* delete the tilings */
...
...
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