Selaa lähdekoodia

Use starpu_malloc

Cédric Augonnet 14 vuotta sitten
vanhempi
commit
2db455d5ab

+ 1 - 1
examples/audio/starpu_audio_processing.c

@@ -328,7 +328,7 @@ static void init_problem(void)
 	/* allocate a buffer to store the content of input file */
 	if (use_pin)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)&A, length_data*sizeof(float));
+		starpu_malloc((void **)&A, length_data*sizeof(float));
 	}
 	else {
 		A = malloc(length_data*sizeof(float));

+ 2 - 2
examples/axpy/axpy.c

@@ -95,10 +95,10 @@ int main(int argc, char **argv)
 		vec_a = malloc(N*sizeof(TYPE));
 		vec_b = malloc(N*sizeof(TYPE));
 	*/
-	starpu_data_malloc_pinned_if_possible((void **)&vec_x, N*sizeof(TYPE));
+	starpu_malloc((void **)&vec_x, N*sizeof(TYPE));
 	assert(vec_x);
 
-	starpu_data_malloc_pinned_if_possible((void **)&vec_y, N*sizeof(TYPE));
+	starpu_malloc((void **)&vec_y, N*sizeof(TYPE));
 	assert(vec_y);
 
 	unsigned i;

+ 6 - 6
examples/cg/cg.c

@@ -97,9 +97,9 @@ static void generate_random_problem(void)
 {
 	int i, j;
 
-	starpu_data_malloc_pinned_if_possible((void **)&A, n*n*sizeof(TYPE));
-	starpu_data_malloc_pinned_if_possible((void **)&b, n*sizeof(TYPE));
-	starpu_data_malloc_pinned_if_possible((void **)&x, n*sizeof(TYPE));
+	starpu_malloc((void **)&A, n*n*sizeof(TYPE));
+	starpu_malloc((void **)&b, n*sizeof(TYPE));
+	starpu_malloc((void **)&x, n*sizeof(TYPE));
 	assert(A && b && x);
 
 	for (j = 0; j < n; j++)
@@ -115,9 +115,9 @@ static void generate_random_problem(void)
 	}
 
 	/* Internal vectors */
-	starpu_data_malloc_pinned_if_possible((void **)&r, n*sizeof(TYPE));
-	starpu_data_malloc_pinned_if_possible((void **)&d, n*sizeof(TYPE));
-	starpu_data_malloc_pinned_if_possible((void **)&q, n*sizeof(TYPE));
+	starpu_malloc((void **)&r, n*sizeof(TYPE));
+	starpu_malloc((void **)&d, n*sizeof(TYPE));
+	starpu_malloc((void **)&q, n*sizeof(TYPE));
 	assert(r && d && q);
 
 	memset(r, 0, n*sizeof(TYPE));

+ 1 - 1
examples/cholesky/cholesky_grain_tag.c

@@ -261,7 +261,7 @@ static void initialize_system(float **A, unsigned dim, unsigned pinned)
 
 	if (pinned)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)A, dim*dim*sizeof(float));
+		starpu_malloc((void **)A, dim*dim*sizeof(float));
 	} 
 	else {
 		*A = malloc(dim*dim*sizeof(float));

+ 1 - 1
examples/cholesky/cholesky_implicit.c

@@ -174,7 +174,7 @@ int main(int argc, char **argv)
 	starpu_helper_cublas_init();
 
 	float *mat;
-	starpu_data_malloc_pinned_if_possible((void **)&mat, (size_t)size*size*sizeof(float));
+	starpu_malloc((void **)&mat, (size_t)size*size*sizeof(float));
 
 	unsigned i,j;
 	for (i = 0; i < size; i++)

+ 1 - 1
examples/cholesky/cholesky_tag.c

@@ -241,7 +241,7 @@ static void initialize_system(float **A, unsigned dim, unsigned pinned)
 
 	if (pinned)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)A, (size_t)dim*dim*sizeof(float));
