Update formal model from local copy

[urcu.git] / formal-model / urcu / Makefile

diff --git a/formal-model/urcu/Makefile b/formal-model/urcu/Makefile
index c52c4badaf93e2dcbcbd96ae1b22e014e4fcaf09..8af320d0de8354a2409150206231c0e348178c00 100644 (file)
--- a/formal-model/urcu/Makefile
+++ b/formal-model/urcu/Makefile
@@ -17,12 +17,20 @@
 # Authors: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
 
 #CFLAGS=-DSAFETY
+#for multi-core verif, 15.5GB shared mem, use files if full
+#CFLAGS=-DHASH64 -DMEMLIM=15500 -DNCORE=2
+#CFLAGS=-DHASH64 -DCOLLAPSE -DMA=88 -DMEMLIM=15500 -DNCORE=8
+
+#liveness
+#CFLAGS=-DHASH64 -DCOLLAPSE -DMA=88
 CFLAGS=-DHASH64
 
 SPINFILE=urcu.spin
 
 default:
        make urcu_free | tee urcu_free.log
+       #nested useless with signal test.
+       #make urcu_free_nested | tee urcu_free_nested.log
        make urcu_free_no_rmb | tee urcu_free_no_rmb.log
        make urcu_free_no_wmb | tee urcu_free_no_wmb.log
        make urcu_free_no_mb | tee urcu_free_no_mb.log
@@ -46,8 +54,8 @@ asserts: clean
        cat ${SPINFILE} >> .input.spin
        rm -f .input.spin.trail
        spin -a -X .input.spin
-       gcc -w ${CFLAGS} -DSAFETY -o pan pan.c
-       ./pan -v -c1 -X -m10000 -w20
+       gcc -O2 -w ${CFLAGS} -DSAFETY -o pan pan.c
+       ./pan -v -c1 -X -m10000000 -w20
        cp .input.spin $@.spin.input
        -cp .input.spin.trail $@.spin.input.trail
 
@@ -55,6 +63,13 @@ urcu_free: clean urcu_free_ltl run
        cp .input.spin $@.spin.input
        -cp .input.spin.trail $@.spin.input.trail
 
+urcu_free_nested: clean urcu_free_ltl urcu_free_nested_define run
+       cp .input.spin $@.spin.input
+       -cp .input.spin.trail $@.spin.input.trail
+
+urcu_free_nested_define:
+       cp urcu_free_nested.define .input.define
+
 urcu_free_no_rmb: clean urcu_free_ltl urcu_free_no_rmb_define run
        cp .input.spin $@.spin.input
        -cp .input.spin.trail $@.spin.input.trail
@@ -85,8 +100,8 @@ urcu_free_single_flip_define:
 
 urcu_free_ltl:
        touch .input.define
-       cat DEFINES > pan.ltl
        cat .input.define >> pan.ltl
+       cat DEFINES >> pan.ltl
        spin -f "!(`cat urcu_free.ltl | grep -v ^//`)" >> pan.ltl
 
 # Progress checks
@@ -101,8 +116,8 @@ urcu_progress_writer_define:
 
 urcu_progress_writer_ltl:
        touch .input.define
-       cat DEFINES > pan.ltl
-       cat .input.define >> pan.ltl
+       cat .input.define > pan.ltl
+       cat DEFINES >> pan.ltl
        spin -f "!(`cat urcu_progress.ltl | grep -v ^//`)" >> pan.ltl
 
 urcu_progress_reader: clean urcu_progress_reader_ltl \
@@ -115,8 +130,8 @@ urcu_progress_reader_define:
 
 urcu_progress_reader_ltl:
        touch .input.define
-       cat DEFINES > pan.ltl
-       cat .input.define >> pan.ltl
+       cat .input.define > pan.ltl
+       cat DEFINES >> pan.ltl
        spin -f "!(`cat urcu_progress.ltl | grep -v ^//`)" >> pan.ltl
 
 urcu_progress_writer_error: clean urcu_progress_writer_error_ltl \
@@ -129,23 +144,23 @@ urcu_progress_writer_error_define:
 
 urcu_progress_writer_error_ltl:
        touch .input.define
-       cat DEFINES > pan.ltl
-       cat .input.define >> pan.ltl
+       cat .input.define > pan.ltl
+       cat DEFINES >> pan.ltl
        spin -f "!(`cat urcu_progress.ltl | grep -v ^//`)" >> pan.ltl
 
 
 run_weak_fair: pan
-       ./pan -a -f -v -c1 -X -m10000 -w20
+       ./pan -a -f -v -c1 -X -m10000000 -w20
 
 run: pan
-       ./pan -a -v -c1 -X -m10000 -w20
+       ./pan -a -v -c1 -X -m10000000 -w20
 
 pan: pan.c
-       gcc -w ${CFLAGS} -o pan pan.c
+       gcc -O2 -w ${CFLAGS} -o pan pan.c
 
 pan.c: pan.ltl ${SPINFILE}
-       cat DEFINES > .input.spin
-       cat .input.define >> .input.spin
+       cat .input.define > .input.spin
+       cat DEFINES >> .input.spin
        cat ${SPINFILE} >> .input.spin
        rm -f .input.spin.trail
        spin -a -X -N pan.ltl .input.spin