[gen] add back Amo.StAdd and Amo.LdAdd in baseline configuration file.

Add back `Amo.StAdd` and `Amo.LdAdd` as the representation for all other
atomic operation. We also remove `[Q Amo.* ***]` as `Q` cannot apply to
`Amo.*`

Author: Shale Xiong

gen/libdir/forbidden.conf

@@ -214,12 +214,12 @@
 # An acquire atomic operation followed by a memory access also matches above
 -safe [A Amo.Swp PodW* ExpObs] [A Amo.Swp PosWR ExpObs]
 -safe [A Amo.Cas PodW* ExpObs] [A Amo.Cas PosWR ExpObs]
+-safe [A Amo.StAdd PodW* ExpObs] [A Amo.StAdd PosWR ExpObs]
+-safe [A Amo.LdAdd PodW* ExpObs] [A Amo.LdAdd PosWR ExpObs]
 -safe [A LxSx PodW* ExpObs] [A LxSx PosWR ExpObs]
--safe [Q Amo.Swp PodW* ExpObs] [Q Amo.Swp PosWR ExpObs]
--safe [Q Amo.Cas PodW* ExpObs] [Q Amo.Cas PosWR ExpObs]
 -safe [Q LxSx PodW* ExpObs] [Q LxSx PosWR ExpObs]
 #[A|Q rmw PosWW] is stronger than `Pos*W`
-#-safe [A Amo.Swp PosWW] [A Amo.Cas PosWW] [Q Amo.Swp PosWW] [Q Amo.Cas PosWW] [A LxSx PosWW] [Q LxSx PosWW]
+#-safe [A Amo.Swp PosWW] [A Amo.Cas PosWW] [A Amo.StAdd PosWW] [A Amo.LdAdd PosWW] [A LxSx PosWW] [Q LxSx PosWW]
 
 # TODO
 # let bob = [Exp & M | Imp & Tag & R]; po; [L]
@@ -229,6 +229,8 @@
 # A memory access followed by a release atomic operation also matches above.
 -safe [ExpObs Pod*R Amo.Swp L]
 -safe [ExpObs Pod*R Amo.Cas L]
+-safe [ExpObs Pod*R Amo.StAdd L]
+-safe [ExpObs Pod*R Amo.LdAdd L]
 -safe [ExpObs Pod*R LxSx L]
 # `[Pos*R rmw L]` is stronger than `Pos*W`
 #-safe  [Pos*R Amo.Swp L] [Pos*R Amo.Cas L] [Pos*R LxSx L]
@@ -240,8 +242,8 @@
 # TODO
 # le aob = [Exp & M]; rmw; lrs; [A | Q]
 # let lrs = [W]; ((po & same-loc) & ~(intervening(W,(po & same-loc)))); [R]
--safe [LxSx PosWR A] [Amo.Swp PosWR A] [Amo.Cas PosWR A]
--safe [LxSx PosWR Q] [Amo.Swp PosWR Q] [Amo.Cas PosWR Q]
+-safe [LxSx PosWR A] [Amo.Swp PosWR A] [Amo.Cas PosWR A] [Amo.StAdd PosWR A] [Amo.LdAdd PosWR A]
+-safe [LxSx PosWR Q] [Amo.Swp PosWR Q] [Amo.Cas PosWR Q] [Amo.StAdd PosWR Q] [Amo.LdAdd PosWR Q]
 
 # TODO
 #let bob = [range([A];amo;[L])]; po; [Exp & M | Imp & Tag & R | MMU & FAULT]
@@ -252,6 +254,8 @@
 # `[A]; amo; [range([A];amo;[L])]; po; [Exp & M | Imp & Tag & R | MMU & FAULT]`
 -safe [A Amo.Swp L PodW* ExpObs] [A Amo.Swp L PosWR ExpObs]
 -safe [A Amo.Cas L PodW* ExpObs] [A Amo.Cas L PosWR ExpObs]
+-safe [A Amo.StAdd L PodW* ExpObs] [A Amo.StAdd L PosWR ExpObs]
+-safe [A Amo.LdAdd L PodW* ExpObs] [A Amo.LdAdd L PosWR ExpObs]
 -safe [A LxSx L PodW* ExpObs]    [A LxSx L PosWR ExpObs]
 # `[A rmw L PosWW]` is stronger than `Pos*W`
 #-safe [A Amo.Swp L PosWW] [A Amo.Cas L PosWW] [A LxSx L PosWW]
@@ -262,6 +266,8 @@
 # This particular edges cannot be auto generated from other safe edges.
 -safe [ExpObs Po**R A Amo.Swp L Po*W* ExpObs]
 -safe [ExpObs Po**R A Amo.Cas L Po*W* ExpObs]
+-safe [ExpObs Po**R A Amo.StAdd L Po*W* ExpObs]
+-safe [ExpObs Po**R A Amo.LdAdd L Po*W* ExpObs]
 
 # TODO
 ### Hat
@@ -278,7 +284,7 @@
 -safe [Hat DMB.LDdR* ExpObs]
 -safe [Hat DSB.LDdR* ExpObs]
 -safe [Hat A PodR* ExpObs] [Hat Q PodR* ExpObs]
--safe [Hat Amo.Swp] [Hat Amo.Cas] [Hat LxSx]
+-safe [Hat Amo.Swp] [Hat Amo.Cas] [Hat Amo.StAdd] [Hat Amo.LdAdd] [Hat LxSx]
 
 ### Note for consuming the generated tests
 # When verifying all the generated tests are indeed forbidden via `herd7`,