+		starpu_malloc((void **)A, (size_t)dim*dim*sizeof(float));
 	} 
 	else {
 		*A = malloc(dim*dim*sizeof(float));

+ 2 - 2
examples/heat/dw_factolu.c

@@ -697,8 +697,8 @@ void initialize_system(float **A, float **B, unsigned dim, unsigned pinned)
 
 	if (pinned)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)A, (size_t)dim*dim*sizeof(float));
-		starpu_data_malloc_pinned_if_possible((void **)B, (size_t)dim*sizeof(float));
+		starpu_malloc((void **)A, (size_t)dim*dim*sizeof(float));
+		starpu_malloc((void **)B, (size_t)dim*sizeof(float));
 	} 
 	else {
 		*A = malloc((size_t)dim*dim*sizeof(float));

+ 2 - 2
examples/lu/lu_example.c

@@ -137,7 +137,7 @@ void copy_matrix_into_blocks(void)
 	for (bj = 0; bj < nblocks; bj++)
 	for (bi = 0; bi < nblocks; bi++)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)&A_blocks[bi+nblocks*bj], (size_t)blocksize*blocksize*sizeof(TYPE));
+		starpu_malloc((void **)&A_blocks[bi+nblocks*bj], (size_t)blocksize*blocksize*sizeof(TYPE));
 
 		for (j = 0; j < blocksize; j++)
 		for (i = 0; i < blocksize; i++)
