Fixed gfortran issue

Author: rweed

timers/Makefile

@@ -3,7 +3,7 @@ SHELL=/bin/sh
 .SUFFIXES:
 .SUFFIXES: .o .F90 .f90
 
-FC=ifx
+FC=gfortran
 FCFLAGS=-O2 -march=native
 FXFLAGS=-O2 -march=native
 

timers/README.txt

@@ -18,12 +18,21 @@
   options. test_timers.F90 also tests the Fortran intrinsic CPU_TIME which
   is called directly.
 
+  The default compiler is gfortran. To build with different compiler
+  using make just type (for example ifx)
+
+  make FC=ifx
+
   You can change the number of iterations by adding -D__IMAX__=x and
   -D__JMAX=y where x and y are integer values to the compile options
-  for test_timers.F90 
+  for test_timers.F90. ie
 
-  These programs were compiled and tested on a Linux Mint 21.3 system running on  an AMD Ryzen 5 5600x processor with the following compilers
+  make FC=gfortran-13 FCFLAGS="-O2 -march=native -D__linux__" FXFLAGS="-O2 -march= native  -D__linux__ -D__IMAX__=1000 -D__JMAX=100" 
 
+  Note the -D__linux__ is only needed for gfortran. The other compilers set
+  __linux__ by default on Linux systems.
+
+  These programs were compiled and tested on a Linux Mint 21.3 system running on  an AMD Ryzen 5 5600x processor with the following compilers
 
   Intel 
    ifx       2024.1.0

timers/test_timers.F90

@@ -1,15 +1,15 @@
 Program test_timers
 
-  USE ISO_FORTRAN_ENV, WP=>REAL64 
-  USE timers
-
 #ifndef __JMAX__
-  #define __JMAX__ 10000
+#define __JMAX__ 10000
 #endif
 #ifndef __IMAX__
- #define __IMAX__ 10000
+#define __IMAX__ 10000
 #endif
 
+  USE ISO_FORTRAN_ENV, WP=>REAL64 
+  USE timers
+
   Implicit NONE
 
   Integer  :: niters
@@ -20,6 +20,7 @@ Program test_timers
   Integer :: i, j
 
   niters = (__IMAX__)*(__JMAX__)
+
   Print *,'' 
   Print *,' *** Test of Fortran and C timer routines ***'
   Print *,''
@@ -28,105 +29,105 @@ Program test_timers
   sum    = 0.0_WP
   time_e = 0.0_WP
   time_s = 0.0_WP
-  Call timer_gtd(time_s)
-  Do j=1, __JMAX__ 
+  Call timer_dt(time_s)
+  Do j=1, __JMAX__
     Do i=1, __IMAX__
-      sum = sum + REAL(i+j,WP) 
+      sum = sum + Real(i+j,WP) 
     End Do 
   End Do 
-  Call timer_gtd(time_e)
+  Call timer_dt(time_e)
   delta = time_e - time_s
-  Write(*,'( " C gettimeofday                   = ", 1PE22.15)') delta 
+  Write(*,'( " DATE_AND_TIME                    = ", 1PE22.15)') delta 
   Write(buf,'(1PE22.15)') sum
 
   sum    = 0.0_WP
   time_e = 0.0_WP
   time_s = 0.0_WP
-  Call timer_cgt(time_s, CLOCK_MONOTONIC)
+  Call CPU_TIME(time_s)
   Do j=1, __JMAX__
     Do i=1, __IMAX__
-      sum = sum + REAL(i+j,WP) 
+      sum = sum + Real(i+j,WP) 
     End Do 
   End Do 
-  Call timer_cgt(time_e, CLOCK_MONOTONIC)
+  Call CPU_TIME(time_e)
   delta = time_e - time_s
-  Write(*,'( " C clock_gettime (MONOTONIC)      = ", 1PE22.15)') delta 
+  Write(*,'( " CPU_TIME                         = ", 1PE22.15)') delta 
   Write(buf,'(1PE22.15)') sum
 
   sum    = 0.0_WP
   time_e = 0.0_WP
   time_s = 0.0_WP
