Skip to content

GitLab

Commit 3eb5ca16 authored by Swann Perarnau's avatar Swann Perarnau
Browse files

Merge branch 'fix-async-requests' into 'master' 

Fix vector resize issue on async requests

Closes #48

See merge request !75
parents d2efb479 04315e6e
Pipeline #8304 passed with stages
in 30 minutes and 55 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 327 additions and 164 deletions
include/aml/dma/linux-par.h
View file @ 3eb5ca16
......@@ -27,8 +27,14 @@
**/
extern struct aml_dma_ops aml_dma_linux_par_ops;
/** Inside of a parallel request for linux movement. **/
/** Request handle for clients of the DMA. **/
struct aml_dma_request_linux_par {
/** internal request uuid, index in the request vector. **/
int uuid;
};
/** Inside of a parallel request for linux movement. **/
struct aml_dma_linux_par_request_data {
/**
* The type of dma request
* @see <aml.h>
......
include/aml/dma/linux-seq.h
View file @ 3eb5ca16
......@@ -27,8 +27,14 @@
**/
extern struct aml_dma_ops aml_dma_linux_seq_ops;
/** Inside of a sequential request for linux movement. **/
/** Request handle for clients of the DMA. **/
struct aml_dma_request_linux_seq {
/** internal request uuid, index in the request vector. **/
int uuid;
};
/** Inside of a sequential request for linux movement. **/
struct aml_dma_linux_seq_request_data {
/**
* The type of dma request
* @see <aml.h>
......@@ -60,7 +66,7 @@ struct aml_dma_linux_seq_ops {
* @see aml_area
**/
int (*do_copy)(struct aml_dma_linux_seq_data *dma,
struct aml_dma_request_linux_seq *req);
struct aml_dma_linux_seq_request_data *req);
};
/**
......@@ -99,7 +105,7 @@ void aml_dma_linux_seq_destroy(struct aml_dma **dma);
* @return 0 if successful; an error code otherwise.
**/
int aml_dma_linux_seq_do_copy(struct aml_dma_linux_seq_data *dma,
struct aml_dma_request_linux_seq *req);
struct aml_dma_linux_seq_request_data *req);
/**
* @}
......
include/aml/scratch/par.h
View file @ 3eb5ca16
......@@ -25,8 +25,14 @@
**/
extern struct aml_scratch_ops aml_scratch_par_ops;
/** Inside of a parallel scratch request with linux dma. **/
/** Request handle for clients of the scratch. **/
struct aml_scratch_request_par {
/** internal request uuid, index in the request vector. **/
int uuid;
};
/** Inside of a parallel scratch request with linux dma. **/
struct aml_scratch_par_request_data {
/**
* The type of scratchpad request
* @see <aml.h>
......
include/aml/scratch/seq.h
View file @ 3eb5ca16
......@@ -25,8 +25,14 @@
**/
extern struct aml_scratch_ops aml_scratch_seq_ops;
/** Inside of a sequential scratch request with linux dma. **/
/** Request handle for clients of the scratch. **/
struct aml_scratch_request_seq {
/** internal request uuid, index in the request vector. **/
int uuid;
};
/** Inside of a sequential scratch request. **/
struct aml_scratch_seq_request_data {
/**
* The type of scratchpad request
* @see <aml.h>
......@@ -79,7 +85,7 @@ struct aml_scratch_seq_ops {
* @param req: The request to execute.
**/
int (*doit)(struct aml_scratch_seq_data *scratch,
struct aml_scratch_request_seq *req);
struct aml_scratch_seq_request_data *req);
};
/** Sequential implementation of a scratchpad **/
......
include/aml/utils/vector.h
View file @ 3eb5ca16
......@@ -16,16 +16,17 @@
* @brief AML Vector API
*
* Generic vector type:
* Vector of nbelems, each of size sz, with a comparison key at offset off
* Vector of nbelems, each of size sz, with a comparison key at offset off.
* Elements are not stored directly in the vector, but are allocated one by one.
* @{
**/
/** Pointer to the key within element "e" of a vector "v". **/
#define AML_VECTOR_ELTKEY_P(v, e) ((int *)(((intptr_t) e) + v->off))
/** Pointer to the key within element index "i" of a vector "v". **/
#define AML_VECTOR_KEY_P(v, i) ((int *)(((intptr_t) v->ptr) + i*v->sz + v->off))
#define AML_VECTOR_KEY_P(v, i) ((int *)(((intptr_t) v->ptr[i]) + v->off))
/** Pointer to the element index "i" of a vector "v". **/
#define AML_VECTOR_ELT_P(v, i) ((void *)(((intptr_t) v->ptr) + i*v->sz))
#define AML_VECTOR_ELT_P(v, i) (v->ptr[i])
/** AML vector structure **/
struct aml_vector {
......@@ -40,8 +41,8 @@ struct aml_vector {
* key (of type int) is stored.
**/
size_t off;
/** Pointer to elements in vector **/
void *ptr;
/** array of element pointers in the vector **/
void **ptr;
};
/**
......@@ -59,6 +60,13 @@ size_t aml_vector_size(const struct aml_vector *vector);
* @return a pointer to the requested element.
**/
void *aml_vector_get(struct aml_vector *vector, int index);
/**
* Provides the index of element "elem" within the vector.
* @param vector: an initialized vector structure.
* @param elem: a valid element within "vector".
* @return the index to the element or "na" if not found.
**/
int aml_vector_getid(struct aml_vector *vector, void *elem);
/**
* Find the first element with a particular key.
* @param vector: an initialized vector structure.
......
src/dma/dma_linux_par.c
View file @ 3eb5ca16
......@@ -28,26 +28,34 @@
/*******************************************************************************
* Requests:
******************************************************************************/
int aml_dma_request_linux_par_copy_init(struct aml_dma_request_linux_par *req,
int type,
struct aml_layout *dest,
struct aml_layout *src)
int aml_dma_request_linux_par_create(struct aml_dma_request_linux_par **req,
int uuid)
{
assert(req != NULL);
req->type = type;
req->dest = dest;
req->src = src;
*req = calloc(1, sizeof(struct aml_dma_request_linux_par));
if (*req == NULL)
return -AML_ENOMEM;
(*req)->uuid = uuid;
return 0;
}
int aml_dma_request_linux_par_copy_destroy(struct aml_dma_request_linux_par *r)
void aml_dma_request_linux_par_destroy(struct aml_dma_request_linux_par **req)
{
assert(r != NULL);
if (r->type == AML_DMA_REQUEST_TYPE_PTR) {
aml_layout_dense_destroy(&r->dest);
aml_layout_dense_destroy(&r->src);
}
assert(req != NULL);
free(*req);
*req = NULL;
}
int aml_dma_linux_par_request_data_init(
struct aml_dma_linux_par_request_data *req,
int type,
struct aml_layout *dest,
struct aml_layout *src)
{
assert(req != NULL);
req->type = type;
req->dest = dest;
req->src = src;
return 0;
}
......@@ -57,8 +65,8 @@ int aml_dma_request_linux_par_copy_destroy(struct aml_dma_request_linux_par *r)
void *aml_dma_linux_par_do_thread(void *arg)
{
struct aml_dma_request_linux_par *req =
(struct aml_dma_request_linux_par *)arg;
struct aml_dma_linux_par_request_data *req =
(struct aml_dma_linux_par_request_data *)arg;
if (req->type != AML_DMA_REQUEST_TYPE_INVALID)
aml_copy_layout_generic(req->dest, req->src);
......@@ -81,8 +89,8 @@ int aml_dma_linux_par_create_request(struct aml_dma_data *d,
assert(r != NULL);
struct aml_dma_linux_par *dma =
(struct aml_dma_linux_par *)d;
struct aml_dma_request_linux_par *req;
struct aml_dma_request_linux_par *ret;
struct aml_dma_linux_par_request_data *req;
pthread_mutex_lock(&dma->data.lock);
req = aml_vector_add(dma->data.requests);
......@@ -93,7 +101,7 @@ int aml_dma_linux_par_create_request(struct aml_dma_data *d,
dl = va_arg(ap, struct aml_layout *);
sl = va_arg(ap, struct aml_layout *);
aml_dma_request_linux_par_copy_init(req,
aml_dma_linux_par_request_data_init(req,
AML_DMA_REQUEST_TYPE_LAYOUT,
dl, sl);
} else if (type == AML_DMA_REQUEST_TYPE_PTR) {
......@@ -111,15 +119,18 @@ int aml_dma_linux_par_create_request(struct aml_dma_data *d,
&sz, NULL, NULL);
aml_layout_dense_create(&sl, sp, 0, sizeof(size_t), 1,
&sz, NULL, NULL);
aml_dma_request_linux_par_copy_init(req,
aml_dma_linux_par_request_data_init(req,
AML_DMA_REQUEST_TYPE_PTR,
dl, sl);
}
pthread_mutex_unlock(&dma->data.lock);
if (req->type != AML_DMA_REQUEST_TYPE_INVALID) {
int uuid = aml_vector_getid(dma->data.requests, req);
if (req->type != AML_DMA_REQUEST_TYPE_INVALID)
pthread_create(&req->thread, NULL, dma->ops.do_thread, req);
*r = (struct aml_dma_request *)req;
aml_dma_request_linux_par_create(&ret, uuid);
*r = (struct aml_dma_request *)ret;
}
return 0;
}
......@@ -133,17 +144,25 @@ int aml_dma_linux_par_destroy_request(struct aml_dma_data *d,
struct aml_dma_request_linux_par *req =
(struct aml_dma_request_linux_par *)r;
struct aml_dma_linux_par_request_data *inner_req;
inner_req = aml_vector_get(dma->data.requests, req->uuid);
if (inner_req == NULL)
return -AML_EINVAL;
/* we cancel and join, instead of killing, for a cleaner result */
if (req->type != AML_DMA_REQUEST_TYPE_INVALID) {
pthread_cancel(req->thread);
pthread_join(req->thread, NULL);
aml_dma_request_linux_par_copy_destroy(req);
if (inner_req->type != AML_DMA_REQUEST_TYPE_INVALID) {
pthread_cancel(inner_req->thread);
pthread_join(inner_req->thread, NULL);
if (inner_req->type == AML_DMA_REQUEST_TYPE_PTR) {
aml_layout_dense_destroy(&inner_req->dest);
aml_layout_dense_destroy(&inner_req->src);
}
}
pthread_mutex_lock(&dma->data.lock);
aml_vector_remove(dma->data.requests, req);
aml_vector_remove(dma->data.requests, inner_req);
pthread_mutex_unlock(&dma->data.lock);
aml_dma_request_linux_par_destroy(&req);
return 0;
}
......@@ -155,15 +174,24 @@ int aml_dma_linux_par_wait_request(struct aml_dma_data *d,
struct aml_dma_linux_par *dma = (struct aml_dma_linux_par *)d;
struct aml_dma_request_linux_par *req =
(struct aml_dma_request_linux_par *)r;
struct aml_dma_linux_par_request_data *inner_req;
if (req->type != AML_DMA_REQUEST_TYPE_INVALID) {
pthread_join(req->thread, NULL);
aml_dma_request_linux_par_copy_destroy(req);
inner_req = aml_vector_get(dma->data.requests, req->uuid);
if (inner_req == NULL)
return -AML_EINVAL;
if (inner_req->type != AML_DMA_REQUEST_TYPE_INVALID) {
pthread_join(inner_req->thread, NULL);
if (inner_req->type == AML_DMA_REQUEST_TYPE_PTR) {
aml_layout_dense_destroy(&inner_req->dest);
aml_layout_dense_destroy(&inner_req->src);
}
}
pthread_mutex_lock(&dma->data.lock);
aml_vector_remove(dma->data.requests, req);
aml_vector_remove(dma->data.requests, inner_req);
pthread_mutex_unlock(&dma->data.lock);
aml_dma_request_linux_par_destroy(&req);
return 0;
}
......@@ -199,8 +227,8 @@ int aml_dma_linux_par_create(struct aml_dma **dma, size_t nbreqs)
/* allocate request array */
aml_vector_create(&d->data.requests, nbreqs,
sizeof(struct aml_dma_request_linux_par),
offsetof(struct aml_dma_request_linux_par, type),
sizeof(struct aml_dma_linux_par_request_data),
offsetof(struct aml_dma_linux_par_request_data, type),
AML_DMA_REQUEST_TYPE_INVALID);
pthread_mutex_init(&d->data.lock, NULL);
......
src/dma/dma_linux_seq.c
View file @ 3eb5ca16
......@@ -29,23 +29,34 @@
* Requests:
******************************************************************************/
int aml_dma_request_linux_seq_copy_init(struct aml_dma_request_linux_seq *req,
int type,
struct aml_layout *dest,
struct aml_layout *src)
int aml_dma_request_linux_seq_create(struct aml_dma_request_linux_seq **req,
int uuid)
{
assert(req != NULL);
req->type = type;
/* figure out pointers */
req->dest = dest;
req->src = src;
*req = calloc(1, sizeof(struct aml_dma_request_linux_seq));
if (*req == NULL)
return -AML_ENOMEM;
(*req)->uuid = uuid;
return 0;
}
int aml_dma_request_linux_seq_copy_destroy(struct aml_dma_request_linux_seq *r)
void aml_dma_request_linux_seq_destroy(struct aml_dma_request_linux_seq **req)
{
assert(r != NULL);
return 0;
assert(req != NULL);
free(*req);
*req = NULL;
}
void aml_dma_linux_seq_request_data_init(
struct aml_dma_linux_seq_request_data *req,
int type,
struct aml_layout *dest,
struct aml_layout *src)
{
assert(req != NULL);
req->type = type;
req->dest = dest;
req->src = src;
}
/*******************************************************************************
......@@ -53,7 +64,7 @@ int aml_dma_request_linux_seq_copy_destroy(struct aml_dma_request_linux_seq *r)
******************************************************************************/
int aml_dma_linux_seq_do_copy(struct aml_dma_linux_seq_data *dma,
struct aml_dma_request_linux_seq *req)
struct aml_dma_linux_seq_request_data *req)
{
assert(dma != NULL);
assert(req != NULL);
......@@ -77,8 +88,8 @@ int aml_dma_linux_seq_create_request(struct aml_dma_data *d,
assert(r != NULL);
struct aml_dma_linux_seq *dma =
(struct aml_dma_linux_seq *)d;
struct aml_dma_request_linux_seq *req;
struct aml_dma_request_linux_seq *ret;
struct aml_dma_linux_seq_request_data *req;
pthread_mutex_lock(&dma->data.lock);
req = aml_vector_add(dma->data.requests);
......@@ -89,7 +100,7 @@ int aml_dma_linux_seq_create_request(struct aml_dma_data *d,
dl = va_arg(ap, struct aml_layout *);
sl = va_arg(ap, struct aml_layout *);
aml_dma_request_linux_seq_copy_init(req,
aml_dma_linux_seq_request_data_init(req,
AML_DMA_REQUEST_TYPE_LAYOUT,
dl, sl);
} else if (type == AML_DMA_REQUEST_TYPE_PTR) {
......@@ -107,12 +118,16 @@ int aml_dma_linux_seq_create_request(struct aml_dma_data *d,
&sz, NULL, NULL);
aml_layout_dense_create(&sl, sp, 0, sizeof(size_t), 1,
&sz, NULL, NULL);
aml_dma_request_linux_seq_copy_init(req,
aml_dma_linux_seq_request_data_init(req,
AML_DMA_REQUEST_TYPE_PTR,
dl, sl);
}
int uuid = aml_vector_getid(dma->data.requests, req);
assert(uuid != AML_DMA_REQUEST_TYPE_INVALID);
aml_dma_request_linux_seq_create(&ret, uuid);
*r = (struct aml_dma_request *)ret;
pthread_mutex_unlock(&dma->data.lock);
*r = (struct aml_dma_request *)req;
return 0;
}
......@@ -126,19 +141,22 @@ int aml_dma_linux_seq_destroy_request(struct aml_dma_data *d,
struct aml_dma_request_linux_seq *req =
(struct aml_dma_request_linux_seq *)r;
struct aml_dma_linux_seq_request_data *inner_req;
if (req->type == AML_DMA_REQUEST_TYPE_LAYOUT)
aml_dma_request_linux_seq_copy_destroy(req);
else if (req->type == AML_DMA_REQUEST_TYPE_PTR) {
aml_layout_dense_destroy(&req->dest);
aml_layout_dense_destroy(&req->src);
aml_dma_request_linux_seq_copy_destroy(req);
inner_req = aml_vector_get(dma->data.requests, req->uuid);
if (inner_req == NULL)
return -AML_EINVAL;
pthread_mutex_lock(&dma->data.lock);
if (inner_req->type == AML_DMA_REQUEST_TYPE_PTR) {
aml_layout_dense_destroy(&inner_req->dest);
aml_layout_dense_destroy(&inner_req->src);
}
/* enough to remove from request vector */
pthread_mutex_lock(&dma->data.lock);
aml_vector_remove(dma->data.requests, req);
aml_vector_remove(dma->data.requests, inner_req);
pthread_mutex_unlock(&dma->data.lock);
aml_dma_request_linux_seq_destroy(&req);
return 0;
}
......@@ -150,10 +168,15 @@ int aml_dma_linux_seq_wait_request(struct aml_dma_data *d,
struct aml_dma_linux_seq *dma = (struct aml_dma_linux_seq *)d;
struct aml_dma_request_linux_seq *req =
(struct aml_dma_request_linux_seq *)r;
struct aml_dma_linux_seq_request_data *inner_req;
inner_req = aml_vector_get(dma->data.requests, req->uuid);
if (inner_req == NULL)
return -AML_EINVAL;
/* execute */
if (req->type != AML_DMA_REQUEST_TYPE_INVALID)
dma->ops.do_copy(&dma->data, req);
if (inner_req->type != AML_DMA_REQUEST_TYPE_INVALID)
dma->ops.do_copy(&dma->data, inner_req);
/* destroy a completed request */
aml_dma_linux_seq_destroy_request(d, r);
......@@ -191,8 +214,8 @@ int aml_dma_linux_seq_create(struct aml_dma **dma, size_t nbreqs)
d->ops = aml_dma_linux_seq_inner_ops;
aml_vector_create(&d->data.requests, nbreqs,
sizeof(struct aml_dma_request_linux_seq),
offsetof(struct aml_dma_request_linux_seq, type),
sizeof(struct aml_dma_linux_seq_request_data),
offsetof(struct aml_dma_linux_seq_request_data, type),
AML_DMA_REQUEST_TYPE_INVALID);
pthread_mutex_init(&d->data.lock, NULL);
......
src/scratch/scratch_par.c
View file @ 3eb5ca16
......@@ -24,12 +24,28 @@
/*******************************************************************************
* Requests:
******************************************************************************/
int aml_scratch_request_par_create(struct aml_scratch_request_par **req,
int uuid)
{
assert(req != NULL);
*req = calloc(1, sizeof(struct aml_scratch_request_par));
if (*req == NULL)
return -AML_ENOMEM;
(*req)->uuid = uuid;
return 0;
}
int aml_scratch_request_par_init(struct aml_scratch_request_par *req, int type,
struct aml_scratch_par *scratch,
void *dstptr, int dstid, void *srcptr,
int srcid)
void aml_scratch_request_par_destroy(struct aml_scratch_request_par **req)
{
assert(req != NULL);
free(*req);
*req = NULL;
}
int aml_scratch_par_request_data_init(struct aml_scratch_par_request_data *req,
int type, struct aml_scratch_par *scratch,
void *dstptr, int dstid, void *srcptr,
int srcid)
{
assert(req != NULL);
req->type = type;
......@@ -41,19 +57,13 @@ int aml_scratch_request_par_init(struct aml_scratch_request_par *req, int type,
return 0;
}
int aml_scratch_request_par_destroy(struct aml_scratch_request_par *r)
{
assert(r != NULL);
return 0;
}
/*******************************************************************************
* Internal functions
******************************************************************************/
void *aml_scratch_par_do_thread(void *arg)
{
struct aml_scratch_request_par *req =
(struct aml_scratch_request_par *)arg;
struct aml_scratch_par_request_data *req =
(struct aml_scratch_par_request_data *)arg;
struct aml_scratch_par *scratch = req->scratch;
void *dest, *src;
......@@ -86,11 +96,12 @@ int aml_scratch_par_create_request(struct aml_scratch_data *d,
assert(r != NULL);
struct aml_scratch_par *scratch =
(struct aml_scratch_par *)d;
struct aml_scratch_request_par *req;
struct aml_scratch_request_par *ret;
struct aml_scratch_par_request_data *req;
pthread_mutex_lock(&scratch->data.lock);
req = aml_vector_add(scratch->data.requests);
/* init the request */
if (type == AML_SCRATCH_REQUEST_TYPE_PUSH) {
int scratchid;
......@@ -110,8 +121,9 @@ int aml_scratch_par_create_request(struct aml_scratch_data *d,
*srcid = *slot;
/* init request */
aml_scratch_request_par_init(req, type, scratch, srcptr, *srcid,
scratchptr, scratchid);
aml_scratch_par_request_data_init(req, type, scratch, srcptr,
*srcid, scratchptr,
scratchid);
} else if (type == AML_SCRATCH_REQUEST_TYPE_PULL) {
int *scratchid;
int srcid;
......@@ -140,46 +152,54 @@ int aml_scratch_par_create_request(struct aml_scratch_data *d,
*scratchid = slot;
/* init request */
aml_scratch_request_par_init(req, type, scratch,
scratchptr, *scratchid,
srcptr, srcid);
aml_scratch_par_request_data_init(req, type, scratch,
scratchptr, *scratchid,
srcptr, srcid);
}
int uuid = aml_vector_getid(scratch->data.requests, req);
assert(uuid != AML_SCRATCH_REQUEST_TYPE_INVALID);
aml_scratch_request_par_create(&ret, uuid);
pthread_mutex_unlock(&scratch->data.lock);
/* thread creation */
if (req->type != AML_SCRATCH_REQUEST_TYPE_NOOP)
pthread_create(&req->thread, NULL, scratch->ops.do_thread, req);
*r = (struct aml_scratch_request *)req;
*r = (struct aml_scratch_request *)ret;
return 0;
}
int aml_scratch_par_destroy_request(struct aml_scratch_data *d,
struct aml_scratch_request *r)
struct aml_scratch_request *r)
{
assert(d != NULL);
assert(r != NULL);
struct aml_scratch_par *scratch =
(struct aml_scratch_par *)d;
struct aml_scratch_par_request_data *inner_req;
struct aml_scratch_request_par *req =
(struct aml_scratch_request_par *)r;
int *tile;
if (req->type != AML_SCRATCH_REQUEST_TYPE_NOOP) {
pthread_cancel(req->thread);
pthread_join(req->thread, NULL);
inner_req = aml_vector_get(scratch->data.requests, req->uuid);
if (inner_req == NULL)
return -AML_EINVAL;
if (inner_req->type != AML_SCRATCH_REQUEST_TYPE_NOOP) {
pthread_cancel(inner_req->thread);
pthread_join(inner_req->thread, NULL);
}
aml_scratch_request_par_destroy(req);
/* destroy removes the tile from the scratch */
if (inner_req->type == AML_SCRATCH_REQUEST_TYPE_PUSH)
tile = aml_vector_get(scratch->data.tilemap, inner_req->srcid);
else if (inner_req->type == AML_SCRATCH_REQUEST_TYPE_PULL)
tile = aml_vector_get(scratch->data.tilemap, inner_req->dstid);
pthread_mutex_lock(&scratch->data.lock);
if (req->type == AML_SCRATCH_REQUEST_TYPE_PUSH)
tile = aml_vector_get(scratch->data.tilemap, req->srcid);
else if (req->type == AML_SCRATCH_REQUEST_TYPE_PULL)
tile = aml_vector_get(scratch->data.tilemap, req->dstid);
aml_vector_remove(scratch->data.tilemap, tile);
aml_vector_remove(scratch->data.requests, req);
aml_vector_remove(scratch->data.requests, inner_req);
pthread_mutex_unlock(&scratch->data.lock);
aml_scratch_request_par_destroy(&req);
return 0;
}
......@@ -189,23 +209,28 @@ int aml_scratch_par_wait_request(struct aml_scratch_data *d,
assert(d != NULL);
assert(r != NULL);
struct aml_scratch_par *scratch = (struct aml_scratch_par *)d;
struct aml_scratch_par_request_data *inner_req;
struct aml_scratch_request_par *req =
(struct aml_scratch_request_par *)r;
int *tile;