From 691b151a55335680a38d0b244a45876320db27be Mon Sep 17 00:00:00 2001 From: gfunck Date: Sat, 30 Mar 2013 16:17:30 +0000 Subject: [PATCH] libgupc/ * portals4/gupcr_coll_reduce.in: Change printf format in error message to match the type of upc_op_t, which is now 'unsigned long'. * portals4/gupcr_coll_reduce.upc: Re-generate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gupc@197268 138bc75d-0d04-0410-961f-82ee72b054a4 --- libgupc/ChangeLog | 7 +++++++ libgupc/portals4/gupcr_coll_reduce.in | 4 ++-- libgupc/portals4/gupcr_coll_reduce.upc | 24 ++++++++++++------------ 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/libgupc/ChangeLog b/libgupc/ChangeLog index 6c8840048d7..6a03f5bb435 100644 --- a/libgupc/ChangeLog +++ b/libgupc/ChangeLog @@ -1,3 +1,10 @@ +2012-03-30 Gary Funck + + * portals4/gupcr_coll_reduce.in: Change printf format in + error message to match the type of upc_op_t, which is + now 'unsigned long'. + * portals4/gupcr_coll_reduce.upc: Re-generate. + 2012-03-29 Gary Funck Implement and use upc_types.h (per UPC 1.3 spec.) diff --git a/libgupc/portals4/gupcr_coll_reduce.in b/libgupc/portals4/gupcr_coll_reduce.in index 3efc502383c..daf248adcf4 100644 --- a/libgupc/portals4/gupcr_coll_reduce.in +++ b/libgupc/portals4/gupcr_coll_reduce.in @@ -100,7 +100,7 @@ gupcr_portals_reduce_op (upc_op_t op) case UPC_MAX: return PTL_MAX; default: - gupcr_fatal_error ("Cannot convert UPC reduce operation %d.", op); + gupcr_fatal_error ("Cannot convert UPC reduce operation 0x%lx.", op); } } @@ -338,7 +338,7 @@ void upc_all_reduce_GENERIC local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } diff --git a/libgupc/portals4/gupcr_coll_reduce.upc b/libgupc/portals4/gupcr_coll_reduce.upc index d014e116377..f6249313e24 100644 --- a/libgupc/portals4/gupcr_coll_reduce.upc +++ b/libgupc/portals4/gupcr_coll_reduce.upc @@ -100,7 +100,7 @@ gupcr_portals_reduce_op (upc_op_t op) case UPC_MAX: return PTL_MAX; default: - gupcr_fatal_error ("Cannot convert UPC reduce operation %d.", op); + gupcr_fatal_error ("Cannot convert UPC reduce operation 0x%lx.", op); } } @@ -295,7 +295,7 @@ void upc_all_reduceC local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -732,7 +732,7 @@ void upc_all_reduceUC local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -1169,7 +1169,7 @@ void upc_all_reduceS local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -1606,7 +1606,7 @@ void upc_all_reduceUS local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -2043,7 +2043,7 @@ void upc_all_reduceI local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -2480,7 +2480,7 @@ void upc_all_reduceUI local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -2917,7 +2917,7 @@ void upc_all_reduceL local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -3354,7 +3354,7 @@ void upc_all_reduceUL local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -3806,7 +3806,7 @@ void upc_all_reduceF local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -4258,7 +4258,7 @@ void upc_all_reduceD local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } @@ -4710,7 +4710,7 @@ void upc_all_reduceLD local_result = func (local_result, *l_src++); break; default: - gupcr_fatal_error ("Bad UPC collectives reduce operator %d.", op); + gupcr_fatal_error ("Bad UPC collectives reduce operator 0x%lx.", op); } } -- 2.11.4.GIT