changeset 115:3005f400d517

Migrate locks.stamped.* tests to new API.
author shade
date Fri, 14 Mar 2014 18:10:02 +0400
parents d2af72371f94
children 647b0aabb065
files tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockTransitionTests.java tests-custom/src/main/resources/org/openjdk/jcstress/desc/locks-stamped.xml
diffstat 3 files changed, 1550 insertions(+), 957 deletions(-) [+]
line wrap: on
line diff
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java	Fri Mar 14 16:36:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockPairwiseTests.java	Fri Mar 14 18:10:02 2014 +0400
@@ -24,6 +24,9 @@
  */
 package org.openjdk.jcstress.tests.locks.stamped;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
 import org.openjdk.jcstress.tests.Actor2_Test;
 
@@ -33,109 +36,97 @@
 
 public class StampedLockPairwiseTests {
 
-    public static class State {
+    @State
+    public static class S {
         public final StampedLock lock = new StampedLock();
         public int x;
         public int y;
-    }
-
-    public static abstract class AbstractStampedLockTest implements Actor2_Test<State, IntResult2> {
-
-        @Override
-        public State newState() {
-            return new State();
-        }
-
-        @Override
-        public IntResult2 newResult() {
-            return new IntResult2();
-        }
 
         /* ----------------- READ PATTERNS ----------------- */
 
-        public void aRL_U(State s, IntResult2 r) {
-            Lock lock = s.lock.asReadLock();
+        public void aRL_U(IntResult2 r) {
+            Lock lock = this.lock.asReadLock();
             lock.lock();
-            r.r1 = s.x;
-            r.r2 = s.y;
+            r.r1 = x;
+            r.r2 = y;
             lock.unlock();
         }
 
-        public void aRWLr_U(State s, IntResult2 r) {
-            Lock lock = s.lock.asReadWriteLock().readLock();
+        public void aRWLr_U(IntResult2 r) {
+            Lock lock = this.lock.asReadWriteLock().readLock();
             lock.lock();
-            r.r1 = s.x;
-            r.r2 = s.y;
+            r.r1 = x;
+            r.r2 = y;
             lock.unlock();
         }
 
-        public void RL_tUR(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void RL_tUR(IntResult2 r) {
+            StampedLock lock = this.lock;
             lock.readLock();
-            r.r1 = s.x;
-            r.r2 = s.y;
+            r.r1 = x;
+            r.r2 = y;
             lock.tryUnlockRead();
         }
 
-        public void RL_Us(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void RL_Us(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.readLock();
-            r.r1 = s.x;
-            r.r2 = s.y;
+            r.r1 = x;
+            r.r2 = y;
             lock.unlock(stamp);
         }
 
-        public void RL_URs(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void RL_URs(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.readLock();
-            r.r1 = s.x;
-            r.r2 = s.y;
+            r.r1 = x;
+            r.r2 = y;
             lock.unlockRead(stamp);
         }
 
-        public void RLI_tUR(State s, IntResult2 r) {
+        public void RLI_tUR(IntResult2 r) {
             try {
-            StampedLock lock = s.lock;
+            StampedLock lock = this.lock;
             lock.readLockInterruptibly();
-            r.r1 = s.x;
-            r.r2 = s.y;
+            r.r1 = x;
+            r.r2 = y;
             lock.tryUnlockRead();
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         }
 
-        public void RLI_Us(State s, IntResult2 r) {
+        public void RLI_Us(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.readLockInterruptibly();
-                r.r1 = s.x;
-                r.r2 = s.y;
+                r.r1 = x;
+                r.r2 = y;
                 lock.unlock(stamp);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         }
 
-        public void RLI_URs(State s, IntResult2 r) {
+        public void RLI_URs(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.readLockInterruptibly();
-                r.r1 = s.x;
-                r.r2 = s.y;
+                r.r1 = x;
+                r.r2 = y;
                 lock.unlockRead(stamp);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         }
 
-        public void tOR_V(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void tOR_V(IntResult2 r) {
+            StampedLock lock = this.lock;
             int x = 0, y = 0;
             long stamp = lock.tryOptimisticRead();
             if (stamp != 0) {
-                x = s.x;
-                y = s.y;
+                x = x;
+                y = y;
                 if (!lock.validate(stamp)) {
                     x = 0;
                     y = 0;
@@ -145,43 +136,43 @@
             r.r2 = y;
         }
 
-        public void tRL_tUR(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void tRL_tUR(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.tryReadLock();
             if (stamp != 0) {
-                r.r1 = s.x;
-                r.r2 = s.y;
+                r.r1 = x;
+                r.r2 = y;
                 lock.tryUnlockRead();
             }
         }
 
-        public void tRL_Us(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void tRL_Us(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.tryReadLock();
             if (stamp != 0) {
-                r.r1 = s.x;
-                r.r2 = s.y;
+                r.r1 = x;
+                r.r2 = y;
                 lock.unlock(stamp);
             }
         }
 
-        public void tRL_URs(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void tRL_URs(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.tryReadLock();
             if (stamp != 0) {
-                r.r1 = s.x;
-                r.r2 = s.y;
+                r.r1 = x;
+                r.r2 = y;
                 lock.unlockRead(stamp);
             }
         }
 
-        public void tRLt_tUR(State s, IntResult2 r) {
+        public void tRLt_tUR(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.tryReadLock(1, TimeUnit.SECONDS);
                 if (stamp != 0) {
-                    r.r1 = s.x;
-                    r.r2 = s.y;
+                    r.r1 = x;
+                    r.r2 = y;
                     lock.tryUnlockRead();
                 }
             } catch (InterruptedException e) {
@@ -189,13 +180,13 @@
             }
         }
 
-        public void tRLt_Us(State s, IntResult2 r) {
+        public void tRLt_Us(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.tryReadLock(1, TimeUnit.SECONDS);
                 if (stamp != 0) {
-                    r.r1 = s.x;
-                    r.r2 = s.y;
+                    r.r1 = x;
+                    r.r2 = y;
                     lock.unlock(stamp);
                 }
             } catch (InterruptedException e) {
@@ -203,13 +194,13 @@
             }
         }
 
-        public void tRLt_URs(State s, IntResult2 r) {
+        public void tRLt_URs(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.tryReadLock(1, TimeUnit.SECONDS);
                 if (stamp != 0) {
-                    r.r1 = s.x;
-                    r.r2 = s.y;
+                    r.r1 = x;
+                    r.r2 = y;
                     lock.unlockRead(stamp);
                 }
             } catch (InterruptedException e) {
@@ -219,40 +210,40 @@
 
         /* ----------------- WRITE PATTERNS ----------------- */
 
-        public void aWL_U(State s, IntResult2 r) {
-            Lock lock = s.lock.asWriteLock();
+        public void aWL_U(IntResult2 r) {
+            Lock lock = this.lock.asWriteLock();
             lock.lock();
-            s.x = 1;
-            s.y = 2;
+            x = 1;
+            y = 2;
             lock.unlock();
         }
 
-        public void aRWLw_U(State s, IntResult2 r) {
-            Lock lock = s.lock.asReadWriteLock().writeLock();
+        public void aRWLw_U(IntResult2 r) {
+            Lock lock = this.lock.asReadWriteLock().writeLock();
             lock.lock();
-            s.x = 1;
-            s.y = 2;
+            x = 1;
+            y = 2;
             lock.unlock();
         }
 
-        public void WL_tUW(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void WL_tUW(IntResult2 r) {
+            StampedLock lock = this.lock;
             lock.writeLock();
-            s.x = 1;
-            s.y = 2;
+            x = 1;
+            y = 2;
             lock.tryUnlockWrite();
         }
 
-        public void orWL_V(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void orWL_V(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.readLock();
             try {
-                while (s.x == 0 && s.y == 0) {
+                while (x == 0 && y == 0) {
                     long ws = lock.tryConvertToWriteLock(stamp);
                     if (ws != 0L) {
                         stamp = ws;
-                        s.x = 1;
-                        s.y = 2;
+                        x = 1;
+                        y = 2;
                         break;
                     } else {
                         lock.unlockRead(stamp);
@@ -264,95 +255,95 @@
             }
         }
 
-        public void WL_Us(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void WL_Us(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.writeLock();
-            s.x = 1;
-            s.y = 2;
+            x = 1;
+            y = 2;
             lock.unlock(stamp);
         }
 
-        public void WL_UWs(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void WL_UWs(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.writeLock();
-            s.x = 1;
-            s.y = 2;
+            x = 1;
+            y = 2;
             lock.unlockWrite(stamp);
         }
 
-        public void WLI_tUW(State s, IntResult2 r) {
+        public void WLI_tUW(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 lock.writeLockInterruptibly();
-                s.x = 1;
-                s.y = 2;
+                x = 1;
+                y = 2;
                 lock.tryUnlockWrite();
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         }
 
-        public void WLI_Us(State s, IntResult2 r) {
+        public void WLI_Us(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.writeLockInterruptibly();
-                s.x = 1;
-                s.y = 2;
+                x = 1;
+                y = 2;
                 lock.unlock(stamp);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         }
 
-        public void WLI_UWs(State s, IntResult2 r) {
+        public void WLI_UWs(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.writeLockInterruptibly();
-                s.x = 1;
-                s.y = 2;
+                x = 1;
+                y = 2;
                 lock.unlockWrite(stamp);
             } catch (InterruptedException e) {
                 throw new RuntimeException(e);
             }
         }
 
-        public void tWL_tUW(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void tWL_tUW(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.tryWriteLock();
             if (stamp != 0) {
-                s.x = 1;
-                s.y = 2;
+                x = 1;
+                y = 2;
                 lock.tryUnlockWrite();
             }
         }
 
-        public void tWL_Us(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void tWL_Us(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.tryWriteLock();
             if (stamp != 0) {
-                s.x = 1;
-                s.y = 2;
+                x = 1;
+                y = 2;
                 lock.unlock(stamp);
             }
         }
 
-        public void tWL_UWs(State s, IntResult2 r) {
-            StampedLock lock = s.lock;
+        public void tWL_UWs(IntResult2 r) {
+            StampedLock lock = this.lock;
             long stamp = lock.tryWriteLock();
             if (stamp != 0) {
-                s.x = 1;
-                s.y = 2;
+                x = 1;
+                y = 2;
                 lock.unlockWrite(stamp);
             }
         }
 
-        public void tWLt_tUW(State s, IntResult2 r) {
+        public void tWLt_tUW(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.tryWriteLock(1, TimeUnit.SECONDS);
                 if (stamp != 0) {
-                    s.x = 1;
-                    s.y = 2;
+                    x = 1;
+                    y = 2;
                     lock.tryUnlockWrite();
                 }
             } catch (InterruptedException e) {
@@ -360,13 +351,13 @@
             }
         }
 
-        public void tWLt_Us(State s, IntResult2 r) {
+        public void tWLt_Us(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.tryWriteLock(1, TimeUnit.SECONDS);
                 if (stamp != 0) {
-                    s.x = 1;
-                    s.y = 2;
+                    x = 1;
+                    y = 2;
                     lock.unlock(stamp);
                 }
             } catch (InterruptedException e) {
@@ -374,13 +365,13 @@
             }
         }
 
-        public void tWLt_UWs(State s, IntResult2 r) {
+        public void tWLt_UWs(IntResult2 r) {
             try {
-                StampedLock lock = s.lock;
+                StampedLock lock = this.lock;
                 long stamp = lock.tryWriteLock(1, TimeUnit.SECONDS);
                 if (stamp != 0) {
-                    s.x = 1;
-                    s.y = 2;
+                    x = 1;
+                    y = 2;
                     lock.unlockWrite(stamp);
                 }
             } catch (InterruptedException e) {
@@ -392,798 +383,1398 @@
 
     /* --------------- CARTESIAN PRODUCT OF READ/WRITE PATTERNS ------------  */
 
-    public abstract static class aRL_U extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { aRL_U(s, r); }
+    public abstract static class aRL_U {
 
-        public abstract static class Base extends aRL_U {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRL_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class aRWLr_U extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { aRWLr_U(s, r); }
+    public static class aRWLr_U {
 
-        public abstract static class Base extends aRWLr_U {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.aRWLr_U(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class RL_tUR extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { RL_tUR(s, r); }
+    public static class RL_tUR {
 
-        public abstract static class Base extends RL_tUR {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class RL_Us extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { RL_Us(s, r); }
+    public static class RL_Us {
 
-        public abstract static class Base extends RL_Us {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class RL_URs extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { RL_URs(s, r); }
+    public static class RL_URs {
 
-        public abstract static class Base extends RL_URs {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.RL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class RLI_tUR extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { RLI_tUR(s, r); }
+    public abstract static class RLI_tUR  {
 
-        public abstract static class Base extends RLI_tUR {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class RLI_Us extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { RLI_Us(s, r); }
+    public static class RLI_Us {
 
-        public abstract static class Base extends RLI_Us {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class RLI_URs extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { RLI_URs(s, r); }
+    public static class RLI_URs {
 
-        public abstract static class Base extends RLI_URs {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.RLI_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class tOR_V extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { tOR_V(s, r); }
+    public static class tOR_V {
 
-        public abstract static class Base extends tOR_V {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.tOR_V(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class tRL_tUR extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { tRL_tUR(s, r); }
+    public static class tRL_tUR {
 
-        public abstract static class Base extends tRL_tUR {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class tRL_Us extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { tRL_Us(s, r); }
+    public static class tRL_Us {
 
-        public abstract static class Base extends tRL_Us {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class tRL_URs extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { tRL_URs(s, r); }
+    public static class tRL_URs {
 
-        public abstract static class Base extends tRL_URs {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRL_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class tRLt_tUR extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { tRLt_tUR(s, r); }
+    public abstract static class tRLt_tUR {
 
-        public abstract static class Base extends tRLt_tUR {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_tUR(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class tRLt_Us extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { tRLt_Us(s, r); }
+    public abstract static class tRLt_Us {
 
-        public abstract static class Base extends tRLt_Us {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_Us(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
-    public abstract static class tRLt_URs extends AbstractStampedLockTest {
-        @Override
-        public void actor1(State s, IntResult2 r) { tRLt_URs(s, r); }
+    public abstract static class tRLt_URs {
 
-        public abstract static class Base extends tRLt_URs {}
+        @ConcurrencyStressTest
+        public static class aWL_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aWL_U(r); }
+        }
 
-        public static class aWL_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aWL_U(s, r); }
+        @ConcurrencyStressTest
+        public static class aRWLw_U {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.aRWLw_U(r); }
         }
-        public static class aRWLw_U extends Base {
-            @Override public void actor2(State s, IntResult2 r) { aRWLw_U(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class WL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class WL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class WL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_tUW(r); }
         }
-        public static class WLI_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_Us(r); }
         }
-        public static class WLI_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class WLI_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WLI_UWs(r); }
         }
-        public static class WLI_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { WLI_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_tUW(r); }
         }
-        public static class tWL_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_Us(r); }
         }
-        public static class tWL_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWL_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.WL_UWs(r); }
         }
-        public static class tWL_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWL_UWs(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_tUW {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_tUW(r); }
         }
-        public static class tWLt_tUW extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_tUW(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_Us {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_Us(r); }
         }
-        public static class tWLt_Us extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_Us(s, r); }
+
+        @ConcurrencyStressTest
+        public static class tWLt_UWs {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.tWLt_UWs(r); }
         }
-        public static class tWLt_UWs extends Base {
-            @Override public void actor2(State s, IntResult2 r) { tWLt_UWs(s, r); }
-        }
-        public static class orWL_V extends Base {
-            @Override public void actor2(State s, IntResult2 r) { orWL_V(s, r); }
+
+        @ConcurrencyStressTest
+        public static class orWL_V {
+            @Actor public void actor1(S s, IntResult2 r) { s.tRLt_URs(r); }
+            @Actor public void actor2(S s, IntResult2 r) { s.orWL_V(r); }
         }
     }
 
--- a/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockTransitionTests.java	Fri Mar 14 16:36:49 2014 +0400
+++ b/tests-custom/src/main/java/org/openjdk/jcstress/tests/locks/stamped/StampedLockTransitionTests.java	Fri Mar 14 18:10:02 2014 +0400
@@ -24,30 +24,20 @@
  */
 package org.openjdk.jcstress.tests.locks.stamped;
 
+import org.openjdk.jcstress.infra.annotations.Actor;
+import org.openjdk.jcstress.infra.annotations.ConcurrencyStressTest;
+import org.openjdk.jcstress.infra.annotations.State;
 import org.openjdk.jcstress.infra.results.IntResult2;
-import org.openjdk.jcstress.tests.Actor2_Test;
 
 import java.util.concurrent.locks.StampedLock;
 
 public class StampedLockTransitionTests {
 
-    public static class State {
+    @State
+    public static class S {
         public final StampedLock lock = new StampedLock();
-    }
 
-    public abstract static class AbstractBase implements Actor2_Test<StampedLockTransitionTests.State, IntResult2> {
-        @Override
-        public State newState() {
-            return new State();
-        }
-
-        @Override
-        public IntResult2 newResult() {
-            return new IntResult2();
-        }
-
-
-        public int optimistic_optimistic(StampedLock lock) {
+        public int optimistic_optimistic() {
             long stamp = lock.tryOptimisticRead();
             if (stamp != 0) {
                 long sw = lock.tryConvertToOptimisticRead(stamp);
@@ -57,7 +47,7 @@
             }
         }
 
-        public int optimistic_read(StampedLock lock) {
+        public int optimistic_read() {
             long stamp = lock.tryOptimisticRead();
             if (stamp != 0) {
                 long sw = lock.tryConvertToReadLock(stamp);
@@ -67,7 +57,7 @@
             }
         }
 
-        public int optimistic_write(StampedLock lock) {
+        public int optimistic_write() {
             long stamp = lock.tryOptimisticRead();
             if (stamp != 0) {
                 long sw = lock.tryConvertToWriteLock(stamp);
@@ -77,7 +67,7 @@
             }
         }
 
-        public int read_optimistic(StampedLock lock) {
+        public int read_optimistic() {
             long stamp = lock.tryReadLock();
             if (stamp != 0) {
                 long sw = lock.tryConvertToOptimisticRead(stamp);
@@ -87,7 +77,7 @@
             }
         }
 
-        public int read_read(StampedLock lock) {
+        public int read_read() {
             long stamp = lock.tryReadLock();
             if (stamp != 0) {
                 long sw = lock.tryConvertToReadLock(stamp);
@@ -97,7 +87,7 @@
             }
         }
 
-        public int read_write(StampedLock lock) {
+        public int read_write() {
             long stamp = lock.tryReadLock();
             if (stamp != 0) {
                 long sw = lock.tryConvertToWriteLock(stamp);
@@ -107,7 +97,7 @@
             }
         }
 
-        public int write_optimistic(StampedLock lock) {
+        public int write_optimistic() {
             long stamp = lock.tryWriteLock();
             if (stamp != 0) {
                 long sw = lock.tryConvertToOptimisticRead(stamp);
@@ -117,7 +107,7 @@
             }
         }
 
-        public int write_read(StampedLock lock) {
+        public int write_read() {
             long stamp = lock.tryWriteLock();
             if (stamp != 0) {
                 long sw = lock.tryConvertToReadLock(stamp);
@@ -127,7 +117,7 @@
             }
         }
 
-        public int write_write(StampedLock lock) {
+        public int write_write() {
             long stamp = lock.tryWriteLock();
             if (stamp != 0) {
                 long sw = lock.tryConvertToWriteLock(stamp);
@@ -138,64 +128,76 @@
         }
     }
 
-    public static class OO_OO extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = optimistic_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = optimistic_optimistic(s.lock); }
+    @ConcurrencyStressTest
+    public static class OO_OO {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.optimistic_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.optimistic_optimistic(); }
     }
 
-    public static class OO_OR extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = optimistic_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = optimistic_read(s.lock); }
+    @ConcurrencyStressTest
+    public static class OO_OR {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.optimistic_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.optimistic_read(); }
     }
 
-    public static class OO_OW extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = optimistic_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = optimistic_write(s.lock); }
+    @ConcurrencyStressTest
+    public static class OO_OW {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.optimistic_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.optimistic_write(); }
     }
 
-    public static class OR_OW extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = optimistic_read(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = optimistic_write(s.lock); }
+    @ConcurrencyStressTest
+    public static class OR_OW {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.optimistic_read(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.optimistic_write(); }
     }
 
-    public static class RO_RO extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = read_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = read_optimistic(s.lock); }
+    @ConcurrencyStressTest
+    public static class RO_RO {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.read_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.read_optimistic(); }
     }
 
-    public static class RO_RR extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = read_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = read_read(s.lock); }
+    @ConcurrencyStressTest
+    public static class RO_RR {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.read_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.read_read(); }
     }
 
-    public static class RO_RW extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = read_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = read_write(s.lock); }
+    @ConcurrencyStressTest
+    public static class RO_RW {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.read_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.read_write(); }
     }
 
-    public static class RR_RW extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = read_read(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = read_write(s.lock); }
+    @ConcurrencyStressTest
+    public static class RR_RW {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.read_read(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.read_write(); }
     }
 
-    public static class WO_WO extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = write_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = write_optimistic(s.lock); }
+    @ConcurrencyStressTest
+    public static class WO_WO {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.write_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.write_optimistic(); }
     }
 
-    public static class WO_WR extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = write_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = write_read(s.lock); }
+    @ConcurrencyStressTest
+    public static class WO_WR {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.write_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.write_read(); }
     }
 
-    public static class WO_WW extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = write_optimistic(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = write_write(s.lock); }
+    @ConcurrencyStressTest
+    public static class WO_WW {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.write_optimistic(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.write_write(); }
     }
 
-    public static class WR_WW extends AbstractBase {
-        @Override public void actor1(State s, IntResult2 r) { r.r1 = write_read(s.lock); }
-        @Override public void actor2(State s, IntResult2 r) { r.r2 = write_write(s.lock); }
+    @ConcurrencyStressTest
+    public static class WR_WW {
+        @Actor public void actor1(S s, IntResult2 r) { r.r1 = s.write_read(); }
+        @Actor public void actor2(S s, IntResult2 r) { r.r2 = s.write_write(); }
     }
 
 }
--- a/tests-custom/src/main/resources/org/openjdk/jcstress/desc/locks-stamped.xml	Fri Mar 14 16:36:49 2014 +0400
+++ b/tests-custom/src/main/resources/org/openjdk/jcstress/desc/locks-stamped.xml	Fri Mar 14 18:10:02 2014 +0400
@@ -53,247 +53,247 @@
         </unmatched>
     </template>
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRL_U$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRL_U.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$aRWLr_U$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.aRWLr_U.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_URs$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_URs.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_Us$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_Us.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RL_tUR$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RL_tUR.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_URs$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_URs.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_Us$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_Us.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$RLI_tUR$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.RLI_tUR.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tOR_V$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tOR_V.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_URs$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_URs.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_Us$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_Us.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRL_tUR$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRL_tUR.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_URs$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_URs.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_Us$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_Us.orWL_V"  />
 
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$aRWLw_U"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$aWL_U"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$tWL_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$tWL_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$tWL_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$tWLt_tUW" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$tWLt_Us"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$tWLt_UWs" />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$WL_tUW"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$WL_Us"    />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$WL_UWs"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$WLI_tUW"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$WLI_Us"   />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$WLI_UWs"  />
-    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests$tRLt_tUR$orWL_V"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.aRWLw_U"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.aWL_U"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.tWL_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.tWL_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.tWL_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.tWLt_tUW" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.tWLt_Us"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.tWLt_UWs" />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.WL_tUW"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.WL_Us"    />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.WL_UWs"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.WLI_tUW"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.WLI_Us"   />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.WLI_UWs"  />
+    <test template="atomicUpdate" name="org.openjdk.jcstress.tests.locks.stamped.StampedLockPairwiseTests.tRLt_tUR.orWL_V"  />
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$OO_OO">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.OO_OO">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -313,7 +313,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$OO_OR">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.OO_OR">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -340,7 +340,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$OO_OW">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.OO_OW">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -368,7 +368,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$OR_OW">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.OR_OW">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -402,7 +402,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$RO_RO">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.RO_RO">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -422,7 +422,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$RO_RR">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.RO_RR">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -442,7 +442,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$RO_RW">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.RO_RW">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -477,7 +477,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$RR_RW">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.RR_RW">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -505,7 +505,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$WO_WO">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.WO_WO">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -534,7 +534,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$WO_WR">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.WO_WR">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -563,7 +563,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$WO_WW">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.WO_WW">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.
@@ -593,7 +593,7 @@
         </unmatched>
     </test>
 
-    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests$WR_WW">
+    <test name="org.openjdk.jcstress.tests.locks.stamped.StampedLockTransitionTests.WR_WW">
         <contributed-by>Aleksey Shipilev (aleksey.shipilev@oracle.com)</contributed-by>
         <description>
             Tests if StampedLock transits to particular state without the illegal races.