Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions apcxi/Makefile.darshan
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#
# AutoPerf Make rules for Darshan
#
DARSHAN_STATIC_MOD_OBJS += lib/darshan-apcxi.o
DARSHAN_DYNAMIC_MOD_OBJS += lib/darshan-apcxi.po

VPATH += :$(srcdir)/../modules/autoperf/apcxi
CFLAGS += \
-DDARSHAN_USE_APCXI \
-I$(srcdir)/../modules/autoperf/apcxi

CFLAGS_SHARED += \
-DDARSHAN_USE_APCXI \
-I$(srcdir)/../modules/autoperf/apcxi

lib/darshan-apcxi.o: lib/darshan-apcxi.c lib/darshan-apcxi-utils.h darshan.h darshan-common.h $(DARSHAN_LOG_FORMAT) darshan-apcxi-log-format.h | lib
$(CC) $(CFLAGS) -c $< -o $@

lib/darshan-apcxi.po: lib/darshan-apcxi.c lib/darshan-apcxi-utils.h darshan.h darshan-dynamic.h darshan-common.h $(DARSHAN_LOG_FORMAT) darshan-apcxi-log-format.h | lib
$(CC) $(CFLAGS_SHARED) -c $< -o $@
28 changes: 14 additions & 14 deletions apss/darshan-apss-log-format.h → apcxi/darshan-apcxi-log-format.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
*
*/

#ifndef __APSS_LOG_FORMAT_H
#define __APSS_LOG_FORMAT_H
#ifndef __APCXI_LOG_FORMAT_H
#define __APCXI_LOG_FORMAT_H

/* current AutoPerf Cray XC log format version */
#define APSS_VER 1
#define APCXI_VER 1

#define APSS_MAGIC ('A'*0x100000000000000+\
#define APCXI_MAGIC ('A'*0x100000000000000+\
'U'*0x1000000000000+\
'T'*0x10000000000+\
'O'*0x100000000+\
Expand All @@ -19,7 +19,7 @@
'R'*0x100+\
'F'*0x1)

#define APSS_PERF_COUNTERS \
#define APCXI_PERF_COUNTERS \
/* PAPI counters */\
X(CQ_CQ_OXE_NUM_STALLS) \
X(CQ_CQ_OXE_NUM_FLITS) \
Expand Down Expand Up @@ -72,40 +72,40 @@
X(HNI_TX_OK_4096_TO_8191) \
X(HNI_TX_OK_8192_TO_MAX) \
/* end of counters */\
Z(APSS_NUM_INDICES)
Z(APCXI_NUM_INDICES)


#define X(a) a,
#define Z(a) a
/* integer counters for the "APSS" example module */
enum darshan_apss_perf_indices
/* integer counters for the "APCXI" example module */
enum darshan_apcxi_perf_indices
{
APSS_PERF_COUNTERS
APCXI_PERF_COUNTERS
};

#undef Z
#undef X

/* the darshan_apss_router_record structure encompasses the data/counters
/* the darshan_apcxi_router_record structure encompasses the data/counters
* which would actually be logged to file by Darshan for the AP HPE Slingshot
* module. This example implementation logs the following data for each
* record:
* - a darshan_base_record structure, which contains the record id & rank
* - integer I/O counters
* - floating point I/O counters
*/
struct darshan_apss_perf_record
struct darshan_apcxi_perf_record
{
struct darshan_base_record base_rec;
int64_t group;
int64_t chassis;
int64_t slot;
int64_t blade;
int64_t node;
uint64_t counters[APSS_NUM_INDICES];
uint64_t counters[APCXI_NUM_INDICES];
};

struct darshan_apss_header_record
struct darshan_apcxi_header_record
{
struct darshan_base_record base_rec;
int64_t magic;
Expand All @@ -116,4 +116,4 @@ struct darshan_apss_header_record
uint64_t appid;
};

#endif /* __APSS_LOG_FORMAT_H */
#endif /* __APCXI_LOG_FORMAT_H */
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#ifndef __APSS_UTILS_H__
#define __APSS_UTILS_H__
#ifndef __APCXI_UTILS_H__
#define __APCXI_UTILS_H__

#include <regex.h>
extern char crusher_nodelist[192][14];
Expand Down
Loading