Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tools/memory-model: Convert underscores to hyphens

Typical cat-language code uses hyphens for word separators in
identifiers, but several LKMM identifiers use underscores instead.
This commit therefore converts underscores to hyphens in the .bell-
and .cat-file identifiers corresponding to smp_mb__before_atomic(),
smp_mb__after_atomic(), and smp_mb__after_spinlock().

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Acked-by: Peter Zijlstra <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: akiyks@gmail.com
Cc: boqun.feng@gmail.com
Cc: dhowells@redhat.com
Cc: j.alglave@ucl.ac.uk
Cc: linux-arch@vger.kernel.org
Cc: luc.maranget@inria.fr
Cc: nborisov@suse.com
Cc: npiggin@gmail.com
Cc: parri.andrea@gmail.com
Cc: stern@rowland.harvard.edu
Cc: will.deacon@arm.com
Link: http://lkml.kernel.org/r/1519169112-20593-11-git-send-email-paulmck@linux.vnet.ibm.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>

authored by

Paul E. McKenney and committed by
Ingo Molnar
cac79a39 556bb7d2

+9 -9
+3 -3
tools/memory-model/linux-kernel.bell
··· 28 28 'rcu-lock (*rcu_read_lock*) || 29 29 'rcu-unlock (*rcu_read_unlock*) || 30 30 'sync-rcu (*synchronize_rcu*) || 31 - 'before_atomic (*smp_mb__before_atomic*) || 32 - 'after_atomic (*smp_mb__after_atomic*) || 33 - 'after_spinlock (*smp_mb__after_spinlock*) 31 + 'before-atomic (*smp_mb__before_atomic*) || 32 + 'after-atomic (*smp_mb__after_atomic*) || 33 + 'after-spinlock (*smp_mb__after_spinlock*) 34 34 instructions F[Barriers] 35 35 36 36 (* Compute matching pairs of nested Rcu-lock and Rcu-unlock *)
+3 -3
tools/memory-model/linux-kernel.cat
··· 29 29 let rmb = [R \ Noreturn] ; fencerel(Rmb) ; [R \ Noreturn] 30 30 let wmb = [W] ; fencerel(Wmb) ; [W] 31 31 let mb = ([M] ; fencerel(Mb) ; [M]) | 32 - ([M] ; fencerel(Before_atomic) ; [RMW] ; po? ; [M]) | 33 - ([M] ; po? ; [RMW] ; fencerel(After_atomic) ; [M]) | 34 - ([M] ; po? ; [LKW] ; fencerel(After_spinlock) ; [M]) 32 + ([M] ; fencerel(Before-atomic) ; [RMW] ; po? ; [M]) | 33 + ([M] ; po? ; [RMW] ; fencerel(After-atomic) ; [M]) | 34 + ([M] ; po? ; [LKW] ; fencerel(After-spinlock) ; [M]) 35 35 let gp = po ; [Sync-rcu] ; po? 36 36 37 37 let strong-fence = mb | gp
+3 -3
tools/memory-model/linux-kernel.def
··· 21 21 smp_rmb() { __fence{rmb} ; } 22 22 smp_wmb() { __fence{wmb} ; } 23 23 smp_read_barrier_depends() { __fence{rb_dep}; } 24 - smp_mb__before_atomic() { __fence{before_atomic} ; } 25 - smp_mb__after_atomic() { __fence{after_atomic} ; } 26 - smp_mb__after_spinlock() { __fence{after_spinlock} ; } 24 + smp_mb__before_atomic() { __fence{before-atomic} ; } 25 + smp_mb__after_atomic() { __fence{after-atomic} ; } 26 + smp_mb__after_spinlock() { __fence{after-spinlock} ; } 27 27 28 28 // Exchange 29 29 xchg(X,V) __xchg{mb}(X,V)