Commit 611f4cd1 authored by Swann Perarnau's avatar Swann Perarnau
Browse files

[fix] make the unstable branch compile

parent f7ec7762
Pipeline #8416 failed with stages
in 6 minutes and 48 seconds
...@@ -21,11 +21,6 @@ DMA_SOURCES = \ ...@@ -21,11 +21,6 @@ DMA_SOURCES = \
dma/dma_linux_par.c \ dma/dma_linux_par.c \
dma/dma_linux_seq.c dma/dma_linux_seq.c
SCRATCH_SOURCES = \
scratch/scratch.c \
scratch/scratch_par.c \
scratch/scratch_seq.c
TILING_SOURCES = \ TILING_SOURCES = \
tiling/tiling.c \ tiling/tiling.c \
tiling/tiling_resize.c tiling/tiling_resize.c
...@@ -38,7 +33,6 @@ UTILS_SOURCES = \ ...@@ -38,7 +33,6 @@ UTILS_SOURCES = \
LIB_SOURCES = \ LIB_SOURCES = \
$(AREA_SOURCES) \ $(AREA_SOURCES) \
$(DMA_SOURCES) \ $(DMA_SOURCES) \
$(SCRATCH_SOURCES) \
$(TILING_SOURCES) \ $(TILING_SOURCES) \
$(LAYOUT_SOURCES) \ $(LAYOUT_SOURCES) \
$(UTILS_SOURCES) \ $(UTILS_SOURCES) \
......
...@@ -138,11 +138,14 @@ struct aml_layout* ...@@ -138,11 +138,14 @@ struct aml_layout*
aml_tiling_resize_column_index_linear(const struct aml_tiling_data *t, aml_tiling_resize_column_index_linear(const struct aml_tiling_data *t,
const size_t uuid) const size_t uuid)
{ {
(void)t;
(void)uuid;
return NULL; return NULL;
} }
int aml_tiling_resize_column_order(const struct aml_tiling_data *t) int aml_tiling_resize_column_order(const struct aml_tiling_data *t)
{ {
(void)t;
return AML_TILING_ORDER_COLUMN_MAJOR; return AML_TILING_ORDER_COLUMN_MAJOR;
} }
...@@ -231,11 +234,14 @@ struct aml_layout* ...@@ -231,11 +234,14 @@ struct aml_layout*
aml_tiling_resize_row_index_linear(const struct aml_tiling_data *t, aml_tiling_resize_row_index_linear(const struct aml_tiling_data *t,
const size_t uuid) const size_t uuid)
{ {
(void)t;
(void)uuid;
return NULL; return NULL;
} }
int aml_tiling_resize_row_order(const struct aml_tiling_data *t) int aml_tiling_resize_row_order(const struct aml_tiling_data *t)
{ {
(void)t;
return AML_TILING_ORDER_ROW_MAJOR; return AML_TILING_ORDER_ROW_MAJOR;
} }
......
...@@ -20,26 +20,20 @@ AREA_TESTS = \ ...@@ -20,26 +20,20 @@ AREA_TESTS = \
LAYOUT_TESTS = layout/test_layout LAYOUT_TESTS = layout/test_layout
TILING_TESTS = tiling/test_tiling
DMA_LINUX_TESTS = dma/test_dma_linux_seq \ DMA_LINUX_TESTS = dma/test_dma_linux_seq \
dma/test_dma_linux_par dma/test_dma_linux_par
SCRATCH_TESTS = scratch/test_scratch_seq \
scratch/test_scratch_par
if RUN_CUDA if RUN_CUDA
AREA_TESTS += area/test_cuda AREA_TESTS += area/test_cuda
endif endif
# unit tests # unit tests
UNIT_TESTS = $(UTILS_TESTS) \ UNIT_TESTS = $(UTILS_TESTS) \
$(TILING_TESTS) \
$(LAYOUT_TESTS) \ $(LAYOUT_TESTS) \
$(BINDING_TESTS) \ $(BINDING_TESTS) \
$(AREA_TESTS) \ $(AREA_TESTS) \
$(DMA_LINUX_TESTS) \ $(DMA_LINUX_TESTS)
$(SCRATCH_TESTS)
# all tests # all tests
TST_PROGS = $(UNIT_TESTS) TST_PROGS = $(UNIT_TESTS)
......
...@@ -36,18 +36,18 @@ void test_tiling_even_mixed(void) ...@@ -36,18 +36,18 @@ void test_tiling_even_mixed(void)
} }
struct aml_layout *a, *ares; struct aml_layout *a, *ares;
aml_layout_native_acreate(&a, AML_TYPE_LAYOUT_COLUMN_ORDER, aml_layout_native_create(&a, AML_TYPE_LAYOUT_COLUMN_ORDER,
(void *)memory, sizeof(int), 3, dims_col, (void *)memory, sizeof(int), 3, dims_col,
stride, dims_col); stride, dims_col);
aml_layout_native_acreate(&ares, AML_TYPE_LAYOUT_ROW_ORDER, aml_layout_native_create(&ares, AML_TYPE_LAYOUT_ROW_ORDER,
(void *)memoryres, sizeof(int), 3, dims_row, (void *)memoryres, sizeof(int), 3, dims_row,
stride, dims_row); stride, dims_row);
struct aml_tiling *t, *tres; struct aml_tiling *t, *tres;
aml_tiling_resize_acreate(&t, AML_TYPE_TILING_COLUMN_ORDER, aml_tiling_resize_create(&t, AML_TYPE_TILING_COLUMN_ORDER,
a, 3, dims_tile_col); a, 3, dims_tile_col);
aml_tiling_resize_acreate(&tres, AML_TYPE_TILING_ROW_ORDER, aml_tiling_resize_create(&tres, AML_TYPE_TILING_ROW_ORDER,
ares, 3, dims_tile_row); ares, 3, dims_tile_row);
...@@ -68,17 +68,17 @@ void test_tiling_even_mixed(void) ...@@ -68,17 +68,17 @@ void test_tiling_even_mixed(void)
free(t); free(t);
free(tres); free(tres);
aml_layout_native_acreate(&a, AML_TYPE_LAYOUT_COLUMN_ORDER, aml_layout_native_create(&a, AML_TYPE_LAYOUT_COLUMN_ORDER,
(void *)memory, sizeof(int), 3, dims_col, (void *)memory, sizeof(int), 3, dims_col,
stride, dims_col); stride, dims_col);
aml_layout_native_acreate(&ares, AML_TYPE_LAYOUT_ROW_ORDER, aml_layout_native_create(&ares, AML_TYPE_LAYOUT_ROW_ORDER,
(void *)memoryres, sizeof(int), 3, dims_row, (void *)memoryres, sizeof(int), 3, dims_row,
stride, dims_row); stride, dims_row);
aml_tiling_resize_acreate(&t, AML_TYPE_TILING_ROW_ORDER, aml_tiling_resize_create(&t, AML_TYPE_TILING_ROW_ORDER,
a, 3, dims_tile_row); a, 3, dims_tile_row);
aml_tiling_resize_acreate(&tres, AML_TYPE_TILING_COLUMN_ORDER, aml_tiling_resize_create(&tres, AML_TYPE_TILING_COLUMN_ORDER,
ares, 3, dims_tile_col); ares, 3, dims_tile_col);
for(size_t i = 0; i < 9; i++) for(size_t i = 0; i < 9; i++)
...@@ -129,18 +129,18 @@ void test_tiling_even(void) ...@@ -129,18 +129,18 @@ void test_tiling_even(void)
} }
struct aml_layout *a, *ares; struct aml_layout *a, *ares;
aml_layout_native_acreate(&a, AML_TYPE_LAYOUT_COLUMN_ORDER, aml_layout_native_create(&a, AML_TYPE_LAYOUT_COLUMN_ORDER,
(void *)memory, sizeof(int), 3, dims_col, (void *)memory, sizeof(int), 3, dims_col,
stride, dims_col); stride, dims_col);
aml_layout_native_acreate(&ares, AML_TYPE_LAYOUT_COLUMN_ORDER, aml_layout_native_create(&ares, AML_TYPE_LAYOUT_COLUMN_ORDER,
(void *)memoryres, sizeof(int), 3, dims_col, (void *)memoryres, sizeof(int), 3, dims_col,
stride, dims_col); stride, dims_col);
struct aml_tiling *t, *tres; struct aml_tiling *t, *tres;
aml_tiling_resize_acreate(&t, AML_TYPE_TILING_COLUMN_ORDER, aml_tiling_resize_create(&t, AML_TYPE_TILING_COLUMN_ORDER,
a, 3, dims_tile_col); a, 3, dims_tile_col);
aml_tiling_resize_acreate(&tres, AML_TYPE_TILING_COLUMN_ORDER, aml_tiling_resize_create(&tres, AML_TYPE_TILING_COLUMN_ORDER,
ares, 3, dims_tile_col); ares, 3, dims_tile_col);
...@@ -170,17 +170,17 @@ void test_tiling_even(void) ...@@ -170,17 +170,17 @@ void test_tiling_even(void)
free(t); free(t);
free(tres); free(tres);
aml_layout_native_acreate(&a, AML_TYPE_LAYOUT_ROW_ORDER, aml_layout_native_create(&a, AML_TYPE_LAYOUT_ROW_ORDER,
(void *)memory, sizeof(int), 3, dims_row, (void *)memory, sizeof(int), 3, dims_row,
stride, dims_row); stride, dims_row);
aml_layout_native_acreate(&ares, AML_TYPE_LAYOUT_ROW_ORDER, aml_layout_native_create(&ares, AML_TYPE_LAYOUT_ROW_ORDER,
(void *)memoryres, sizeof(int), 3, dims_row, (void *)memoryres, sizeof(int), 3, dims_row,
stride, dims_row); stride, dims_row);
aml_tiling_resize_acreate(&t, AML_TYPE_TILING_ROW_ORDER, aml_tiling_resize_create(&t, AML_TYPE_TILING_ROW_ORDER,
a, 3, dims_tile_row); a, 3, dims_tile_row);
aml_tiling_resize_acreate(&tres, AML_TYPE_TILING_ROW_ORDER, aml_tiling_resize_create(&tres, AML_TYPE_TILING_ROW_ORDER,
ares, 3, dims_tile_row); ares, 3, dims_tile_row);
assert(aml_tiling_order(t) == AML_TYPE_TILING_ROW_ORDER); assert(aml_tiling_order(t) == AML_TYPE_TILING_ROW_ORDER);
...@@ -240,18 +240,18 @@ void test_tiling_uneven(void) ...@@ -240,18 +240,18 @@ void test_tiling_uneven(void)
} }
struct aml_layout *a, *ares; struct aml_layout *a, *ares;
aml_layout_native_acreate(&a, AML_TYPE_LAYOUT_COLUMN_ORDER, aml_layout_native_create(&a, AML_TYPE_LAYOUT_COLUMN_ORDER,
(void *)memory, sizeof(int), 3, dims_col, (void *)memory, sizeof(int), 3, dims_col,
stride, dims_col); stride, dims_col);
aml_layout_native_acreate(&ares, AML_TYPE_LAYOUT_COLUMN_ORDER, aml_layout_native_create(&ares, AML_TYPE_LAYOUT_COLUMN_ORDER,
(void *)memoryres, sizeof(int), 3, dims_col, (void *)memoryres, sizeof(int), 3, dims_col,
stride, dims_col); stride, dims_col);
struct aml_tiling *t, *tres; struct aml_tiling *t, *tres;
aml_tiling_resize_acreate(&t, AML_TYPE_TILING_COLUMN_ORDER, aml_tiling_resize_create(&t, AML_TYPE_TILING_COLUMN_ORDER,
a, 3, dims_tile_col); a, 3, dims_tile_col);
aml_tiling_resize_acreate(&tres, AML_TYPE_TILING_COLUMN_ORDER, aml_tiling_resize_create(&tres, AML_TYPE_TILING_COLUMN_ORDER,
ares, 3, dims_tile_col); ares, 3, dims_tile_col);
...@@ -281,16 +281,16 @@ void test_tiling_uneven(void) ...@@ -281,16 +281,16 @@ void test_tiling_uneven(void)
free(t); free(t);
free(tres); free(tres);
aml_layout_native_acreate(&a, AML_TYPE_LAYOUT_ROW_ORDER, aml_layout_native_create(&a, AML_TYPE_LAYOUT_ROW_ORDER,
(void *)memory, sizeof(int), 3, dims_row, (void *)memory, sizeof(int), 3, dims_row,
stride, dims_row); stride, dims_row);
aml_layout_native_acreate(&ares, AML_TYPE_LAYOUT_ROW_ORDER, aml_layout_native_create(&ares, AML_TYPE_LAYOUT_ROW_ORDER,
(void *)memoryres, sizeof(int), 3, dims_row, (void *)memoryres, sizeof(int), 3, dims_row,
stride, dims_row); stride, dims_row);
aml_tiling_resize_acreate(&t, AML_TYPE_TILING_ROW_ORDER, aml_tiling_resize_create(&t, AML_TYPE_TILING_ROW_ORDER,
a, 3, dims_tile_row); a, 3, dims_tile_row);
aml_tiling_resize_acreate(&tres, AML_TYPE_TILING_ROW_ORDER, aml_tiling_resize_create(&tres, AML_TYPE_TILING_ROW_ORDER,
ares, 3, dims_tile_row); ares, 3, dims_tile_row);
assert(aml_tiling_order(t) == AML_TYPE_TILING_ROW_ORDER); assert(aml_tiling_order(t) == AML_TYPE_TILING_ROW_ORDER);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment