diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/BT/bt.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/BT/bt.f90 index f801785c2..bf13d8242 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/BT/bt.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/BT/bt.f90 @@ -147,12 +147,12 @@ program BT call timer_clear(i) end do + call timer_start(1) + #ifdef M5_ANNOTATION call m5_work_begin_interface #endif - call timer_start(1) - do step = 1, niter if (mod(step, 20) .eq. 0 .or. & @@ -165,12 +165,13 @@ program BT end do - call timer_stop(1) - #ifdef M5_ANNOTATION call m5_work_end_interface #endif + call timer_stop(1) + + tmax = timer_read(1) call verify(niter, class, verified) diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/CG/cg.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/CG/cg.f90 index c76ecc736..f964df6cb 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/CG/cg.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/CG/cg.f90 @@ -279,10 +279,11 @@ program cg write (*, 2000) timer_read(T_init) 2000 format(' Initialization time = ',f15.3,' seconds') + call timer_start( T_bench ) + #ifdef M5_ANNOTATION call m5_work_begin_interface #endif - call timer_start( T_bench ) !--------------------------------------------------------------------- !----> @@ -341,12 +342,13 @@ program cg enddo ! end of main iter inv pow meth - call timer_stop( T_bench ) - #ifdef M5_ANNOTATION call m5_work_end_interface #endif + call timer_stop( T_bench ) + + !--------------------------------------------------------------------- ! End of timed section !--------------------------------------------------------------------- diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/EP/ep.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/EP/ep.f90 index c41585dd5..65a36cd81 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/EP/ep.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/EP/ep.f90 @@ -121,10 +121,11 @@ program EMBAR if (timers_enabled) call timer_clear(3) !$omp end parallel + call timer_start(1) + #ifdef M5_ANNOTATION call m5_work_begin_interface #endif - call timer_start(1) t1 = a call vranlc(0, t1, a, x) @@ -218,12 +219,13 @@ program EMBAR gc = gc + q(i) 160 continue - call timer_stop(1) - #ifdef M5_ANNOTATION call m5_work_end_interface #endif + call timer_stop(1) + + tm = timer_read(1) call verify(m, sx, sy, gc, verified, classv) diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/FT/ft.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/FT/ft.f90 index 601ac3cc6..de2312ba2 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/FT/ft.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/FT/ft.f90 @@ -99,11 +99,13 @@ program ft do i = 1, t_max call timer_clear(i) end do + + call timer_start(T_total) + #ifdef M5_ANNOTATION call m5_work_begin_interface #endif - call timer_start(T_total) if (timers_enabled) call timer_start(T_setup) call compute_indexmap(twiddle, dims(1), dims(2), dims(3)) @@ -133,12 +135,13 @@ program ft call verify(nx, ny, nz, niter, verified, class) - call timer_stop(t_total) - #ifdef M5_ANNOTATION call m5_work_end_interface #endif + call timer_stop(t_total) + + total_time = timer_read(t_total) if( total_time .ne. 0. ) then mflops = 1.0d-6*ntotal_f * & diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/IS/is.c b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/IS/is.c index 0e84a0b5e..8b362b99c 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/IS/is.c +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/IS/is.c @@ -957,12 +957,12 @@ int main( int argc, char **argv ) if( CLASS != 'S' ) printf( "\n iteration\n" ); -#ifdef M5_ANNOTATION - m5_work_begin_interface_(); -#endif /* Start timer */ timer_start( 0 ); +#ifdef M5_ANNOTATION + m5_work_begin_interface_(); +#endif /* This is the main iteration */ for( iteration=1; iteration<=MAX_ITERATIONS; iteration++ ) @@ -971,13 +971,13 @@ int main( int argc, char **argv ) rank( iteration ); } +#ifdef M5_ANNOTATION + m5_work_end_interface_(); +#endif /* End of timing, obtain maximum time of all processors */ timer_stop( 0 ); -#ifdef M5_ANNOTATION - m5_work_end_interface_(); -#endif timecounter = timer_read( 0 ); /* This tests that keys are in sequence: sorting of last ranked key seq diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor.f90 index 92cadb6a0..14a0e44bb 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor.f90 @@ -54,14 +54,15 @@ subroutine ssor(niter) call timer_clear(i) end do + + call timer_start(1) + if (niter > 1) then #ifdef M5_ANNOTATION call m5_work_begin_interface #endif endif - call timer_start(1) - !--------------------------------------------------------------------- ! the timestep loop !--------------------------------------------------------------------- @@ -244,14 +245,15 @@ subroutine ssor(niter) end do 900 continue - - call timer_stop(1) if (niter > 1) then #ifdef M5_ANNOTATION call m5_work_end_interface #endif endif + + call timer_stop(1) + maxtime= timer_read(1) diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor_doac.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor_doac.f90 index a5924cb25..2066d646b 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor_doac.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor_doac.f90 @@ -54,12 +54,13 @@ subroutine ssor(niter) call timer_clear(i) end do + + call timer_start(1) +if (niter > 1) then #ifdef M5_ANNOTATION call m5_work_begin_interface #endif - - call timer_start(1) - +endif !--------------------------------------------------------------------- ! the timestep loop !--------------------------------------------------------------------- @@ -231,12 +232,15 @@ subroutine ssor(niter) end do 900 continue - - call timer_stop(1) +if (niter > 1) then #ifdef M5_ANNOTATION call m5_work_end_interface #endif +endif + + call timer_stop(1) + maxtime= timer_read(1) diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor_hp.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor_hp.f90 index 77f71ffd8..cb1b62231 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor_hp.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/LU/ssor_hp.f90 @@ -54,12 +54,14 @@ subroutine ssor(niter) call timer_clear(i) end do -#ifdef M5_ANNOTATION - call m5_work_begin_interface -#endif call timer_start(1) +if (niter > 1) then +#ifdef M5_ANNOTATION + call m5_work_begin_interface +#endif +endif !--------------------------------------------------------------------- ! the timestep loop !--------------------------------------------------------------------- @@ -232,11 +234,14 @@ subroutine ssor(niter) end do 900 continue - call timer_stop(1) - +if (niter > 1) then #ifdef M5_ANNOTATION call m5_work_end_interface #endif +endif + + call timer_stop(1) + maxtime= timer_read(1) diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/MG/mg.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/MG/mg.f90 index 1c2bb0cd7..ea8f54e5d 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/MG/mg.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/MG/mg.f90 @@ -235,12 +235,13 @@ program mg call timer_clear(i) end do + + call timer_start(T_bench) + #ifdef M5_ANNOTATION call m5_work_begin_interface #endif - call timer_start(T_bench) - if (timeron) call timer_start(T_resid2) call resid(u,v,r,n1,n2,n3,a,k) if (timeron) call timer_stop(T_resid2) @@ -264,12 +265,13 @@ program mg call norm2u3(r,n1,n2,n3,rnm2,rnmu,nx(lt),ny(lt),nz(lt)) - call timer_stop(T_bench) - #ifdef M5_ANNOTATION call m5_work_end_interface #endif + call timer_stop(T_bench) + + t = timer_read(T_bench) verified = .FALSE. diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/SP/sp.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/SP/sp.f90 index faeb74de1..43de36208 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/SP/sp.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/SP/sp.f90 @@ -150,12 +150,13 @@ program SP call timer_clear(i) end do + + call timer_start(1) + #ifdef M5_ANNOTATION call m5_work_begin_interface #endif - call timer_start(1) - do step = 1, niter if (mod(step, 20) .eq. 0 .or. step .eq. 1) then @@ -167,12 +168,13 @@ program SP end do - call timer_stop(1) - #ifdef M5_ANNOTATION call m5_work_end_interface #endif + call timer_stop(1) + + tmax = timer_read(1) call verify(niter, class, verified) diff --git a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/UA/ua.f90 b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/UA/ua.f90 index 3e4a41590..cffc818a4 100644 --- a/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/UA/ua.f90 +++ b/src/npb-24.04-imgs/npb-with-roi/NPB/NPB3.4-OMP/UA/ua.f90 @@ -166,10 +166,13 @@ program ua do i = 1, t_last if (i.ne.t_init) call timer_clear(i) end do + + call timer_start(1) + #ifdef M5_ANNOTATION call m5_work_begin_interface #endif - call timer_start(1) + endif !.......advance the convection step @@ -241,12 +244,13 @@ program ua nelt_tot = nelt_tot + dble(nelt) end do - call timer_stop(1) - #ifdef M5_ANNOTATION call m5_work_end_interface #endif + call timer_stop(1) + + tmax = timer_read(1) call verify(class, verified)