@@ -151,7 +151,7 @@ void copy_matrix_into_blocks(void)
 static void init_matrix(void)
 {
 	/* allocate matrix */
-	starpu_data_malloc_pinned_if_possible((void **)&A, (size_t)size*size*sizeof(TYPE));
+	starpu_malloc((void **)&A, (size_t)size*size*sizeof(TYPE));
 	STARPU_ASSERT(A);
 
 	starpu_srand48((long int)time(NULL));

+ 1 - 1
examples/mandelbrot/mandelbrot.c

@@ -461,7 +461,7 @@ int main(int argc, char **argv)
 	starpu_init(&conf);
 
 	unsigned *buffer;
-	starpu_data_malloc_pinned_if_possible((void **)&buffer, height*width*sizeof(unsigned));
+	starpu_malloc((void **)&buffer, height*width*sizeof(unsigned));
 
 #ifdef STARPU_HAVE_X11
 	if (use_x11)

+ 3 - 3
examples/mult/xgemm.c

@@ -69,9 +69,9 @@ static void init_problem_data(void)
 {
 	unsigned i,j;
 
-	starpu_data_malloc_pinned_if_possible((void **)&A, zdim*ydim*sizeof(TYPE));
-	starpu_data_malloc_pinned_if_possible((void **)&B, xdim*zdim*sizeof(TYPE));
-	starpu_data_malloc_pinned_if_possible((void **)&C, xdim*ydim*sizeof(TYPE));
+	starpu_malloc((void **)&A, zdim*ydim*sizeof(TYPE));
+	starpu_malloc((void **)&B, xdim*zdim*sizeof(TYPE));
+	starpu_malloc((void **)&C, xdim*ydim*sizeof(TYPE));
 
 	/* fill the A and B matrices */
 	for (j=0; j < ydim; j++) {

+ 1 - 1
examples/starpufft/starpufftx.c

@@ -310,7 +310,7 @@ STARPUFFT(malloc)(size_t n)
 {
 #ifdef STARPU_USE_CUDA
 	void *res;
-	starpu_data_malloc_pinned_if_possible(&res, n);
+	starpu_malloc(&res, n);
 	return res;
 #else
 #  ifdef STARPU_HAVE_FFTW

+ 1 - 1
examples/stencil/stencil-blocks.c

@@ -249,7 +249,7 @@ static void allocate_block_on_node(starpu_data_handle *handleptr, TYPE **ptr, un
 
 	/* Allocate memory */
 #if 1
-	ret = starpu_data_malloc_pinned_if_possible((void **)ptr, block_size);
+	ret = starpu_malloc((void **)ptr, block_size);
 	STARPU_ASSERT(ret == 0);
 #else
 	*ptr = malloc(block_size);

+ 1 - 1
mpi/examples/cholesky/mpi_cholesky.c

@@ -160,7 +160,7 @@ void initialize_system(float **A, unsigned dim, unsigned pinned, int *rank, int
 
 	if (pinned)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)A, (size_t)dim*dim*sizeof(float));
+		starpu_malloc((void **)A, (size_t)dim*dim*sizeof(float));
 	}
 	else {
 		*A = malloc(dim*dim*sizeof(float));

+ 7 - 7
mpi/examples/mpi_lu/plu_example.c

@@ -223,7 +223,7 @@ static void init_matrix(int rank)
 			{
 				/* This blocks should be treated by the current MPI process */
 				/* Allocate and fill it */
-				starpu_data_malloc_pinned_if_possible((void **)blockptr, blocksize);
+				starpu_malloc((void **)blockptr, blocksize);
 				allocated_memory += blocksize;
 
 				//fprintf(stderr, "Rank %d : fill block (i = %d, j = %d)\n", rank, i, j);
@@ -256,7 +256,7 @@ static void init_matrix(int rank)
 
 	/* tmp buffer 11 */
 #ifdef SINGLE_TMP11
-	starpu_data_malloc_pinned_if_possible((void **)&tmp_11_block, blocksize);
+	starpu_malloc((void **)&tmp_11_block, blocksize);
 	allocated_memory_extra += blocksize;
 	starpu_matrix_data_register(&tmp_11_block_handle, 0, (uintptr_t)tmp_11_block,
 			size/nblocks, size/nblocks, size/nblocks, sizeof(TYPE));
@@ -269,7 +269,7 @@ static void init_matrix(int rank)
 	{
 		if (tmp_11_block_is_needed(rank, nblocks, k))
 		{
-			starpu_data_malloc_pinned_if_possible((void **)&tmp_11_block[k], blocksize);
+			starpu_malloc((void **)&tmp_11_block[k], blocksize);
 			allocated_memory_extra += blocksize;
 			STARPU_ASSERT(tmp_11_block[k]);
 
@@ -304,7 +304,7 @@ static void init_matrix(int rank)
 #ifdef SINGLE_TMP1221
 		if (tmp_12_block_is_needed(rank, nblocks, k))
 		{
-			starpu_data_malloc_pinned_if_possible((void **)&tmp_12_block[k], blocksize);
+			starpu_malloc((void **)&tmp_12_block[k], blocksize);
 			allocated_memory_extra += blocksize;
 			STARPU_ASSERT(tmp_12_block[k]);
 
@@ -315,7 +315,7 @@ static void init_matrix(int rank)
 
 		if (tmp_21_block_is_needed(rank, nblocks, k))
 		{
-			starpu_data_malloc_pinned_if_possible((void **)&tmp_21_block[k], blocksize);
+			starpu_malloc((void **)&tmp_21_block[k], blocksize);
 			allocated_memory_extra += blocksize;
 			STARPU_ASSERT(tmp_21_block[k]);
 
@@ -327,7 +327,7 @@ static void init_matrix(int rank)
 	for (i = 0; i < 2; i++) {
 		if (tmp_12_block_is_needed(rank, nblocks, k))
 		{
-			starpu_data_malloc_pinned_if_possible((void **)&tmp_12_block[i][k], blocksize);
+			starpu_malloc((void **)&tmp_12_block[i][k], blocksize);
 			allocated_memory_extra += blocksize;
 			STARPU_ASSERT(tmp_12_block[i][k]);
 	
@@ -338,7 +338,7 @@ static void init_matrix(int rank)
 
 		if (tmp_21_block_is_needed(rank, nblocks, k))
 		{
-			starpu_data_malloc_pinned_if_possible((void **)&tmp_21_block[i][k], blocksize);
+			starpu_malloc((void **)&tmp_21_block[i][k], blocksize);
 			allocated_memory_extra += blocksize;
 			STARPU_ASSERT(tmp_21_block[i][k]);
 	

+ 2 - 2
mpi/tests/block_interface_pinned.c

@@ -61,7 +61,7 @@ int main(int argc, char **argv)
 
 	if (rank == 0)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)&block,
+		starpu_malloc((void **)&block,
 				BIGSIZE*BIGSIZE*BIGSIZE*sizeof(float));
 		memset(block, 0, BIGSIZE*BIGSIZE*BIGSIZE*sizeof(float));
 
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
 	}
 	else /* rank == 1 */
 	{
-		starpu_data_malloc_pinned_if_possible((void **)&block,
+		starpu_malloc((void **)&block,
 			SIZE*SIZE*SIZE*sizeof(float));
 		memset(block, 0, SIZE*SIZE*SIZE*sizeof(float));
 

+ 1 - 1
tests/core/execute_on_a_specific_worker.c

@@ -86,7 +86,7 @@ int main(int argc, char **argv)
 {
 	starpu_init(NULL);
 
-	starpu_data_malloc_pinned_if_possible((void **)&v, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v, VECTORSIZE*sizeof(unsigned));
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 
 	unsigned nworker = starpu_worker_get_count();

+ 2 - 2
tests/datawizard/dsm_stress.c

@@ -93,8 +93,8 @@ int main(int argc, char **argv)
 {
 	starpu_init(NULL);
 
-	starpu_data_malloc_pinned_if_possible((void **)&v, VECTORSIZE*sizeof(unsigned));
-	starpu_data_malloc_pinned_if_possible((void **)&v2, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v2, VECTORSIZE*sizeof(unsigned));
 
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 	starpu_vector_data_register(&v_handle2, 0, (uintptr_t)v2, VECTORSIZE, sizeof(unsigned));

+ 1 - 1
tests/datawizard/sync_with_data_with_mem.c

@@ -73,7 +73,7 @@ int main(int argc, char **argv)
 	unsigned b;
 	for (b = 0; b < NBUFFERS; b++)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)&buffer[b], VECTORSIZE);
+		starpu_malloc((void **)&buffer[b], VECTORSIZE);
 		starpu_vector_data_register(&v_handle[b], 0,
 				(uintptr_t)buffer[b], VECTORSIZE, sizeof(char));
 	}

+ 1 - 1
tests/datawizard/sync_with_data_with_mem_non_blocking.c

@@ -90,7 +90,7 @@ int main(int argc, char **argv)
 	unsigned b;
 	for (b = 0; b < NBUFFERS; b++)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)&buffer[b], VECTORSIZE);
+		starpu_malloc((void **)&buffer[b], VECTORSIZE);
 		starpu_vector_data_register(&v_handle[b], 0,
 				(uintptr_t)buffer[b], VECTORSIZE, sizeof(char));
 		starpu_data_set_sequential_consistency_flag(v_handle[b], 0);

+ 1 - 1
tests/datawizard/sync_with_data_with_mem_non_blocking_implicit.c

@@ -90,7 +90,7 @@ int main(int argc, char **argv)
 	unsigned b;
 	for (b = 0; b < NBUFFERS; b++)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)&buffer[b], VECTORSIZE);
+		starpu_malloc((void **)&buffer[b], VECTORSIZE);
 		starpu_vector_data_register(&v_handle[b], 0,
 				(uintptr_t)buffer[b], VECTORSIZE, sizeof(char));
 	}

+ 1 - 1
tests/datawizard/unpartition.c

@@ -67,7 +67,7 @@ int main(int argc, char **argv)
 
 	starpu_init(NULL);
 
-	starpu_data_malloc_pinned_if_possible((void **)&buffer, VECTORSIZE);
+	starpu_malloc((void **)&buffer, VECTORSIZE);
 
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)buffer, VECTORSIZE, sizeof(char));
 

+ 2 - 2
tests/helper/pinned_memory.c

@@ -30,8 +30,8 @@ int main(int argc, char **argv)
 	unsigned iter;
 	for (iter = 0; iter < NITER; iter++)
 	{
-		starpu_data_malloc_pinned_if_possible((void **)&data, SIZE);
-		starpu_data_free_pinned_if_possible(data);
+		starpu_malloc((void **)&data, SIZE);
+		starpu_free(data);
 	}
 
 	starpu_shutdown();

+ 1 - 1
tests/microbenchs/local_pingpong.c

@@ -46,7 +46,7 @@ int main(int argc, char **argv)
 	starpu_init(NULL);
 
 	/* Create a piece of data */
-	starpu_data_malloc_pinned_if_possible((void **)&v, vector_size);
+	starpu_malloc((void **)&v, vector_size);
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, vector_size, 1);
 
 	/* Find a pair of memory nodes */

+ 1 - 1
tests/microbenchs/prefetch_data_on_node.c

@@ -90,7 +90,7 @@ int main(int argc, char **argv)
 {
 	starpu_init(NULL);
 
-	starpu_data_malloc_pinned_if_possible((void **)&v, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v, VECTORSIZE*sizeof(unsigned));
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 
 	unsigned nworker = starpu_worker_get_count();

+ 1 - 1
tests/microbenchs/redundant_buffer.c

@@ -53,7 +53,7 @@ int main(int argc, char **argv)
 {
 	starpu_init(NULL);
 
-	starpu_data_malloc_pinned_if_possible((void **)&v, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v, VECTORSIZE*sizeof(unsigned));
 
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 

+ 1 - 1
tests/overlap/overlap.c

@@ -77,7 +77,7 @@ int main(int argc, char **argv)
 	starpu_init(NULL);
 
 	/* create data */
-	starpu_data_malloc_pinned_if_possible((void **)&buffer, NTASKS*VECTORSIZE*sizeof(char));
+	starpu_malloc((void **)&buffer, NTASKS*VECTORSIZE*sizeof(char));
 
 	/* declare data to StarPU */
 	starpu_vector_data_register(&handle, 0, (uintptr_t)buffer,

+ 1 - 1
tests/parallel_tasks/explicit_combined_worker.c

@@ -70,7 +70,7 @@ int main(int argc, char **argv)
 
 	starpu_init(NULL);
 
-	starpu_data_malloc_pinned_if_possible((void **)&v, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v, VECTORSIZE*sizeof(unsigned));
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 
 	unsigned nworker = starpu_worker_get_count() + starpu_combined_worker_get_count();

+ 1 - 1
tests/parallel_tasks/parallel_kernels.c

@@ -76,7 +76,7 @@ int main(int argc, char **argv)
 
 	starpu_init(&conf);
 
-	starpu_data_malloc_pinned_if_possible((void **)&v, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v, VECTORSIZE*sizeof(unsigned));
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 
 	unsigned nworker = starpu_worker_get_count() + starpu_combined_worker_get_count();

+ 1 - 1
tests/parallel_tasks/parallel_kernels_spmd.c

@@ -78,7 +78,7 @@ int main(int argc, char **argv)
 
 	starpu_init(&conf);
 
-	starpu_data_malloc_pinned_if_possible((void **)&v, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v, VECTORSIZE*sizeof(unsigned));
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 
 	unsigned nworker = starpu_worker_get_count() + starpu_combined_worker_get_count();

+ 1 - 1
tests/parallel_tasks/spmd_pgreedy.c

@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 
 	starpu_init(&conf);
 
-	starpu_data_malloc_pinned_if_possible((void **)&v, VECTORSIZE*sizeof(unsigned));
+	starpu_malloc((void **)&v, VECTORSIZE*sizeof(unsigned));
 	starpu_vector_data_register(&v_handle, 0, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
 
 	unsigned iter;//, worker;