OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

openmp: Change omp_atv_default value and rename omp_atv_sequential to omp_atv_serialized.

Browse Source 
While this is an OpenMP 5.1 change, it is undesirable to let people use different
values and then deal with ABI backwards compatibility in a year or two.

2020-07-09  Jakub Jelinek  <jakub@redhat.com>

	* omp.h.in (omp_alloctrait_value_t): Change omp_atv_default from
	2 to -1.  Add omp_atv_serialized and define omp_atv_sequential using
	it.  Remove __omp_alloctrait_value_max__.
	* allocator.c (omp_init_allocator): Handle omp_atv_default for
	omp_atk_alignment and omp_atk_pool_size.
This commit is contained in:
Jakub Jelinek 2020-07-09 11:29:30 +02:00 committed by Giuliano Belinassi
parent 5dacbaeaf2
commit 98a095a89e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libgomp/allocator.c
View File

@ -90,6 +90,11 @@ omp_init_allocator (omp_memspace_handle_t memspace, int ntraits,
} }
break; break;
case omp_atk_alignment: case omp_atk_alignment:
if (traits[i].value == omp_atv_default)
{
data.alignment = 1;
break;
}
if ((traits[i].value & (traits[i].value - 1)) != 0 if ((traits[i].value & (traits[i].value - 1)) != 0
|| !traits[i].value) || !traits[i].value)
return omp_null_allocator; return omp_null_allocator;
@ -112,7 +117,10 @@ omp_init_allocator (omp_memspace_handle_t memspace, int ntraits,
} }
break; break;
case omp_atk_pool_size: case omp_atk_pool_size:
data.pool_size = traits[i].value; if (traits[i].value == omp_atv_default)
data.pool_size = ~(uintptr_t) 0;
else
data.pool_size = traits[i].value;
break; break;
case omp_atk_fallback: case omp_atk_fallback:
switch (traits[i].value) switch (traits[i].value)

8
libgomp/omp.h.in
View File

@ -136,12 +136,13 @@ typedef enum omp_alloctrait_key_t
typedef enum omp_alloctrait_value_t typedef enum omp_alloctrait_value_t
{ {
omp_atv_default = (__UINTPTR_TYPE__) -1,
omp_atv_false = 0, omp_atv_false = 0,
omp_atv_true = 1, omp_atv_true = 1,
omp_atv_default = 2,
omp_atv_contended = 3, omp_atv_contended = 3,
omp_atv_uncontended = 4, omp_atv_uncontended = 4,
omp_atv_sequential = 5, omp_atv_serialized = 5,
omp_atv_sequential = omp_atv_serialized,
omp_atv_private = 6, omp_atv_private = 6,
omp_atv_all = 7, omp_atv_all = 7,
omp_atv_thread = 8, omp_atv_thread = 8,
@ -154,8 +155,7 @@ typedef enum omp_alloctrait_value_t
omp_atv_environment = 15, omp_atv_environment = 15,
omp_atv_nearest = 16, omp_atv_nearest = 16,
omp_atv_blocked = 17, omp_atv_blocked = 17,
omp_atv_interleaved = 18, omp_atv_interleaved = 18
__omp_alloctrait_value_max__ = __UINTPTR_MAX__
} omp_alloctrait_value_t; } omp_alloctrait_value_t;
typedef struct omp_alloctrait_t typedef struct omp_alloctrait_t