-  Call timer_cgt(time_s, CLOCK_REALTIME)
+  Call timer_sc(time_s)
   Do j=1, __JMAX__
     Do i=1, __IMAX__
-      sum = sum + REAL(i+j,WP) 
+      sum = sum + Real(i+j,WP) 
     End Do 
   End Do 
-  Call timer_cgt(time_e, CLOCK_REALTIME)
+  Call timer_sc(time_e)
   delta = time_e - time_s
-  Write(*,'( " C clock_gettime (REALTIME)       = ", 1PE22.15)') delta 
+  Write(*,'( " SYSTEM_CLOCK                     = ", 1PE22.15)') delta
   Write(buf,'(1PE22.15)') sum
 
-#ifdef __linux__ 
   sum    = 0.0_WP
   time_e = 0.0_WP
   time_s = 0.0_WP
-  Call timer_cgt(time_s, CLOCK_THREAD_CPUTIME_ID)
-  Do j=1, __JMAX__
+  Call timer_gtd(time_s)
+  Do j=1, __JMAX__ 
     Do i=1, __IMAX__
-      sum = sum + REAL(i+j,WP) 
+      sum = sum + Real(i+j,WP) 
     End Do 
   End Do 
-  Call timer_cgt(time_e, CLOCK_THREAD_CPUTIME_ID)
+  Call timer_gtd(time_e)
   delta = time_e - time_s
-  Write(*,'( " C clock_gettime (THREAD_CPUTIME) = ", 1PE22.15," Linux only")') delta 
+  Write(*,'( " C gettimeofday                   = ", 1PE22.15)') delta 
   Write(buf,'(1PE22.15)') sum
-#endif
- 
+
   sum    = 0.0_WP
   time_e = 0.0_WP
   time_s = 0.0_WP
-  Call timer_dt(time_s)
+  Call timer_cgt(time_s, CLOCK_MONOTONIC)
   Do j=1, __JMAX__
     Do i=1, __IMAX__
-      sum = sum + REAL(i+j,WP) 
+      sum = sum + Real(i+j,WP) 
     End Do 
   End Do 
-  Call timer_dt(time_e)
+  Call timer_cgt(time_e, CLOCK_MONOTONIC)
   delta = time_e - time_s
-  Write(*,'( " DATE_AND_TIME                    = ", 1PE22.15)') delta 
+  Write(*,'( " C clock_gettime (MONOTONIC)      = ", 1PE22.15)') delta 
   Write(buf,'(1PE22.15)') sum
 
   sum    = 0.0_WP
   time_e = 0.0_WP
   time_s = 0.0_WP
-  Call CPU_TIME(time_s)
+  Call timer_cgt(time_s, CLOCK_REALTIME)
   Do j=1, __JMAX__
     Do i=1, __IMAX__
-      sum = sum + REAL(i+j,WP) 
+      sum = sum + Real(i+j,WP) 
     End Do 
   End Do 
-  Call CPU_TIME(time_e)
+  Call timer_cgt(time_e, CLOCK_REALTIME)
   delta = time_e - time_s
-  Write(*,'( " CPU_TIME                         = ", 1PE22.15)') delta 
+  Write(*,'( " C clock_gettime (REALTIME)       = ", 1PE22.15)') delta 
   Write(buf,'(1PE22.15)') sum
 
+#ifdef __linux__ 
   sum    = 0.0_WP
   time_e = 0.0_WP
   time_s = 0.0_WP
-  Call timer_sc(time_s)
+  Call timer_cgt(time_s, CLOCK_THREAD_CPUTIME_ID)
   Do j=1, __JMAX__
     Do i=1, __IMAX__
-      sum = sum + REAL(i+j,WP) 
+      sum = sum + Real(i+j,WP) 
     End Do 
   End Do 
-  Call timer_sc(time_e)
+  Call timer_cgt(time_e, CLOCK_THREAD_CPUTIME_ID)
   delta = time_e - time_s
-  Write(*,'( " SYSTEM_CLOCK                     = ", 1PE22.15)') delta
+  Write(*,'( " C clock_gettime (THREAD_CPUTIME) = ", 1PE22.15," Linux only")') delta 
   Write(buf,'(1PE22.15)') sum
