replace 0 with macro part 1

tests/datawizard/acquire_cb.c

@@ -34,7 +34,7 @@ int main(int argc, char **argv)
 	if (ret == -ENODEV) return STARPU_TEST_SKIPPED;
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
-	starpu_variable_data_register(&token_handle, 0, (uintptr_t)&token, sizeof(unsigned));
+	starpu_variable_data_register(&token_handle, STARPU_MAIN_RAM, (uintptr_t)&token, sizeof(unsigned));
         starpu_data_acquire_cb(token_handle, STARPU_RW, callback, NULL);
 
 	starpu_data_unregister(token_handle);

tests/datawizard/acquire_cb_insert.c

@@ -78,13 +78,13 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	/* Declare x */
-	starpu_variable_data_register(&x_handle, 0, (uintptr_t)&x, sizeof(x));
+	starpu_variable_data_register(&x_handle, STARPU_MAIN_RAM, (uintptr_t)&x, sizeof(x));
 
 	/* Allocate and Declare f */
 	ret = starpu_malloc((void**)&f, N * sizeof(*f));
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
 	memset(f, 0, N * sizeof(*f));
-	starpu_vector_data_register(&f_handle, 0, (uintptr_t)f, N, sizeof(*f));
+	starpu_vector_data_register(&f_handle, STARPU_MAIN_RAM, (uintptr_t)f, N, sizeof(*f));
 
 	/* Partition f */
 	struct starpu_data_filter filter =

tests/datawizard/acquire_release.c

@@ -90,7 +90,7 @@ int main(int argc, char **argv)
 						  &opencl_program, NULL);
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_opencl_load_opencl_from_file");
 #endif
-	starpu_variable_data_register(&token_handle, 0, (uintptr_t)&token, sizeof(unsigned));
+	starpu_variable_data_register(&token_handle, STARPU_MAIN_RAM, (uintptr_t)&token, sizeof(unsigned));
 
         FPRINTF(stderr, "Token: %u\n", token);
 

tests/datawizard/acquire_release2.c

@@ -93,7 +93,7 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_opencl_load_opencl_from_file");
 #endif
 
-	starpu_variable_data_register(&token_handle, 0, (uintptr_t)&token, sizeof(unsigned));
+	starpu_variable_data_register(&token_handle, STARPU_MAIN_RAM, (uintptr_t)&token, sizeof(unsigned));
 
         FPRINTF(stderr, "Token: %u\n", token);
 

tests/datawizard/allocate.c

@@ -38,7 +38,7 @@ int test_prefetch(unsigned memnodes)
 	buffers[0] = malloc(1*1024*512);
 	STARPU_ASSERT(buffers[0]);
 
