summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Peyton <jonathan.l.peyton@intel.com>2015-11-04 22:06:07 +0000
committerJonathan Peyton <jonathan.l.peyton@intel.com>2015-11-04 22:06:07 +0000
commit4505bf68b05e491232400e8cbdd13a934e3a88ae (patch)
treed44877f19fd78b96f49a5c3f835e77304a716c9a
parent23a3bf0147b53c352dd9a6ef82d5298d34200b4b (diff)
downloadbcm5719-llvm-4505bf68b05e491232400e8cbdd13a934e3a88ae.tar.gz
bcm5719-llvm-4505bf68b05e491232400e8cbdd13a934e3a88ae.zip
Remove some empty lines.
llvm-svn: 252084
-rw-r--r--openmp/runtime/src/kmp.h3
-rw-r--r--openmp/runtime/src/kmp_global.c1
-rw-r--r--openmp/runtime/src/kmp_runtime.c9
-rw-r--r--openmp/runtime/src/kmp_settings.c6
-rw-r--r--openmp/runtime/src/z_Linux_util.c2
5 files changed, 0 insertions, 21 deletions
diff --git a/openmp/runtime/src/kmp.h b/openmp/runtime/src/kmp.h
index 294154a2bd7..a4041a40e7a 100644
--- a/openmp/runtime/src/kmp.h
+++ b/openmp/runtime/src/kmp.h
@@ -2418,7 +2418,6 @@ typedef struct kmp_base_global {
int g_dynamic;
enum dynamic_mode g_dynamic_mode;
-
} kmp_base_global_t;
typedef union KMP_ALIGN_CACHE kmp_global {
@@ -2593,7 +2592,6 @@ extern kmp_uint32 __kmp_yield_cycle;
extern kmp_int32 __kmp_yield_on_count;
extern kmp_int32 __kmp_yield_off_count;
-
/* ------------------------------------------------------------------------- */
extern int __kmp_allThreadsSpecified;
@@ -2774,7 +2772,6 @@ extern void __kmp_exit_single( int gtid );
extern void __kmp_parallel_deo( int *gtid_ref, int *cid_ref, ident_t *loc_ref );
extern void __kmp_parallel_dxo( int *gtid_ref, int *cid_ref, ident_t *loc_ref );
-
#ifdef USE_LOAD_BALANCE
extern int __kmp_get_load_balance( int );
#endif
diff --git a/openmp/runtime/src/kmp_global.c b/openmp/runtime/src/kmp_global.c
index 5e278ec89b2..1de4a832b0e 100644
--- a/openmp/runtime/src/kmp_global.c
+++ b/openmp/runtime/src/kmp_global.c
@@ -317,7 +317,6 @@ int __kmp_storage_map_verbose_specified = FALSE;
int __kmp_need_register_atfork = TRUE; /* At initialization, call pthread_atfork to install fork handler */
int __kmp_need_register_atfork_specified = TRUE;
-
int __kmp_env_chunk = FALSE; /* KMP_CHUNK specified? */
int __kmp_env_stksize = FALSE; /* KMP_STACKSIZE specified? */
int __kmp_env_omp_stksize = FALSE; /* OMP_STACKSIZE specified? */
diff --git a/openmp/runtime/src/kmp_runtime.c b/openmp/runtime/src/kmp_runtime.c
index ecab297c6f8..831afbe69dd 100644
--- a/openmp/runtime/src/kmp_runtime.c
+++ b/openmp/runtime/src/kmp_runtime.c
@@ -79,7 +79,6 @@ void __kmp_fork_barrier( int gtid, int tid );
void __kmp_join_barrier( int gtid );
void __kmp_setup_icv_copy( kmp_team_t *team, int new_nproc, kmp_internal_control_t * new_icvs, ident_t *loc );
-
#ifdef USE_LOAD_BALANCE
static int __kmp_load_balance_nproc( kmp_root_t * root, int set_nproc );
#endif
@@ -1746,7 +1745,6 @@ __kmp_fork_call(
/* If we temporarily changed the set number of threads then restore it now */
master_th->th.th_set_nproc = 0;
-
/* create a serialized parallel region? */
if ( nthreads == 1 ) {
/* josh todo: hypothetical question: what do we do for OS X*? */
@@ -2649,7 +2647,6 @@ __kmp_set_num_threads( int new_nth, int gtid )
// Special flag in case omp_set_num_threads() call
hot_team->t.t_size_changed = -1;
}
-
}
/* Changes max_active_levels */
@@ -3224,7 +3221,6 @@ __kmp_initialize_root( kmp_root_t *root )
hot_team->t.t_sched.r_sched_type = r_sched.r_sched_type;
hot_team->t.t_sched.chunk = r_sched.chunk;
hot_team->t.t_size_changed = 0;
-
}
#ifdef KMP_DEBUG
@@ -3828,7 +3824,6 @@ __kmp_register_root( int initial_thread )
}
KMP_DEBUG_ASSERT( root->r.r_hot_team->t.t_bar[ bs_forkjoin_barrier ].b_arrived == KMP_INIT_BARRIER_STATE );
-
#if KMP_AFFINITY_SUPPORTED
if ( TCR_4(__kmp_init_middle) ) {
__kmp_affinity_set_init_mask( gtid, TRUE );
@@ -6469,7 +6464,6 @@ __kmp_do_serial_initialize( void )
// Moved here from __kmp_env_initialize() "KMP_ALL_THREADPRIVATE" part
__kmp_tp_capacity = __kmp_default_tp_capacity(__kmp_dflt_team_nth_ub, __kmp_max_nth, __kmp_allThreadsSpecified);
-
// If the library is shut down properly, both pools must be NULL. Just in case, set them
// to NULL -- some memory may leak, but subsequent code will work even if pools are not freed.
KMP_DEBUG_ASSERT( __kmp_thread_pool == NULL );
@@ -7189,7 +7183,6 @@ __kmp_load_balance_nproc( kmp_root_t *root, int set_nproc )
#endif /* USE_LOAD_BALANCE */
-
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
@@ -7219,9 +7212,7 @@ __kmp_cleanup( void )
KA_TRACE( 10, ("__kmp_cleanup: go serial cleanup\n" ) );
if (__kmp_init_serial) {
-
__kmp_runtime_destroy();
-
__kmp_init_serial = FALSE;
}
diff --git a/openmp/runtime/src/kmp_settings.c b/openmp/runtime/src/kmp_settings.c
index 383797ceda7..51b23ee2e46 100644
--- a/openmp/runtime/src/kmp_settings.c
+++ b/openmp/runtime/src/kmp_settings.c
@@ -3374,8 +3374,6 @@ __kmp_stg_print_ld_balance_interval( kmp_str_buf_t * buffer, char const * name,
#endif /* USE_LOAD_BALANCE */
-
-
// -------------------------------------------------------------------------------------------------
// KMP_INIT_AT_FORK
// -------------------------------------------------------------------------------------------------
@@ -4598,8 +4596,6 @@ static kmp_setting_t __kmp_stg_table[] = {
{ "KMP_LOAD_BALANCE_INTERVAL", __kmp_stg_parse_ld_balance_interval,__kmp_stg_print_ld_balance_interval,NULL, 0, 0 },
#endif
-
-
{ "KMP_NUM_LOCKS_IN_BLOCK", __kmp_stg_parse_lock_block, __kmp_stg_print_lock_block, NULL, 0, 0 },
{ "KMP_LOCK_KIND", __kmp_stg_parse_lock_kind, __kmp_stg_print_lock_kind, NULL, 0, 0 },
#if KMP_USE_ADAPTIVE_LOCKS
@@ -5409,7 +5405,5 @@ __kmp_env_print_2() {
} // __kmp_env_print_2
#endif // OMP_40_ENABLED
-
-
// end of file
diff --git a/openmp/runtime/src/z_Linux_util.c b/openmp/runtime/src/z_Linux_util.c
index 78cada4c3c0..dd290936756 100644
--- a/openmp/runtime/src/z_Linux_util.c
+++ b/openmp/runtime/src/z_Linux_util.c
@@ -2003,7 +2003,6 @@ __kmp_read_system_info( struct kmp_sys_info *info )
/* ------------------------------------------------------------------------ */
/* ------------------------------------------------------------------------ */
-
void
__kmp_read_system_time( double *delta )
{
@@ -2155,7 +2154,6 @@ __kmp_runtime_initialize( void )
/* Set up minimum number of threads to switch to TLS gtid */
__kmp_tls_gtid_min = KMP_TLS_GTID_MIN;
-
#ifdef BUILD_TV
{
int rc = pthread_key_create( & __kmp_tv_key, 0 );
OpenPOWER on IntegriCloud