[ofa-general] [PATCH] perftest: Make rdma_lat, rdma_bw, and clock_test executable names rdma neutral

[Hal Rosenstock]

Since rdma_lat and rdma_bw use RDMA CM, they can be used with both IB and
iWARP so make their executable names neutral (by removing ib_)

IB only tests only require linking with libibverbs

Also, spec file change for executable name changes

Signed-off-by: Hal Rosenstock <hal.rosenstock at gmail.com>
---
diff --git a/Makefile b/Makefile
index 8042531..83c22c3 100755
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
-TESTS = write_bw_postlist rdma_lat rdma_bw send_lat send_bw write_lat write_bw read_lat read_bw
+RDMACM_TESTS = rdma_lat rdma_bw
+TESTS = write_bw_postlist send_lat send_bw write_lat write_bw read_lat read_bw
 UTILS = clock_test
 
-all: ${TESTS} ${UTILS}
+all: ${RDMACM_TESTS} ${TESTS} ${UTILS}
 
 CFLAGS += -Wall -g -D_GNU_SOURCE -O2
 EXTRA_FILES = get_clock.c
@@ -10,11 +11,18 @@ EXTRA_HEADERS = get_clock.h
 LOADLIBES += 
 LDFLAGS +=
 
-${TESTS}: LOADLIBES += -libverbs -lrdmacm
+${RDMACM_TESTS} ${UTILS}: LOADLIBES += -libverbs -lrdmacm
+${TESTS}: LOADLIBES += -libverbs
 
-${TESTS} ${UTILS}: %: %.c ${EXTRA_FILES} ${EXTRA_HEADERS}
+${RDMACM_TESTS}: %: %.c ${EXTRA_FILES} ${EXTRA_HEADERS}
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< ${EXTRA_FILES} $(LOADLIBES) $(LDLIBS) -o $@
+${TESTS}: %: %.c ${EXTRA_FILES} ${EXTRA_HEADERS}
 	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< ${EXTRA_FILES} $(LOADLIBES) $(LDLIBS) -o ib_$@
+${UTILS}: %: %.c ${EXTRA_FILES} ${EXTRA_HEADERS}
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $< ${EXTRA_FILES} $(LOADLIBES) $(LDLIBS) -o rdma_$@
+
 clean:
-	$(foreach fname,${TESTS} ${UTILS}, rm -f ib_${fname})
+	$(foreach fname,${RDMACM_TESTS} ${UTILS}, rm -f ${fname})
+	$(foreach fname,${TESTS}, rm -f ib_${fname})
 .DELETE_ON_ERROR:
 .PHONY: all clean
diff --git a/perftest.spec b/perftest.spec
index bd234e1..81ca90a 100755
--- a/perftest.spec
+++ b/perftest.spec
@@ -23,8 +23,8 @@ export CFLAGS="$RPM_OPT_FLAGS"
 chmod -x runme
 
 %install
-install -D -m 0755 ib_rdma_lat $RPM_BUILD_ROOT%{_bindir}/ib_rdma_lat
-install -D -m 0755 ib_rdma_bw $RPM_BUILD_ROOT%{_bindir}/ib_rdma_bw
+install -D -m 0755 rdma_lat $RPM_BUILD_ROOT%{_bindir}/rdma_lat
+install -D -m 0755 rdma_bw $RPM_BUILD_ROOT%{_bindir}/rdma_bw
 install -D -m 0755 ib_write_lat $RPM_BUILD_ROOT%{_bindir}/ib_write_lat
 install -D -m 0755 ib_write_bw $RPM_BUILD_ROOT%{_bindir}/ib_write_bw
 install -D -m 0755 ib_send_lat $RPM_BUILD_ROOT%{_bindir}/ib_send_lat
@@ -32,7 +32,7 @@ install -D -m 0755 ib_send_bw $RPM_BUILD_ROOT%{_bindir}/ib_send_bw
 install -D -m 0755 ib_read_lat $RPM_BUILD_ROOT%{_bindir}/ib_read_lat
 install -D -m 0755 ib_read_bw $RPM_BUILD_ROOT%{_bindir}/ib_read_bw
 install -D -m 0755 ib_write_bw_postlist $RPM_BUILD_ROOT%{_bindir}/ib_write_bw_postlist
-install -D -m 0755 ib_clock_test $RPM_BUILD_ROOT%{_bindir}/ib_clock_test
+install -D -m 0755 rdma_clock_test $RPM_BUILD_ROOT%{_bindir}/rdma_clock_test
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -43,6 +43,8 @@ rm -rf ${RPM_BUILD_ROOT}
 %_bindir/*
 
 %changelog
+* Sat Apr 18 2009 - hal.rosenstock at gmail.com
+- Change executable names for rdma_lat, rdma_bw, and clock_test
 * Mon Jul 09 2007 - hvogel at suse.de
 - Use correct version
 * Wed Jul 04 2007 - hvogel at suse.de