[aarch64] Exclude initital writes from ifetch warning

Signed-off-by: Nikos Nikoleris <[email protected]>
herd · Jan 17, 2025 · 403bfd6 · 403bfd6
1 parent cc04fc1
commit 403bfd6
Show file tree

Hide file tree

Showing 9 changed files with 1 addition and 9 deletions.
diff --git a/herd/libdir/aarch64util.cat b/herd/libdir/aarch64util.cat
@@ -125,7 +125,7 @@ let sca-class = [M & Exp]; sm; [M & Exp]
 
 (* Flag any occurrence of writes to two different locations that might be on
  * the same cache line. *)
-flag ~empty ((W & Instr)*(W & Instr) \ loc)
+flag ~empty (((W \ IW) & Instr) * ((W \ IW) & Instr) \ loc)
   as Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 
 (* Flag the runs of herd7 with unsupported combinations of variants *)

diff --git a/herd/tests/instructions/AArch64.self/A013.litmus.expected b/herd/tests/instructions/AArch64.self/A013.litmus.expected
@@ -4,7 +4,6 @@ States 1
 Ok
 Witnesses
 Positive: 2 Negative: 0
-Flag Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 Condition forall (true)
 Observation A013 Always 2 0
 Hash=2709172bb2cddf652d30338fd2804dea

diff --git a/herd/tests/instructions/AArch64.self/A016.litmus.expected b/herd/tests/instructions/AArch64.self/A016.litmus.expected
@@ -5,7 +5,6 @@ States 2
 Ok
 Witnesses
 Positive: 1 Negative: 1
-Flag Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 Condition exists (0:X9=0)
 Observation A016 Sometimes 1 1
 Hash=4030de5673678c66761560ccadc0ba40

diff --git a/herd/tests/instructions/AArch64.self/S13.litmus.expected b/herd/tests/instructions/AArch64.self/S13.litmus.expected
@@ -5,7 +5,6 @@ States 2
 Ok
 Witnesses
 Positive: 2 Negative: 0
-Flag Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 Condition forall (0:X0=1 \/ 0:X0=2)
 Observation S13 Always 2 0
 Hash=f16cfb44fbd6372cf1b443fa042b4d90

diff --git a/herd/tests/instructions/AArch64.self/S14.litmus.expected b/herd/tests/instructions/AArch64.self/S14.litmus.expected
@@ -6,7 +6,6 @@ States 3
 Ok
 Witnesses
 Positive: 3 Negative: 0
-Flag Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 Condition forall (0:X0=2 \/ 0:X0=3 \/ 0:X0=4)
 Observation S14 Always 3 0
 Hash=037d336cd00d0983446ae270e9369843

diff --git a/herd/tests/instructions/AArch64.self/S21.litmus.expected b/herd/tests/instructions/AArch64.self/S21.litmus.expected
@@ -5,7 +5,6 @@ States 2
 Ok
 Witnesses
 Positive: 1 Negative: 1
-Flag Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 Condition exists (0:X3=1)
 Observation S21 Sometimes 1 1
 Hash=3959ffccf8d2c829f46dc74ade96b1f8

diff --git a/herd/tests/instructions/AArch64.self/S23.litmus.expected b/herd/tests/instructions/AArch64.self/S23.litmus.expected
@@ -5,7 +5,6 @@ t={3,2};
 Ok
 Witnesses
 Positive: 2 Negative: 0
-Flag Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 Flag violates-CMODX-requirements
 Condition forall (true)
 Observation S23 Always 2 0

diff --git a/herd/tests/instructions/AArch64.self/S25.litmus.expected b/herd/tests/instructions/AArch64.self/S25.litmus.expected
@@ -4,7 +4,6 @@ States 1
 Ok
 Witnesses
 Positive: 1 Negative: 0
-Flag Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 Condition forall (true)
 Observation S25 Always 1 0
 Hash=353531dc6e6299b14776426e2440091c

diff --git a/herd/tests/instructions/AArch64.self/S27.litmus.expected b/herd/tests/instructions/AArch64.self/S27.litmus.expected
@@ -5,7 +5,6 @@ States 2
 Ok
 Witnesses
 Positive: 2 Negative: 0
-Flag Assuming-no-two-modified-instructions-are-on-the-same-cache-line
 Flag violates-CMODX-requirements
 Condition forall (true)
 Observation S27 Always 2 0