Re: [PATCH v2] tools/memory-model: Make compat with herd7 7.47 ("-" -> "_")

["Paul E. McKenney" <paulmck@linux.vnet.ibm.com>]

On Sat, Feb 10, 2018 at 08:46:25AM +0900, Akira Yokosawa wrote:
> >From 7c1f497a9a51e8db1a94c8a7ef0b74b235aaab88 Mon Sep 17 00:00:00 2001
> From: Akira Yokosawa <akiyks@gmail.com>
> Date: Fri, 9 Feb 2018 04:51:05 -0800
> Subject: [PATCH v2] tools/memory-model: Make compat with herd7 7.47 ("-" -> "_")
> 
> As of herd7 7.47, these '-'s are not permitted and end up in
> errors such as:
> 
>     File "./linux-kernel.def", line 44, characters 29-30:
>     unexpected '-' (in macros)
> 
> Partial revert of commit 2d5fba7782d6 ("linux-kernel*: Make RCU
> identifiers match ASPLOS paper") in the repository at
> https://github.com/aparri/memory-model can restore the compatibility
> with herd7 7.47.
> 
> Reported-by: Patrick Bellasi <patrick.bellasi@arm.com>
> Suggested-by: Andrea Parri <parri.andrea@gmail.com>
> Signed-off-by: Akira Yokosawa <akiyks@gmail.com>
> ---
> Paul,
> 
> FWIW, this is a squashed version relative to patch 07/10 in the RFC series.

Thank you, Akira!

I am going to hold off on this for a bit to see if we can instead get
a new release of herd7, but if we can't. this might well be a very good
way to go.

							Thanx, Paul

>     Thanks, Akira
> --
>  tools/memory-model/linux-kernel.bell | 14 +++++++-------
>  tools/memory-model/linux-kernel.cat  |  2 +-
>  tools/memory-model/linux-kernel.def  |  8 ++++----
>  3 files changed, 12 insertions(+), 12 deletions(-)
> 
> diff --git a/tools/memory-model/linux-kernel.bell b/tools/memory-model/linux-kernel.bell
> index b984bbd..436791b 100644
> --- a/tools/memory-model/linux-kernel.bell
> +++ b/tools/memory-model/linux-kernel.bell
> @@ -25,9 +25,9 @@ enum Barriers = 'wmb (*smp_wmb*) ||
>  		'rmb (*smp_rmb*) ||
>  		'mb (*smp_mb*) ||
>  		'rb_dep (*smp_read_barrier_depends*) ||
> -		'rcu-lock (*rcu_read_lock*)  ||
> -		'rcu-unlock (*rcu_read_unlock*) ||
> -		'sync-rcu (*synchronize_rcu*) ||
> +		'rcu_lock (*rcu_read_lock*)  ||
> +		'rcu_unlock (*rcu_read_unlock*) ||
> +		'sync_rcu (*synchronize_rcu*) ||
>  		'before_atomic (*smp_mb__before_atomic*) ||
>  		'after_atomic (*smp_mb__after_atomic*) ||
>  		'after_spinlock (*smp_mb__after_spinlock*)
> @@ -35,8 +35,8 @@ instructions F[Barriers]
> 
>  (* Compute matching pairs of nested Rcu-lock and Rcu-unlock *)
>  let matched = let rec
> -	    unmatched-locks = Rcu-lock \ domain(matched)
> -	and unmatched-unlocks = Rcu-unlock \ range(matched)
> +	    unmatched-locks = Rcu_lock \ domain(matched)
> +	and unmatched-unlocks = Rcu_unlock \ range(matched)
>  	and unmatched = unmatched-locks | unmatched-unlocks
>  	and unmatched-po = [unmatched] ; po ; [unmatched]
>  	and unmatched-locks-to-unlocks =
> @@ -46,8 +46,8 @@ let matched = let rec
>  	in matched
> 
>  (* Validate nesting *)
> -flag ~empty Rcu-lock \ domain(matched) as unbalanced-rcu-locking
> -flag ~empty Rcu-unlock \ range(matched) as unbalanced-rcu-locking
> +flag ~empty Rcu_lock \ domain(matched) as unbalanced-rcu-locking
> +flag ~empty Rcu_unlock \ range(matched) as unbalanced-rcu-locking
> 
>  (* Outermost level of nesting only *)
>  let crit = matched \ (po^-1 ; matched ; po^-1)
> diff --git a/tools/memory-model/linux-kernel.cat b/tools/memory-model/linux-kernel.cat
> index babe2b3..d0085d5 100644
> --- a/tools/memory-model/linux-kernel.cat
> +++ b/tools/memory-model/linux-kernel.cat
> @@ -32,7 +32,7 @@ let mb = ([M] ; fencerel(Mb) ; [M]) |
>  	([M] ; fencerel(Before_atomic) ; [RMW] ; po? ; [M]) |
>  	([M] ; po? ; [RMW] ; fencerel(After_atomic) ; [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
> 
> diff --git a/tools/memory-model/linux-kernel.def b/tools/memory-model/linux-kernel.def
> index a397387..fc08371 100644
> --- a/tools/memory-model/linux-kernel.def
> +++ b/tools/memory-model/linux-kernel.def
> @@ -41,10 +41,10 @@ spin_unlock(X) { __unlock(X) ; }
>  spin_trylock(X) __trylock(X)
> 
>  // RCU
> -rcu_read_lock() { __fence{rcu-lock}; }
> -rcu_read_unlock() { __fence{rcu-unlock};}
> -synchronize_rcu() { __fence{sync-rcu}; }
> -synchronize_rcu_expedited() { __fence{sync-rcu}; }
> +rcu_read_lock() { __fence{rcu_lock}; }
> +rcu_read_unlock() { __fence{rcu_unlock};}
> +synchronize_rcu() { __fence{sync_rcu}; }
> +synchronize_rcu_expedited() { __fence{sync_rcu}; }
> 
>  // Atomic
>  atomic_read(X) READ_ONCE(*X)
> -- 
> 2.7.4
> 
>