(litmus) broad update to requires

rems-project · Jan 2, 2025 · d117766 · d117766
1 parent 8d19fe7
commit d117766
Show file tree

Hide file tree

Showing 123 changed files with 123 additions and 122 deletions.
diff --git a/litmus/litmus_tests/amo/MP+po_p_amoswap_pl-coi+addr.c b/litmus/litmus_tests/amo/MP+po_p_amoswap_pl-coi+addr.c
@@ -54,4 +54,5 @@ litmus_test_t MP_pop_amoswap_pl_coi_addr = {
     /* p1:x4 =*/0,
   },
   .no_sc_results = 3,
+  .requires = REQUIRES_ARM_AARCH64_FEAT_LSE,
 };
diff --git a/litmus/litmus_tests/checks/check1.c b/litmus/litmus_tests/checks/check1.c
@@ -108,5 +108,5 @@ litmus_test_t check1 = {
       (th_f*)teardown,
       (th_f*)teardown,
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
 };
diff --git a/litmus/litmus_tests/checks/check2.c b/litmus/litmus_tests/checks/check2.c
@@ -83,5 +83,5 @@ litmus_test_t check2 = {
       (th_f*)teardown,
       (th_f*)teardown,
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
 };
diff --git a/litmus/litmus_tests/checks/check5.c b/litmus/litmus_tests/checks/check5.c
@@ -35,5 +35,5 @@ litmus_test_t check5 = {
     (u32 * *[]){
       (u32*[]){ (u32*)handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
 };
diff --git a/litmus/litmus_tests/checks/check6.c b/litmus/litmus_tests/checks/check6.c
@@ -36,5 +36,5 @@ litmus_test_t check6 = {
   .interesting_result = (u64[]){
     /* p0:x0 =*/1,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
 };
diff --git a/litmus/litmus_tests/exc/faults/MP+dmb+fault.c b/litmus/litmus_tests/exc/faults/MP+dmb+fault.c
@@ -64,7 +64,7 @@ litmus_test_t MP_dmb_fault = {
   MAKE_VARS(VARS),
   MAKE_REGS(REGS),
   INIT_STATE(3, INIT_VAR(x, 0), INIT_VAR(y, 0), INIT_UNMAPPED(z)),
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .thread_sync_handlers =
     (u32 * *[]){
       (u32*[]){ NULL, NULL },

diff --git a/litmus/litmus_tests/exc/faults/MP+fault+dmb.c b/litmus/litmus_tests/exc/faults/MP+fault+dmb.c
@@ -56,7 +56,7 @@ litmus_test_t MP_fault_dmb = {
   MAKE_VARS(VARS),
   MAKE_REGS(REGS),
   INIT_STATE(3, INIT_VAR(x, 0), INIT_VAR(y, 0), INIT_UNMAPPED(z)),
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .thread_sync_handlers =
     (u32 * *[]){
       (u32*[]){ (u32*)sync_handler, NULL },

diff --git a/litmus/litmus_tests/exc/faults/SB+faults.c b/litmus/litmus_tests/exc/faults/SB+faults.c
@@ -80,7 +80,7 @@ litmus_test_t SB_faults = {
   MAKE_VARS(VARS),
   MAKE_REGS(REGS),
   INIT_STATE(3, INIT_VAR(x, 0), INIT_VAR(y, 0), INIT_UNMAPPED(z)),
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .thread_sync_handlers =
     (u32 * *[]){
       (u32*[]){ (u32*)sync_handler0, NULL },

diff --git a/litmus/litmus_tests/pgtable/CoRT+dsb-isb.c b/litmus/litmus_tests/pgtable/CoRT+dsb-isb.c
@@ -50,6 +50,6 @@ litmus_test_t CoRT_dsbisb = {
     /* p0:x0 =*/1,
     /* p0:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoRT.c b/litmus/litmus_tests/pgtable/CoRT.c
@@ -48,6 +48,6 @@ litmus_test_t CoRT = {
     /* p0:x0 =*/1,
     /* p0:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR+addr.c b/litmus/litmus_tests/pgtable/CoTR+addr.c
@@ -51,6 +51,6 @@ litmus_test_t CoTR_addr = {
     /* p0:x0 =*/1,
     /* p0:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR+dmb.c b/litmus/litmus_tests/pgtable/CoTR+dmb.c
@@ -51,6 +51,6 @@ litmus_test_t CoTR_dmb = {
     /* p0:x0 =*/1,
     /* p0:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR+dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR+dsb-isb.c
@@ -51,6 +51,6 @@ litmus_test_t CoTR_dsbisb = {
     /* p0:x0 =*/1,
     /* p0:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR+dsb.c b/litmus/litmus_tests/pgtable/CoTR+dsb.c
@@ -50,6 +50,6 @@ litmus_test_t CoTR_dsb = {
     /* p0:x0 =*/1,
     /* p0:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR.c b/litmus/litmus_tests/pgtable/CoTR.c
@@ -49,6 +49,6 @@ litmus_test_t CoTR = {
     /* p0:x0 =*/1,
     /* p0:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR.inv+dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR.inv+dsb-isb.c
@@ -60,6 +60,6 @@ litmus_test_t CoTRinv_dsbisb = {
       (u32*[]){ NULL, NULL },
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR.inv.c b/litmus/litmus_tests/pgtable/CoTR.inv.c
@@ -58,6 +58,6 @@ litmus_test_t CoTRinv = {
       (u32*[]){ NULL, NULL },
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR1+dsb-dc-dsb-tlbi-dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR1+dsb-dc-dsb-tlbi-dsb-isb.c
@@ -57,6 +57,6 @@ litmus_test_t CoTR1_dsbdcdsbtlbidsbisb = {
     /* p0:x2 =*/0,
   },
   .start_els = (int[]){ 0, 1 },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR1+dsb-tlbi-dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR1+dsb-tlbi-dsb-isb.c
@@ -55,6 +55,6 @@ litmus_test_t CoTR1_dsbtlbidsbisb = {
     /* p0:x2 =*/0,
   },
   .start_els = (int[]){ 0, 1 },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTR1.tlbi+dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR1.tlbi+dsb-isb.c
@@ -55,6 +55,6 @@ litmus_test_t CoTR1tlbi_dsbdsbisb = {
     /* p0:x2 =*/0,
   },
   .start_els = (int[]){ 0, 1 },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTT.c b/litmus/litmus_tests/pgtable/CoTT.c
@@ -46,6 +46,6 @@ litmus_test_t CoTT = {
     /* p0:x0 =*/1,
     /* p0:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 3,
 };
diff --git a/litmus/litmus_tests/pgtable/CoTW.c b/litmus/litmus_tests/pgtable/CoTW.c
@@ -33,7 +33,7 @@ litmus_test_t CoTW = {
   .interesting_result = (u64[]){
     /* p0:x2 =*/1,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
   .expected_allowed =
     (arch_allow_st[]){

diff --git a/litmus/litmus_tests/pgtable/CoWT+dsb-isb.c b/litmus/litmus_tests/pgtable/CoWT+dsb-isb.c
@@ -35,6 +35,6 @@ litmus_test_t CoWT_dsbisb = {
   .interesting_result = (u64[]){
     /* p0:x2 =*/1,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT+dsb-svc-tlbi-dsb.c b/litmus/litmus_tests/pgtable/CoWT+dsb-svc-tlbi-dsb.c
@@ -49,6 +49,6 @@ litmus_test_t CoWT_dsbsvctlbidsb = {
     (u32 * *[]){
       (u32*[]){ (u32*)svc_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT+dsb.c b/litmus/litmus_tests/pgtable/CoWT+dsb.c
@@ -32,6 +32,6 @@ litmus_test_t CoWT_dsb = {
   .interesting_result = (u64[]){
     /* p0:x2 =*/1,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT.c b/litmus/litmus_tests/pgtable/CoWT.c
@@ -33,6 +33,6 @@ litmus_test_t CoWT = {
   .interesting_result = (u64[]){
     /* p0:x2 =*/1,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT.inv+dmb.c b/litmus/litmus_tests/pgtable/CoWT.inv+dmb.c
@@ -43,6 +43,6 @@ litmus_test_t CoWTinv_dmb = {
     (u32 * *[]){
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT.inv+dsb-isb.c b/litmus/litmus_tests/pgtable/CoWT.inv+dsb-isb.c
@@ -44,6 +44,6 @@ litmus_test_t CoWTinv_dsbisb = {
     (u32 * *[]){
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT.inv+dsb.c b/litmus/litmus_tests/pgtable/CoWT.inv+dsb.c
@@ -43,6 +43,6 @@ litmus_test_t CoWTinv_dsb = {
     (u32 * *[]){
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT.inv.c b/litmus/litmus_tests/pgtable/CoWT.inv.c
@@ -42,6 +42,6 @@ litmus_test_t CoWTinv = {
     (u32 * *[]){
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb-isb.c b/litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb-isb.c
@@ -42,6 +42,6 @@ litmus_test_t CoWT1_dsbtlbidsbisb = {
     (int[]){
       1,
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb.c b/litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb.c
@@ -41,6 +41,6 @@ litmus_test_t CoWT1_dsbtlbidsb = {
     (int[]){
       1,
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWinvT+dsb-isb.c b/litmus/litmus_tests/pgtable/CoWinvT+dsb-isb.c
@@ -42,6 +42,6 @@ litmus_test_t CoWinvT_dsbisb = {
     (u32 * *[]){
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWinvT.c b/litmus/litmus_tests/pgtable/CoWinvT.c
@@ -42,6 +42,6 @@ litmus_test_t CoWinvT = {
     (u32 * *[]){
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWinvT1+dsb-tlbi-dsb.c b/litmus/litmus_tests/pgtable/CoWinvT1+dsb-tlbi-dsb.c
@@ -50,6 +50,6 @@ litmus_test_t CoWinvT1_dsbtlbidsb = {
     (u32 * *[]){
       (u32*[]){ NULL, (u32*)sync_handler },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb-isb.c b/litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb-isb.c
@@ -48,6 +48,6 @@ litmus_test_t CoWinvT1_tlbidsbisb = {
     (u32 * *[]){
       (u32*[]){ NULL, (u32*)sync_handler },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb.c b/litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb.c
@@ -49,6 +49,6 @@ litmus_test_t CoWinvT1_tlbidsb = {
     (u32 * *[]){
       (u32*[]){ NULL, (u32*)sync_handler },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/CoWinvWT1+dsb-tlbi-dsb-dsb-isb.c b/litmus/litmus_tests/pgtable/CoWinvWT1+dsb-tlbi-dsb-dsb-isb.c
@@ -62,6 +62,6 @@ litmus_test_t CoWinvWT1_dsbtlbidsbdsbisb = {
     (u32 * *[]){
       (u32*[]){ NULL, (u32*)sync_handler },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 1,
 };
diff --git a/litmus/litmus_tests/pgtable/ISA2.TRR+dmb+po+dmb.c b/litmus/litmus_tests/pgtable/ISA2.TRR+dmb+po+dmb.c
@@ -62,6 +62,6 @@ litmus_test_t ISA2trr_dmb_po_dmb = {
     /* p2:x0 =*/1,
     /* p2:x2 =*/0,
   },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 7,
 };
diff --git a/litmus/litmus_tests/pgtable/MP.BBM+dmb-dmb+dmb.c b/litmus/litmus_tests/pgtable/MP.BBM+dmb-dmb+dmb.c
@@ -71,6 +71,6 @@ litmus_test_t MPBBM_dmbdmb_dmb = {
       (u32*[]){ NULL, NULL },
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 4,
 };
diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+[dmb.ld]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1+[dmb.ld]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c
@@ -111,6 +111,6 @@ litmus_test_t BBM1_dmblddsbtlbiisdsbisbdsbisb_dsbisb = {
       (u32*[]){ (u32*)sync_handler, NULL },
       (u32*[]){ NULL, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 16,
 };
diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+[dmb.ld]-tlbiis-dsb-isb-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1+[dmb.ld]-tlbiis-dsb-isb-dsb-isb+dsb-isb.c
@@ -110,6 +110,6 @@ litmus_test_t BBM1_dmbldtlbiisdsbisbdsbisb_dsbisb = {
       (u32*[]){ (u32*)sync_handler, NULL },
       (u32*[]){ NULL, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 16,
 };
diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+[po]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1+[po]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c
@@ -112,6 +112,6 @@ litmus_test_t BBM1_podetourdsbtlbiisdsbisbdsbisb_dsbisb = {
       (u32*[]){ (u32*)sync_handler, NULL },
       (u32*[]){ NULL, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 16,
 };
diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+dmb-tlbiis-dmb-dmb+dmb.c b/litmus/litmus_tests/pgtable/MP.BBM1+dmb-tlbiis-dmb-dmb+dmb.c
@@ -75,6 +75,6 @@ litmus_test_t BBM1_dmbtlbiisdmbdmb_dmb = {
       (u32*[]){ NULL, NULL },
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 4,
 };
diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-isb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-isb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c
@@ -79,6 +79,6 @@ litmus_test_t BBM1_dsbisbtlbiisdsbisbdsbisb_dsbisb = {
       (u32*[]){ NULL, NULL },
       (u32*[]){ (u32*)sync_handler, NULL },
     },
-  .requires_pgtable = 1,
+  .requires=REQUIRES_PGTABLE,
   .no_sc_results = 4,
 };