diff -r -u /tmp/perftest-1.3.0/Makefile perftest-1.3.0/Makefile

--- /tmp/perftest-1.3.0/Makefile	Thu Jan 20 01:37:35 2011

+++ perftest-1.3.0/Makefile	Fri Feb 11 04:12:45 2011

@@ -2,6 +2,7 @@

 MCAST_TESTS = send_bw send_lat

 TESTS = write_bw_postlist write_lat write_bw read_lat read_bw

 UTILS = clock_test

+BINS = ib_write_bw_postlist rdma_lat rdma_bw ib_send_lat ib_send_bw ib_write_lat ib_write_bw ib_read_lat ib_read_bw ib_clock_test

 all: ${RDMACM_TESTS} ${MCAST_TESTS} ${TESTS} ${UTILS}

@@ -12,13 +13,14 @@

 BASIC_HEADERS = get_clock.h

 EXTRA_HEADERS = perftest_resources.h

 MCAST_HEADERS = multicast_resources.h

+CC=gcc

 #The following seems to help GNU make on some platforms

 LOADLIBES += 

 LDFLAGS +=

-${RDMACM_TESTS}: LOADLIBES += -libverbs -lrdmacm

-${MCAST_TESTS}: LOADLIBES += -libverbs -libumad -lm

-${TESTS} ${UTILS}: LOADLIBES += -libverbs

+${RDMACM_TESTS}: LOADLIBES += -lsocket -libverbs -lrdmacm -lrt 

+${MCAST_TESTS}: LOADLIBES += -lsocket -libverbs -lrdmacm -lrt -libumad -lm

+${TESTS} ${UTILS}: LOADLIBES += -lsocket -lrt -libverbs

 ${RDMACM_TESTS}: %: %.c ${BASIC_FILES} ${BASIC_HEADERS}

 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< ${BASIC_FILES} $(LOADLIBES) $(LDLIBS) -o $@

@@ -27,6 +29,10 @@

 ${TESTS} ${UTILS}: %: %.c ${BASIC_FILES} ${EXTRA_FILES} ${BASIC_HEADERS} ${EXTRA_HEADERS}

 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< ${BASIC_FILES} ${EXTRA_FILES} $(LOADLIBES) $(LDLIBS) -o ib_$@

+install: all

+	$(INSTALL) -d $(DESTDIR)$(BINDIR)

+	$(INSTALL) -m 755 -s $(BINS) $(DESTDIR)$(BINDIR)

+

 clean:

 	$(foreach fname,${RDMACM_TESTS}, rm -f ${fname})

 	$(foreach fname,${MCAST_TESTS}, rm -f ib_${fname})

diff -r -u /tmp/perftest-1.3.0/get_clock.c perftest-1.3.0/get_clock.c

--- /tmp/perftest-1.3.0/get_clock.c	Sun Dec 19 06:36:26 2010

+++ perftest-1.3.0/get_clock.c	Fri Feb 11 04:12:46 2011

@@ -45,6 +45,9 @@

 #include <unistd.h>

 #include <stdio.h>

 #include "get_clock.h"

+#if defined(__SVR4) && defined(__sun)

+#include <infiniband/ofa_solaris.h>

+#endif

 #ifndef DEBUG

 #define DEBUG 0

@@ -137,7 +140,11 @@

 	FILE* f;

 	char buf[256];

 	double mhz = 0.0;

+#if defined(__SVR4) && defined(__sun)

+	sol_cpu_info_t	info;

+#endif

+#if !(defined(__SVR4) && defined(__sun))

 	f = fopen("/proc/cpuinfo","r");

 	if (!f)

 		return 0.0;

@@ -174,6 +181,12 @@

 		}

 	}

 	fclose(f);

+#else

+	if (!sol_get_cpu_info(&info))

+		mhz = info.cpu_mhz;

+	else

+		return (0.0);

+#endif

 	return mhz;

 }

@@ -184,9 +197,6 @@

 	sample = sample_get_cpu_mhz();

 	proc = proc_get_cpu_mhz(no_cpu_freq_fail);

-	if (!proc || !sample)

-		return 0;

-

 	delta = proc > sample ? proc - sample : sample - proc;

 	if (delta / proc > 0.01) {

 			fprintf(stderr, "Warning: measured timestamp frequency "

diff -r -u /tmp/perftest-1.3.0/get_clock.h perftest-1.3.0/get_clock.h

--- /tmp/perftest-1.3.0/get_clock.h	Sun Nov  1 03:09:16 2009

+++ perftest-1.3.0/get_clock.h	Fri Feb 11 04:12:46 2011

@@ -71,6 +71,23 @@

 	return ret;

 }

+#elif defined(__sparc)

+#include <sys/times.h>

+#include <limits.h>

+typedef long	cycles_t;

+

+static inline cycles_t get_cycles()

+{

+	struct timespec tp;

+	long   time;

+

+	if (clock_gettime(CLOCK_HIGHRES, &tp))

+		return -1;

+

+	time = (tp.tv_sec * 1000000) + (tp.tv_nsec / 1000);

+	return time;

+}

+

 #else

 #warning get_cycles not implemented for this architecture: attempt asm/timex.h

 #include <asm/timex.h>

diff -r -u /tmp/perftest-1.3.0/rdma_bw.c perftest-1.3.0/rdma_bw.c

--- /tmp/perftest-1.3.0/rdma_bw.c	Wed Apr  7 09:44:56 2010

+++ perftest-1.3.0/rdma_bw.c	Fri Feb 11 04:12:46 2011

@@ -50,8 +50,11 @@

 #include <malloc.h>

 #include <getopt.h>

 #include <arpa/inet.h>

+#if !(defined(__SVR4) && defined(__sun))

 #include <byteswap.h>

+#endif

 #include <time.h>

+#include <inttypes.h>

 #include <infiniband/verbs.h>

 #include <rdma/rdma_cma.h>

@@ -144,7 +147,7 @@

 	if (n < 0) {

 		fprintf(stderr, "%d:%s: %s for %s:%d\n", 

-				pid, __func__, gai_strerror(n),

+				(int)pid, __func__, gai_strerror(n),

 				data->servername, data->port);

 		goto err4;

 	}

@@ -157,7 +160,7 @@

 		if (rdma_resolve_addr(data->cm_id, NULL,

 					 (struct sockaddr *)&sin, 2000)) {

 			fprintf(stderr, "%d:%s: rdma_resolve_addr failed\n",

-					 pid, __func__ );

+					 (int)pid, __func__ );

 			goto err2;

 		}

@@ -172,7 +175,7 @@

 		if (event->event != RDMA_CM_EVENT_ADDR_RESOLVED) {

 			fprintf(stderr, "%d:%s: unexpected CM event %d\n", 

-				pid, __func__, event->event);

+				(int)pid, __func__, event->event);

 			goto err1;

 		}

 		rdma_ack_cm_event(event);

@@ -180,7 +183,7 @@

 retry_route:

 		if (rdma_resolve_route(data->cm_id, 2000)) {

 			fprintf(stderr, "%d:%s: rdma_resolve_route failed\n", 

-						pid, __func__);

+						(int)pid, __func__);

 			goto err2;

 		}

@@ -195,7 +198,7 @@

 		if (event->event != RDMA_CM_EVENT_ROUTE_RESOLVED) {

 			fprintf(stderr, "%d:%s: unexpected CM event %d\n", 

-					pid, __func__, event->event);

+					(int)pid, __func__, event->event);

 			rdma_ack_cm_event(event);

 			goto err1;

 		}

@@ -202,7 +205,7 @@

 		rdma_ack_cm_event(event);

 		ctx = pp_init_ctx(data->cm_id, data);

 		if (!ctx) {

-			fprintf(stderr, "%d:%s: pp_init_ctx failed\n", pid, __func__);

+			fprintf(stderr, "%d:%s: pp_init_ctx failed\n", (int)pid, __func__);

 			goto err2;

 		}

 		data->my_dest.psn = lrand48() & 0xffffff;

