Rename tests in catalogue

diaolo01 · diaolo01 · commit c24a9bb47dc1 · 2026-03-11T10:22:37.000Z
diff --git a/catalogue/aarch64-PAC/shelf.py b/catalogue/aarch64-PAC/shelf.py
@@ -9,31 +9,31 @@
 ]
 
 illustrative_tests = [
-    "tests/xpacd-basic-dep.litmus",
-    "tests/pacda-basic-dep-pointer.litmus",
-    "tests/pacda-basic-dep-modifier.litmus",
-    "tests/pacda-disable-basic-dep-pointer.litmus",
-    "tests/pacda-disable-no-basic-dep-modifier.litmus",
-    "tests/pacda-disable-no-pick-basic-dep-modifier.litmus",
-    "tests/autda-disable-basic-dep-pointer.litmus",
-    "tests/autda-disable-no-basic-dep-modifier.litmus",
-    "tests/autda-disable-no-pick-basic-dep-modifier.litmus",
-    "tests/autda-success-basic-dep-pointer.litmus",
-    "tests/autda-fpac-success-basic-dep-pointer.litmus",
-    "tests/autda-failure-basic-dep-pointer.litmus",
-    "tests/autda-success-pick-basic-dep-modifier.litmus",
-    "tests/autda-success-no-basic-dep-modifier.litmus",
-    "tests/autda-fpac-success-pick-basic-dep-modifier.litmus",
-    "tests/autda-fpac-success-no-basic-dep-modifier.litmus",
-    "tests/autda-failure-basic-dep-modifier.litmus",
-    "tests/autda-fpac-failure-pick-basic-dep-pointer.litmus",
-    "tests/autda-fpac-failure-pick-basic-dep-modifier.litmus",
-    "tests/autda-fpac-basic-dep-branch.litmus",
-    "tests/autda-fpac-pick-basic-dep-branch.litmus",
-    "tests/pauth1-autda-success-basic-dep-pointer.litmus",
-    "tests/pauth1-autda-success-no-basic-dep-modifier.litmus",
-    "tests/pauth1-autda-success-pick-basic-dep-modifier.litmus",
-    "tests/pauth1-autda-failure-pick-basic-dep-modifier.litmus",
-    "tests/pauth1-autda-failure-no-basic-dep-modifier.litmus",
-    "tests/pauth1-autda-failure-basic-dep-pointer.litmus",
+    "tests/pauth1+MP+dmb.sy+pacdza-autda.litmus",
+    "tests/pauth1+MP+dmb.sy+pacdza-autdza.litmus",
+    "tests/pauth1+S+dmb.sy+pacdza-autda.litmus",
+    "tests/pauth1+WW+RR+R+dmb.sy+autda-xpacd+pacdza.litmus",
+    "tests/pauth1+WW+RR+R+dmb.sy+autdza-xpacd+pacdza.litmus",
+    "tests/pauth1+WW+RW+R+dmb.sy+autda-xpacd+pacdza.litmus",
+    "tests/pauth2+MP+dmb.sy+add-pacdza-xpacd.litmus",
+    "tests/pauth2+MP+dmb.sy+pacda-xpacd.litmus",
+    "tests/pauth2+MP+dmb.sy+pacdza-add-xpacd.litmus",
+    "tests/pauth2+MP+dmb.sy+pacdza-autda.litmus",
+    "tests/pauth2+MP+dmb.sy+pacdza-autdza.litmus",
+    "tests/pauth2+S+dmb.sy+pacdza-autda.litmus",
+    "tests/pauth2+WW+RR+R+dmb.sy+autda+pacdza.litmus",
+    "tests/pauth2+WW+RR+R+dmb.sy+autdza-xpacd+pacdza.litmus",
+    "tests/pauth2-fpac+MP+dmb.sy+pacdza-autda.litmus",
+    "tests/pauth2-fpac+MP+dmb.sy+pacdza-autdza.litmus",
+    "tests/pauth2-fpac+S+dmb.sy+pacdza-autda.litmus",
+    "tests/pauth2-fpac+S+dmb.sy+pacdza-autdza.litmus",
+    "tests/pauth2-fpac+S+dmb.sy+pacdza-csel-autda.litmus",
+    "tests/pauth2-fpac+WW+R+R+dmb.sy+autda-mov.litmus",
+    "tests/pauth2-fpac+WW+R+R+dmb.sy+autdza-mov.litmus",
+    "tests/pauth2-no-key-da+MP+dmb.sy+autda.litmus",
+    "tests/pauth2-no-key-da+MP+dmb.sy+autdza.litmus",
+    "tests/pauth2-no-key-da+MP+dmb.sy+pacda.litmus",
+    "tests/pauth2-no-key-da+MP+dmb.sy+pacdza.litmus",
+    "tests/pauth2-no-key-da+S+dmb.sy+pacda.litmus",
+    "tests/pauth2-no-key-da+S+dmb.sy+po-autda.litmus",
 ]
