[herd] use event's static po index in dot graph

Author: fsestini

herd/Pretty.ml

@@ -827,7 +827,7 @@ module Make (S:SemExtra.S) : S with module S = S  = struct
   | E.IdSome ii ->
       fprintf chan "proc:%s poi:%i\\l"
         (Proc.pp ii.A.proc)
-        ii.A.program_order_index
+        ii.A.static_poi
 
 (*
   This complex function is not meant to be used directly,

herd/event.ml

@@ -69,6 +69,7 @@ val same_instance : event -> event -> bool
   val same_proc     : event -> event -> bool
   val same_proc_not_init : event -> event -> bool
   val progorder_of  : event -> A.program_order_index option
+  val static_poi  : event -> A.program_order_index option
 
 (* Is e1 before e2 w.r.t. prog order ? Nothing assumed on e1 and e2 *)
   val po_strict : event -> event -> bool
@@ -643,6 +644,10 @@ module Make  (C:Config) (AI:Arch_herd.S) (Act:Action.S with module A = AI) :
     | IdSome i -> Some i.A.program_order_index
     | IdInit|IdSpurious -> None
 
+    let static_poi e =
+      match e.iiid with
+      | IdSome i -> Some i.A.static_poi
+      | IdInit | IdSpurious -> None
 
 (************************)
 (* Predicates on events *)

herd/prettyUtils.ml

@@ -23,7 +23,7 @@ module Make(S : SemExtra.S) = struct
     let by_po =
       E.EventSet.fold
         (fun e k ->
-          match E.progorder_of e with
+          match E.static_poi e with
             | None -> k
             | Some poi ->
                let es_poi = IntMap.safe_find []  poi k in