iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools/memory-model: Convert underscores to hyphens

Browse Source 
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>
This commit is contained in:
Paul E. McKenney 2018-02-20 15:25:11 -08:00 committed by Ingo Molnar
parent 556bb7d252
commit cac79a39f2
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/memory-model/linux-kernel.bell
View File

@ -28,9 +28,9 @@ enum Barriers = 'wmb (*smp_wmb*) ||
'rcu-lock (*rcu_read_lock*) || 'rcu-lock (*rcu_read_lock*) ||
'rcu-unlock (*rcu_read_unlock*) || 'rcu-unlock (*rcu_read_unlock*) ||
'sync-rcu (*synchronize_rcu*) || 'sync-rcu (*synchronize_rcu*) ||
'before_atomic (*smp_mb__before_atomic*) || 'before-atomic (*smp_mb__before_atomic*) ||
'after_atomic (*smp_mb__after_atomic*) || 'after-atomic (*smp_mb__after_atomic*) ||
'after_spinlock (*smp_mb__after_spinlock*) 'after-spinlock (*smp_mb__after_spinlock*)
instructions F[Barriers] instructions F[Barriers]
(* Compute matching pairs of nested Rcu-lock and Rcu-unlock *) (* Compute matching pairs of nested Rcu-lock and Rcu-unlock *)

6
tools/memory-model/linux-kernel.cat
View File

@ -29,9 +29,9 @@ let rb-dep = [R] ; fencerel(Rb_dep) ; [R]
let rmb = [R \ Noreturn] ; fencerel(Rmb) ; [R \ Noreturn] let rmb = [R \ Noreturn] ; fencerel(Rmb) ; [R \ Noreturn]
let wmb = [W] ; fencerel(Wmb) ; [W] let wmb = [W] ; fencerel(Wmb) ; [W]
let mb = ([M] ; fencerel(Mb) ; [M]) | let mb = ([M] ; fencerel(Mb) ; [M]) |
([M] ; fencerel(Before_atomic) ; [RMW] ; po? ; [M]) | ([M] ; fencerel(Before-atomic) ; [RMW] ; po? ; [M]) |
([M] ; po? ; [RMW] ; fencerel(After_atomic) ; [M]) | ([M] ; po? ; [RMW] ; fencerel(After-atomic) ; [M]) |
([M] ; po? ; [LKW] ; fencerel(After_spinlock) ; [M]) ([M] ; po? ; [LKW] ; fencerel(After-spinlock) ; [M])
let gp = po ; [Sync-rcu] ; po? let gp = po ; [Sync-rcu] ; po?
let strong-fence = mb | gp let strong-fence = mb | gp

6
tools/memory-model/linux-kernel.def
View File

@ -21,9 +21,9 @@ smp_mb() { __fence{mb} ; }
smp_rmb() { __fence{rmb} ; } smp_rmb() { __fence{rmb} ; }
smp_wmb() { __fence{wmb} ; } smp_wmb() { __fence{wmb} ; }
smp_read_barrier_depends() { __fence{rb_dep}; } smp_read_barrier_depends() { __fence{rb_dep}; }
smp_mb__before_atomic() { __fence{before_atomic} ; } smp_mb__before_atomic() { __fence{before-atomic} ; }
smp_mb__after_atomic() { __fence{after_atomic} ; } smp_mb__after_atomic() { __fence{after-atomic} ; }
smp_mb__after_spinlock() { __fence{after_spinlock} ; } smp_mb__after_spinlock() { __fence{after-spinlock} ; }
// Exchange // Exchange
xchg(X,V) __xchg{mb}(X,V) xchg(X,V) __xchg{mb}(X,V)