CodeSamples/count: change full memory barrier to partial one
PATCH 1/1 CodeSamples/count: change full memory barrier to partial one
The original memory barriers in count_stat_eventual.c ensure writing to global_count happens before writing to stopflag and reading from stopflag happens before later reading from global_count.
Thus, smp_load_acquire and smp_store_release will suffice.
In count_lim_sig.c, there is only one ordering required, that is writing to counter happens before setting theft to THEFT_READY in add_count/sub_count's fast path. Therefore, partial memory barrier will suffice.
--- CodeSamples/count/count_lim_sig.c | 10 +++------- CodeSamples/count/count_stat_eventual.c | 6 ++---- 2 files changed, 5 insertions(+), 11 deletions(-)
CodeSamples/count/count_lim_sig.c +3 -7
@@ -56,12 +56,10 @@ static void flush_local_count_sig(int unused) //\lnlbl{flush_sig:b} {if (READ_ONCE (theft) !=THEFT_REQ )//\lnlbl{flush_sig:check:REQ} return ;//\lnlbl{flush_sig:return:n} -smp_mb ();//\lnlbl{flush_sig:mb:1} WRITE_ONCE (theft,THEFT_ACK );//\lnlbl{flush_sig:set:ACK} if (!counting) {//\lnlbl{flush_sig:check:fast} -WRITE_ONCE (theft,THEFT_READY );//\lnlbl{flush_sig:set:READY} +smp_store_release (&theft,THEFT_READY );//\lnlbl{flush_sig:set:READY} } -smp_mb (); }//\lnlbl{flush_sig:e} static void flush_local_count (void )//\lnlbl{flush:b}
@@ -125,8 +123,7 @@ int add_count(unsigned long delta) //\lnlbl{b}WRITE_ONCE (counting,0 );//\lnlbl{clearcnt} barrier ();//\lnlbl{barrier:3} if (READ_ONCE (theft) ==THEFT_ACK ) {//\lnlbl{check:ACK} -smp_mb ();//\lnlbl{mb} -WRITE_ONCE (theft,THEFT_READY );//\lnlbl{READY} +smp_store_release (&theft,THEFT_READY );//\lnlbl{READY} }if (fastpath)return 1 ;//\lnlbl{return:fs}
@@ -164,8 +161,7 @@ int sub_count(unsigned long delta)WRITE_ONCE (counting,0 );barrier ();if (READ_ONCE (theft) ==THEFT_ACK ) { -smp_mb (); -WRITE_ONCE (theft,THEFT_READY ); +smp_store_release (&theft,THEFT_READY ); }if (fastpath)return 1 ;
CodeSamples/count/count_stat_eventual.c +2 -4
@@ -51,8 +51,7 @@ void *eventual(void *arg) //\lnlbl{eventual:b}WRITE_ONCE (global_count, sum);poll (NULL ,0 ,1 );if (READ_ONCE (stopflag)) { -smp_mb (); -WRITE_ONCE (stopflag, stopflag +1 ); +smp_store_release (&stopflag, stopflag +1 ); } }return NULL ;
@@ -73,9 +72,8 @@ void count_init(void) //\lnlbl{init:b}void count_cleanup (void )//\lnlbl{cleanup:b} {WRITE_ONCE (stopflag,1 ); -while (READ_ONCE (stopflag) <3 ) +while (smp_load_acquire (&stopflag) <3 )poll (NULL ,0 ,1 ); -smp_mb (); }//\lnlbl{cleanup:e} //\end{snippet}
Signature · 1 line
2.34.1
Hi Alan,
Thanks for your continued efforts.
Unfortunately, I (as a LaTeX adviser) see a couple of problems. Please see below.
Quoted 22 lines · Alan Huang
The original memory barriers in
count_stat_eventual.censure writing toglobal_counthappens before writing to stopflag and reading from stopflag happens before later reading fromglobal_count.Thus,
smp_load_acquireandsmp_store_releasewill suffice.In
count_lim_sig.c, there is only one ordering required, that is writing to counter happens before setting theft toTHEFT_READYin add_count/sub_count's fast path. Therefore, partial memory barrier will suffice.Signed-off-by Alan Huang <[email protected]>--- CodeSamples/count/count_lim_sig.c | 10 +++------- CodeSamples/count/count_stat_eventual.c | 6 ++---- 2 files changed, 5 insertions(+), 11 deletions(-)CodeSamples/count/count_lim_sig.c +0
-0
CodeSamples/count/count_lim_sig.c static void flush_local_count_sig(int unused) //\lnlbl{flush_sig:b} · line 59
Quoted 4 lines
CodeSamples/count/count_lim_sig.c +0
-1@@ -56,12 +56,10 @@ static void flush_local_count_sig(int unused) //\lnlbl{flush_sig:b} {if (READ_ONCE (theft) !=THEFT_REQ )//\lnlbl{flush_sig:check:REQ} return ;//\lnlbl{flush_sig:return:n} -smp_mb ();//\lnlbl{flush_sig:mb:1}
Removing a line that has //\lnlbl{foo} from a code snippet will cause warnings of "Reference ... undefined on ...".
I think you will see warnings that look like:
----- Excerpt around remaining warning messages -----
[63]
<count/sig-theft.pdf, id=5442, 172.645pt x 234.8775pt>
File: count/sig-theft.pdf Graphic file (type pdf)
<use count/sig-theft.pdf>
Package pdftex.def Info: count/sig-theft.pdf used on input line 2303.
(pdftex.def) Requested size: 172.64456pt x 234.87692pt.
[64 <./count/sig-theft.pdf>] (./CodeSamples/count/[email protected])
LaTeX Warning: Reference `ln:count:count_lim_sig:migration:flush_sig:mb:1' on p age 65 undefined on input line 2428.
[...]
You need to update text-side references to the to-be-removed label. You will likely need to adjust wording in surrounding text as well.
If you are wondering how these labels in code snippets can be referenced from LaTeX sources, please see Appendix D.3.1.1.
Quoted 10 lines
CodeSamples/count/count_lim_sig.c +1
-2WRITE_ONCE (theft,THEFT_ACK );//\lnlbl{flush_sig:set:ACK} if (!counting) {//\lnlbl{flush_sig:check:fast} -WRITE_ONCE (theft,THEFT_READY );//\lnlbl{flush_sig:set:READY} +smp_store_release (&theft,THEFT_READY );//\lnlbl{flush_sig:set:READY} } -smp_mb (); }//\lnlbl{flush_sig:e} static void flush_local_count (void )//\lnlbl{flush:b}
CodeSamples/count/count_lim_sig.c int add_count(unsigned long delta) //\lnlbl{b} · line 128
Quoted 4 lines
CodeSamples/count/count_lim_sig.c +0
-1@@ -125,8 +123,7 @@ int add_count(unsigned long delta) //\lnlbl{b}WRITE_ONCE (counting,0 );//\lnlbl{clearcnt} barrier ();//\lnlbl{barrier:3} if (READ_ONCE (theft) ==THEFT_ACK ) {//\lnlbl{check:ACK} -smp_mb ();//\lnlbl{mb}
Ditto.
Can you submit a v2 including text-side updates?
In the meantime, I'll review your code changes.
Thanks, Akira
Quoted 40 lines
CodeSamples/count/count_lim_sig.c +2
-3-WRITE_ONCE (theft,THEFT_READY );//\lnlbl{READY} +smp_store_release (&theft,THEFT_READY );//\lnlbl{READY} }if (fastpath)return 1 ;//\lnlbl{return:fs} @@ -164,8 +161,7 @@ int sub_count(unsigned long delta)WRITE_ONCE (counting,0 );barrier ();if (READ_ONCE (theft) ==THEFT_ACK ) { -smp_mb (); -WRITE_ONCE (theft,THEFT_READY ); +smp_store_release (&theft,THEFT_READY ); }if (fastpath)return 1 ;CodeSamples/count/count_stat_eventual.c +2
-4@@ -51,8 +51,7 @@ void *eventual(void *arg) //\lnlbl{eventual:b}WRITE_ONCE (global_count, sum);poll (NULL ,0 ,1 );if (READ_ONCE (stopflag)) { -smp_mb (); -WRITE_ONCE (stopflag, stopflag +1 ); +smp_store_release (&stopflag, stopflag +1 ); } }return NULL ;@@ -73,9 +72,8 @@ void count_init(void) //\lnlbl{init:b}void count_cleanup (void )//\lnlbl{cleanup:b} {WRITE_ONCE (stopflag,1 ); -while (READ_ONCE (stopflag) <3 ) +while (smp_load_acquire (&stopflag) <3 )poll (NULL ,0 ,1 ); -smp_mb (); }//\lnlbl{cleanup:e} //\end{snippet}
Hi Akira,
Thanks for your advice!
I’ll try to fix that.
Thanks,
Alan
Quoted 124 lines
2023年4月4日 下午7:28,Akira Yokosawa <[email protected]> 写道:
Hi Alan,
Thanks for your continued efforts.
Unfortunately, I (as a LaTeX adviser) see a couple of problems. Please see below.Quoted 22 lines · Alan Huang
The original memory barriers in
count_stat_eventual.censure writing toglobal_counthappens before writing to stopflag and reading from stopflag happens before later reading fromglobal_count.Thus,
smp_load_acquireandsmp_store_releasewill suffice.In
count_lim_sig.c, there is only one ordering required, that is writing to counter happens before setting theft toTHEFT_READYin add_count/sub_count's fast path. Therefore, partial memory barrier will suffice.Signed-off-by Alan Huang <[email protected]>---
CodeSamples/count/count_lim_sig.c| 10 +++-------CodeSamples/count/count_stat_eventual.c| 6 ++----2 files changed, 5 insertions(+), 11 deletions(-)CodeSamples/count/count_lim_sig.c +0
-0CodeSamples/count/count_lim_sig.c static void flush_local_count_sig(int unused) //\lnlbl{flush_sig:b} · line 59
Quoted 4 lines
CodeSamples/count/count_lim_sig.c +0
-1@@ -56,12 +56,10 @@ static void flush_local_count_sig(int unused) //\lnlbl{flush_sig:b} {if (READ_ONCE (theft) !=THEFT_REQ )//\lnlbl{flush_sig:check:REQ} return ;//\lnlbl{flush_sig:return:n} -smp_mb ();//\lnlbl{flush_sig:mb:1} Removing a line that has //\lnlbl{foo} from a code snippet will cause warnings of "Reference ... undefined on ...".
I think you will see warnings that look like:
----- Excerpt around remaining warning messages -----
[63]
<count/sig-theft.pdf, id=5442, 172.645pt x 234.8775pt>
File: count/sig-theft.pdf Graphic file (type pdf)
<use count/sig-theft.pdf>
Package pdftex.def Info: count/sig-theft.pdf used on input line 2303.
(pdftex.def) Requested size: 172.64456pt x 234.87692pt.
[64 <./count/sig-theft.pdf>] (./CodeSamples/count/[email protected] <mailto:CodeSamples/count/[email protected]>)LaTeX Warning: Reference `ln:count:count_lim_sig:migration:flush_sig:mb:1' on p age 65 undefined on input line 2428.
[...]You need to update text-side references to the to-be-removed label. You will likely need to adjust wording in surrounding text as well.
If you are wondering how these labels in code snippets can be referenced from LaTeX sources, please see Appendix D.3.1.1.
Quoted 10 lines
CodeSamples/count/count_lim_sig.c +1
-2WRITE_ONCE (theft,THEFT_ACK );//\lnlbl{flush_sig:set:ACK} if (!counting) {//\lnlbl{flush_sig:check:fast} -WRITE_ONCE (theft,THEFT_READY );//\lnlbl{flush_sig:set:READY} +smp_store_release (&theft,THEFT_READY );//\lnlbl{flush_sig:set:READY} } -smp_mb (); }//\lnlbl{flush_sig:e} static void flush_local_count (void )//\lnlbl{flush:b} CodeSamples/count/count_lim_sig.c int add_count(unsigned long delta) //\lnlbl{b} · line 128
Quoted 4 lines
CodeSamples/count/count_lim_sig.c +0
-1@@ -125,8 +123,7 @@ int add_count(unsigned long delta) //\lnlbl{b}WRITE_ONCE (counting,0 );//\lnlbl{clearcnt} barrier ();//\lnlbl{barrier:3} if (READ_ONCE (theft) ==THEFT_ACK ) {//\lnlbl{check:ACK} -smp_mb ();//\lnlbl{mb} Ditto.
Can you submit a v2 including text-side updates?
In the meantime, I'll review your code changes.
Thanks, Akira
Quoted 39 lines
CodeSamples/count/count_lim_sig.c +2
-3-WRITE_ONCE (theft,THEFT_READY );//\lnlbl{READY} +smp_store_release (&theft,THEFT_READY );//\lnlbl{READY} }if (fastpath)return 1 ;//\lnlbl{return:fs} @@ -164,8 +161,7 @@ int sub_count(unsigned long delta)WRITE_ONCE (counting,0 );barrier ();if (READ_ONCE (theft) ==THEFT_ACK ) { -smp_mb (); -WRITE_ONCE (theft,THEFT_READY ); +smp_store_release (&theft,THEFT_READY ); }if (fastpath)return 1 ;CodeSamples/count/count_stat_eventual.c +2
-4@@ -51,8 +51,7 @@ void *eventual(void *arg) //\lnlbl{eventual:b}WRITE_ONCE (global_count, sum);poll (NULL ,0 ,1 );if (READ_ONCE (stopflag)) { -smp_mb (); -WRITE_ONCE (stopflag, stopflag +1 ); +smp_store_release (&stopflag, stopflag +1 ); } }return NULL ;@@ -73,9 +72,8 @@ void count_init(void) //\lnlbl{init:b}void count_cleanup (void )//\lnlbl{cleanup:b} {WRITE_ONCE (stopflag,1 ); -while (READ_ONCE (stopflag) <3 ) +while (smp_load_acquire (&stopflag) <3 )poll (NULL ,0 ,1 ); -smp_mb (); }//\lnlbl{cleanup:e} //\end{snippet}
Hi Akira,
Thanks for your advice!
I’ll try to fix that.
Thanks,
Alan
Quoted 124 lines
2023年4月4日 下午7:28,Akira Yokosawa <[email protected]> 写道:
Hi Alan,
Thanks for your continued efforts.
Unfortunately, I (as a LaTeX adviser) see a couple of problems. Please see below.Quoted 22 lines · Alan Huang
The original memory barriers in
count_stat_eventual.censure writing toglobal_counthappens before writing to stopflag and reading from stopflag happens before later reading fromglobal_count.Thus,
smp_load_acquireandsmp_store_releasewill suffice.In
count_lim_sig.c, there is only one ordering required, that is writing to counter happens before setting theft toTHEFT_READYin add_count/sub_count's fast path. Therefore, partial memory barrier will suffice.Signed-off-by Alan Huang <[email protected]>---
CodeSamples/count/count_lim_sig.c| 10 +++-------CodeSamples/count/count_stat_eventual.c| 6 ++----2 files changed, 5 insertions(+), 11 deletions(-)CodeSamples/count/count_lim_sig.c +0
-0CodeSamples/count/count_lim_sig.c static void flush_local_count_sig(int unused) //\lnlbl{flush_sig:b} · line 59
Quoted 4 lines
CodeSamples/count/count_lim_sig.c +0
-1@@ -56,12 +56,10 @@ static void flush_local_count_sig(int unused) //\lnlbl{flush_sig:b} {if (READ_ONCE (theft) !=THEFT_REQ )//\lnlbl{flush_sig:check:REQ} return ;//\lnlbl{flush_sig:return:n} -smp_mb ();//\lnlbl{flush_sig:mb:1} Removing a line that has //\lnlbl{foo} from a code snippet will cause warnings of "Reference ... undefined on ...".
I think you will see warnings that look like:
----- Excerpt around remaining warning messages -----
[63]
<count/sig-theft.pdf, id=5442, 172.645pt x 234.8775pt>
File: count/sig-theft.pdf Graphic file (type pdf)
<use count/sig-theft.pdf>
Package pdftex.def Info: count/sig-theft.pdf used on input line 2303.
(pdftex.def) Requested size: 172.64456pt x 234.87692pt.[64 <./count/sig-theft.pdf>] (./CodeSamples/count/[email protected])LaTeX Warning: Reference `ln:count:count_lim_sig:migration:flush_sig:mb:1' on p age 65 undefined on input line 2428.
[...]You need to update text-side references to the to-be-removed label. You will likely need to adjust wording in surrounding text as well.
If you are wondering how these labels in code snippets can be referenced from LaTeX sources, please see Appendix D.3.1.1.
Quoted 10 lines
CodeSamples/count/count_lim_sig.c +1
-2WRITE_ONCE (theft,THEFT_ACK );//\lnlbl{flush_sig:set:ACK} if (!counting) {//\lnlbl{flush_sig:check:fast} -WRITE_ONCE (theft,THEFT_READY );//\lnlbl{flush_sig:set:READY} +smp_store_release (&theft,THEFT_READY );//\lnlbl{flush_sig:set:READY} } -smp_mb (); }//\lnlbl{flush_sig:e} static void flush_local_count (void )//\lnlbl{flush:b} CodeSamples/count/count_lim_sig.c int add_count(unsigned long delta) //\lnlbl{b} · line 128
Quoted 4 lines
CodeSamples/count/count_lim_sig.c +0
-1@@ -125,8 +123,7 @@ int add_count(unsigned long delta) //\lnlbl{b}WRITE_ONCE (counting,0 );//\lnlbl{clearcnt} barrier ();//\lnlbl{barrier:3} if (READ_ONCE (theft) ==THEFT_ACK ) {//\lnlbl{check:ACK} -smp_mb ();//\lnlbl{mb} Ditto.
Can you submit a v2 including text-side updates?
In the meantime, I'll review your code changes.
Thanks, Akira
Quoted 39 lines
CodeSamples/count/count_lim_sig.c +2
-3-WRITE_ONCE (theft,THEFT_READY );//\lnlbl{READY} +smp_store_release (&theft,THEFT_READY );//\lnlbl{READY} }if (fastpath)return 1 ;//\lnlbl{return:fs} @@ -164,8 +161,7 @@ int sub_count(unsigned long delta)WRITE_ONCE (counting,0 );barrier ();if (READ_ONCE (theft) ==THEFT_ACK ) { -smp_mb (); -WRITE_ONCE (theft,THEFT_READY ); +smp_store_release (&theft,THEFT_READY ); }if (fastpath)return 1 ;CodeSamples/count/count_stat_eventual.c +2
-4@@ -51,8 +51,7 @@ void *eventual(void *arg) //\lnlbl{eventual:b}WRITE_ONCE (global_count, sum);poll (NULL ,0 ,1 );if (READ_ONCE (stopflag)) { -smp_mb (); -WRITE_ONCE (stopflag, stopflag +1 ); +smp_store_release (&stopflag, stopflag +1 ); } }return NULL ;@@ -73,9 +72,8 @@ void count_init(void) //\lnlbl{init:b}void count_cleanup (void )//\lnlbl{cleanup:b} {WRITE_ONCE (stopflag,1 ); -while (READ_ONCE (stopflag) <3 ) +while (smp_load_acquire (&stopflag) <3 )poll (NULL ,0 ,1 ); -smp_mb (); }//\lnlbl{cleanup:e} //\end{snippet}