This commit fixes trac:2679 and should be added to cmr:v1.4:reviewer=jsquyres

and cmr:v1.5:reviewer=jsquyres This commit was SVN r25155. The following Trac tickets were found above: Ticket 2679 --> https://svn.open-mpi.org/trac/ompi/ticket/2679
2011-09-18 00:58:26 +00:00 · 2011-09-18 00:58:26 +00:00 · 9687e7f38e
--- a/ompi/mca/btl/ofud/btl_ofud.h
+++ b/ompi/mca/btl/ofud/btl_ofud.h
@ -2,7 +2,7 @@
 * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2009 The University of Tennessee and The University
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@ -324,12 +324,12 @@ extern int mca_btl_ud_ft_event(int state);
 #if MCA_BTL_UD_ENABLE_PROFILE

 #define MCA_BTL_UD_START_TIME(var) \
-    ((mca_btl_ud_profile.tmp_ ## var) = opal_sys_timer_get_cycles())
+    ((mca_btl_ud_profile.tmp_ ## var) = opal_timer_base_get_cycles())

 #define MCA_BTL_UD_END_TIME(var)                                             \
 do {                                                                         \
    mca_btl_ud_profile.avg_ ## var +=                                        \
-        opal_sys_timer_get_cycles() - mca_btl_ud_profile.tmp_ ## var;        \
+        opal_timer_base_get_cycles() - mca_btl_ud_profile.tmp_ ## var;        \
    mca_btl_ud_profile.cnt_ ## var++;                                        \
 } while(0)

--- a/ompi/mca/btl/ofud/btl_ofud_component.c
+++ b/ompi/mca/btl/ofud/btl_ofud_component.c
@ -2,7 +2,7 @@
 * Copyright (c) 2004-2008 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2008 The University of Tennessee and The University
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart,
@ -438,8 +438,8 @@ mca_btl_base_module_t** mca_btl_ud_component_init(int* num_btl_modules,
    num_devs = 0;

    seedv[0] = ORTE_PROC_MY_NAME->vpid;
-    seedv[1] = opal_sys_timer_get_cycles();
-    seedv[2] = opal_sys_timer_get_cycles();
+    seedv[1] = opal_timer_base_get_cycles();
+    seedv[2] = opal_timer_base_get_cycles();
    seed48(seedv);


--- a/ompi/mca/btl/openib/btl_openib_component.c
+++ b/ompi/mca/btl/openib/btl_openib_component.c
@ -2462,8 +2462,8 @@ btl_openib_component_init(int *num_btl_modules,

 #ifndef __WINDOWS__
    seedv[0] = ORTE_PROC_MY_NAME->vpid;
-    seedv[1] = opal_sys_timer_get_cycles();
-    seedv[2] = opal_sys_timer_get_cycles();
+    seedv[1] = opal_timer_base_get_cycles();
+    seedv[2] = opal_timer_base_get_cycles();
    seed48(seedv);
 #endif

--- a/ompi/mca/coll/sm2/coll_sm2_allreduce.c
+++ b/ompi/mca/coll/sm2/coll_sm2_allreduce.c
@ -1,5 +1,8 @@
 /*
 * Copyright (c) 2007-2008 UT-Battelle, LLC
+ * Copyright (c) 2011      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -834,11 +837,11 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
    count_processed=0;

    /* debug 
-    t0=opal_sys_timer_get_cycles();
+    t0=opal_timer_base_get_cycles();
     end debug */
    sm_buffer_desc=alloc_sm2_shared_buffer(sm_module);
    /* debug 
-    t1=opal_sys_timer_get_cycles();
+    t1=opal_timer_base_get_cycles();
            timers[0]+=(t1-t0);
             end debug */

@ -847,7 +850,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
    for( stripe_number=0 ; stripe_number < n_data_segments ; stripe_number++ ) {
        /* get number of elements to process in this stripe */
        /* debug 
-        t2=opal_sys_timer_get_cycles();
+        t2=opal_timer_base_get_cycles();
         end debug */
        count_this_stripe=n_dts_per_buffer;
        if( count_processed + count_this_stripe > count )
@ -875,7 +878,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
                return OMPI_ERROR;
            }
            /* debug 
-            t3=opal_sys_timer_get_cycles();
+            t3=opal_timer_base_get_cycles();
            timers[1]+=(t3-t2);
             end debug */
            
@ -998,7 +1001,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
        for(exchange=0 ; exchange < my_exchange_node->n_exchanges ; exchange++) {

            /* debug 
-            t4=opal_sys_timer_get_cycles();
+            t4=opal_timer_base_get_cycles();
             end debug */

            index_read=(exchange&1);
@ -1022,7 +1025,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
                opal_progress();
            }
            /* debug 
-            t5=opal_sys_timer_get_cycles();
+            t5=opal_timer_base_get_cycles();
        timers[2]+=(t5-t4);
             end debug */

@ -1033,7 +1036,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
                my_write_pointer,count_this_stripe,dtype);

            /* debug 
-            t6=opal_sys_timer_get_cycles();
+            t6=opal_timer_base_get_cycles();
        timers[3]+=(t6-t5);
             end debug */

@ -1050,7 +1053,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
                opal_progress();
            }
            /* debug 
-            t7=opal_sys_timer_get_cycles();
+            t7=opal_timer_base_get_cycles();
        timers[4]+=(t7-t6);
             end debug */

@ -1119,7 +1122,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
        }

            /* debug 
-            t8=opal_sys_timer_get_cycles();
+            t8=opal_timer_base_get_cycles();
             end debug */
        /* copy data into the destination buffer */
        rc=ompi_datatype_copy_content_same_ddt(dtype, count_this_stripe,
@ -1136,7 +1139,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,

    /* debug 

-    t9=opal_sys_timer_get_cycles();
+    t9=opal_timer_base_get_cycles();
    timers[5]+=(t9-t8);
     end debug */

@ -1148,7 +1151,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
    }

    /* debug 
-    t10=opal_sys_timer_get_cycles();
+    t10=opal_timer_base_get_cycles();
    timers[6]+=(t10-t9);
     end debug */

@ -1237,7 +1240,7 @@ int mca_coll_sm2_allreduce_intra_reducescatter_allgather(void *sbuf, void *rbuf,
    for( stripe_number=0 ; stripe_number < n_data_segments ; stripe_number++ ) {
        /* get number of elements to process in this stripe */
        /* debug 
-        t2=opal_sys_timer_get_cycles();
+        t2=opal_timer_base_get_cycles();
         end debug */
        count_this_stripe=n_dts_per_buffer;
        if( count_processed + count_this_stripe > count )
@ -1275,7 +1278,7 @@ int mca_coll_sm2_allreduce_intra_reducescatter_allgather(void *sbuf, void *rbuf,
        }

            /* debug 
-            t3=opal_sys_timer_get_cycles();
+            t3=opal_timer_base_get_cycles();
            timers[1]+=(t3-t2);
             end debug */
            
@ -1476,7 +1479,7 @@ int mca_coll_sm2_allreduce_intra_reducescatter_allgather(void *sbuf, void *rbuf,
        } /* end exchange loop */

           /* debug 
-            t8=opal_sys_timer_get_cycles();
+            t8=opal_timer_base_get_cycles();
             end debug */
        /* copy data out to final destination.  Could do some sort of
         * recursive doubleing in the sm, then copy to process private,
@ -1614,7 +1617,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,

   
    /* debug 
-    t0=opal_sys_timer_get_cycles();
+    t0=opal_timer_base_get_cycles();
     end debug */

    /* use the same set of buffers for a single reduction */
@ -1628,7 +1631,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
    my_tmp_data_buffer[1]=my_read_pointer;

    /* debug 
-    t1=opal_sys_timer_get_cycles();
+    t1=opal_timer_base_get_cycles();
     end debug */
    for( stripe_number=0 ; stripe_number < n_data_segments ; stripe_number++ ) {
        /* get number of elements to process in this stripe */
@ -1644,7 +1647,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
        sm_module->collective_tag+=my_exchange_node->n_tags;

        /* debug 
-        t2=opal_sys_timer_get_cycles();
+        t2=opal_timer_base_get_cycles();
        timers[0]+=(t2-t1);
         end debug */

@ -1656,7 +1659,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
            return OMPI_ERROR;
        }
        /* debug 
-        t3=opal_sys_timer_get_cycles();
+        t3=opal_timer_base_get_cycles();
        timers[1]+=(t3-t2);
         end debug */
        
@ -1706,7 +1709,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
        /* loop over data exchanges */
        for(exchange=0 ; exchange < my_exchange_node->n_exchanges ; exchange++) {
            /* debug 
-            t4=opal_sys_timer_get_cycles();
+            t4=opal_timer_base_get_cycles();
             end debug */

            index_read=(exchange&1);
@ -1730,7 +1733,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
                opal_progress();
            }
            /* debug 
-            t5=opal_sys_timer_get_cycles();
+            t5=opal_timer_base_get_cycles();
        timers[2]+=(t5-t4);
             end debug */

@ -1755,7 +1758,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,

               }
            /* debug 
-            t6=opal_sys_timer_get_cycles();
+            t6=opal_timer_base_get_cycles();
        timers[3]+=(t6-t5);
             end debug */

@ -1772,7 +1775,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
                opal_progress();
            }
            /* debug 
-            t7=opal_sys_timer_get_cycles();
+            t7=opal_timer_base_get_cycles();
        timers[4]+=(t7-t6);
             end debug */

@ -1842,7 +1845,7 @@ int mca_coll_sm2_allreduce_intra_recursive_doubling(void *sbuf, void *rbuf,
        }

            /* debug 
-            t8=opal_sys_timer_get_cycles();
+            t8=opal_timer_base_get_cycles();
             end debug */
        /* copy data into the destination buffer */
        rc=ompi_datatype_copy_content_same_ddt(dtype, count_this_stripe,
--- a/ompi/mca/coll/sm2/coll_sm2_barrier.c
+++ b/ompi/mca/coll/sm2/coll_sm2_barrier.c
@ -2,7 +2,7 @@
 * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 *                         University Research and Technology
 *                         Corporation.  All rights reserved.
- * Copyright (c) 2004-2005 The University of Tennessee and The University
+ * Copyright (c) 2004-2011 The University of Tennessee and The University
 *                         of Tennessee Research Foundation.  All rights
 *                         reserved.
 * Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@ -582,7 +582,7 @@ int mca_coll_sm2_barrier_intra_recursive_doubling(
        for(exchange=0 ; exchange < my_exchange_node->n_exchanges ; exchange++) {

            /* debug 
-            t4=opal_sys_timer_get_cycles();
+            t4=opal_timer_base_get_cycles();
             end debug */

            /* is the remote data read */
@ -670,7 +670,7 @@ int mca_coll_sm2_barrier_intra_recursive_doubling(

    /* debug 

-    t9=opal_sys_timer_get_cycles();
+    t9=opal_timer_base_get_cycles();
    timers[5]+=(t9-t8);
     end debug */

--- a/ompi/mca/coll/sm2/coll_sm2_reduce.c
+++ b/ompi/mca/coll/sm2/coll_sm2_reduce.c
@ -1,5 +1,8 @@
 /*
 * Copyright (c) 2007-2008 UT-Battelle, LLC
+ * Copyright (c) 2011      The University of Tennessee and The University
+ *                         of Tennessee Research Foundation.  All rights
+ *                         reserved.
 * $COPYRIGHT$
 * 
 * Additional copyrights may follow
@ -464,7 +467,7 @@ int mca_coll_sm2_reduce_intra_reducescatter_gather(void *sbuf, void *rbuf,
    for( stripe_number=0 ; stripe_number < n_data_segments ; stripe_number++ ) {
        /* get number of elements to process in this stripe */
        /* debug 
-        t2=opal_sys_timer_get_cycles();
+        t2=opal_timer_base_get_cycles();
         end debug */
        count_this_stripe=n_dts_per_buffer;
        if( count_processed + count_this_stripe > count )
@ -513,7 +516,7 @@ int mca_coll_sm2_reduce_intra_reducescatter_gather(void *sbuf, void *rbuf,
         end debug */

            /* debug 
-            t3=opal_sys_timer_get_cycles();
+            t3=opal_timer_base_get_cycles();
            timers[1]+=(t3-t2);
             end debug */
            
@ -725,7 +728,7 @@ int mca_coll_sm2_reduce_intra_reducescatter_gather(void *sbuf, void *rbuf,
        } /* end exchange loop */

           /* debug 
-            t8=opal_sys_timer_get_cycles();
+            t8=opal_timer_base_get_cycles();
             end debug */
        /* copy data out to final destination.  Could do some sort of
         * recursive doubleing in the sm, then copy to process private,