From: Mathieu Desnoyers Date: Fri, 15 May 2009 20:35:57 +0000 (-0400) Subject: Remove old memory models X-Git-Tag: v0.1~222 X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=commitdiff_plain;h=d372f56172a6871969f88a524a65f9c40f358900 Remove old memory models Signed-off-by: Mathieu Desnoyers --- diff --git a/formal-model/ooomem-deps/DEFINES b/formal-model/ooomem-deps/DEFINES deleted file mode 100644 index e74150d..0000000 --- a/formal-model/ooomem-deps/DEFINES +++ /dev/null @@ -1,2 +0,0 @@ -#define read_one_is_zero (read_one == 0) -#define read_two_is_zero (read_two == 0) diff --git a/formal-model/ooomem-deps/Makefile b/formal-model/ooomem-deps/Makefile deleted file mode 100644 index e63a073..0000000 --- a/formal-model/ooomem-deps/Makefile +++ /dev/null @@ -1,82 +0,0 @@ -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# Copyright (C) Mathieu Desnoyers, 2009 -# -# Authors: Mathieu Desnoyers - -#CFLAGS=-DSAFETY -CFLAGS=-DHASH64 - -SPINFILE=mem.spin - -default: - make read_order | tee read_order.log - make read_order_sync_core | tee read_order_sync_core.log - make asserts | tee asserts.log - make summary - -#show trail : spin -v -t -N pan.ltl input.spin -# after each individual make. - -summary: - @echo - @echo "Verification summary" - @grep error *.log - -asserts: clean - cat DEFINES > .input.spin - 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 -w19 - cp .input.spin $@.spin.input - -cp .input.spin.trail $@.spin.input.trail - -read_order: clean read_order_ltl run - cp .input.spin $@.spin.input - -cp .input.spin.trail $@.spin.input.trail - -read_order_sync_core: clean read_order_ltl read_order_sync_core_define run - cp .input.spin $@.spin.input - -cp .input.spin.trail $@.spin.input.trail - -read_order_sync_core_define: - cp read_order_sync_core.define .input.define - -read_order_ltl: - touch .input.define - cat DEFINES > pan.ltl - cat .input.define >> pan.ltl - spin -f "!(`cat read_order.ltl | grep -v ^//`)" >> pan.ltl - -run: pan - ./pan -a -v -c1 -X -m10000 -w19 - -pan: pan.c - gcc -w ${CFLAGS} -o pan pan.c - -pan.c: pan.ltl ${SPINFILE} - cat DEFINES > .input.spin - cat .input.define >> .input.spin - cat ${SPINFILE} >> .input.spin - rm -f .input.spin.trail - spin -a -X -N pan.ltl .input.spin - -.PHONY: clean default distclean summary -clean: - rm -f pan* trail.out .input.spin* *.spin.trail .input.define -distclean: - rm -f *.trail *.input *.log diff --git a/formal-model/ooomem-deps/mem.sh b/formal-model/ooomem-deps/mem.sh deleted file mode 100644 index 56e8123..0000000 --- a/formal-model/ooomem-deps/mem.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Compiles and runs the urcu.spin Promela model. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# Copyright (C) IBM Corporation, 2009 -# Mathieu Desnoyers, 2009 -# -# Authors: Paul E. McKenney -# Mathieu Desnoyers - -# Basic execution, without LTL clauses. See Makefile. - -spin -a mem.spin -cc -DSAFETY -o pan pan.c -./pan -v -c1 -X -m10000000 -w21 diff --git a/formal-model/ooomem-deps/mem.spin b/formal-model/ooomem-deps/mem.spin deleted file mode 100644 index ca68cb7..0000000 --- a/formal-model/ooomem-deps/mem.spin +++ /dev/null @@ -1,192 +0,0 @@ -/* - * mem.spin: Promela code to validate memory barriers with OOO memory. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Copyright (c) 2009 Mathieu Desnoyers - */ - -/* Promela validation variables. */ - -#define NR_READERS 1 -#define NR_WRITERS 1 - -#define NR_PROCS 2 - -#define get_pid() (_pid) - -/* - * Each process have its own data in cache. Caches are randomly updated. - * smp_wmb and smp_rmb forces cache updates (write and read), wmb_mb forces - * both. - */ - -#define DECLARE_CACHED_VAR(type, x, v) \ - type mem_##x = v; \ - type cached_##x[NR_PROCS] = v; \ - bit cache_dirty_##x[NR_PROCS] = 0 - -#define IS_CACHE_DIRTY(x, id) (cache_dirty_##x[id]) - -#define READ_CACHED_VAR(x) (cached_##x[get_pid()]) - -#define WRITE_CACHED_VAR(x, v) \ - atomic { \ - cached_##x[get_pid()] = v; \ - cache_dirty_##x[get_pid()] = 1; \ - } - -#define CACHE_WRITE_TO_MEM(x, id) \ - if \ - :: IS_CACHE_DIRTY(x, id) -> \ - mem_##x = cached_##x[id]; \ - cache_dirty_##x[id] = 0; \ - :: else -> \ - skip \ - fi; - -#define CACHE_READ_FROM_MEM(x, id) \ - if \ - :: !IS_CACHE_DIRTY(x, id) -> \ - cached_##x[id] = mem_##x;\ - :: else -> \ - skip \ - fi; - -/* - * May update other caches if cache is dirty, or not. - */ -#define RANDOM_CACHE_WRITE_TO_MEM(x, id)\ - if \ - :: 1 -> CACHE_WRITE_TO_MEM(x, id); \ - :: 1 -> skip \ - fi; - -#define RANDOM_CACHE_READ_FROM_MEM(x, id)\ - if \ - :: 1 -> CACHE_READ_FROM_MEM(x, id); \ - :: 1 -> skip \ - fi; - -inline smp_rmb() -{ - atomic { - CACHE_READ_FROM_MEM(alpha, get_pid()); - CACHE_READ_FROM_MEM(beta, get_pid()); - } -} - -inline smp_wmb() -{ - atomic { - CACHE_WRITE_TO_MEM(alpha, get_pid()); - CACHE_WRITE_TO_MEM(beta, get_pid()); - } -} - -inline smp_mb() -{ - atomic { - smp_wmb(); - smp_rmb(); - } -} - -/* - * Instruction scheduling support. Declares instruction data flow dependency. - * INSTRUCTION_SCHED_BEGIN/INSTRUCTION_SCHED_END can be nested. - */ -#define INSTRUCTION_SCHED_BEGIN(i) \ - if \ - :: 1 -> \ - ooo_mem(i) - -/* No data flow dependency between two consecutive instructions */ -#define INSTRUCTION_SCHED_NODEP_NEXT(i) \ - :: 1 -> \ - ooo_mem(i) - -/* Has dependency between two consecutive instructions */ -#define INSTRUCTION_SCHED_DEP_NEXT(i) \ - ooo_mem(i) - -#define INSTRUCTION_SCHED_END(i) \ - fi - -inline ooo_mem() -{ - atomic { - RANDOM_CACHE_WRITE_TO_MEM(alpha, get_pid()); - RANDOM_CACHE_WRITE_TO_MEM(beta, get_pid()); - RANDOM_CACHE_READ_FROM_MEM(alpha, get_pid()); - RANDOM_CACHE_READ_FROM_MEM(beta, get_pid()); - } -} - -/* Keep in sync manually with smp_rmb, wmp_wmb and ooo_mem */ -DECLARE_CACHED_VAR(byte, alpha, 0); -DECLARE_CACHED_VAR(byte, beta, 0); - -/* value 2 is uninitialized */ -byte read_one = 2; -byte read_two = 2; - -active proctype test_proc_one() -{ - assert(get_pid() < NR_PROCS); - - INSTRUCTION_SCHED_BEGIN(); - WRITE_CACHED_VAR(alpha, 1); - INSTRUCTION_SCHED_DEP_NEXT(); - smp_wmb(); -#ifndef USE_SYNC_CORE - INSTRUCTION_SCHED_NODEP_NEXT(); -#else - // if we use a sync_core(); (equivalent to smp_mb()) - INSTRUCTION_SCHED_DEP_NEXT(); -#endif - smp_rmb(); - INSTRUCTION_SCHED_DEP_NEXT(); - read_one = READ_CACHED_VAR(beta); - INSTRUCTION_SCHED_END(); - - // test : [] (read_one == 0 -> read_two != 0) - // test : [] (read_two == 0 -> read_one != 0) - assert(!(read_one == 0 && read_two == 0)); -} - -active proctype test_proc_two() -{ - assert(get_pid() < NR_PROCS); - - INSTRUCTION_SCHED_BEGIN(); - WRITE_CACHED_VAR(beta, 1); - INSTRUCTION_SCHED_DEP_NEXT(); - smp_wmb(); -#ifndef USE_SYNC_CORE - INSTRUCTION_SCHED_NODEP_NEXT(); -#else - // if we use a sync_core(); (equivalent to smp_mb()) - // INSTRUCTION_SCHED_DEP_NEXT(); -#endif - smp_rmb(); - INSTRUCTION_SCHED_DEP_NEXT(); - read_two = READ_CACHED_VAR(alpha); - INSTRUCTION_SCHED_END(); - - // test : [] (read_one == 0 -> read_two != 0) - // test : [] (read_two == 0 -> read_one != 0) - assert(!(read_one == 0 && read_two == 0)); -} diff --git a/formal-model/ooomem-deps/read_order.ltl b/formal-model/ooomem-deps/read_order.ltl deleted file mode 100644 index f4dbf03..0000000 --- a/formal-model/ooomem-deps/read_order.ltl +++ /dev/null @@ -1 +0,0 @@ -[] (read_one_is_zero -> !read_two_is_zero) diff --git a/formal-model/ooomem-deps/read_order_sync_core.define b/formal-model/ooomem-deps/read_order_sync_core.define deleted file mode 100644 index eb80fc9..0000000 --- a/formal-model/ooomem-deps/read_order_sync_core.define +++ /dev/null @@ -1 +0,0 @@ -#define USE_SYNC_CORE diff --git a/formal-model/ooomem-deps/references.txt b/formal-model/ooomem-deps/references.txt deleted file mode 100644 index ca6798f..0000000 --- a/formal-model/ooomem-deps/references.txt +++ /dev/null @@ -1,7 +0,0 @@ -http://spinroot.com/spin/Man/ltl.html -http://en.wikipedia.org/wiki/Linear_temporal_logic -http://www.dcs.gla.ac.uk/~muffy/MRS4-2002/lect11.ppt - -http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/index.php -http://spinroot.com/spin/Man/index.html -http://spinroot.com/spin/Man/promela.html diff --git a/formal-model/ooomem-no-sched/DEFINES b/formal-model/ooomem-no-sched/DEFINES new file mode 100644 index 0000000..04aa898 --- /dev/null +++ b/formal-model/ooomem-no-sched/DEFINES @@ -0,0 +1,2 @@ +#define first_read_updated (first_read[0] == 6) +#define second_read_updated (second_read[0] == 4) diff --git a/formal-model/ooomem-no-sched/Makefile b/formal-model/ooomem-no-sched/Makefile new file mode 100644 index 0000000..e0aed43 --- /dev/null +++ b/formal-model/ooomem-no-sched/Makefile @@ -0,0 +1,90 @@ +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# Copyright (C) Mathieu Desnoyers, 2009 +# +# Authors: Mathieu Desnoyers + +#CFLAGS=-DSAFETY +CFLAGS=-DHASH64 + +SPINFILE=mem.spin + +default: + make read_order | tee read_order.log + make read_order_no_wmb | tee read_order_no_wmb.log + make read_order_no_rmb | tee read_order_no_rmb.log + make asserts | tee asserts.log + make summary + +#show trail : spin -v -t -N pan.ltl input.spin +# after each individual make. + +summary: + @echo + @echo "Verification summary" + @grep error *.log + +asserts: clean + cat DEFINES > .input.spin + 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 -w19 + cp .input.spin $@.spin.input + -cp .input.spin.trail $@.spin.input.trail + +read_order: clean read_order_ltl run + cp .input.spin $@.spin.input + -cp .input.spin.trail $@.spin.input.trail + +read_order_no_rmb: clean read_order_ltl read_order_no_rmb_define run + cp .input.spin $@.spin.input + -cp .input.spin.trail $@.spin.input.trail + +read_order_no_rmb_define: + cp read_order_no_rmb.define .input.define + +read_order_no_wmb: clean read_order_ltl read_order_no_wmb_define run + cp .input.spin $@.spin.input + -cp .input.spin.trail $@.spin.input.trail + +read_order_no_wmb_define: + cp read_order_no_wmb.define .input.define + +read_order_ltl: + touch .input.define + cat DEFINES > pan.ltl + cat .input.define >> pan.ltl + spin -f "!(`cat read_order.ltl | grep -v ^//`)" >> pan.ltl + +run: pan + ./pan -a -v -c1 -X -m10000 -w19 + +pan: pan.c + gcc -w ${CFLAGS} -o pan pan.c + +pan.c: pan.ltl ${SPINFILE} + cat DEFINES > .input.spin + cat .input.define >> .input.spin + cat ${SPINFILE} >> .input.spin + rm -f .input.spin.trail + spin -a -X -N pan.ltl .input.spin + +.PHONY: clean default distclean summary +clean: + rm -f pan* trail.out .input.spin* *.spin.trail .input.define +distclean: + rm -f *.trail *.input *.log diff --git a/formal-model/ooomem-no-sched/mem.sh b/formal-model/ooomem-no-sched/mem.sh new file mode 100644 index 0000000..56e8123 --- /dev/null +++ b/formal-model/ooomem-no-sched/mem.sh @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Compiles and runs the urcu.spin Promela model. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# Copyright (C) IBM Corporation, 2009 +# Mathieu Desnoyers, 2009 +# +# Authors: Paul E. McKenney +# Mathieu Desnoyers + +# Basic execution, without LTL clauses. See Makefile. + +spin -a mem.spin +cc -DSAFETY -o pan pan.c +./pan -v -c1 -X -m10000000 -w21 diff --git a/formal-model/ooomem-no-sched/mem.spin b/formal-model/ooomem-no-sched/mem.spin new file mode 100644 index 0000000..9359a5a --- /dev/null +++ b/formal-model/ooomem-no-sched/mem.spin @@ -0,0 +1,165 @@ +/* + * mem.spin: Promela code to validate memory barriers with OOO memory. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * Copyright (c) 2009 Mathieu Desnoyers + */ + +/* + * Out-of-order memory model _without_ out-of-order instruction scheduling. + */ + +/* Promela validation variables. */ + +#define NR_READERS 1 +#define NR_WRITERS 1 + +#define NR_PROCS 2 + +#define get_pid() (_pid) + +/* + * Each process have its own data in cache. Caches are randomly updated. + * smp_wmb and smp_rmb forces cache updates (write and read), wmb_mb forces + * both. + */ + +#define DECLARE_CACHED_VAR(type, x, v) \ + type mem_##x = v; \ + type cached_##x[NR_PROCS] = v; \ + bit cache_dirty_##x[NR_PROCS] = 0 + +#define IS_CACHE_DIRTY(x, id) (cache_dirty_##x[id]) + +#define READ_CACHED_VAR(x) (cached_##x[get_pid()]) + +#define WRITE_CACHED_VAR(x, v) \ + atomic { \ + cached_##x[get_pid()] = v; \ + cache_dirty_##x[get_pid()] = 1; \ + } + +#define CACHE_WRITE_TO_MEM(x, id) \ + if \ + :: IS_CACHE_DIRTY(x, id) -> \ + mem_##x = cached_##x[id]; \ + cache_dirty_##x[id] = 0; \ + :: else -> \ + skip \ + fi; + +#define CACHE_READ_FROM_MEM(x, id) \ + if \ + :: !IS_CACHE_DIRTY(x, id) -> \ + cached_##x[id] = mem_##x;\ + :: else -> \ + skip \ + fi; + +/* + * May update other caches if cache is dirty, or not. + */ +#define RANDOM_CACHE_WRITE_TO_MEM(x, id)\ + if \ + :: 1 -> CACHE_WRITE_TO_MEM(x, id); \ + :: 1 -> skip \ + fi; + +#define RANDOM_CACHE_READ_FROM_MEM(x, id)\ + if \ + :: 1 -> CACHE_READ_FROM_MEM(x, id); \ + :: 1 -> skip \ + fi; + +inline smp_rmb() +{ + atomic { + CACHE_READ_FROM_MEM(alpha, get_pid()); + CACHE_READ_FROM_MEM(beta, get_pid()); + } +} + +inline smp_wmb() +{ + atomic { + CACHE_WRITE_TO_MEM(alpha, get_pid()); + CACHE_WRITE_TO_MEM(beta, get_pid()); + } +} + +inline smp_mb() +{ + atomic { + smp_wmb(); + smp_rmb(); + } +} + +/* Keep in sync manually with smp_rmb, wmp_wmb and ooo_mem */ +DECLARE_CACHED_VAR(byte, alpha, 0); +DECLARE_CACHED_VAR(byte, beta, 0); + +inline ooo_mem() +{ + atomic { + RANDOM_CACHE_WRITE_TO_MEM(alpha, get_pid()); + RANDOM_CACHE_WRITE_TO_MEM(beta, get_pid()); + RANDOM_CACHE_READ_FROM_MEM(alpha, get_pid()); + RANDOM_CACHE_READ_FROM_MEM(beta, get_pid()); + } +} + +#define get_readerid() (get_pid()) + +byte first_read[NR_READERS]; +byte second_read[NR_READERS]; + +active [NR_READERS] proctype test_reader() +{ + assert(get_pid() < NR_PROCS); + + ooo_mem(); + first_read[get_readerid()] = READ_CACHED_VAR(beta); + ooo_mem(); +#ifndef NO_RMB + smp_rmb(); + ooo_mem(); +#endif + second_read[get_readerid()] = READ_CACHED_VAR(alpha); + ooo_mem(); + // test : [] (first_read == 6 -> <> second_read == 4) + assert(first_read[get_readerid()] != 6 + || second_read[get_readerid()] == 4); +} + +#define get_writerid() (get_readerid() + NR_READERS) + +active [NR_WRITERS] proctype test_writer() +{ + byte i; + + assert(get_pid() < NR_PROCS); + + ooo_mem(); + WRITE_CACHED_VAR(alpha, 4); + ooo_mem(); +#ifndef NO_WMB + smp_wmb(); + ooo_mem(); +#endif + WRITE_CACHED_VAR(beta, 6); + ooo_mem(); +} diff --git a/formal-model/ooomem-no-sched/read_order.ltl b/formal-model/ooomem-no-sched/read_order.ltl new file mode 100644 index 0000000..b1cdfb7 --- /dev/null +++ b/formal-model/ooomem-no-sched/read_order.ltl @@ -0,0 +1 @@ +[] (first_read_updated -> <> second_read_updated) diff --git a/formal-model/ooomem-no-sched/read_order_no_rmb.define b/formal-model/ooomem-no-sched/read_order_no_rmb.define new file mode 100644 index 0000000..73e61a4 --- /dev/null +++ b/formal-model/ooomem-no-sched/read_order_no_rmb.define @@ -0,0 +1 @@ +#define NO_RMB diff --git a/formal-model/ooomem-no-sched/read_order_no_wmb.define b/formal-model/ooomem-no-sched/read_order_no_wmb.define new file mode 100644 index 0000000..710f29d --- /dev/null +++ b/formal-model/ooomem-no-sched/read_order_no_wmb.define @@ -0,0 +1 @@ +#define NO_WMB diff --git a/formal-model/ooomem-no-sched/references.txt b/formal-model/ooomem-no-sched/references.txt new file mode 100644 index 0000000..ca6798f --- /dev/null +++ b/formal-model/ooomem-no-sched/references.txt @@ -0,0 +1,7 @@ +http://spinroot.com/spin/Man/ltl.html +http://en.wikipedia.org/wiki/Linear_temporal_logic +http://www.dcs.gla.ac.uk/~muffy/MRS4-2002/lect11.ppt + +http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/index.php +http://spinroot.com/spin/Man/index.html +http://spinroot.com/spin/Man/promela.html diff --git a/formal-model/ooomem/DEFINES b/formal-model/ooomem/DEFINES deleted file mode 100644 index 04aa898..0000000 --- a/formal-model/ooomem/DEFINES +++ /dev/null @@ -1,2 +0,0 @@ -#define first_read_updated (first_read[0] == 6) -#define second_read_updated (second_read[0] == 4) diff --git a/formal-model/ooomem/Makefile b/formal-model/ooomem/Makefile deleted file mode 100644 index e0aed43..0000000 --- a/formal-model/ooomem/Makefile +++ /dev/null @@ -1,90 +0,0 @@ -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# Copyright (C) Mathieu Desnoyers, 2009 -# -# Authors: Mathieu Desnoyers - -#CFLAGS=-DSAFETY -CFLAGS=-DHASH64 - -SPINFILE=mem.spin - -default: - make read_order | tee read_order.log - make read_order_no_wmb | tee read_order_no_wmb.log - make read_order_no_rmb | tee read_order_no_rmb.log - make asserts | tee asserts.log - make summary - -#show trail : spin -v -t -N pan.ltl input.spin -# after each individual make. - -summary: - @echo - @echo "Verification summary" - @grep error *.log - -asserts: clean - cat DEFINES > .input.spin - 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 -w19 - cp .input.spin $@.spin.input - -cp .input.spin.trail $@.spin.input.trail - -read_order: clean read_order_ltl run - cp .input.spin $@.spin.input - -cp .input.spin.trail $@.spin.input.trail - -read_order_no_rmb: clean read_order_ltl read_order_no_rmb_define run - cp .input.spin $@.spin.input - -cp .input.spin.trail $@.spin.input.trail - -read_order_no_rmb_define: - cp read_order_no_rmb.define .input.define - -read_order_no_wmb: clean read_order_ltl read_order_no_wmb_define run - cp .input.spin $@.spin.input - -cp .input.spin.trail $@.spin.input.trail - -read_order_no_wmb_define: - cp read_order_no_wmb.define .input.define - -read_order_ltl: - touch .input.define - cat DEFINES > pan.ltl - cat .input.define >> pan.ltl - spin -f "!(`cat read_order.ltl | grep -v ^//`)" >> pan.ltl - -run: pan - ./pan -a -v -c1 -X -m10000 -w19 - -pan: pan.c - gcc -w ${CFLAGS} -o pan pan.c - -pan.c: pan.ltl ${SPINFILE} - cat DEFINES > .input.spin - cat .input.define >> .input.spin - cat ${SPINFILE} >> .input.spin - rm -f .input.spin.trail - spin -a -X -N pan.ltl .input.spin - -.PHONY: clean default distclean summary -clean: - rm -f pan* trail.out .input.spin* *.spin.trail .input.define -distclean: - rm -f *.trail *.input *.log diff --git a/formal-model/ooomem/mem.sh b/formal-model/ooomem/mem.sh deleted file mode 100644 index 56e8123..0000000 --- a/formal-model/ooomem/mem.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Compiles and runs the urcu.spin Promela model. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# Copyright (C) IBM Corporation, 2009 -# Mathieu Desnoyers, 2009 -# -# Authors: Paul E. McKenney -# Mathieu Desnoyers - -# Basic execution, without LTL clauses. See Makefile. - -spin -a mem.spin -cc -DSAFETY -o pan pan.c -./pan -v -c1 -X -m10000000 -w21 diff --git a/formal-model/ooomem/mem.spin b/formal-model/ooomem/mem.spin deleted file mode 100644 index a7f2d7d..0000000 --- a/formal-model/ooomem/mem.spin +++ /dev/null @@ -1,161 +0,0 @@ -/* - * mem.spin: Promela code to validate memory barriers with OOO memory. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * Copyright (c) 2009 Mathieu Desnoyers - */ - -/* Promela validation variables. */ - -#define NR_READERS 1 -#define NR_WRITERS 1 - -#define NR_PROCS 2 - -#define get_pid() (_pid) - -/* - * Each process have its own data in cache. Caches are randomly updated. - * smp_wmb and smp_rmb forces cache updates (write and read), wmb_mb forces - * both. - */ - -#define DECLARE_CACHED_VAR(type, x, v) \ - type mem_##x = v; \ - type cached_##x[NR_PROCS] = v; \ - bit cache_dirty_##x[NR_PROCS] = 0 - -#define IS_CACHE_DIRTY(x, id) (cache_dirty_##x[id]) - -#define READ_CACHED_VAR(x) (cached_##x[get_pid()]) - -#define WRITE_CACHED_VAR(x, v) \ - atomic { \ - cached_##x[get_pid()] = v; \ - cache_dirty_##x[get_pid()] = 1; \ - } - -#define CACHE_WRITE_TO_MEM(x, id) \ - if \ - :: IS_CACHE_DIRTY(x, id) -> \ - mem_##x = cached_##x[id]; \ - cache_dirty_##x[id] = 0; \ - :: else -> \ - skip \ - fi; - -#define CACHE_READ_FROM_MEM(x, id) \ - if \ - :: !IS_CACHE_DIRTY(x, id) -> \ - cached_##x[id] = mem_##x;\ - :: else -> \ - skip \ - fi; - -/* - * May update other caches if cache is dirty, or not. - */ -#define RANDOM_CACHE_WRITE_TO_MEM(x, id)\ - if \ - :: 1 -> CACHE_WRITE_TO_MEM(x, id); \ - :: 1 -> skip \ - fi; - -#define RANDOM_CACHE_READ_FROM_MEM(x, id)\ - if \ - :: 1 -> CACHE_READ_FROM_MEM(x, id); \ - :: 1 -> skip \ - fi; - -inline smp_rmb() -{ - atomic { - CACHE_READ_FROM_MEM(alpha, get_pid()); - CACHE_READ_FROM_MEM(beta, get_pid()); - } -} - -inline smp_wmb() -{ - atomic { - CACHE_WRITE_TO_MEM(alpha, get_pid()); - CACHE_WRITE_TO_MEM(beta, get_pid()); - } -} - -inline smp_mb() -{ - atomic { - smp_wmb(); - smp_rmb(); - } -} - -/* Keep in sync manually with smp_rmb, wmp_wmb and ooo_mem */ -DECLARE_CACHED_VAR(byte, alpha, 0); -DECLARE_CACHED_VAR(byte, beta, 0); - -inline ooo_mem() -{ - atomic { - RANDOM_CACHE_WRITE_TO_MEM(alpha, get_pid()); - RANDOM_CACHE_WRITE_TO_MEM(beta, get_pid()); - RANDOM_CACHE_READ_FROM_MEM(alpha, get_pid()); - RANDOM_CACHE_READ_FROM_MEM(beta, get_pid()); - } -} - -#define get_readerid() (get_pid()) - -byte first_read[NR_READERS]; -byte second_read[NR_READERS]; - -active [NR_READERS] proctype test_reader() -{ - assert(get_pid() < NR_PROCS); - - ooo_mem(); - first_read[get_readerid()] = READ_CACHED_VAR(beta); - ooo_mem(); -#ifndef NO_RMB - smp_rmb(); - ooo_mem(); -#endif - second_read[get_readerid()] = READ_CACHED_VAR(alpha); - ooo_mem(); - // test : [] (first_read == 6 -> <> second_read == 4) - assert(first_read[get_readerid()] != 6 - || second_read[get_readerid()] == 4); -} - -#define get_writerid() (get_readerid() + NR_READERS) - -active [NR_WRITERS] proctype test_writer() -{ - byte i; - - assert(get_pid() < NR_PROCS); - - ooo_mem(); - WRITE_CACHED_VAR(alpha, 4); - ooo_mem(); -#ifndef NO_WMB - smp_wmb(); - ooo_mem(); -#endif - WRITE_CACHED_VAR(beta, 6); - ooo_mem(); -} diff --git a/formal-model/ooomem/read_order.ltl b/formal-model/ooomem/read_order.ltl deleted file mode 100644 index b1cdfb7..0000000 --- a/formal-model/ooomem/read_order.ltl +++ /dev/null @@ -1 +0,0 @@ -[] (first_read_updated -> <> second_read_updated) diff --git a/formal-model/ooomem/read_order_no_rmb.define b/formal-model/ooomem/read_order_no_rmb.define deleted file mode 100644 index 73e61a4..0000000 --- a/formal-model/ooomem/read_order_no_rmb.define +++ /dev/null @@ -1 +0,0 @@ -#define NO_RMB diff --git a/formal-model/ooomem/read_order_no_wmb.define b/formal-model/ooomem/read_order_no_wmb.define deleted file mode 100644 index 710f29d..0000000 --- a/formal-model/ooomem/read_order_no_wmb.define +++ /dev/null @@ -1 +0,0 @@ -#define NO_WMB diff --git a/formal-model/ooomem/references.txt b/formal-model/ooomem/references.txt deleted file mode 100644 index ca6798f..0000000 --- a/formal-model/ooomem/references.txt +++ /dev/null @@ -1,7 +0,0 @@ -http://spinroot.com/spin/Man/ltl.html -http://en.wikipedia.org/wiki/Linear_temporal_logic -http://www.dcs.gla.ac.uk/~muffy/MRS4-2002/lect11.ppt - -http://www.lsv.ens-cachan.fr/~gastin/ltl2ba/index.php -http://spinroot.com/spin/Man/index.html -http://spinroot.com/spin/Man/promela.html