Changeset 3749 for LMDZ6

Timestamp:

Jul 8, 2020, 7:49:06 PM (4 years ago)

Author:

adurocher

Message:

Added getin parameter to enable/disable profiling

Location:

LMDZ6/branches/Optimisation_LMDZ/libf/phy_common

Files:

• ioipsl_getin_p_mod.F90 (modified) (1 diff)
• profiling_physic.F90 (modified) (5 diffs)

LMDZ6/branches/Optimisation_LMDZ/libf/phy_common/ioipsl_getin_p_mod.F90

@@ -17 +17 @@
 !-
 PRIVATE
-PUBLIC :: getin_p
+PUBLIC :: getin_p, getin
 !-
 INTERFACE getin_p

LMDZ6/branches/Optimisation_LMDZ/libf/phy_common/profiling_physic.F90

@@ -37 +37 @@
   REAL, ALLOCATABLE :: elapsed(:,:)!(omp_size, max_id) ! Cumulative time for each timer
   SCOREP_DEFINE_HANDLE_ARRAY(scorep_handle)
+
+  LOGICAL :: profiling_enabled = .false.
   
   PUBLIC :: enter_profile, exit_profile, print_profile
@@ -43 +45 @@
   ! Be sure to init mod_phys_lmdz_omp_data before profiling
   SUBROUTINE init_profiling
+    use ioipsl_getin_p_mod, only : getin
+    call getin("phy_profiling_enable", profiling_enabled)
     nb_id=0
     allocate(depth(0:omp_size-1))
@@ -94 +98 @@
       !$omp end master
       !$omp barrier
-    end if    
-    ! Create prof_id at first call with 'name'
-    if( .not. exists(ids, name) ) then
-       call checked_omp_barrier(name)
-       !$omp master 
-       call register_id(name,id)
-       call insert_or_assign(ids, name, id)
-       !$omp end master
-       !$omp barrier
-    end if
-    call enter_profile_aux(get_val(ids, name))
+    end if 
+    if( profiling_enabled ) then 
+      ! Create prof_id at first call with 'name'
+      if( .not. exists(ids, name) ) then
+        call checked_omp_barrier(name)
+        !$omp master 
+        call register_id(name,id)
+        call insert_or_assign(ids, name, id)
+        !$omp end master
+        !$omp barrier
+      end if
+      call enter_profile_aux(get_val(ids, name))
+    endif
   END SUBROUTINE
   
@@ -118 +124 @@
   ! Region must exist and be active on current thread
   SUBROUTINE exit_profile(name)
-    CHARACTER(*) :: name    
-    if(.not. exists(ids, name)) call abort_physic(modname, "Exit unknown timer", 1)
-    call exit_profile_aux(get_val(ids,name))
+    CHARACTER(*) :: name
+    if( profiling_enabled ) then   
+      if(.not. exists(ids, name)) call abort_physic(modname, "Exit unknown timer", 1)
+      call exit_profile_aux(get_val(ids,name))
+    endif
   END SUBROUTINE
    
@@ -155 +163 @@
     REAL :: mean_time, max_process, min_process, percent
 
