[cat] Revamp the definition of dependencies

Signed-off-by: Nikos Nikoleris <nikos.nikoleris@arm.com>

Author: relokin

herd/libdir/aarch64deps.cat

@@ -66,11 +66,9 @@ let rec dtrm =
 
 (** Data, Address and Control dependencies *)
 
-let basic-dep =
-   [Exp & R | Rreg]; dtrm?
-let data = [Exp & R]; (basic-dep; [DATA]; iico_data+; [Exp & W]) & ~same-instance
-let addr = [Exp & R]; (basic-dep; [ADDR]; iico_data+; [Exp & M | Imp & Tag & R | Imp & TTD & R | HU | TLBI | DC.CVAU | IC.IVAU]) & ~same-instance
-let ctrl = [Exp & R]; basic-dep; [BCC]; po
+let data = [Exp & R]; dtrm & po; [Rreg]; iico_data & DATA; [Exp & W]
+let addr = [Exp & R]; dtrm & po; [Rreg]; iico_data & ADDR; [Exp & M | Imp & Tag & R | Imp & TTD & R | HU | TLBI | DC.CVAU | IC.IVAU]
+let ctrl = [Exp & R]; dtrm & po; [Rreg]; iico_data; [BCC]; po
 
 (** Pick dependencies *)
 let rec pick-dtrm =
@@ -82,11 +80,11 @@ let pick-basic-dep =
    [Exp & R | Rreg];  pick-dtrm?
 
 let pick-addr-dep =
-   [Exp & R]; (pick-basic-dep; [ADDR]; iico_data+; [Exp & M | Imp & Tag & R | Imp & TTD & R | HU | TLBI | DC.CVAU | IC.IVAU]) & ~same-instance
+   [Exp & R]; pick-dtrm & po; [Rreg]; iico_data & ADDR; [Exp & M | Imp & Tag & R | Imp & TTD & R | HU | TLBI | DC.CVAU | IC.IVAU]
 let pick-data-dep =
-   [Exp & R]; (pick-basic-dep; [DATA]; (iico_data|iico_ctrl)+; [Exp & W]) & ~same-instance
+   [Exp & R]; pick-dtrm & po; [Rreg]; (iico_data; iico_ctrl?) & DATA; [Exp & W]
 let pick-ctrl-dep =
-   [Exp & R]; pick-basic-dep; [BCC]; po
+   [Exp & R]; pick-dtrm & po; [Rreg]; iico_data; [BCC]; po
 
 let pick-dep =
    ( pick-basic-dep

herd/libdir/aarch64util.cat

@@ -44,6 +44,10 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *)
 
+let iico_data = iico_data+
+let ADDR = [ADDR]; iico_data
+let DATA = [DATA]; (iico_data|iico_ctrl)+
+
 (*
  * Include default definitions for sets that are undefined without
  * -variant vmsa

herd/libdir/catdefinitions.tex

@@ -26,8 +26,8 @@
 \newcommand{\rfi}[2]{#2 Reads-from-internal #1}
 \newcommand{\rfreg}[2]{#2 Reads-from-register #1}
 \newcommand{\rmw}[2]{#1 and #2 form a successful Read-Modify-Write pair}
-\newcommand{\DATA}[2]{#1 affects the data value written by #2}
-\newcommand{\ADDR}[2]{#1 affects the address of the Location accessed by #2}
+\newcommand{\DATA}[2]{the semantics of the instruction that generates #1 and #2 indicate that the value produced by #1 is consumed in the calculation of the data value written by #2}
+\newcommand{\ADDR}[2]{the semantics of the instruction that generates #1 and #2 indicate that the value produced by #1 is consumed in the calculation of the address of the Location of #2}
 \newcommand{\sameinstance}[2]{#1 and #2 are generated by the same instruction}
 \newcommand{\sm}[2]{\sameinstance{#1}{#2}}
 \newcommand{\si}[2]{\sameinstance{#1}{#2}}