-
+#endif
+ 
   Print *,''
-  Print *,'DATE_AND_TIME and SYSTEM_CLOCK increments'
+  Print *,'DATE_AND_TIME, CPU_TIME and SYSTEM_CLOCK increments'
   Print *,''
   time_e = 0.0_WP
   time_s = 0.0_WP
@@ -137,6 +138,17 @@ Program test_timers
   End Do
   delta = time_e - time_s
   Write(*,'( " DATE_AND_TIME increment          = ", 1PE22.15)') delta
+
+  time_e = 0.0_WP
+  time_s = 0.0_WP
+  Call CPU_TIME(time_s)
+  Do
+    Call CPU_TIME(time_e)
+    If (time_e > time_s) EXIT
+  End Do
+  delta = time_e - time_s
+  Write(*,'( " CPU_TIME increment               = ", 1PE22.15)') delta
+
   time_e = 0.0_WP
   time_s = 0.0_WP
   Call timer_sc(time_s)
@@ -147,6 +159,7 @@ Program test_timers
   delta = time_e - time_s
   Write(*,'( " SYSTEM_CLOCK increment           = ", 1PE22.15)') delta
   Print *,'' 
+
   Stop
 
 End Program test_timers

timers/timers.F90

@@ -4,7 +4,8 @@ Module timers
   USE ISO_C_BINDING,   ONLY: C_INT, C_LONG, C_PTR, C_NULL_PTR, C_DOUBLE
 
   Implicit NONE
-  PRIVATE
+  Private
+
 ! Define some clock ids for C clock_gettime function
 
   Integer(C_INT), Parameter :: CLOCK_REALTIME           = 0_C_INT
@@ -35,10 +36,10 @@ Module timers
   Interface
     Function gettimeofday_c(timeval, timezone) BIND(C, NAME="gettimeofday")
 
-      Import                         :: timeval_c, C_PTR, C_INT
-      Type(timeval_c), Intent(INOUT) :: timeval
-      Type(C_PTR),     Intent(IN)    :: timezone
-      Integer(C_INT)                 :: gettimeofday_c 
+      Import                       :: timeval_c, C_PTR, C_INT
+      Type(timeval_c), Intent(OUT) :: timeval
+      Type(C_PTR),     Intent(IN)  :: timezone
+      Integer(C_INT)               :: gettimeofday_c 
     End Function gettimeofday_c
   End Interface
 
@@ -47,16 +48,17 @@ Function clock_gettime_c(clockid, tp) BIND(C,NAME="clock_gettime")
 
       Import                                :: timespec_c, C_INT
 
-      Integer(C_INT),   VALUE               :: clockid
-      Type(timespec_c),       Intent(INOUT) :: tp
-      Integer(C_INT)                        :: clock_gettime_c
+      Integer(C_INT),   VALUE             :: clockid
+      Type(timespec_c),       Intent(OUT) :: tp
+      Integer(C_INT)                      :: clock_gettime_c
 
     End Function clock_gettime_c
   End Interface
 
   Public :: timer_dt, timer_gtd, timer_cgt, timer_sc
   Public :: CLOCK_REALTIME
   Public :: CLOCK_MONOTONIC
+
 ! These are Linux only
 #ifdef __linux__
   Public :: CLOCK_PROCESS_CPUTIME_ID
@@ -100,14 +102,14 @@ End Subroutine timer_gtd
 
   Subroutine timer_cgt(time, clockid)
 
-! Wrap call to C clock_gettime and return time in secs and nsecs
-! depending on clockid. Realative clock CLOCK_MONOTONIC is default 
+! Wrap call to C clock_gettime and return time in seconds
+! depending on clockid. clockid CLOCK_MONOTONIC is the default 
 
     Real(WP),                 Intent(OUT) :: time
     Integer(C_INT), Optional, Intent(IN)  :: clockid
-    Type(timespec_c) :: td
 
-    Integer(C_INT) :: cid, err
+    Integer(C_INT)   :: cid, err
+    Type(timespec_c) :: td
 
     cid = CLOCK_MONOTONIC