From owner-p4-projects@FreeBSD.ORG  Mon Mar  7 21:46:37 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0F17D16A4D2; Mon,  7 Mar 2005 21:46:37 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id C1AA616A4CE
	for <perforce@freebsd.org>; Mon,  7 Mar 2005 21:46:36 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2786943D31
	for <perforce@freebsd.org>; Mon,  7 Mar 2005 21:46:36 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j27LkZin025446
	for <perforce@freebsd.org>; Mon, 7 Mar 2005 21:46:36 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j27LkZ46025443
	for perforce@freebsd.org; Mon, 7 Mar 2005 21:46:35 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 7 Mar 2005 21:46:35 GMT
Message-Id: <200503072146.j27LkZ46025443@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 72662 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 07 Mar 2005 21:46:37 -0000

http://perforce.freebsd.org/chv.cgi?CH=72662

Change 72662 by jhb@jhb_slimer on 2005/03/07 21:46:07

	Move acq barriers back to being after the operation (alc@), and
	reduce duplication in amd64 versions by moving the membars out
	of the atomic op __asm().

Affected files ...

.. //depot/projects/smpng/sys/alpha/include/atomic.h#11 edit
.. //depot/projects/smpng/sys/amd64/include/atomic.h#8 edit

Differences ...

==== //depot/projects/smpng/sys/alpha/include/atomic.h#11 (text+ko) ====

@@ -228,9 +228,9 @@
 static __inline void							\
 atomic_##NAME##_acq_##WIDTH(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\
 {									\
+	atomic_##NAME##_##WIDTH(p, v);					\
 	alpha_mb(); 							\
 	__asm __volatile("" ::: "memory");				\
-	atomic_##NAME##_##WIDTH(p, v);					\
 }									\
 									\
 static __inline void							\
@@ -243,9 +243,9 @@
 static __inline void							\
 atomic_##NAME##_acq_##TYPE(volatile u_int##WIDTH##_t *p, u_int##WIDTH##_t v)\
 {									\
+	atomic_##NAME##_##WIDTH(p, v);					\
 	alpha_mb();							\
 	__asm __volatile("" ::: "memory");				\
-	atomic_##NAME##_##WIDTH(p, v);					\
 }									\
 									\
 static __inline void							\
@@ -283,9 +283,9 @@
 {							\
 	u_##TYPE v;					\
 							\
+	v = *p;						\
 	alpha_mb();					\
 	__asm __volatile("" ::: "memory");		\
-	v = *p;						\
 	return (v);					\
 }							\
 							\
@@ -301,9 +301,9 @@
 {							\
 	u_##TYPE v;					\
 							\
+	v = *p;						\
 	alpha_mb();					\
 	__asm __volatile("" ::: "memory");		\
-	v = *p;						\
 	return (v);					\
 }							\
 							\
@@ -389,9 +389,9 @@
 {
 	int retval;
 
+	retval = atomic_cmpset_32(p, cmpval, newval);
 	alpha_mb();
 	__asm __volatile("" ::: "memory");
-	retval = atomic_cmpset_32(p, cmpval, newval);
 	return (retval);
 }
 
@@ -407,9 +407,9 @@
 {
 	int retval;
 
+	retval = atomic_cmpset_64(p, cmpval, newval);
 	alpha_mb();
 	__asm __volatile("" ::: "memory");
-	retval = atomic_cmpset_64(p, cmpval, newval);
 	return (retval);
 }
 

==== //depot/projects/smpng/sys/amd64/include/atomic.h#8 (text+ko) ====

@@ -110,18 +110,15 @@
 static __inline void					\
 atomic_##NAME##_##TYPE##_acq(volatile u_##TYPE *p, u_##TYPE v)\
 {							\
-	__asm __volatile(MPLFENCE MPLOCKED OP		\
-			 : "=m" (*p)			\
-			 : CONS (V), "m" (*p)		\
-			 : "memory");			\
+	atomic_##NAME_##TYPE(p, v);			\
+	__asm __volatile(MPLFENCE ::: "memory");	\
 }							\
 							\
 static __inline void					\
 atomic_##NAME##_##TYPE##_rel(volatile u_##TYPE *p, u_##TYPE v)\
 {							\
-	__asm __volatile(MPSFENCE MPLOCKED OP		\
-			 : "=m" (*p)			\
-			 : CONS (V), "m" (*p));		\
+	__asm __volatile(MPSFENCE);			\
+	atomic_##NAME_##TYPE(p, v);			\
 }							\
 struct __hack
 
@@ -186,8 +183,11 @@
 static __inline int					\
 atomic_cmpset_acq_##TYPE(volatile u_##TYPE *dst, u_##TYPE exp, u_##TYPE src)\
 {							\
+	int retval;					\
+							\
+	retval = atomic_cmpset_##TYPE(dst, exp, src);	\
 	__asm __volatile(MPLFENCE ::: "memory");	\
-	return (atomic_cmpset_##TYPE(dst, exp, src);	\
+	return (retval);				\
 }							\
 							\
 static __inline int					\