diff --git a/tools/memory-model/lock.cat b/tools/memory-model/lock.cat index 3b1439edc818..1f6d67e79065 100644 --- a/tools/memory-model/lock.cat +++ b/tools/memory-model/lock.cat @@ -41,11 +41,15 @@ flag ~empty [FW] ; loc ; [ALL-LOCKS] as lock-final *) let RL = try RL with emptyset (* defined herd7 >= 7.49 *) let RU = try RU with emptyset (* defined herd7 >= 7.49 *) + +(* Treat RL as a kind of LF: a read with no ordering properties *) +let LF = LF | RL + (* * Put lock operations in their appropriate classes, but leave UL out of W * until after the co relation has been generated. *) -let R = R | LKR | LF | RL | RU +let R = R | LKR | LF | RU let W = W | LKW let Release = Release | UL @@ -80,28 +84,8 @@ let all-possible-rfe-lf = (* Generate all rf relations for LF events *) with rfe-lf from cross(all-possible-rfe-lf) - let rf-lf = rfe-lf | rfi-lf -(* rf for RL events, ie islocked returning true, similar to LF above *) - -(* islocked returning true inside a critical section - * must read from the opening lock - *) -let rfi-rl = ([LKW] ; po-loc ; [RL]) \ ([LKW] ; po-loc ; [UL] ; po-loc) - -(* islocked returning true outside critical sections can match any - * external lock. - *) -let all-possible-rfe-rl = - let possible-rfe-lf r = - let pair-to-relation p = p ++ 0 - in map pair-to-relation ((LKW * {r}) & loc & ext) - in map possible-rfe-lf (RL \ range(rfi-rl)) - -with rfe-rl from cross(all-possible-rfe-rl) -let rf-rl = rfe-rl | rfi-rl - (* Read from unlock, ie islocked returning false, slightly different *) (* islocked returning false can read from the last po-previous unlock *) @@ -118,7 +102,7 @@ with rfe-ru from cross(all-possible-rfe-ru) let rf-ru = rfe-ru | rfi-ru (* Final rf relation *) -let rf = rf | rf-lf | rf-rl | rf-ru +let rf = rf | rf-lf | rf-ru (* Generate all co relations, including LKW events but not UL *) let co0 = co0 | ([IW] ; loc ; [LKW]) |