Skip to content

Commit a6b0bb9

Browse files
evan-charmworksevan-charmworks
committed
Improve debug prints in Converse reductions and Isomalloc-Sync
1 parent 223f8b3 commit a6b0bb9

File tree

2 files changed

+38
-22
lines changed

2 files changed

+38
-22
lines changed

‎src/conv-core/convcore.C‎

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2419,6 +2419,13 @@ void CmiSyncVectorSendAndFree(int destPE, int n, int *sizes, char **msgs) {
24192419
* particular by the rank zero in each node.
24202420
****************************************************************************/
24212421

2422+
#define REDUCTION_DEBUG 0
2423+
#if REDUCTION_DEBUG
2424+
#define REDN_DBG(...) CmiPrintf(__VA_ARGS__)
2425+
#else
2426+
#define REDN_DBG(...)
2427+
#endif
2428+
24222429
CpvStaticDeclare(int, CmiReductionMessageHandler);
24232430
CpvStaticDeclare(int, CmiReductionDynamicRequestHandler);
24242431

@@ -2640,7 +2647,7 @@ void CmiSendReduce(CmiReduction *red) {
26402647
}
26412648
CmiSetHandler(msg, CpvAccess(CmiReductionMessageHandler));
26422649
CmiSetRedID(msg, red->seqID);
2643-
/*CmiPrintf("CmiSendReduce(%d): sending %d bytes to %d\n",CmiMyPe(),msg_size,red->parent);*/
2650+
REDN_DBG("[%d] CmiSendReduce: sending %d bytes to %d\n",CmiMyPe(),msg_size,red->parent);
26442651
CmiSyncSendAndFree(red->parent, msg_size, msg);
26452652
} else {
26462653
(red->ops.destination)(msg);
@@ -2678,7 +2685,8 @@ void CmiSendNodeReduce(CmiReduction *red) {
26782685
}
26792686
CmiSetHandler(msg, CpvAccess(CmiNodeReductionMessageHandler));
26802687
CmiSetRedID(msg, red->seqID);
2681-
/*CmiPrintf("CmiSendNodeReduce(%d): sending %d bytes to %d\n",CmiMyNode(),msg_size,red->parent);*/
2688+
REDN_DBG("[%d:%d][%d] CmiSendNodeReduce: sending %d bytes to %d\n",
2689+
CmiMyNode(),CmiMyRank(),CmiMyPe(),msg_size,red->parent);
26822690
CmiSyncNodeSendAndFree(red->parent, msg_size, msg);
26832691
} else {
26842692
(red->ops.destination)(msg);
@@ -2708,7 +2716,7 @@ static void CmiGlobalReduce(void *msg, int size, CmiReduceMergeFn mergeFn, CmiRe
27082716
red->ops.destination = (CmiHandler)CmiGetHandlerFunction(msg);
27092717
red->ops.mergeFn = mergeFn;
27102718
red->ops.pupFn = NULL;
2711-
/*CmiPrintf("[%d] CmiReduce::local %hd parent=%d, numChildren=%d\n",CmiMyPe(),red->seqID,red->parent,red->numChildren);*/
2719+
REDN_DBG("[%d] CmiReduce::local %hd parent=%d, numChildren=%d\n",CmiMyPe(),red->seqID,red->parent,red->numChildren);
27122720
CmiSendReduce(red);
27132721
}
27142722

@@ -2725,7 +2733,7 @@ static void CmiGlobalReduceStruct(void *data, CmiReducePupFn pupFn,
27252733
red->ops.mergeFn = mergeFn;
27262734
red->ops.pupFn = pupFn;
27272735
red->ops.deleteFn = deleteFn;
2728-
/*CmiPrintf("[%d] CmiReduceStruct::local %hd parent=%d, numChildren=%d\n",CmiMyPe(),red->seqID,red->parent,red->numChildren);*/
2736+
REDN_DBG("[%d] CmiReduceStruct::local %hd parent=%d, numChildren=%d\n",CmiMyPe(),red->seqID,red->parent,red->numChildren);
27292737
CmiSendReduce(red);
27302738
}
27312739

@@ -2739,7 +2747,8 @@ static void CmiGlobalNodeReduce(void *msg, int size, CmiReduceMergeFn mergeFn, C
27392747
red->ops.destination = (CmiHandler)CmiGetHandlerFunction(msg);
27402748
red->ops.mergeFn = mergeFn;
27412749
red->ops.pupFn = NULL;
2742-
/*CmiPrintf("[%d] CmiNodeReduce::local %hd parent=%d, numChildren=%d\n",CmiMyNode(),red->seqID,red->parent,red->numChildren);*/
2750+
REDN_DBG("[%d:%d][%d] CmiNodeReduce::local %hd parent=%d, numChildren=%d\n",
2751+
CmiMyNode(),CmiMyRank(),CmiMyPe(),red->seqID,red->parent,red->numChildren);
27432752
CmiSendNodeReduce(red);
27442753
}
27452754

@@ -2756,7 +2765,8 @@ static void CmiGlobalNodeReduceStruct(void *data, CmiReducePupFn pupFn,
27562765
red->ops.mergeFn = mergeFn;
27572766
red->ops.pupFn = pupFn;
27582767
red->ops.deleteFn = deleteFn;
2759-
/*CmiPrintf("[%d] CmiNodeReduceStruct::local %hd parent=%d, numChildren=%d\n",CmiMyNode(),red->seqID,red->parent,red->numChildren);*/
2768+
REDN_DBG("[%d:%d][%d] CmiNodeReduceStruct::local %hd parent=%d, numChildren=%d\n",
2769+
CmiMyNode(),CmiMyRank(),CmiMyPe(),red->seqID,red->parent,red->numChildren);
27602770
CmiSendNodeReduce(red);
27612771
}
27622772

@@ -2803,7 +2813,7 @@ void CmiListReduce(int npes, int *pes, void *msg, int size, CmiReduceMergeFn mer
28032813
red->ops.destination = (CmiHandler)CmiGetHandlerFunction(msg);
28042814
red->ops.mergeFn = mergeFn;
28052815
red->ops.pupFn = NULL;
2806-
/*CmiPrintf("[%d] CmiListReduce::local %hd parent=%d, numChildren=%d\n",CmiMyPe(),red->seqID,red->parent,red->numChildren);*/
2816+
REDN_DBG("[%d] CmiListReduce::local %hd parent=%d, numChildren=%d\n",CmiMyPe(),red->seqID,red->parent,red->numChildren);
28072817
CmiSendReduce(red);
28082818
}
28092819

@@ -2875,15 +2885,16 @@ void CmiHandleReductionMessage(void *msg) {
28752885
CmiReduction *red = CmiGetReduction(CmiGetRedID(msg));
28762886
if (red->numRemoteReceived == red->numChildren) red = CmiGetReductionCreate(CmiGetRedID(msg), red->numChildren+4);
28772887
red->remoteData[red->numRemoteReceived++] = (char *)msg;
2878-
/*CmiPrintf("[%d] CmiReduce::remote %hd\n",CmiMyPe(),red->seqID);*/
2888+
REDN_DBG("[%d] CmiReduce::remote %hd\n",CmiMyPe(),red->seqID);
28792889
CmiSendReduce(red);
28802890
}
28812891

28822892
void CmiHandleNodeReductionMessage(void *msg) {
28832893
CmiReduction *red = CmiGetNodeReduction(CmiGetRedID(msg));
28842894
if (red->numRemoteReceived == red->numChildren) red = CmiGetNodeReductionCreate(CmiGetRedID(msg), red->numChildren+4);
28852895
red->remoteData[red->numRemoteReceived++] = (char *)msg;
2886-
/*CmiPrintf("[%d] CmiNodeReduce::remote %hd\n",CmiMyNode(),red->seqID);*/
2896+
REDN_DBG("[%d:%d][%d] CmiNodeReduce::remote %hd\n",
2897+
CmiMyNode(),CmiMyRank(),CmiMyPe(),red->seqID);
28872898
CmiSendNodeReduce(red);
28882899
}
28892900

‎src/conv-core/isomalloc.C‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,20 @@ Substantially rewritten by Evan Ramos in 2019.
2626
#include "pup_stl.h"
2727

2828
#define ISOMALLOC_DEBUG 0
29-
3029
#if ISOMALLOC_DEBUG
3130
#define DEBUG_PRINT(...) CmiPrintf(__VA_ARGS__)
3231
#else
3332
#define DEBUG_PRINT(...)
3433
#endif
3534

36-
#define ISOMEMPOOL_DEBUG 0
35+
#define ISOSYNC_DEBUG 0
36+
#if ISOSYNC_DEBUG
37+
#define SYNC_DBG(...) CmiPrintf(__VA_ARGS__)
38+
#else
39+
#define SYNC_DBG(...)
40+
#endif
3741

42+
#define ISOMEMPOOL_DEBUG 0
3843
#if ISOMEMPOOL_DEBUG
3944
#define IMP_DBG(...) CmiPrintf(__VA_ARGS__)
4045
#else
@@ -726,8 +731,8 @@ static void CmiIsomallocSyncReductionHandler(void * data)
726731
static void CmiIsomallocSyncBroadcastHandler(void * msg)
727732
{
728733
const CmiAddressSpaceRegion region = ((CmiAddressSpaceRegionMsg *)msg)->region;
729-
DEBUG_PRINT("Isomalloc> Node %d received region for assignment: %" PRIx64 " %" PRIx64 "\n",
730-
CmiMyNode(), region.s, region.e);
734+
SYNC_DBG("Isomalloc> Node %d received region for assignment: %" PRIx64 " %" PRIx64 "\n",
735+
CmiMyNode(), region.s, region.e);
731736

732737
IsoRegion = region;
733738

@@ -832,8 +837,8 @@ static void CmiIsomallocInitExtent(char ** argv)
832837
if (CmiMyPe() == 0)
833838
CmiPrintf("Isomalloc> Synchronized global address space.\n");
834839

835-
DEBUG_PRINT("Charm++> Consolidated Isomalloc memory region at restart: %p - %p (%" PRId64 " MB).\n",
836-
(void *)IsoRegion.s, (void *)IsoRegion.e, (IsoRegion.e - IsoRegion.s) / meg);
840+
SYNC_DBG("Charm++> Consolidated Isomalloc memory region at restart: %p - %p (%" PRId64 " MB).\n",
841+
(void *)IsoRegion.s, (void *)IsoRegion.e, (IsoRegion.e - IsoRegion.s) / meg);
837842
}
838843
}
839844
else
@@ -849,11 +854,11 @@ static void CmiIsomallocInitExtent(char ** argv)
849854
{
850855
if (CmiMyNode() == 0)
851856
{
852-
DEBUG_PRINT("Charm++> Synchronizing Isomalloc memory region...\n");
857+
SYNC_DBG("Charm++> Synchronizing Isomalloc memory region...\n");
853858
}
854859

855-
DEBUG_PRINT("Isomalloc> Node %d sending region for comparison: %" PRIx64 " %" PRIx64 "\n",
856-
CmiMyNode(), IsoRegion.s, IsoRegion.e);
860+
SYNC_DBG("Isomalloc> Node %d sending region for comparison: %" PRIx64 " %" PRIx64 "\n",
861+
CmiMyNode(), IsoRegion.s, IsoRegion.e);
857862

858863
CmiNodeReduceStruct(&IsoRegion, CmiAddressSpaceRegionPup, CmiAddressSpaceRegionMerge,
859864
CmiIsomallocSyncReductionHandler, nullptr);
@@ -862,8 +867,8 @@ static void CmiIsomallocInitExtent(char ** argv)
862867

863868
if (CmiMyNode() == 0)
864869
{
865-
DEBUG_PRINT("Isomalloc> Node %d sending region for assignment: %" PRIx64 " %" PRIx64 "\n",
866-
CmiMyNode(), IsoRegion.s, IsoRegion.e);
870+
SYNC_DBG("Isomalloc> Node %d sending region for assignment: %" PRIx64 " %" PRIx64 "\n",
871+
CmiMyNode(), IsoRegion.s, IsoRegion.e);
867872

868873
CmiAddressSpaceRegionMsg msg;
869874
CmiInitMsgHeader(msg.converseHeader, sizeof(CmiAddressSpaceRegionMsg));
@@ -881,8 +886,8 @@ static void CmiIsomallocInitExtent(char ** argv)
881886
if (CmiMyPe() == 0)
882887
CmiPrintf("Isomalloc> Synchronized global address space.\n");
883888

884-
DEBUG_PRINT("Charm++> Consolidated Isomalloc memory region: %p - %p (%" PRId64 " MB).\n",
885-
(void *)IsoRegion.s, (void *)IsoRegion.e, (IsoRegion.e - IsoRegion.s) / meg);
889+
SYNC_DBG("Charm++> Consolidated Isomalloc memory region: %p - %p (%" PRId64 " MB).\n",
890+
(void *)IsoRegion.s, (void *)IsoRegion.e, (IsoRegion.e - IsoRegion.s) / meg);
886891
}
887892

888893
#if CMK_SMP && !CMK_SMP_NO_COMMTHD

0 commit comments

Comments
 (0)