From a934b9d97551251a005b5baec918d521c9466211 Mon Sep 17 00:00:00 2001 From: George Bosilca Date: Mon, 13 Jul 2009 20:01:12 +0000 Subject: [PATCH] Add the Open MPI specific part based on a patch from Manuel. Add the sparc and alpha. A manpage patch is also included. This partially fixes ticket #1973. This commit was SVN r21654. --- opal/asm/base/ALPHA.asm | 26 ++++++++++++++++++++++++++ orte/tools/orterun/orterun.1in | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/opal/asm/base/ALPHA.asm b/opal/asm/base/ALPHA.asm index dac8b6dbc3..a16f5b1367 100644 --- a/opal/asm/base/ALPHA.asm +++ b/opal/asm/base/ALPHA.asm @@ -197,3 +197,29 @@ opal_atomic_cmpset_rel_64: addl $31,$0,$0 ret $31,($26),1 .end opal_atomic_cmpset_rel_64 + .align 2 + .align 4 + .globl opal_sys_timer_get_cycles + .ent opal_sys_timer_get_cycles + $opal_sys_timer_get_cycles..ng: + opal_sys_timer_get_cycles: + .eflag 48 + .frame $30,0,$26,0 + .prologue 0 + .set macro + wmb + 1: ldq_l $0, 0($16) + cmpeq $0, $17, $0 + beq $0, 2f + mov $18, $0 + stq_c $0, 0($16) + beq $0, 1b + jmp 3f + 2: mov $31, $0 + 3: + + .set nomacro + rpcc $0 + ret + .end opal_sys_timer_get_cycles + diff --git a/orte/tools/orterun/orterun.1in b/orte/tools/orterun/orterun.1in index eb38e85c7e..d3d0068a91 100644 --- a/orte/tools/orterun/orterun.1in +++ b/orte/tools/orterun/orterun.1in @@ -324,7 +324,7 @@ or a filename to which the pid is to be written. . . .TP -.B -rf \f |--rankfile \fP. +.B -rf\fR,\fP --rankfile Provide a rankfile file. . . @@ -709,7 +709,7 @@ and distance among them. See the following example of the cartofile: #Node declaration Node type (Free string) Node name #(Reserve word) (socket is a reserve (free string) # word for CPU socket) - #===================================================== + #============================================================= EDGE Memory mem0 EDGE Memory mem3 #