-	starpu_variable_data_register(&handles[0], 0, (uintptr_t)buffers[0], 1*1024*512);
+	starpu_variable_data_register(&handles[0], STARPU_MAIN_RAM, (uintptr_t)buffers[0], 1*1024*512);
 	for(i=1 ; i<memnodes ; i++)
 	{
 		starpu_data_prefetch_on_node(handles[0], i, 0);
@@ -54,7 +54,7 @@ int test_prefetch(unsigned memnodes)
 	buffers[1] = malloc(1*1024*256);
 	STARPU_ASSERT(buffers[1]);
 
-	starpu_variable_data_register(&handles[1], 0, (uintptr_t)buffers[1], 1*1024*256);
+	starpu_variable_data_register(&handles[1], STARPU_MAIN_RAM, (uintptr_t)buffers[1], 1*1024*256);
 	for(i=1 ; i<memnodes ; i++)
 	{
 		starpu_data_prefetch_on_node(handles[1], i, 0);
@@ -70,7 +70,7 @@ int test_prefetch(unsigned memnodes)
 	buffers[2] = malloc(1*1024*600);
 	STARPU_ASSERT(buffers[2]);
 
-	starpu_variable_data_register(&handles[2], 0, (uintptr_t)buffers[2], 1*1024*600);
+	starpu_variable_data_register(&handles[2], STARPU_MAIN_RAM, (uintptr_t)buffers[2], 1*1024*600);
 	for(i=1 ; i<memnodes ; i++)
 	{
 		starpu_data_prefetch_on_node(handles[2], i, 0);
@@ -87,7 +87,7 @@ int test_prefetch(unsigned memnodes)
 	buffers[3] = malloc(1*1024*512);
 	STARPU_ASSERT(buffers[3]);
 
-	starpu_variable_data_register(&handles[3], 0, (uintptr_t)buffers[3], 1*1024*512);
+	starpu_variable_data_register(&handles[3], STARPU_MAIN_RAM, (uintptr_t)buffers[3], 1*1024*512);
 	for(i=0 ; i<memnodes ; i++)
 	{
 		starpu_data_prefetch_on_node(handles[3], i, 0);

tests/datawizard/commute.c

@@ -156,7 +156,7 @@ int main(int argc, char **argv)
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_init");
 
 	/* Declare x */
-	starpu_variable_data_register(&x_handle, 0, (uintptr_t)&x, sizeof(x));
+	starpu_variable_data_register(&x_handle, STARPU_MAIN_RAM, (uintptr_t)&x, sizeof(x));
 
 	for (i = 0; i <= 1; i++)
 	{

tests/datawizard/copy.c

@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 	}
 
         foo = 0.0f;
-	starpu_variable_data_register(&float_array_handle, 0, (uintptr_t)&foo, sizeof(foo));
+	starpu_variable_data_register(&float_array_handle, STARPU_MAIN_RAM, (uintptr_t)&foo, sizeof(foo));
 
         for (i = 0; i < nloops; i++)
 	{

tests/datawizard/data_implicit_deps.c

@@ -134,12 +134,12 @@ int main(int argc, char **argv)
 	C = (unsigned *) malloc(VECTORSIZE*sizeof(unsigned));
 	D = (unsigned *) malloc(VECTORSIZE*sizeof(unsigned));
 
-	starpu_vector_data_register(&A_handle, 0, (uintptr_t)A, VECTORSIZE, sizeof(unsigned));
-	starpu_vector_data_register(&B_handle, 0, (uintptr_t)B, VECTORSIZE, sizeof(unsigned));
-	starpu_vector_data_register(&C_handle, 0, (uintptr_t)C, VECTORSIZE, sizeof(unsigned));
-	starpu_vector_data_register(&D_handle, 0, (uintptr_t)D, VECTORSIZE, sizeof(unsigned));
+	starpu_vector_data_register(&A_handle, STARPU_MAIN_RAM, (uintptr_t)A, VECTORSIZE, sizeof(unsigned));
+	starpu_vector_data_register(&B_handle, STARPU_MAIN_RAM, (uintptr_t)B, VECTORSIZE, sizeof(unsigned));
+	starpu_vector_data_register(&C_handle, STARPU_MAIN_RAM, (uintptr_t)C, VECTORSIZE, sizeof(unsigned));
+	starpu_vector_data_register(&D_handle, STARPU_MAIN_RAM, (uintptr_t)D, VECTORSIZE, sizeof(unsigned));
 
-	starpu_variable_data_register(&var_handle, 0, (uintptr_t)(&var), sizeof(var));
+	starpu_variable_data_register(&var_handle, STARPU_MAIN_RAM, (uintptr_t)(&var), sizeof(var));
 
 #if 0
 	starpu_data_set_sequential_consistency_flag(A_handle, 0);

tests/datawizard/data_lookup.c

@@ -104,7 +104,7 @@ static void test_filters(void)
 	ret = starpu_malloc((void**)&ptr, VECTOR_SIZE * sizeof(*ptr));
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
 
-	starpu_vector_data_register(&handle, 0, (uintptr_t)ptr,
+	starpu_vector_data_register(&handle, STARPU_MAIN_RAM, (uintptr_t)ptr,
 				    VECTOR_SIZE, sizeof(*ptr));
 
 	struct starpu_data_filter f =
@@ -163,7 +163,7 @@ int main(int argc, char *argv[])
 	{
 		ret = starpu_malloc(&variables[i], sizeof(float));
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
-		starpu_variable_data_register(&variable_handles[i], 0,
+		starpu_variable_data_register(&variable_handles[i], STARPU_MAIN_RAM,
 					      (uintptr_t)variables[i],
 					      sizeof(float));
 	}
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
 	{
 		ret = starpu_malloc(&vectors[i], VECTOR_SIZE * sizeof(float));
 		STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
-		starpu_vector_data_register(&vector_handles[i], 0,
+		starpu_vector_data_register(&vector_handles[i], STARPU_MAIN_RAM,
 					    (uintptr_t)vectors[i],
 					    VECTOR_SIZE, sizeof(float));
 	}

tests/datawizard/dining_philosophers.c

@@ -68,7 +68,7 @@ int main(int argc, char **argv)
 	{
 		forks[f] = 0;
 
-		starpu_vector_data_register(&fork_handles[f], 0, (uintptr_t)&forks[f], 1, sizeof(unsigned));
+		starpu_vector_data_register(&fork_handles[f], STARPU_MAIN_RAM, (uintptr_t)&forks[f], 1, sizeof(unsigned));
 	}
 
 	unsigned ntasks = 1024;

tests/datawizard/dsm_stress.c

@@ -189,8 +189,8 @@ int main(int argc, char **argv)
 	ret = starpu_malloc((void **)&v2, VECTORSIZE*sizeof(unsigned));
 	STARPU_CHECK_RETURN_VALUE(ret, "starpu_malloc");
 
-	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));
+	starpu_vector_data_register(&v_handle, STARPU_MAIN_RAM, (uintptr_t)v, VECTORSIZE, sizeof(unsigned));
+	starpu_vector_data_register(&v_handle2, STARPU_MAIN_RAM, (uintptr_t)v2, VECTORSIZE, sizeof(unsigned));
 
 	unsigned iter;
 	for (iter = 0; iter < N; iter++)