diff --git a/catalogue/aarch64-PAC/tests/@all b/catalogue/aarch64-PAC/tests/@all
@@ -1,27 +1,27 @@
-xpacd-basic-dep.litmus
-pacda-basic-dep-pointer.litmus
-pacda-basic-dep-modifier.litmus
-pacda-disable-basic-dep-pointer.litmus
-pacda-disable-no-basic-dep-modifier.litmus
-pacda-disable-no-pick-basic-dep-modifier.litmus
-autda-disable-basic-dep-pointer.litmus
-autda-disable-no-basic-dep-modifier.litmus
-autda-disable-no-pick-basic-dep-modifier.litmus
-autda-success-basic-dep-pointer.litmus
-autda-fpac-success-basic-dep-pointer.litmus
-autda-failure-basic-dep-pointer.litmus
-autda-success-pick-basic-dep-modifier.litmus
-autda-success-no-basic-dep-modifier.litmus
-autda-fpac-success-pick-basic-dep-modifier.litmus
-autda-fpac-success-no-basic-dep-modifier.litmus
-autda-failure-basic-dep-modifier.litmus
-autda-fpac-failure-pick-basic-dep-pointer.litmus
-autda-fpac-failure-pick-basic-dep-modifier.litmus
-autda-fpac-basic-dep-branch.litmus
-autda-fpac-pick-basic-dep-branch.litmus
-pauth1-autda-success-basic-dep-pointer.litmus
-pauth1-autda-success-no-basic-dep-modifier.litmus
-pauth1-autda-success-pick-basic-dep-modifier.litmus
-pauth1-autda-failure-pick-basic-dep-modifier.litmus
-pauth1-autda-failure-no-basic-dep-modifier.litmus
-pauth1-autda-failure-basic-dep-pointer.litmus
+pauth1+MP+dmb.sy+pacdza-autda.litmus
+pauth1+MP+dmb.sy+pacdza-autdza.litmus
+pauth1+S+dmb.sy+pacdza-autda.litmus
+pauth1+WW+RR+R+dmb.sy+autda-xpacd+pacdza.litmus
+pauth1+WW+RR+R+dmb.sy+autdza-xpacd+pacdza.litmus
+pauth1+WW+RW+R+dmb.sy+autda-xpacd+pacdza.litmus
+pauth2+MP+dmb.sy+add-pacdza-xpacd.litmus
+pauth2+MP+dmb.sy+pacda-xpacd.litmus
+pauth2+MP+dmb.sy+pacdza-add-xpacd.litmus
+pauth2+MP+dmb.sy+pacdza-autda.litmus
+pauth2+MP+dmb.sy+pacdza-autdza.litmus
+pauth2+S+dmb.sy+pacdza-autda.litmus
+pauth2+WW+RR+R+dmb.sy+autda+pacdza.litmus
+pauth2+WW+RR+R+dmb.sy+autdza-xpacd+pacdza.litmus
+pauth2-fpac+MP+dmb.sy+pacdza-autda.litmus
+pauth2-fpac+MP+dmb.sy+pacdza-autdza.litmus
+pauth2-fpac+S+dmb.sy+pacdza-autda.litmus
+pauth2-fpac+S+dmb.sy+pacdza-autdza.litmus
+pauth2-fpac+S+dmb.sy+pacdza-csel-autda.litmus
+pauth2-fpac+WW+R+R+dmb.sy+autda-mov.litmus
+pauth2-fpac+WW+R+R+dmb.sy+autdza-mov.litmus
+pauth2-no-key-da+MP+dmb.sy+autda.litmus
+pauth2-no-key-da+MP+dmb.sy+autdza.litmus
+pauth2-no-key-da+MP+dmb.sy+pacda.litmus
+pauth2-no-key-da+MP+dmb.sy+pacdza.litmus
+pauth2-no-key-da+S+dmb.sy+pacda.litmus
+pauth2-no-key-da+S+dmb.sy+po-autda.litmus
diff --git a/catalogue/aarch64-PAC/tests/kinds.txt b/catalogue/aarch64-PAC/tests/kinds.txt
@@ -1,27 +1,27 @@
-xpacd-basic-dep Forbidden
-pacda-basic-dep-pointer Forbidden
-pacda-basic-dep-modifier Forbidden
-pacda-disable-basic-dep-pointer Forbidden
-pacda-disable-no-basic-dep-modifier Allowed
-pacda-disable-no-pick-basic-dep-modifier Allowed
-autda-disable-basic-dep-pointer Forbidden
-autda-disable-no-basic-dep-modifier Allowed
-autda-disable-no-pick-basic-dep-modifier Allowed
-autda-success-basic-dep-pointer Forbidden
-autda-fpac-success-basic-dep-pointer Forbidden
-autda-failure-basic-dep-pointer Forbidden
-autda-success-pick-basic-dep-modifier Forbidden
-autda-success-no-basic-dep-modifier Allowed
-autda-fpac-success-pick-basic-dep-modifier Forbidden
-autda-fpac-success-no-basic-dep-modifier Allowed
-autda-failure-basic-dep-modifier Forbidden
-autda-fpac-failure-pick-basic-dep-pointer Forbidden
-autda-fpac-failure-pick-basic-dep-modifier Forbidden
-autda-fpac-basic-dep-branch Forbidden
-autda-fpac-pick-basic-dep-branch Forbidden
-pauth1-autda-success-basic-dep-pointer Forbidden
-pauth1-autda-success-no-basic-dep-modifier Allowed
-pauth1-autda-success-pick-basic-dep-modifier Forbidden
-pauth1-autda-failure-pick-basic-dep-modifier Forbidden
-pauth1-autda-failure-no-basic-dep-modifier Allowed
-pauth1-autda-failure-basic-dep-pointer Forbidden
+pauth2+MP+dmb.sy+pacdza-add-xpacd Forbidden
+pauth2+MP+dmb.sy+add-pacdza-xpacd Forbidden
+pauth2+MP+dmb.sy+pacda-xpacd Forbidden
+pauth2-no-key-da+MP+dmb.sy+pacdza Forbidden
+pauth2-no-key-da+MP+dmb.sy+pacda Allowed
+pauth2-no-key-da+S+dmb.sy+pacda Allowed
+pauth2-no-key-da+MP+dmb.sy+autdza Forbidden
+pauth2-no-key-da+MP+dmb.sy+autda Allowed
+pauth2-no-key-da+S+dmb.sy+po-autda Allowed
+pauth2+MP+dmb.sy+pacdza-autdza Forbidden
+pauth2-fpac+MP+dmb.sy+pacdza-autdza Forbidden
+pauth2+WW+RR+R+dmb.sy+autdza-xpacd+pacdza Forbidden
+pauth2+S+dmb.sy+pacdza-autda Forbidden
+pauth2+MP+dmb.sy+pacdza-autda Allowed
+pauth2-fpac+S+dmb.sy+pacdza-autda Forbidden
+pauth2-fpac+MP+dmb.sy+pacdza-autda Allowed
+pauth2+WW+RR+R+dmb.sy+autda+pacdza Forbidden
+pauth2-fpac+WW+R+R+dmb.sy+autdza-mov Forbidden
+pauth2-fpac+WW+R+R+dmb.sy+autda-mov Forbidden
+pauth2-fpac+S+dmb.sy+pacdza-autdza Forbidden
+pauth2-fpac+S+dmb.sy+pacdza-csel-autda Forbidden
+pauth1+MP+dmb.sy+pacdza-autdza Forbidden
+pauth1+MP+dmb.sy+pacdza-autda Allowed
+pauth1+S+dmb.sy+pacdza-autda Forbidden
+pauth1+WW+RW+R+dmb.sy+autda-xpacd+pacdza Forbidden
+pauth1+WW+RR+R+dmb.sy+autda-xpacd+pacdza Allowed
+pauth1+WW+RR+R+dmb.sy+autdza-xpacd+pacdza Forbidden
diff --git a/catalogue/aarch64-PAC/tests/pauth1+MP+dmb.sy+pacdza-autda.litmus b/catalogue/aarch64-PAC/tests/pauth1+MP+dmb.sy+pacdza-autda.litmus
@@ -1,4 +1,4 @@
-AArch64 pauth1-autda-success-no-basic-dep-modifier
+AArch64 pauth1+MP+dmb.sy+pacdza-autda
 variant=pauth1
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth1+MP+dmb.sy+pacdza-autdza.litmus b/catalogue/aarch64-PAC/tests/pauth1+MP+dmb.sy+pacdza-autdza.litmus
@@ -1,11 +1,10 @@
-AArch64 pauth1-autda-success-basic-dep-pointer
+AArch64 pauth1+MP+dmb.sy+pacdza-autdza
 Variant=pauth1
 {
     int64_t x=0;
     int64_t y=0;
     0:X0=x; 0:X1=y; int64_t 0:X2=1;
     1:X0=x; 1:X1=y; int64_t 1:X2=0; int64_t 1:X3=0;
-
 }
 P0          | P1           ;
 STR X2,[X0] | PACDZA X0    ; (* Write pacda(x) in 1:X0 *)