@@ -218,7 +221,7 @@

 		conn_param.private_data_len = sizeof(data->my_dest);

 		if (rdma_connect(data->cm_id, &conn_param)) {

-			fprintf(stderr, "%d:%s: rdma_connect failure\n", pid, __func__);

+			fprintf(stderr, "%d:%s: rdma_connect failure\n", (int)pid, __func__);

 			goto err2;

 		}

@@ -227,13 +230,13 @@

 		if (event->event != RDMA_CM_EVENT_ESTABLISHED) {

 			fprintf(stderr, "%d:%s: unexpected CM event %d\n", 

- 					pid, __func__, event->event);

+ 					(int)pid, __func__, event->event);

 			goto err1;

 		}

 		if (!event->param.conn.private_data || 

 		    (event->param.conn.private_data_len < sizeof(*data->rem_dest))) {

 			fprintf(stderr, "%d:%s: bad private data ptr %p len %d\n",  

-				pid, __func__, event->param.conn.private_data, 

+				(int)pid, __func__, event->param.conn.private_data, 

 				event->param.conn.private_data_len);

 			goto err1;

 		}

@@ -257,7 +260,7 @@

 		}

 		if (sockfd < 0) {

 			fprintf(stderr, "%d:%s: Couldn't connect to %s:%d\n", 

-				 pid, __func__, data->servername, data->port);

+				 (int)pid, __func__, data->servername, data->port);

 			goto err3;

 		}

 		ctx = pp_init_ctx(data->ib_dev, data);

@@ -287,13 +290,13 @@

 	int parsed;

 	if (!data->use_cma) {

-		sprintf(msg, "%04x:%06x:%06x:%08x:%016Lx", data->my_dest.lid, 

+		sprintf(msg, "%04x:%06x:%06x:%08x:%016llx", data->my_dest.lid, 

 				data->my_dest.qpn, data->my_dest.psn,

 				data->my_dest.rkey, data->my_dest.vaddr);

 		if (write(data->sockfd, msg, sizeof msg) != sizeof msg) {

 			perror("client write");

 			fprintf(stderr, "%d:%s: Couldn't send local address\n", 

-					pid, __func__);

+					(int)pid, __func__);

 			goto err;

 		}

@@ -300,7 +303,7 @@

 		if (read(data->sockfd, msg, sizeof msg) != sizeof msg) {

 			perror("client read");

 			fprintf(stderr, "%d:%s: Couldn't read remote address\n", 

-					pid, __func__);

+					(int)pid, __func__);

 			goto err;

 		}

@@ -310,7 +313,7 @@

 		if (!data->rem_dest)

 			goto err;

