work in progress

[nbds] / makefile

diff --git a/makefile b/makefile
index b7649ed5fe31b339bd13888a3cecd9b6cf58feae..d9863f2a0111bec1fc8069fcfff905bb347ac8eb 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,22 +4,25 @@
 ###################################################################################################
 # Makefile for building programs with whole-program interfile optimization
 ###################################################################################################
-CFLAGS0 := -g -Wall -Werror -std=c99 -lpthread 
-CFLAGS1 := $(CFLAGS0) -O3 #-DNDEBUG #-DENABLE_TRACE #-fwhole-program -combine 
-CFLAGS  := $(CFLAGS1) -DUSE_SYSTEM_MALLOC #-DLIST_USE_HAZARD_POINTER #-DTEST_STRING_KEYS #-DNBD32 
+CFLAGS0 := -Wall -Werror -std=gnu99 -lpthread #-m32 -DNBD32
+CFLAGS1 := $(CFLAGS0) -g #-DNDEBUG #-fwhole-program -combine
+CFLAGS2 := $(CFLAGS1) #-DENABLE_TRACE
+CFLAGS3 := $(CFLAGS2) #-DLIST_USE_HAZARD_POINTER
+CFLAGS  := $(CFLAGS3) #-DNBD_SINGLE_THREADED #-DUSE_SYSTEM_MALLOC #-DTEST_STRING_KEYS
 INCS    := $(addprefix -I, include)
-TESTS   := output/rcu_test output/haz_test output/map_test2 output/map_test1 output/txn_test 
-EXES    := $(TESTS)
+TESTS   := output/perf_test output/map_test1 output/map_test2 output/rcu_test output/txn_test #output/haz_test
+OBJS    := $(TESTS)
 
-RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c datatype/nstring.c \
-                               runtime/hazard.c
+RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c runtime/random.c \
+                               datatype/nstring.c #runtime/hazard.c
 MAP_SRCS     := map/map.c map/list.c map/skiplist.c map/hashtable.c
 
 haz_test_SRCS  := $(RUNTIME_SRCS) test/haz_test.c
 rcu_test_SRCS  := $(RUNTIME_SRCS) test/rcu_test.c
 txn_test_SRCS  := $(RUNTIME_SRCS) $(MAP_SRCS) test/txn_test.c test/CuTest.c txn/txn.c
-map_test1_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/map_test1.c 
+map_test1_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/map_test1.c
 map_test2_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/map_test2.c test/CuTest.c
+perf_test_SRCS := $(RUNTIME_SRCS) $(MAP_SRCS) test/perf_test.c
 
 tests: $(TESTS)
 
@@ -39,16 +42,16 @@ $(addsuffix .log, $(TESTS)) : %.log : %
 #              gcc. Compilation fails when -MM -MF is used and there is more than one source file.
 #              Otherwise "-MM -MT $@.d -MF $@.d" should be part of the command line for the compile.
 #
-#       Also, when calculating dependencies -combine is removed from CFLAGS because of another bug 
+#       Also, when calculating dependencies -combine is removed from CFLAGS because of another bug
 #              in gcc. It chokes when -MM is used with -combine.
 ###################################################################################################
-$(EXES): output/% : output/%.d makefile
-       gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > $@.d
+$(OBJS): output/% : output/%.d makefile
+       gcc $(CFLAGS) $(INCS) -MM -MT $@ $($*_SRCS) > $@.d
        gcc $(CFLAGS) $(INCS) -o $@ $($*_SRCS)
 
-asm: $(addsuffix .s, $(EXES))
+asm: $(addsuffix .s, $(OBJS))
 
-$(addsuffix .s, $(EXES)): output/%.s : output/%.d makefile
+$(addsuffix .s, $(OBJS)): output/%.s : output/%.d makefile
        gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > output/$*.d
        gcc $(CFLAGS) $(INCS) -combine -S -o $@.temp $($*_SRCS)
        grep -v "^L[BFM]\|^LCF" $@.temp > $@
@@ -69,8 +72,8 @@ clean:
 ###################################################################################################
 # dummy rule for boostrapping dependency files
 ###################################################################################################
-$(addsuffix .d, $(EXES)) : output/%.d :
+$(addsuffix .d, $(OBJS)) : output/%.d :
 
--include $(addsuffix .d, $(EXES))
+-include $(addsuffix .d, $(OBJS))
 
 .PHONY: clean test tags asm