diff options
Diffstat (limited to 'openmp/runtime/src')
| -rw-r--r-- | openmp/runtime/src/kmp_barrier.cpp | 3 | ||||
| -rw-r--r-- | openmp/runtime/src/kmp_runtime.c | 7 |
2 files changed, 5 insertions, 5 deletions
diff --git a/openmp/runtime/src/kmp_barrier.cpp b/openmp/runtime/src/kmp_barrier.cpp index 45bbb3150aa..8821e6f3023 100644 --- a/openmp/runtime/src/kmp_barrier.cpp +++ b/openmp/runtime/src/kmp_barrier.cpp @@ -1686,7 +1686,6 @@ void __kmp_setup_icv_copy(kmp_team_t *team, int new_nproc, kmp_internal_control_t *new_icvs, ident_t *loc ) { KMP_TIME_BLOCK(KMP_setup_icv_copy); - int f; KMP_DEBUG_ASSERT(team && new_nproc && new_icvs); KMP_DEBUG_ASSERT((!TCR_4(__kmp_init_parallel)) || new_icvs->nproc); @@ -1709,7 +1708,7 @@ __kmp_setup_icv_copy(kmp_team_t *team, int new_nproc, kmp_internal_control_t *ne // Copy the ICVs to each of the non-master threads. This takes O(nthreads) time. ngo_load(new_icvs); KMP_DEBUG_ASSERT(team->t.t_threads[0]); // The threads arrays should be allocated at this point - for (f=1; f<new_nproc; ++f) { // Skip the master thread + for (int f=1; f<new_nproc; ++f) { // Skip the master thread // TODO: GEH - pass in better source location info since usually NULL here KF_TRACE(10, ("__kmp_setup_icv_copy: LINEAR: T#%d this_thread=%p team=%p\n", f, team->t.t_threads[f], team)); diff --git a/openmp/runtime/src/kmp_runtime.c b/openmp/runtime/src/kmp_runtime.c index 779b2b6c4d2..231277b51cf 100644 --- a/openmp/runtime/src/kmp_runtime.c +++ b/openmp/runtime/src/kmp_runtime.c @@ -329,7 +329,6 @@ __kmp_infinite_loop( void ) void __kmp_print_storage_map_gtid( int gtid, void *p1, void *p2, size_t size, char const *format, ...) { char buffer[MAX_MESSAGE]; - int node; va_list ap; va_start( ap, format); @@ -337,6 +336,7 @@ __kmp_print_storage_map_gtid( int gtid, void *p1, void *p2, size_t size, char co __kmp_acquire_bootstrap_lock( & __kmp_stdio_lock ); __kmp_vprintf( kmp_err, buffer, ap ); #if KMP_PRINT_DATA_PLACEMENT + int node; if(gtid >= 0) { if(p1 <= p2 && (char*)p2 - (char*)p1 == size) { if( __kmp_storage_map_verbose ) { @@ -7511,8 +7511,6 @@ __kmp_determine_reduction_method( ident_t *loc, kmp_int32 global_tid, int team_size; - int teamsize_cutoff = 4; - KMP_DEBUG_ASSERT( loc ); // it would be nice to test ( loc != 0 ) KMP_DEBUG_ASSERT( lck ); // it would be nice to test ( lck != 0 ) @@ -7535,6 +7533,9 @@ __kmp_determine_reduction_method( ident_t *loc, kmp_int32 global_tid, #if KMP_ARCH_X86_64 || KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 #if KMP_OS_LINUX || KMP_OS_FREEBSD || KMP_OS_WINDOWS || KMP_OS_DARWIN + + int teamsize_cutoff = 4; + #if KMP_ARCH_X86_64 && (KMP_OS_LINUX || KMP_OS_WINDOWS) if( __kmp_mic_type != non_mic ) { teamsize_cutoff = 8; |