-		parsed = sscanf(msg, "%x:%x:%x:%x:%Lx", &data->rem_dest->lid,

+		parsed = sscanf(msg, "%x:%x:%x:%x:%llx", &data->rem_dest->lid,

 				&data->rem_dest->qpn, &data->rem_dest->psn,

 				&data->rem_dest->rkey, &data->rem_dest->vaddr);

@@ -347,7 +350,7 @@

 		goto err5;

 	if ( (n = getaddrinfo(NULL, service, &hints, &res)) < 0 ) {

-		fprintf(stderr, "%d:%s: %s for port %d\n", pid, __func__, 

+		fprintf(stderr, "%d:%s: %s for port %d\n", (int)pid, __func__, 

 					gai_strerror(n), data->port);

 		goto err5;

 	}

@@ -357,12 +360,12 @@

 		sin.sin_family = AF_INET;

 		sin.sin_port = htons(data->port);

 		if (rdma_bind_addr(data->cm_id, (struct sockaddr *)&sin)) {

-			fprintf(stderr, "%d:%s: rdma_bind_addr failed\n", pid, __func__);

+			fprintf(stderr, "%d:%s: rdma_bind_addr failed\n", (int)pid, __func__);

 			goto err3;

 		}

 		if (rdma_listen(data->cm_id, 0)) {

-			fprintf(stderr, "%d:%s: rdma_listen failed\n", pid, __func__);

+			fprintf(stderr, "%d:%s: rdma_listen failed\n", (int)pid, __func__);

 			goto err3;

 		}

@@ -371,13 +374,13 @@

 		if (event->event != RDMA_CM_EVENT_CONNECT_REQUEST) {

 			fprintf(stderr, "%d:%s: bad event waiting for connect request %d\n", 

-				pid, __func__, event->event);

+				(int)pid, __func__, event->event);

 			goto err2;

 		}

 		if (!event->param.conn.private_data ||

 		    (event->param.conn.private_data_len < sizeof(*data->rem_dest))) {

-			fprintf(stderr, "%d:%s: bad private data len %d\n", pid,

+			fprintf(stderr, "%d:%s: bad private data len %d\n", (int)pid,

 				__func__, event->param.conn.private_data_len);

 			goto err2;

 		}

@@ -405,18 +408,18 @@

 		conn_param.private_data = &data->my_dest;

 		conn_param.private_data_len = sizeof(data->my_dest);

 		if (rdma_accept(child_cm_id, &conn_param)) {

-			fprintf(stderr, "%d:%s: rdma_accept failed\n", pid, __func__);

+			fprintf(stderr, "%d:%s: rdma_accept failed\n", (int)pid, __func__);

 			goto err1;

 		}	

 		rdma_ack_cm_event(event);

 		if (rdma_get_cm_event(data->cm_channel, &event)) {

-			fprintf(stderr, "%d:%s: rdma_get_cm_event error\n", pid, __func__);

+			fprintf(stderr, "%d:%s: rdma_get_cm_event error\n", (int)pid, __func__);

 			rdma_destroy_id(child_cm_id);

 			goto err3;

 		}

 		if (event->event != RDMA_CM_EVENT_ESTABLISHED) {

 			fprintf(stderr, "%d:%s: bad event waiting for established %d\n", 

-				pid, __func__, event->event);

+				(int)pid, __func__, event->event);

 			goto err1;

 		}

 		rdma_ack_cm_event(event);	

@@ -436,7 +439,7 @@

 		}

 		if (sockfd < 0) {

-			fprintf(stderr, "%d:%s: Couldn't listen to port %d\n", pid,

+			fprintf(stderr, "%d:%s: Couldn't listen to port %d\n", (int)pid,

 						__func__, data->port);

 			goto err4;

 		}

@@ -445,7 +448,7 @@

 		connfd = accept(sockfd, NULL, 0);

 		if (connfd < 0) {

 			perror("server accept");

-			fprintf(stderr, "%d:%s: accept() failed\n", pid, __func__);

+			fprintf(stderr, "%d:%s: accept() failed\n", (int)pid, __func__);

 			close(sockfd);

 			goto err4;

 		}

@@ -485,7 +488,7 @@

 		if (n != sizeof msg) {

 			perror("server read");

 			fprintf(stderr, "%d:%s: %d/%d Couldn't read remote address\n", 

-						pid, __func__, n, (int) sizeof msg);

+						(int)pid, __func__, n, (int) sizeof msg);

 			goto err;

 		}

@@ -495,23 +498,23 @@

 		if (!data->rem_dest)

 			goto err;