-    call enter_profile("print_profile")
-
-    !$OMP MASTER
-    ! mean_total : mean of sum of all timers on all threads and all procs
-    mean_total_local = SUM(elapsed(:,1:nb_id))/omp_size/mpi_size
-    !call MPI_Reduce(mean_total_local, mean_total, 1, MPI_DOUBLE, MPI_SUM, 0, comm_icosa, ierr)
-    call reduce_sum_mpi( mean_total_local, mean_total )
-    ! min_total : min on all procs of sum of all timers on all threads
-    min_total_local = MINVAL( SUM(elapsed(:,1:nb_id), 2) )
-    !call MPI_Reduce(min_total_local, min_total, 1, MPI_DOUBLE, MPI_MIN, 0, comm_icosa, ierr)
-    call reduce_min_mpi(min_total_local, min_total)
-    ! max_total : max on all procs of sum of all timers on all threads
-    max_total_local = MAXVAL( SUM(elapsed(:,1:nb_id), 2) )
-    !call MPI_Reduce(max_total_local, max_total, 1, MPI_DOUBLE, MPI_MAX, 0, comm_icosa, ierr)
-    call reduce_max_mpi(max_total_local, max_total)
-
-    if(is_mpi_root) PRINT *, '---------------------- Profiling (Physic) --------------'
-    if(is_mpi_root) PRINT ('(A15, F12.3, A, F12.3, A, F12.3, A)'), 'Total (Physic) (s) : ', mean_total, "  [", min_total, ",", max_total, "]"
-    if(is_mpi_root) PRINT ('(A15, A7, A47, A47)'), " ","  %  ","  Process mean(s)[ min, max, diff/mean(%) ]  ", "Process 1 threads(s)[ min, max, diff/mean(%) ]"
-    DO i=1,nb_id
-       omp_mean_time_local = SUM(elapsed(:,i))/omp_size ! Mean time of timer on local threads 
-       omp_min_time_local = MINVAL(elapsed(:,i)) ! Max time of timer on local threads
-       omp_max_time_local = MAXVAL(elapsed(:,i)) ! Min time of timer on local threads
-       !omp_inbalance_local = 100*(max_time-min_time)/min_time
-       
-       ! mean_time : mean of timer on all threads and all procs
-       !call MPI_Reduce(omp_mean_time_local, mean_time, 1, MPI_DOUBLE, MPI_SUM, 0, comm_icosa, ierr); 
-       call reduce_sum_mpi( omp_mean_time_local, mean_time )
-       mean_time = mean_time/mpi_size
-       ! max_process_time : max on procs of mean omp time 
-       !call MPI_Reduce(omp_mean_time_local, max_process, 1, MPI_DOUBLE, MPI_MAX, 0, comm_icosa, ierr)
-       call reduce_max_mpi(omp_mean_time_local, max_process)
-       ! min_process_time : min on procs of mean omp time 
-       !call MPI_Reduce(omp_mean_time_local, min_process, 1, MPI_DOUBLE, MPI_MIN, 0, comm_icosa, ierr)
-       call reduce_min_mpi(omp_mean_time_local, min_process)
-
-       percent = 100*mean_time/mean_total
-
-       if(is_mpi_root) PRINT ('(A15, F5.1, F12.3, A, F12.3, A, F12.3, A, F6.1, A, F12.3, A, F12.3, A, F12.3, A, F6.1, A)'), name(i), percent, mean_time, " [", min_process, ",", max_process, "," , inbalance(mean_time, min_process, max_process),  "]", omp_mean_time_local, " [", omp_min_time_local, ",", omp_max_time_local, "," , inbalance(omp_mean_time_local, omp_min_time_local, omp_max_time_local) , "]"
-    END DO
-    if(is_mpi_root) PRINT *, '---------------------- Profiling -----------------------'
-    !$OMP END MASTER
-    call exit_profile("print_profile")
+    if( profiling_enabled ) then 
+      call enter_profile("print_profile")
+
+      !$OMP MASTER
+      ! mean_total : mean of sum of all timers on all threads and all procs
+      mean_total_local = SUM(elapsed(:,1:nb_id))/omp_size/mpi_size
+      !call MPI_Reduce(mean_total_local, mean_total, 1, MPI_DOUBLE, MPI_SUM, 0, comm_icosa, ierr)
+      call reduce_sum_mpi( mean_total_local, mean_total )
+      ! min_total : min on all procs of sum of all timers on all threads
+      min_total_local = MINVAL( SUM(elapsed(:,1:nb_id), 2) )
+      !call MPI_Reduce(min_total_local, min_total, 1, MPI_DOUBLE, MPI_MIN, 0, comm_icosa, ierr)
+      call reduce_min_mpi(min_total_local, min_total)
+      ! max_total : max on all procs of sum of all timers on all threads
+      max_total_local = MAXVAL( SUM(elapsed(:,1:nb_id), 2) )
+      !call MPI_Reduce(max_total_local, max_total, 1, MPI_DOUBLE, MPI_MAX, 0, comm_icosa, ierr)
+      call reduce_max_mpi(max_total_local, max_total)
+
+      if(is_mpi_root) PRINT *, '---------------------- Profiling (Physic) --------------'
+      if(is_mpi_root) PRINT ('(A15, F12.3, A, F12.3, A, F12.3, A)'), 'Total (Physic) (s) : ', mean_total, "  [", min_total, ",", max_total, "]"
+      if(is_mpi_root) PRINT ('(A15, A7, A47, A47)'), " ","  %  ","  Process mean(s)[ min, max, diff/mean(%) ]  ", "Process 1 threads(s)[ min, max, diff/mean(%) ]"
+      DO i=1,nb_id
+        omp_mean_time_local = SUM(elapsed(:,i))/omp_size ! Mean time of timer on local threads 
+        omp_min_time_local = MINVAL(elapsed(:,i)) ! Max time of timer on local threads
+        omp_max_time_local = MAXVAL(elapsed(:,i)) ! Min time of timer on local threads
+        !omp_inbalance_local = 100*(max_time-min_time)/min_time
+        
+        ! mean_time : mean of timer on all threads and all procs
+        !call MPI_Reduce(omp_mean_time_local, mean_time, 1, MPI_DOUBLE, MPI_SUM, 0, comm_icosa, ierr); 
+        call reduce_sum_mpi( omp_mean_time_local, mean_time )
+        mean_time = mean_time/mpi_size
+        ! max_process_time : max on procs of mean omp time 
+        !call MPI_Reduce(omp_mean_time_local, max_process, 1, MPI_DOUBLE, MPI_MAX, 0, comm_icosa, ierr)
+        call reduce_max_mpi(omp_mean_time_local, max_process)
+        ! min_process_time : min on procs of mean omp time 
+        !call MPI_Reduce(omp_mean_time_local, min_process, 1, MPI_DOUBLE, MPI_MIN, 0, comm_icosa, ierr)
+        call reduce_min_mpi(omp_mean_time_local, min_process)
+
+        percent = 100*mean_time/mean_total
+
+        if(is_mpi_root) PRINT ('(A15, F5.1, F12.3, A, F12.3, A, F12.3, A, F6.1, A, F12.3, A, F12.3, A, F12.3, A, F6.1, A)'), name(i), percent, mean_time, " [", min_process, ",", max_process, "," , inbalance(mean_time, min_process, max_process),  "]", omp_mean_time_local, " [", omp_min_time_local, ",", omp_max_time_local, "," , inbalance(omp_mean_time_local, omp_min_time_local, omp_max_time_local) , "]"
+      END DO
+      if(is_mpi_root) PRINT *, '---------------------- Profiling -----------------------'
+      !$OMP END MASTER
+      call exit_profile("print_profile")
+    endif
   contains
     function inbalance( mean, min, max )