X-Git-Url: https://pd.if.org/git/?p=nbds;a=blobdiff_plain;f=makefile;h=dbb0b8db987ffd01e9621506ab1e8c1f2db04578;hp=13364a88a8df4074ee6cb153832069542bcd2021;hb=5aa9223647fbb52fa8941d92c8896ebaf148b41c;hpb=8143ca0acc36e19d004431952e3b6f9b3d337f49

diff --git a/makefile b/makefile
index 13364a8..dbb0b8d 100644
--- a/makefile
+++ b/makefile
@@ -4,20 +4,26 @@
 ###################################################################################################
 # Makefile for building programs with whole-program interfile optimization
 ###################################################################################################
-OPT	   := -fwhole-program -combine -03 #-DNDEBUG
-CFLAGS := -g -Wall -Werror -std=c99 -m64 $(OPT) #-DENABLE_TRACE
-INCS   := $(addprefix -I, include)
-TESTS  := output/ll_test output/sl_test output/ht_test output/rcu_test
-EXES   := $(TESTS)
+CFLAGS0 := -Wall -Werror -std=gnu99 -lpthread #-m32 -DNBD32 
+CFLAGS1 := $(CFLAGS0) -g #-O3 #-DNDEBUG #-fwhole-program -combine 
+CFLAGS2 := $(CFLAGS1) #-DENABLE_TRACE 
+CFLAGS3 := $(CFLAGS2) #-DLIST_USE_HAZARD_POINTER 
+CFLAGS  := $(CFLAGS3) #-DUSE_SYSTEM_MALLOC #-DTEST_STRING_KEYS 
+INCS    := $(addprefix -I, include)
+TESTS   := output/perf_test output/map_test2 output/map_test1 output/txn_test \
+           output/rcu_test  output/haz_test
+OBJS    := $(TESTS)
 
-RUNTIME_SRCS  := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.c
-MAP_SRCS      := map/map.c map/nstring.c 
-TEST_SRCS     := $(RUNTIME_SRCS) $(MAP_SRCS)
-rcu_test_SRCS := $(TEST_SRCS) test/rcu_test.c
-txn_test_SRCS := $(TEST_SRCS) txn/txn.c map/hashtable.c 
-ll_test_SRCS  := $(TEST_SRCS) test/ll_test.c map/list.c 
-sl_test_SRCS  := $(TEST_SRCS) test/sl_test.c map/skiplist.c 
-ht_test_SRCS  := $(TEST_SRCS) test/ht_test.c map/hashtable.c test/CuTest.c
+RUNTIME_SRCS := runtime/runtime.c runtime/rcu.c runtime/lwt.c runtime/mem.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_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)
 
@@ -40,10 +46,18 @@ $(addsuffix .log, $(TESTS)) : %.log : %
 #       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
+$(OBJS): output/% : output/%.d makefile
 	gcc $(CFLAGS:-combine:) $(INCS) -MM -MT $@ $($*_SRCS) > $@.d
 	gcc $(CFLAGS) $(INCS) -o $@ $($*_SRCS)
 
+asm: $(addsuffix .s, $(OBJS))
+
+$(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 > $@
+	rm $@.temp
+
 ###################################################################################################
 # tags file for vi
 ###################################################################################################
@@ -59,8 +73,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
+.PHONY: clean test tags asm