-		parsed = sscanf(msg, "%x:%x:%x:%x:%Lx", &data->rem_dest->lid,

+		parsed = sscanf(msg, "%x:%x:%x:%x:%llx", &data->rem_dest->lid,

 			      &data->rem_dest->qpn, &data->rem_dest->psn,

 			      &data->rem_dest->rkey, &data->rem_dest->vaddr);

 		if (parsed != 5) {

-			fprintf(stderr, "%d:%s: Couldn't parse line <%.*s>\n", pid,

+			fprintf(stderr, "%d:%s: Couldn't parse line <%.*s>\n", (int)pid,

 						 __func__, (int)sizeof msg, msg);

 			free(data->rem_dest);

 			goto err;

 		}

-		sprintf(msg, "%04x:%06x:%06x:%08x:%016Lx", data->my_dest.lid,

+		sprintf(msg, "%04x:%06x:%06x:%08x:%016llx", data->my_dest.lid,

 					 data->my_dest.qpn, data->my_dest.psn,

 					 data->my_dest.rkey, data->my_dest.vaddr);

 		if (write(data->sockfd, msg, sizeof msg) != sizeof msg) {

 			perror("server write");

 			fprintf(stderr, "%d:%s: Couldn't send local address\n", 

-					pid, __func__);

+					(int)pid, __func__);

 			free(data->rem_dest);

 			goto err;

 		}

@@ -538,7 +541,7 @@

 	ctx->buf = memalign(page_size, ctx->size * 2);

 	if (!ctx->buf) {

 		fprintf(stderr, "%d:%s: Couldn't allocate work buf.\n",

-					 pid, __func__);

+					 (int)pid, __func__);

 		return NULL;

 	}

@@ -548,7 +551,7 @@

 		cm_id = (struct rdma_cm_id *)ptr;

 		ctx->context = cm_id->verbs;

 		if (!ctx->context) {

-			fprintf(stderr, "%d:%s: Unbound cm_id!!\n", pid, 

+			fprintf(stderr, "%d:%s: Unbound cm_id!!\n", (int)pid, 

 							__func__);

 			return NULL;

 		}

@@ -558,7 +561,7 @@

 		ctx->context = ibv_open_device(ib_dev);

 		if (!ctx->context) {

 			fprintf(stderr, "%d:%s: Couldn't get context for %s\n", 

-				pid, __func__, ibv_get_device_name(ib_dev));

+				(int)pid, __func__, ibv_get_device_name(ib_dev));

 			return NULL;

 		}

 	}

@@ -565,7 +568,7 @@

 	ctx->pd = ibv_alloc_pd(ctx->context);

 	if (!ctx->pd) {

-		fprintf(stderr, "%d:%s: Couldn't allocate PD\n", pid, __func__);

+		fprintf(stderr, "%d:%s: Couldn't allocate PD\n", (int)pid, __func__);

 		return NULL;

 	}

@@ -575,7 +578,7 @@

 	ctx->mr = ibv_reg_mr(ctx->pd, ctx->buf, ctx->size * 2,

 			     IBV_ACCESS_REMOTE_WRITE | IBV_ACCESS_LOCAL_WRITE);

 	if (!ctx->mr) {

-		fprintf(stderr, "%d:%s: Couldn't allocate MR\n", pid, __func__);

+		fprintf(stderr, "%d:%s: Couldn't allocate MR\n", (int)pid, __func__);

 		return NULL;

 	}

@@ -582,7 +585,7 @@

 	ctx->ch = ibv_create_comp_channel(ctx->context);

 	if (!ctx->ch) {

-		fprintf(stderr, "%d:%s: Couldn't create comp channel\n", pid,

+		fprintf(stderr, "%d:%s: Couldn't create comp channel\n", (int)pid,

 								 __func__);

 		return NULL;

 	}

@@ -589,7 +592,7 @@

 	ctx->rcq = ibv_create_cq(ctx->context, 1, NULL, NULL, 0);

 	if (!ctx->rcq) {

-		fprintf(stderr, "%d:%s: Couldn't create recv CQ\n", pid,

+		fprintf(stderr, "%d:%s: Couldn't create recv CQ\n", (int)pid,

 								 __func__);

 		return NULL;

 	}

@@ -596,7 +599,7 @@

 	ctx->scq = ibv_create_cq(ctx->context, ctx->tx_depth, ctx, ctx->ch, 0);

 	if (!ctx->scq) {

-		fprintf(stderr, "%d:%s: Couldn't create send CQ\n", pid,

+		fprintf(stderr, "%d:%s: Couldn't create send CQ\n", (int)pid,

 								 __func__);

 		return NULL;

 	}

@@ -619,7 +622,7 @@

 	if (data->use_cma) {

 		if (rdma_create_qp(cm_id, ctx->pd, &attr)) {

-			fprintf(stderr, "%d:%s: Couldn't create QP\n", pid, __func__);

+			fprintf(stderr, "%d:%s: Couldn't create QP\n", (int)pid, __func__);

 			return NULL;

 		}

 		ctx->qp = cm_id->qp;

@@ -628,7 +631,7 @@

 	} else {

 		ctx->qp = ibv_create_qp(ctx->pd, &attr);

 		if (!ctx->qp)  {

-			fprintf(stderr, "%d:%s: Couldn't create QP\n", pid, __func__);

+			fprintf(stderr, "%d:%s: Couldn't create QP\n", (int)pid, __func__);

 			return NULL;

 		}

 		{

@@ -645,7 +648,7 @@

 					IBV_QP_PORT               |

 					IBV_QP_ACCESS_FLAGS)) {

 				fprintf(stderr, "%d:%s: Failed to modify QP to INIT\n", 

-						pid, __func__);

+						(int)pid, __func__);

 				return NULL;

 			}

 		}

@@ -679,7 +682,7 @@

 			  IBV_QP_RQ_PSN             |

 			  IBV_QP_MAX_DEST_RD_ATOMIC |

 			  IBV_QP_MIN_RNR_TIMER)) {

-		fprintf(stderr, "%d:%s: Failed to modify QP to RTR\n", pid, __func__);

+		fprintf(stderr, "%d:%s: Failed to modify QP to RTR\n", (int)pid, __func__);

 		return 1;

 	}

