[herd,test] Include x66_64 catalogue tests in default testing

Author: maranget

Makefile

@@ -612,6 +612,18 @@ ifetch-test:
 		$(REGRESSION_TEST_MODE)
 		@ echo "herd7 catalogue aarch64-ifetch tests: OK"
 
+cata-test:: x86_64-test
+x86_64-test:
+	@ echo
+	$(HERD_CATALOGUE_REGRESSION_TEST) \
+		-herd-timeout $(TIMEOUT) \
+		-j $(J) \
+		-herd-path $(HERD) \
+		-libdir-path ./herd/libdir \
+		-kinds-path catalogue/x86_64/kinds.txt \
+		-shelf-path catalogue/x86_64/shelf.py \
+		$(REGRESSION_TEST_MODE)
+		@ echo "herd7 catalogue x86_64 tests: OK"
 
 # Not in cata-test, too-long
 test-all:: vmsa-test

catalogue/x86_64/cats/sc.cat

@@ -0,0 +1 @@
+../../../herd/libdir/sc.cat

catalogue/x86_64/cats/x86tso-mixed.cat

@@ -0,0 +1 @@
+../../../herd/libdir/x86tso-mixed.cat

catalogue/x86_64/cfgs/new-web.cfg

@@ -0,0 +1,14 @@
+graph columns
+squished true
+showevents memory
+showinitwrites false
+showlegend false
+fontsize 8
+scale 0.75
+xscale 1.0
+yscale 0.6667
+arrowsize 0.5
+showinitrf false
+showfinalrf false
+splines spline
+pad 0.1

catalogue/x86_64/kinds.txt

@@ -0,0 +1,29 @@
+2+2W                 Forbid
+LB                   Forbid
+MP                   Forbid
+MP+po+po-rfi-po      Forbid
+R                    Allow 
+R+po+mfence          Forbid
+R+po+po-rfi-po       Allow 
+R+po+rfi-po          Allow 
+RWC                  Allow 
+RWC+po+mfence        Forbid
+RWC+po+rfi-po        Allow 
+S                    Forbid
+SB                   Allow 
+SB+mfence+po         Allow 
+SB+mfence+po-rfi-po  Allow 
+SB+mfence+rfi-po     Allow 
+SB+mfences           Forbid
+SB+po+po-rfi-po      Allow 
+SB+po+rfi-po         Allow 
+SB+rfi-po+po-rfi-po  Allow 
+SB+rfi-pos           Allow 
+WRC                  Forbid
+WRR+2W               Forbid
+WRW+2W               Forbid
+WRW+WR               Allow 
+WRW+WR+po+mfence     Forbid
+WRW+WR+po+rfi-po     Allow 
+WWC                  Forbid
+ 

catalogue/x86_64/shelf.py

@@ -0,0 +1,41 @@
+record = "X86-64"
+
+cats = [
+    "cats/x86tso-mixed.cat",
+    "cats/sc.cat",
+    ]
+
+cfgs = [
+    "cfgs/new-web.cfg"
+]
+
+illustrative_tests = [
+    "tests/2+2W.litmus",
+    "tests/LB.litmus",
+    "tests/MP.litmus",
+    "tests/MP+po+po-rfi-po.litmus",
+    "tests/R.litmus",
+    "tests/R+po+mfence.litmus",
+    "tests/R+po+po-rfi-po.litmus",
+    "tests/R+po+rfi-po.litmus",
+    "tests/RWC.litmus",
+    "tests/RWC+po+mfence.litmus",
+    "tests/RWC+po+rfi-po.litmus",
+    "tests/SB.litmus",
+    "tests/SB+mfence+po.litmus",
+    "tests/SB+mfence+po-rfi-po.litmus",
+    "tests/SB+mfence+rfi-po.litmus",
+    "tests/SB+mfences.litmus",
+    "tests/SB+po+po-rfi-po.litmus",
+    "tests/SB+po+rfi-po.litmus",
+    "tests/SB+rfi-po+po-rfi-po.litmus",
+    "tests/SB+rfi-pos.litmus",
+    "tests/S.litmus",
+    "tests/WRC.litmus",
+    "tests/WRR+2W.litmus",
+    "tests/WRW+2W.litmus",
+    "tests/WRW+WR.litmus",
+    "tests/WRW+WR+po+mfence.litmus",
+    "tests/WRW+WR+po+rfi-po.litmus",
+    "tests/WWC.litmus",
+]