diff --git a/catalogue/aarch64-PAC/tests/pauth1+S+dmb.sy+pacdza-autda.litmus b/catalogue/aarch64-PAC/tests/pauth1+S+dmb.sy+pacdza-autda.litmus
@@ -1,4 +1,4 @@
-AArch64 pauth1-autda-success-pick-basic-dep-modifier
+AArch64 pauth1+S+dmb.sy+pacdza-autda
 variant=pauth1
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth1+WW+RR+R+dmb.sy+autda-xpacd+pacdza.litmus b/catalogue/aarch64-PAC/tests/pauth1+WW+RR+R+dmb.sy+autda-xpacd+pacdza.litmus
@@ -1,4 +1,4 @@
-AArch64 pauth1-autda-failure-no-basic-dep-modifier
+AArch64 pauth1+WW+RR+R+dmb.sy+autda-xpacd+pacdza
 variant=pauth1
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth1+WW+RR+R+dmb.sy+autdza-xpacd+pacdza.litmus b/catalogue/aarch64-PAC/tests/pauth1+WW+RR+R+dmb.sy+autdza-xpacd+pacdza.litmus
@@ -1,4 +1,4 @@
-AArch64 pauth1-autda-failure-basic-dep-pointer
+AArch64 pauth1+WW+RR+R+dmb.sy+autdza-xpacd+pacdza
 Variant=pauth1
 {
     int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth1+WW+RW+R+dmb.sy+autda-xpacd+pacdza.litmus b/catalogue/aarch64-PAC/tests/pauth1+WW+RW+R+dmb.sy+autda-xpacd+pacdza.litmus
@@ -1,4 +1,4 @@
-AArch64 pauth1-autda-failure-pick-basic-dep-modifier
+AArch64 pauth1+WW+RW+R+dmb.sy+autda-xpacd+pacdza
 variant=pauth1
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+add-pacdza-xpacd.litmus b/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+add-pacdza-xpacd.litmus
@@ -1,4 +1,4 @@
-AArch64 pacda-basic-dep-pointer
+AArch64 pauth2+MP+dmb.sy+add-pacdza-xpacd
 Variant=pauth2
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+pacda-xpacd.litmus b/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+pacda-xpacd.litmus
@@ -1,4 +1,4 @@
-AArch64 pacda-basic-dep-modifier
+AArch64 pauth2+MP+dmb.sy+pacda-xpacd
 Variant=pauth2
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+pacdza-add-xpacd.litmus b/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+pacdza-add-xpacd.litmus
@@ -1,4 +1,4 @@
-AArch64 xpacd-basic-dep
+AArch64 pauth2+MP+dmb.sy+pacdza-add-xpacd
 Variant=pauth2
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+pacdza-autda.litmus b/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+pacdza-autda.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-success-no-basic-dep-modifier
+AArch64 pauth2+MP+dmb.sy+pacdza-autda
 variant=pauth2
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+pacdza-autdza.litmus b/catalogue/aarch64-PAC/tests/pauth2+MP+dmb.sy+pacdza-autdza.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-success-basic-dep-pointer
+AArch64 pauth2+MP+dmb.sy+pacdza-autdza
 Variant=pauth2
 {
     int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2+S+dmb.sy+pacdza-autda.litmus b/catalogue/aarch64-PAC/tests/pauth2+S+dmb.sy+pacdza-autda.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-success-pick-basic-dep-modifier
+AArch64 pauth2+S+dmb.sy+pacdza-autda
 variant=pauth2
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2+WW+RR+R+dmb.sy+autda+pacdza.litmus b/catalogue/aarch64-PAC/tests/pauth2+WW+RR+R+dmb.sy+autda+pacdza.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-failure-basic-dep-modifier
+AArch64 pauth2+WW+RR+R+dmb.sy+autda+pacdza
 Variant=pauth2
 {
     int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2+WW+RR+R+dmb.sy+autdza-xpacd+pacdza.litmus b/catalogue/aarch64-PAC/tests/pauth2+WW+RR+R+dmb.sy+autdza-xpacd+pacdza.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-failure-basic-dep-pointer
+AArch64 pauth2+WW+RR+R+dmb.sy+autdza-xpacd+pacdza
 Variant=pauth2
 {
     int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-fpac+MP+dmb.sy+pacdza-autda.litmus b/catalogue/aarch64-PAC/tests/pauth2-fpac+MP+dmb.sy+pacdza-autda.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-fpac-success-no-basic-dep-modifier
+AArch64 pauth2-fpac+MP+dmb.sy+pacdza-autda
 variant=pauth2,fpac
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-fpac+MP+dmb.sy+pacdza-autdza.litmus b/catalogue/aarch64-PAC/tests/pauth2-fpac+MP+dmb.sy+pacdza-autdza.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-fpac-success-basic-dep-pointer
+AArch64 pauth2-fpac+MP+dmb.sy+pacdza-autdza
 Variant=pauth2,fpac
 {
     int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-fpac+S+dmb.sy+pacdza-autda.litmus b/catalogue/aarch64-PAC/tests/pauth2-fpac+S+dmb.sy+pacdza-autda.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-fpac-success-pick-basic-dep-modifier
+AArch64 pauth2-fpac+S+dmb.sy+pacdza-autda
 variant=pauth2,fpac
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-fpac+S+dmb.sy+pacdza-autdza.litmus b/catalogue/aarch64-PAC/tests/pauth2-fpac+S+dmb.sy+pacdza-autdza.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-fpac-basic-dep-branch
+AArch64 pauth2-fpac+S+dmb.sy+pacdza-autdza
 Variant=pauth2,fpac
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-fpac+S+dmb.sy+pacdza-csel-autda.litmus b/catalogue/aarch64-PAC/tests/pauth2-fpac+S+dmb.sy+pacdza-csel-autda.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-fpac-pick-basic-dep-branch
+AArch64 pauth2-fpac+S+dmb.sy+pacdza-csel-autda
 Variant=pauth2,fpac
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-fpac+WW+R+R+dmb.sy+autda-mov.litmus b/catalogue/aarch64-PAC/tests/pauth2-fpac+WW+R+R+dmb.sy+autda-mov.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-fpac-failure-pick-basic-dep-modifier
+AArch64 pauth2-fpac+WW+R+R+dmb.sy+autda-mov
 Variant=pauth2,fpac
 {
     int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-fpac+WW+R+R+dmb.sy+autdza-mov.litmus b/catalogue/aarch64-PAC/tests/pauth2-fpac+WW+R+R+dmb.sy+autdza-mov.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-fpac-failure-pick-basic-dep-pointer
+AArch64 pauth2-fpac+WW+R+R+dmb.sy+autdza-mov
 Variant=pauth2,fpac
 {
     int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-no-key-da+MP+dmb.sy+autda.litmus b/catalogue/aarch64-PAC/tests/pauth2-no-key-da+MP+dmb.sy+autda.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-disable-no-basic-dep-modifier
+AArch64 pauth2-no-key-da+MP+dmb.sy+autda
 Variant=pauth2,no-key-da
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-no-key-da+MP+dmb.sy+autdza.litmus b/catalogue/aarch64-PAC/tests/pauth2-no-key-da+MP+dmb.sy+autdza.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-disable-basic-dep-pointer
+AArch64 pauth2-no-key-da+MP+dmb.sy+autdza
 Variant=pauth2,no-key-da
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-no-key-da+MP+dmb.sy+pacda.litmus b/catalogue/aarch64-PAC/tests/pauth2-no-key-da+MP+dmb.sy+pacda.litmus
@@ -1,4 +1,4 @@
-AArch64 pacda-disable-no-basic-dep-modifier
+AArch64 pauth2-no-key-da+MP+dmb.sy+pacda
 Variant=pauth2,no-key-da
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-no-key-da+MP+dmb.sy+pacdza.litmus b/catalogue/aarch64-PAC/tests/pauth2-no-key-da+MP+dmb.sy+pacdza.litmus
@@ -1,4 +1,4 @@
-AArch64 pacda-disable-basic-dep-pointer
+AArch64 pauth2-no-key-da+MP+dmb.sy+pacdza
 Variant=pauth2,no-key-da
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-no-key-da+S+dmb.sy+pacda.litmus b/catalogue/aarch64-PAC/tests/pauth2-no-key-da+S+dmb.sy+pacda.litmus
@@ -1,4 +1,4 @@
-AArch64 pacda-disable-no-pick-basic-dep-modifier
+AArch64 pauth2-no-key-da+S+dmb.sy+pacda
 Variant=pauth2,no-key-da
 {
   int64_t x=0;
diff --git a/catalogue/aarch64-PAC/tests/pauth2-no-key-da+S+dmb.sy+po-autda.litmus b/catalogue/aarch64-PAC/tests/pauth2-no-key-da+S+dmb.sy+po-autda.litmus
@@ -1,4 +1,4 @@
-AArch64 autda-disable-no-pick-basic-dep-modifier
+AArch64 pauth2-no-key-da+S+dmb.sy+po-autda
 Variant=pauth2,no-key-da
 {
   int64_t x=0;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AArch64 pauth1-autda-success-no-basic-dep-modifier`
	`1`	`+AArch64 pauth1+MP+dmb.sy+pacdza-autda`
`2`	`2`	`variant=pauth1`
`3`	`3`	`{`
`4`	`4`	`int64_t x=0;`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`		`-AArch64 pauth1-autda-success-basic-dep-pointer`
	`1`	`+AArch64 pauth1+MP+dmb.sy+pacdza-autdza`
`2`	`2`	`Variant=pauth1`
`3`	`3`	`{`
`4`	`4`	`int64_t x=0;`
`5`	`5`	`int64_t y=0;`
`6`	`6`	`0:X0=x; 0:X1=y; int64_t 0:X2=1;`
`7`	`7`	`1:X0=x; 1:X1=y; int64_t 1:X2=0; int64_t 1:X3=0;`
`8`		`-`
`9`	`8`	`}`
`10`	`9`	`P0 \| P1 ;`
`11`	`10`	`STR X2,[X0] \| PACDZA X0 ; (* Write pacda(x) in 1:X0 *)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AArch64 pauth1-autda-success-pick-basic-dep-modifier`
	`1`	`+AArch64 pauth1+S+dmb.sy+pacdza-autda`
`2`	`2`	`variant=pauth1`
`3`	`3`	`{`
`4`	`4`	`int64_t x=0;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AArch64 pauth1-autda-failure-no-basic-dep-modifier`
	`1`	`+AArch64 pauth1+WW+RR+R+dmb.sy+autda-xpacd+pacdza`
`2`	`2`	`variant=pauth1`
`3`	`3`	`{`
`4`	`4`	`int64_t x=0;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AArch64 pauth1-autda-failure-basic-dep-pointer`
	`1`	`+AArch64 pauth1+WW+RR+R+dmb.sy+autdza-xpacd+pacdza`
`2`	`2`	`Variant=pauth1`
`3`	`3`	`{`
`4`	`4`	`int64_t x=0;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AArch64 pauth1-autda-failure-pick-basic-dep-modifier`
	`1`	`+AArch64 pauth1+WW+RW+R+dmb.sy+autda-xpacd+pacdza`
`2`	`2`	`variant=pauth1`
`3`	`3`	`{`
`4`	`4`	`int64_t x=0;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-AArch64 pacda-basic-dep-pointer`
	`1`	`+AArch64 pauth2+MP+dmb.sy+add-pacdza-xpacd`
`2`	`2`	`Variant=pauth2`
`3`	`3`	`{`
`4`	`4`	`int64_t x=0;`