@@ -696,7 +699,7 @@

 			  IBV_QP_RNR_RETRY          |

 			  IBV_QP_SQ_PSN             |

 			  IBV_QP_MAX_QP_RD_ATOMIC)) {

-		fprintf(stderr, "%d:%s: Failed to modify QP to RTS\n", pid, __func__);

+		fprintf(stderr, "%d:%s: Failed to modify QP to RTS\n", (int)pid, __func__);

 		return 1;

 	}

@@ -720,7 +723,7 @@

         rc = ibv_post_recv(ctx->qp, &wr, &bad_wr);

         if (rc) {

                 perror("ibv_post_recv");

-                fprintf(stderr, "%d:%s: ibv_post_recv failed %d\n", pid,

+                fprintf(stderr, "%d:%s: ibv_post_recv failed %d\n", (int)pid,

 				 __func__, rc);

         }

 }

@@ -736,13 +739,13 @@

 	} while (ne == 0);

 	if (wc.status) 

-		fprintf(stderr, "%d:%s: bad wc status %d\n", pid, __func__,

+		fprintf(stderr, "%d:%s: bad wc status %d\n", (int)pid, __func__,

 					 wc.status);

 	if (!(wc.opcode & IBV_WC_RECV))

-		fprintf(stderr, "%d:%s: bad wc opcode %d\n", pid, __func__,

+		fprintf(stderr, "%d:%s: bad wc opcode %d\n", (int)pid, __func__,

 					 wc.opcode);

 	if (wc.wr_id != 0xdeadbeef) 

-		fprintf(stderr, "%d:%s: bad wc wr_id 0x%x\n", pid, __func__,

+		fprintf(stderr, "%d:%s: bad wc wr_id 0x%x\n", (int)pid, __func__,

 					 (int)wc.wr_id);

 }

@@ -762,7 +765,7 @@

 	ctx->wr.send_flags = IBV_SEND_SIGNALED;

 	ctx->wr.next       = NULL;

 	if (ibv_post_send(ctx->qp, &ctx->wr, &bad_wr)) {

-		fprintf(stderr, "%d:%s: ibv_post_send failed\n", pid, __func__);

+		fprintf(stderr, "%d:%s: ibv_post_send failed\n", (int)pid, __func__);

 		return;

 	}

 	do {

@@ -771,13 +774,13 @@

 	} while (ne == 0);

 	if (wc.status) 

-		fprintf(stderr, "%d:%s: bad wc status %d\n", pid, __func__,

+		fprintf(stderr, "%d:%s: bad wc status %d\n", (int)pid, __func__,

 						wc.status);

 	if (wc.opcode != IBV_WC_SEND)