remove deprecated register storage class specifier
While importing libomp into the FreeBSD base system we encountered
Clang warnings that "'register' storage class specifier is deprecated
and incompatible with C++1z [-Wdeprecated-register]".
Differential Revision: https://reviews.llvm.org/D35124
llvm-svn: 307441
diff --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp
index 227eaed..1c4b514 100644
--- a/openmp/runtime/src/kmp_barrier.cpp
+++ b/openmp/runtime/src/kmp_barrier.cpp
@@ -49,9 +49,9 @@
enum barrier_type bt, kmp_info_t *this_thr, int gtid, int tid,
void (*reduce)(void *, void *) USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_linear_gather);
- register kmp_team_t *team = this_thr->th.th_team;
- register kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
- register kmp_info_t **other_threads = team->t.t_threads;
+ kmp_team_t *team = this_thr->th.th_team;
+ kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
+ kmp_info_t **other_threads = team->t.t_threads;
KA_TRACE(
20,
@@ -83,11 +83,11 @@
kmp_flag_64 flag(&thr_bar->b_arrived, other_threads[0]);
flag.release();
} else {
- register kmp_balign_team_t *team_bar = &team->t.t_bar[bt];
- register int nproc = this_thr->th.th_team_nproc;
- register int i;
+ kmp_balign_team_t *team_bar = &team->t.t_bar[bt];
+ int nproc = this_thr->th.th_team_nproc;
+ int i;
// Don't have to worry about sleep bit here or atomic since team setting
- register kmp_uint64 new_state =
+ kmp_uint64 new_state =
team_bar->b_arrived + KMP_BARRIER_STATE_BUMP;
// Collect all the worker team member threads.
@@ -145,13 +145,13 @@
enum barrier_type bt, kmp_info_t *this_thr, int gtid, int tid,
int propagate_icvs USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_linear_release);
- register kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
- register kmp_team_t *team;
+ kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
+ kmp_team_t *team;
if (KMP_MASTER_TID(tid)) {
- register unsigned int i;
- register kmp_uint32 nproc = this_thr->th.th_team_nproc;
- register kmp_info_t **other_threads;
+ unsigned int i;
+ kmp_uint32 nproc = this_thr->th.th_team_nproc;
+ kmp_info_t **other_threads;
team = __kmp_threads[gtid]->th.th_team;
KMP_DEBUG_ASSERT(team != NULL);
@@ -249,15 +249,15 @@
int tid, void (*reduce)(void *, void *)
USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_tree_gather);
- register kmp_team_t *team = this_thr->th.th_team;
- register kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
- register kmp_info_t **other_threads = team->t.t_threads;
- register kmp_uint32 nproc = this_thr->th.th_team_nproc;
- register kmp_uint32 branch_bits = __kmp_barrier_gather_branch_bits[bt];
- register kmp_uint32 branch_factor = 1 << branch_bits;
- register kmp_uint32 child;
- register kmp_uint32 child_tid;
- register kmp_uint64 new_state;
+ kmp_team_t *team = this_thr->th.th_team;
+ kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
+ kmp_info_t **other_threads = team->t.t_threads;
+ kmp_uint32 nproc = this_thr->th.th_team_nproc;
+ kmp_uint32 branch_bits = __kmp_barrier_gather_branch_bits[bt];
+ kmp_uint32 branch_factor = 1 << branch_bits;
+ kmp_uint32 child;
+ kmp_uint32 child_tid;
+ kmp_uint64 new_state;
KA_TRACE(
20, ("__kmp_tree_barrier_gather: T#%d(%d:%d) enter for barrier type %d\n",
@@ -279,8 +279,8 @@
new_state = team->t.t_bar[bt].b_arrived + KMP_BARRIER_STATE_BUMP;
child = 1;
do {
- register kmp_info_t *child_thr = other_threads[child_tid];
- register kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
+ kmp_info_t *child_thr = other_threads[child_tid];
+ kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
#if KMP_CACHE_MANAGE
// Prefetch next thread's arrived count
if (child + 1 <= branch_factor && child_tid + 1 < nproc)
@@ -321,7 +321,7 @@
}
if (!KMP_MASTER_TID(tid)) { // Worker threads
- register kmp_int32 parent_tid = (tid - 1) >> branch_bits;
+ kmp_int32 parent_tid = (tid - 1) >> branch_bits;
KA_TRACE(20,
("__kmp_tree_barrier_gather: T#%d(%d:%d) releasing T#%d(%d:%d) "
@@ -357,13 +357,13 @@
enum barrier_type bt, kmp_info_t *this_thr, int gtid, int tid,
int propagate_icvs USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_tree_release);
- register kmp_team_t *team;
- register kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
- register kmp_uint32 nproc;
- register kmp_uint32 branch_bits = __kmp_barrier_release_branch_bits[bt];
- register kmp_uint32 branch_factor = 1 << branch_bits;
- register kmp_uint32 child;
- register kmp_uint32 child_tid;
+ kmp_team_t *team;
+ kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
+ kmp_uint32 nproc;
+ kmp_uint32 branch_bits = __kmp_barrier_release_branch_bits[bt];
+ kmp_uint32 branch_factor = 1 << branch_bits;
+ kmp_uint32 child;
+ kmp_uint32 child_tid;
// Perform a tree release for all of the threads that have been gathered
if (!KMP_MASTER_TID(
@@ -416,12 +416,12 @@
child_tid = (tid << branch_bits) + 1;
if (child_tid < nproc) {
- register kmp_info_t **other_threads = team->t.t_threads;
+ kmp_info_t **other_threads = team->t.t_threads;
child = 1;
// Parent threads release all their children
do {
- register kmp_info_t *child_thr = other_threads[child_tid];
- register kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
+ kmp_info_t *child_thr = other_threads[child_tid];
+ kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
#if KMP_CACHE_MANAGE
// Prefetch next thread's go count
if (child + 1 <= branch_factor && child_tid + 1 < nproc)
@@ -466,15 +466,15 @@
int tid, void (*reduce)(void *, void *)
USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_hyper_gather);
- register kmp_team_t *team = this_thr->th.th_team;
- register kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
- register kmp_info_t **other_threads = team->t.t_threads;
- register kmp_uint64 new_state = KMP_BARRIER_UNUSED_STATE;
- register kmp_uint32 num_threads = this_thr->th.th_team_nproc;
- register kmp_uint32 branch_bits = __kmp_barrier_gather_branch_bits[bt];
- register kmp_uint32 branch_factor = 1 << branch_bits;
- register kmp_uint32 offset;
- register kmp_uint32 level;
+ kmp_team_t *team = this_thr->th.th_team;
+ kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
+ kmp_info_t **other_threads = team->t.t_threads;
+ kmp_uint64 new_state = KMP_BARRIER_UNUSED_STATE;
+ kmp_uint32 num_threads = this_thr->th.th_team_nproc;
+ kmp_uint32 branch_bits = __kmp_barrier_gather_branch_bits[bt];
+ kmp_uint32 branch_factor = 1 << branch_bits;
+ kmp_uint32 offset;
+ kmp_uint32 level;
KA_TRACE(
20,
@@ -494,11 +494,11 @@
kmp_flag_64 p_flag(&thr_bar->b_arrived);
for (level = 0, offset = 1; offset < num_threads;
level += branch_bits, offset <<= branch_bits) {
- register kmp_uint32 child;
- register kmp_uint32 child_tid;
+ kmp_uint32 child;
+ kmp_uint32 child_tid;
if (((tid >> level) & (branch_factor - 1)) != 0) {
- register kmp_int32 parent_tid = tid & ~((1 << (level + branch_bits)) - 1);
+ kmp_int32 parent_tid = tid & ~((1 << (level + branch_bits)) - 1);
KA_TRACE(20,
("__kmp_hyper_barrier_gather: T#%d(%d:%d) releasing T#%d(%d:%d) "
@@ -523,10 +523,10 @@
for (child = 1, child_tid = tid + (1 << level);
child < branch_factor && child_tid < num_threads;
child++, child_tid += (1 << level)) {
- register kmp_info_t *child_thr = other_threads[child_tid];
- register kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
+ kmp_info_t *child_thr = other_threads[child_tid];
+ kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
#if KMP_CACHE_MANAGE
- register kmp_uint32 next_child_tid = child_tid + (1 << level);
+ kmp_uint32 next_child_tid = child_tid + (1 << level);
// Prefetch next thread's arrived count
if (child + 1 < branch_factor && next_child_tid < num_threads)
KMP_CACHE_PREFETCH(
@@ -585,16 +585,16 @@
enum barrier_type bt, kmp_info_t *this_thr, int gtid, int tid,
int propagate_icvs USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_hyper_release);
- register kmp_team_t *team;
- register kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
- register kmp_info_t **other_threads;
- register kmp_uint32 num_threads;
- register kmp_uint32 branch_bits = __kmp_barrier_release_branch_bits[bt];
- register kmp_uint32 branch_factor = 1 << branch_bits;
- register kmp_uint32 child;
- register kmp_uint32 child_tid;
- register kmp_uint32 offset;
- register kmp_uint32 level;
+ kmp_team_t *team;
+ kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
+ kmp_info_t **other_threads;
+ kmp_uint32 num_threads;
+ kmp_uint32 branch_bits = __kmp_barrier_release_branch_bits[bt];
+ kmp_uint32 branch_factor = 1 << branch_bits;
+ kmp_uint32 child;
+ kmp_uint32 child_tid;
+ kmp_uint32 offset;
+ kmp_uint32 level;
/* Perform a hypercube-embedded tree release for all of the threads that have
been gathered. If KMP_REVERSE_HYPER_BAR is defined (default) the threads
@@ -690,10 +690,10 @@
if (child_tid >= num_threads)
continue; // Child doesn't exist so keep going
else {
- register kmp_info_t *child_thr = other_threads[child_tid];
- register kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
+ kmp_info_t *child_thr = other_threads[child_tid];
+ kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
#if KMP_CACHE_MANAGE
- register kmp_uint32 next_child_tid = child_tid - (1 << level);
+ kmp_uint32 next_child_tid = child_tid - (1 << level);
// Prefetch next thread's go count
#ifdef KMP_REVERSE_HYPER_BAR
if (child - 1 >= 1 && next_child_tid < num_threads)
@@ -817,11 +817,11 @@
enum barrier_type bt, kmp_info_t *this_thr, int gtid, int tid,
void (*reduce)(void *, void *) USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_hier_gather);
- register kmp_team_t *team = this_thr->th.th_team;
- register kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
- register kmp_uint32 nproc = this_thr->th.th_team_nproc;
- register kmp_info_t **other_threads = team->t.t_threads;
- register kmp_uint64 new_state;
+ kmp_team_t *team = this_thr->th.th_team;
+ kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
+ kmp_uint32 nproc = this_thr->th.th_team_nproc;
+ kmp_info_t **other_threads = team->t.t_threads;
+ kmp_uint64 new_state;
int level = team->t.t_level;
#if OMP_40_ENABLED
@@ -851,7 +851,7 @@
team);
if (thr_bar->my_level) { // not a leaf (my_level==0 means leaf)
- register kmp_int32 child_tid;
+ kmp_int32 child_tid;
new_state =
(kmp_uint64)team->t.t_bar[bt].b_arrived + KMP_BARRIER_STATE_BUMP;
if (__kmp_dflt_blocktime == KMP_MAX_BLOCKTIME &&
@@ -895,8 +895,8 @@
if (last > nproc)
last = nproc;
for (child_tid = tid + skip; child_tid < (int)last; child_tid += skip) {
- register kmp_info_t *child_thr = other_threads[child_tid];
- register kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
+ kmp_info_t *child_thr = other_threads[child_tid];
+ kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
KA_TRACE(20, ("__kmp_hierarchical_barrier_gather: T#%d(%d:%d) wait "
"T#%d(%d:%d) "
"arrived(%p) == %llu\n",
@@ -928,8 +928,8 @@
if (last > nproc)
last = nproc;
for (child_tid = tid + skip; child_tid < (int)last; child_tid += skip) {
- register kmp_info_t *child_thr = other_threads[child_tid];
- register kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
+ kmp_info_t *child_thr = other_threads[child_tid];
+ kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
KA_TRACE(20, ("__kmp_hierarchical_barrier_gather: T#%d(%d:%d) wait "
"T#%d(%d:%d) "
"arrived(%p) == %llu\n",
@@ -999,9 +999,9 @@
enum barrier_type bt, kmp_info_t *this_thr, int gtid, int tid,
int propagate_icvs USE_ITT_BUILD_ARG(void *itt_sync_obj)) {
KMP_TIME_DEVELOPER_PARTITIONED_BLOCK(KMP_hier_release);
- register kmp_team_t *team;
- register kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
- register kmp_uint32 nproc;
+ kmp_team_t *team;
+ kmp_bstate_t *thr_bar = &this_thr->th.th_bar[bt].bb;
+ kmp_uint32 nproc;
bool team_change = false; // indicates on-core barrier shouldn't be used
if (KMP_MASTER_TID(tid)) {
@@ -1111,7 +1111,7 @@
// Now, release my children
if (thr_bar->my_level) { // not a leaf
- register kmp_int32 child_tid;
+ kmp_int32 child_tid;
kmp_uint32 last;
if (__kmp_dflt_blocktime == KMP_MAX_BLOCKTIME &&
thr_bar->use_oncore_barrier) {
@@ -1126,7 +1126,7 @@
// hierarchy
for (child_tid = thr_bar->skip_per_level[1]; child_tid < (int)nproc;
child_tid += thr_bar->skip_per_level[1]) {
- register kmp_bstate_t *child_bar =
+ kmp_bstate_t *child_bar =
&team->t.t_threads[child_tid]->th.th_bar[bt].bb;
KA_TRACE(20, ("__kmp_hierarchical_barrier_release: T#%d(%d:%d) "
"releasing T#%d(%d:%d)"
@@ -1157,8 +1157,8 @@
last = nproc;
for (child_tid = tid + 1 + old_leaf_kids; child_tid < (int)last;
++child_tid) { // skip_per_level[0]=1
- register kmp_info_t *child_thr = team->t.t_threads[child_tid];
- register kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
+ kmp_info_t *child_thr = team->t.t_threads[child_tid];
+ kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
KA_TRACE(
20,
("__kmp_hierarchical_barrier_release: T#%d(%d:%d) releasing"
@@ -1184,8 +1184,8 @@
if (last > nproc)
last = nproc;
for (child_tid = tid + skip; child_tid < (int)last; child_tid += skip) {
- register kmp_info_t *child_thr = team->t.t_threads[child_tid];
- register kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
+ kmp_info_t *child_thr = team->t.t_threads[child_tid];
+ kmp_bstate_t *child_bar = &child_thr->th.th_bar[bt].bb;
KA_TRACE(20, ("__kmp_hierarchical_barrier_release: T#%d(%d:%d) "
"releasing T#%d(%d:%d) go(%p): %u => %u\n",
gtid, team->t.t_id, tid,
@@ -1223,10 +1223,10 @@
void (*reduce)(void *, void *)) {
KMP_TIME_PARTITIONED_BLOCK(OMP_plain_barrier);
KMP_SET_THREAD_STATE_BLOCK(PLAIN_BARRIER);
- register int tid = __kmp_tid_from_gtid(gtid);
- register kmp_info_t *this_thr = __kmp_threads[gtid];
- register kmp_team_t *team = this_thr->th.th_team;
- register int status = 0;
+ int tid = __kmp_tid_from_gtid(gtid);
+ kmp_info_t *this_thr = __kmp_threads[gtid];
+ kmp_team_t *team = this_thr->th.th_team;
+ int status = 0;
ident_t *loc = __kmp_threads[gtid]->th.th_ident;
#if OMPT_SUPPORT
ompt_task_id_t my_task_id;
@@ -1553,9 +1553,9 @@
void __kmp_join_barrier(int gtid) {
KMP_TIME_PARTITIONED_BLOCK(OMP_join_barrier);
KMP_SET_THREAD_STATE_BLOCK(FORK_JOIN_BARRIER);
- register kmp_info_t *this_thr = __kmp_threads[gtid];
- register kmp_team_t *team;
- register kmp_uint nproc;
+ kmp_info_t *this_thr = __kmp_threads[gtid];
+ kmp_team_t *team;
+ kmp_uint nproc;
kmp_info_t *master_thread;
int tid;
#ifdef KMP_DEBUG
@@ -1807,8 +1807,8 @@
#endif /* USE_ITT_BUILD && USE_ITT_NOTIFY */
#ifdef KMP_DEBUG
- register kmp_info_t **other_threads = team->t.t_threads;
- register int i;
+ kmp_info_t **other_threads = team->t.t_threads;
+ int i;
// Verify state
KMP_MB();