From d117766dab6828ee8cf022fc5f1d772fbbb66e06 Mon Sep 17 00:00:00 2001 From: bjs Date: Thu, 2 Jan 2025 19:35:16 +0000 Subject: [PATCH] (litmus) broad update to requires --- litmus/litmus_tests/amo/MP+po_p_amoswap_pl-coi+addr.c | 1 + litmus/litmus_tests/checks/check1.c | 2 +- litmus/litmus_tests/checks/check2.c | 2 +- litmus/litmus_tests/checks/check5.c | 2 +- litmus/litmus_tests/checks/check6.c | 2 +- litmus/litmus_tests/exc/faults/MP+dmb+fault.c | 2 +- litmus/litmus_tests/exc/faults/MP+fault+dmb.c | 2 +- litmus/litmus_tests/exc/faults/SB+faults.c | 2 +- litmus/litmus_tests/pgtable/CoRT+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoRT.c | 2 +- litmus/litmus_tests/pgtable/CoTR+addr.c | 2 +- litmus/litmus_tests/pgtable/CoTR+dmb.c | 2 +- litmus/litmus_tests/pgtable/CoTR+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoTR+dsb.c | 2 +- litmus/litmus_tests/pgtable/CoTR.c | 2 +- litmus/litmus_tests/pgtable/CoTR.inv+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoTR.inv.c | 2 +- litmus/litmus_tests/pgtable/CoTR1+dsb-dc-dsb-tlbi-dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoTR1+dsb-tlbi-dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoTR1.tlbi+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoTT.c | 2 +- litmus/litmus_tests/pgtable/CoTW.c | 2 +- litmus/litmus_tests/pgtable/CoWT+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoWT+dsb-svc-tlbi-dsb.c | 2 +- litmus/litmus_tests/pgtable/CoWT+dsb.c | 2 +- litmus/litmus_tests/pgtable/CoWT.c | 2 +- litmus/litmus_tests/pgtable/CoWT.inv+dmb.c | 2 +- litmus/litmus_tests/pgtable/CoWT.inv+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoWT.inv+dsb.c | 2 +- litmus/litmus_tests/pgtable/CoWT.inv.c | 2 +- litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb.c | 2 +- litmus/litmus_tests/pgtable/CoWinvT+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoWinvT.c | 2 +- litmus/litmus_tests/pgtable/CoWinvT1+dsb-tlbi-dsb.c | 2 +- litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb.c | 2 +- litmus/litmus_tests/pgtable/CoWinvWT1+dsb-tlbi-dsb-dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/ISA2.TRR+dmb+po+dmb.c | 2 +- litmus/litmus_tests/pgtable/MP.BBM+dmb-dmb+dmb.c | 2 +- .../MP.BBM1+[dmb.ld]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c | 2 +- .../pgtable/MP.BBM1+[dmb.ld]-tlbiis-dsb-isb-dsb-isb+dsb-isb.c | 2 +- .../pgtable/MP.BBM1+[po]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.BBM1+dmb-tlbiis-dmb-dmb+dmb.c | 2 +- .../pgtable/MP.BBM1+dsb-isb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dmb+dmb.c | 2 +- litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+addr.c | 2 +- .../litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb.c | 2 +- .../pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb-isb.c | 2 +- .../litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb.c | 2 +- .../pgtable/MP.BBM1+po-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.BBM1+po-tlbiis-po-po+po.c | 2 +- litmus/litmus_tests/pgtable/MP.BBM1+tlbiis-dsb-dsb+dsb-isb.c | 2 +- .../MP.BBM1.dud+[po]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c | 2 +- .../pgtable/MP.BBM1.dud+dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c | 2 +- .../pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT+dmbs.c | 2 +- litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbi-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbiis-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT.inv+dmb+addr.c | 2 +- litmus/litmus_tests/pgtable/MP.RT.inv+dmb+po.c | 2 +- litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dmb+dsb-isb.c | 2 +- .../pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dmb.c | 2 +- .../pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dsb-isb.c | 2 +- .../pgtable/MP.RT1+[dmb.ld]-dsb-tlbiis-dsb-isb+dmb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb+dsb-isb.c | 2 +- .../pgtable/MP.RT1+dc-dsb-tlbiall-dsb-isb+dsb-isb.c | 2 +- .../pgtable/MP.RT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbi-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiall-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiallis-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dmb.c | 2 +- litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dsb-isb.c | 2 +- .../pgtable/MP.RT1+dsb-tlbiis-dsb-tlbiis-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.TT+Winv-dmb-Winv+tpo.c | 2 +- litmus/litmus_tests/pgtable/MP.TT+dmb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.TT+dmb+tpo.c | 2 +- litmus/litmus_tests/pgtable/MP.TT.inv+dmb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.TT.inv+dmb+tpo.c | 2 +- litmus/litmus_tests/pgtable/MP.invRT+dsb+dsb-isb.c | 2 +- .../pgtable/MP.invRT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb.c | 2 +- litmus/litmus_tests/pgtable/WRC.AT+ctrl+dsb.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRR+addr+dmb.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRR.inv+addrs.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT+addr+dmb.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT+dmbs.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT+dsb-isbs.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT.inv+addrs.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT.inv+dsb-isbs.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT.inv+po+addr.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT.inv+po+dmb.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dmb.c | 2 +- litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/aliasing/CoWR.alias.c | 2 +- .../pgtable/cacheability/MP.NC+dsb-dc-dsb-dmb+dmb.c | 2 +- litmus/litmus_tests/pgtable/cacheability/MP.NC+po-dmb+dmb.c | 2 +- .../pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dc-dsb-dmb+dmb.c | 2 +- .../pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dmb+dmb.c | 2 +- litmus/litmus_tests/pgtable/cacheability/WR.NC+dsb.c | 2 +- litmus/litmus_tests/pgtable/cacheability/WR.NC+po.c | 2 +- litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+dsb.c | 2 +- litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+po.c | 2 +- litmus/litmus_tests/pgtable/cacheability/WWR.NC+po-po.c | 2 +- litmus/litmus_tests/pgtable/pmds/CoWT.L23+dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/pmds/CoWT.L23+po.c | 2 +- litmus/litmus_tests/pgtable/pmds/CoWT1.L23+dsb-tlbi-dsb-isb.c | 2 +- litmus/litmus_tests/pgtable/pmds/ROT+dsb-dsb.c | 2 +- litmus/litmus_tests/pgtable/pmds/ROT+po-po.c | 2 +- litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbi-dsb.c | 2 +- litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbivaa-dsb.c | 2 +- litmus/litmus_tests/pgtable/same_page/CoTT+dsb-popage.c | 2 +- litmus/litmus_tests/pgtable/same_page/CoTT+po-popage.c | 2 +- litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-dc-dsb.c | 2 +- litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-po.c | 2 +- .../pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-dc-dsb.c | 2 +- .../litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-po.c | 2 +- litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+po-po.c | 2 +- litmus/litmus_tests/timing/MP.times+pos.c | 2 +- 123 files changed, 123 insertions(+), 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 index 9f9e881..7b947d7 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/checks/check1.c b/litmus/litmus_tests/checks/check1.c index 0dd37dc..71ffb77 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/checks/check2.c b/litmus/litmus_tests/checks/check2.c index d2e0035..db6f6c6 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/checks/check5.c b/litmus/litmus_tests/checks/check5.c index d8520e5..e05ff0f 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/checks/check6.c b/litmus/litmus_tests/checks/check6.c index ca26655..dd235b8 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/exc/faults/MP+dmb+fault.c b/litmus/litmus_tests/exc/faults/MP+dmb+fault.c index 72eff3b..f93ca0a 100644 --- 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 index 70f0d3f..91d1a3c 100644 --- 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 index 63dc2fc..5de1198 100644 --- 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 index c5d7a4a..8abab98 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoRT.c b/litmus/litmus_tests/pgtable/CoRT.c index 742c145..b017800 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR+addr.c b/litmus/litmus_tests/pgtable/CoTR+addr.c index a2d7071..dc26e09 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR+dmb.c b/litmus/litmus_tests/pgtable/CoTR+dmb.c index cd7d670..c998bcc 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR+dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR+dsb-isb.c index add2de1..8cc5891 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR+dsb.c b/litmus/litmus_tests/pgtable/CoTR+dsb.c index ccb87c1..f53d11d 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR.c b/litmus/litmus_tests/pgtable/CoTR.c index 6c2c5b5..a5ae8bd 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR.inv+dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR.inv+dsb-isb.c index 6f71ab4..9183355 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR.inv.c b/litmus/litmus_tests/pgtable/CoTR.inv.c index 68aa000..35ed56b 100644 --- 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, }; \ No newline at end of file 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 index d4a64cf..a803413 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR1+dsb-tlbi-dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR1+dsb-tlbi-dsb-isb.c index d7e8ef0..455018f 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTR1.tlbi+dsb-isb.c b/litmus/litmus_tests/pgtable/CoTR1.tlbi+dsb-isb.c index 0033ed3..de0edab 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTT.c b/litmus/litmus_tests/pgtable/CoTT.c index 6233ff3..3c80683 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoTW.c b/litmus/litmus_tests/pgtable/CoTW.c index 64ea8d3..5832969 100644 --- 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 index f1f7a93..5dff7f0 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT+dsb-svc-tlbi-dsb.c b/litmus/litmus_tests/pgtable/CoWT+dsb-svc-tlbi-dsb.c index db6547b..5f99684 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT+dsb.c b/litmus/litmus_tests/pgtable/CoWT+dsb.c index aa030d7..7cb5932 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT.c b/litmus/litmus_tests/pgtable/CoWT.c index 098f4aa..0eb5832 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT.inv+dmb.c b/litmus/litmus_tests/pgtable/CoWT.inv+dmb.c index a46d314..d1dd052 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT.inv+dsb-isb.c b/litmus/litmus_tests/pgtable/CoWT.inv+dsb-isb.c index b850170..87fb82d 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT.inv+dsb.c b/litmus/litmus_tests/pgtable/CoWT.inv+dsb.c index b0c3ebf..be3d453 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT.inv.c b/litmus/litmus_tests/pgtable/CoWT.inv.c index ee4227f..a3f475e 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb-isb.c b/litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb-isb.c index 5b14dec..a787cfd 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb.c b/litmus/litmus_tests/pgtable/CoWT1+dsb-tlbi-dsb.c index 8cff153..a777213 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWinvT+dsb-isb.c b/litmus/litmus_tests/pgtable/CoWinvT+dsb-isb.c index 95e86c8..291175c 100644 --- 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 index 25d1411..a075bff 100644 --- 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 index 13428c8..f5ae0e3 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb-isb.c b/litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb-isb.c index 88f63a2..d4aed14 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb.c b/litmus/litmus_tests/pgtable/CoWinvT1+tlbi-dsb.c index 0c07fba..7e714d2 100644 --- 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, }; \ No newline at end of file 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 index 3804b1c..0fcba05 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/ISA2.TRR+dmb+po+dmb.c b/litmus/litmus_tests/pgtable/ISA2.TRR+dmb+po+dmb.c index dcb3366..77a6097 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM+dmb-dmb+dmb.c b/litmus/litmus_tests/pgtable/MP.BBM+dmb-dmb+dmb.c index 5b65079..8c8e3c5 100644 --- 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, }; \ No newline at end of file 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 index f847485..86ef3e5 100644 --- 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, }; \ No newline at end of file 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 index 9de083d..fb1f75a 100644 --- 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, }; \ No newline at end of file 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 index d2a299e..0ab7417 100644 --- 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, }; \ No newline at end of file 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 index 2502158..685a2d0 100644 --- 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, }; \ No newline at end of file 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 index e8beb1a..209b74f 100644 --- 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, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dmb+dmb.c b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dmb+dmb.c index 62a944b..e4130de 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dmb+dmb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dmb+dmb.c @@ -75,6 +75,6 @@ litmus_test_t MPBBM1_dsbtlbiisdsbdmb_dmb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+addr.c b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+addr.c index 20af5f6..1fc41d1 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+addr.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+addr.c @@ -75,6 +75,6 @@ litmus_test_t BBM1_dsbtlbiisdsbdsb_addr = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb-isb.c index 106fb2d..330d7d6 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb-isb.c @@ -76,6 +76,6 @@ litmus_test_t BBM1_dsbtlbiisdsbdsb_dsbisb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb.c b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb.c index 7315283..a9a0fcf 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb+dsb.c @@ -75,6 +75,6 @@ litmus_test_t BBM1_dsbtlbiisdsbdsb_dsb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb-isb.c index 5a3497d..bf7ade9 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb-isb.c @@ -77,6 +77,6 @@ litmus_test_t BBM1_dsbtlbiisdsbdsbisb_dsbisb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb.c b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb.c index d4b06f0..2008527 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1+dsb-tlbiis-dsb-dsb-isb+dsb.c @@ -76,6 +76,6 @@ litmus_test_t BBM1_dsbtlbiisdsbdsbisb_dsb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file 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 index ae6c13c..3cf773a 100644 --- 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 @@ -84,6 +84,6 @@ litmus_test_t BBM1_podsbtlbiisdsbisbdsbisb_dsbisb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+po-tlbiis-po-po+po.c b/litmus/litmus_tests/pgtable/MP.BBM1+po-tlbiis-po-po+po.c index 1d993da..111e3b6 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1+po-tlbiis-po-po+po.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1+po-tlbiis-po-po+po.c @@ -71,6 +71,6 @@ litmus_test_t BBM1_potlbiispopo_po = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1+tlbiis-dsb-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1+tlbiis-dsb-dsb+dsb-isb.c index 11a2a61..9e81803 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1+tlbiis-dsb-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1+tlbiis-dsb-dsb+dsb-isb.c @@ -75,6 +75,6 @@ litmus_test_t BBM1_tlbiisdsbdsb_dsbisb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1.dud+[po]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1.dud+[po]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c index ed51333..9703f3e 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1.dud+[po]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1.dud+[po]-dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c @@ -111,6 +111,6 @@ litmus_test_t BBM1dud_podetourdsbtlbiisdsbisbdsbisb_dsbisb = { (u32*[]){ (u32*)sync_handler, NULL }, (u32*[]){ NULL, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 12, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1.dud+dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1.dud+dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c index 83d00c9..f7ce163 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1.dud+dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1.dud+dsb-tlbiis-dsb-isb-dsb-isb+dsb-isb.c @@ -103,6 +103,6 @@ litmus_test_t BBM1dud_dsbtlbiisdsbisbdsbisb_dsbisb = { (u32*[]){ (u32*)sync_handler, NULL }, (u32*[]){ NULL, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb-isb.c index cb3be42..98482ea 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb-isb.c @@ -79,6 +79,6 @@ litmus_test_t BBM1id_dsbtlbiisdsbdsb_dsbisb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb.c b/litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb.c index 08b7ee4..771559c 100644 --- a/litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb.c +++ b/litmus/litmus_tests/pgtable/MP.BBM1.id+dsb-tlbiis-dsb-dsb+dsb.c @@ -77,6 +77,6 @@ litmus_test_t BBM1id_dsbtlbiisdsbdsb_dsb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 4, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT+dmbs.c b/litmus/litmus_tests/pgtable/MP.RT+dmbs.c index fb42171..b9343ad 100644 --- a/litmus/litmus_tests/pgtable/MP.RT+dmbs.c +++ b/litmus/litmus_tests/pgtable/MP.RT+dmbs.c @@ -49,6 +49,6 @@ litmus_test_t MPRT_dmbs = { /* p1:x0 =*/1, /* p1:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbi-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbi-dsb+dsb-isb.c index 6bd0983..7bbae08 100644 --- a/litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbi-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbi-dsb+dsb-isb.c @@ -66,6 +66,6 @@ litmus_test_t MPRT_svcdsbtlbidsb_dsbisb = { (u32*[]){ (u32*)svc_handler, NULL }, (u32*[]){ NULL, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbiis-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbiis-dsb+dsb-isb.c index ba0f668..c8d9f43 100644 --- a/litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbiis-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT+svc-dsb-tlbiis-dsb+dsb-isb.c @@ -66,6 +66,6 @@ litmus_test_t MPRT_svcdsbtlbiisdsb_dsbisb = { (u32*[]){ (u32*)svc_handler, NULL }, (u32*[]){ NULL, NULL }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT.inv+dmb+addr.c b/litmus/litmus_tests/pgtable/MP.RT.inv+dmb+addr.c index 0f3eaf2..56b488c 100644 --- a/litmus/litmus_tests/pgtable/MP.RT.inv+dmb+addr.c +++ b/litmus/litmus_tests/pgtable/MP.RT.inv+dmb+addr.c @@ -61,6 +61,6 @@ litmus_test_t MPRTinv_dmb_addr = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT.inv+dmb+po.c b/litmus/litmus_tests/pgtable/MP.RT.inv+dmb+po.c index 0eeed30..a9cd6a1 100644 --- a/litmus/litmus_tests/pgtable/MP.RT.inv+dmb+po.c +++ b/litmus/litmus_tests/pgtable/MP.RT.inv+dmb+po.c @@ -59,6 +59,6 @@ litmus_test_t MPRTinv_dmb_po = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dmb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dmb+dsb-isb.c index 289dfb1..36e4420 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dmb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dmb+dsb-isb.c @@ -83,6 +83,6 @@ litmus_test_t MPRT1_dsbdmblddmb_dsbisb = { /* p2:x2 =*/0, }, .start_els = (int[]){ 1, 0, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 12, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dmb.c b/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dmb.c index 90296e5..6d2630d 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dmb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dmb.c @@ -86,6 +86,6 @@ litmus_test_t MPRT1_dsbdmblddsbisbtlbiisdsbisb_dmb = { /* p2:x2 =*/0, }, .start_els = (int[]){ 1, 0, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 12, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dsb-isb.c index b486053..0e7192f 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-isb-tlbiis-dsb-isb+dsb-isb.c @@ -87,6 +87,6 @@ litmus_test_t MPRT1_dsbdmblddsbisbtlbiisdsbisb_dsbisb = { /* p2:x2 =*/0, }, .start_els = (int[]){ 1, 0, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 12, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-tlbiis-dsb-isb+dmb.c b/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-tlbiis-dsb-isb+dmb.c index 4d39337..3b2cdce 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-tlbiis-dsb-isb+dmb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+[dmb.ld]-dsb-tlbiis-dsb-isb+dmb.c @@ -85,6 +85,6 @@ litmus_test_t MPRT1_dsbdmblddsbtlbiisdsbisb_dmb = { /* p2:x2 =*/0, }, .start_els = (int[]){ 1, 0, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 12, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb+dsb-isb.c index 945df50..7b34238 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb+dsb-isb.c @@ -53,6 +53,6 @@ litmus_test_t MPRT1_dcdsbtlbialldsb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb-isb+dsb-isb.c index 5c4965d..bb595b2 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb-isb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dc-dsb-tlbiall-dsb-isb+dsb-isb.c @@ -54,6 +54,6 @@ litmus_test_t MPRT1_dcdsbtlbialldsbisb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c index 2a38b2d..64f7926 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c @@ -55,6 +55,6 @@ litmus_test_t MPRT1_dsbisbtlbiisdsbisb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbi-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbi-dsb+dsb-isb.c index bbf23b6..23da359 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbi-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbi-dsb+dsb-isb.c @@ -53,6 +53,6 @@ litmus_test_t MPRT1_dsbtlbidsb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiall-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiall-dsb+dsb-isb.c index c523243..55e38cc 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiall-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiall-dsb+dsb-isb.c @@ -52,6 +52,6 @@ litmus_test_t MPRT1_dsbtlbialldsb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiallis-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiallis-dsb+dsb-isb.c index b2d3f75..e2176c1 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiallis-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiallis-dsb+dsb-isb.c @@ -52,6 +52,6 @@ litmus_test_t MPRT1_dsbtlbiallisdsb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb+dsb-isb.c index e51c00a..fe867a8 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb+dsb-isb.c @@ -54,6 +54,6 @@ litmus_test_t MPRT1_dsbtlbiisdsb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dmb.c b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dmb.c index 13bbbf3..af68a7a 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dmb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dmb.c @@ -53,6 +53,6 @@ litmus_test_t MPRT1_dsbtlbiisdsbisb_dmb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dsb-isb.c index e10ec7a..901a17b 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-isb+dsb-isb.c @@ -54,6 +54,6 @@ litmus_test_t MPRT1_dsbtlbiisdsbisb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-tlbiis-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-tlbiis-dsb+dsb-isb.c index d3777d2..ee67d0d 100644 --- a/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-tlbiis-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.RT1+dsb-tlbiis-dsb-tlbiis-dsb+dsb-isb.c @@ -55,6 +55,6 @@ litmus_test_t MPRT1_dsbtlbiisdsbtlbiisdsb_dsbisb = { /* p1:x2 =*/0, }, .start_els = (int[]){ 1, 0 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.TT+Winv-dmb-Winv+tpo.c b/litmus/litmus_tests/pgtable/MP.TT+Winv-dmb-Winv+tpo.c index a14a58d..1f4454b 100644 --- a/litmus/litmus_tests/pgtable/MP.TT+Winv-dmb-Winv+tpo.c +++ b/litmus/litmus_tests/pgtable/MP.TT+Winv-dmb-Winv+tpo.c @@ -66,6 +66,6 @@ litmus_test_t MPTT_WinvdmbWinv_tpo = { /* p0:x0 =*/1, /* p0:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.TT+dmb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.TT+dmb+dsb-isb.c index 85a7e8a..071f797 100644 --- a/litmus/litmus_tests/pgtable/MP.TT+dmb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.TT+dmb+dsb-isb.c @@ -53,6 +53,6 @@ litmus_test_t MPTT_dmb_dsbisb = { /* p0:x0 =*/1, /* p0:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.TT+dmb+tpo.c b/litmus/litmus_tests/pgtable/MP.TT+dmb+tpo.c index f35db05..21b597f 100644 --- a/litmus/litmus_tests/pgtable/MP.TT+dmb+tpo.c +++ b/litmus/litmus_tests/pgtable/MP.TT+dmb+tpo.c @@ -51,6 +51,6 @@ litmus_test_t MPTT_dmb_tpo = { /* p0:x0 =*/1, /* p0:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.TT.inv+dmb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.TT.inv+dmb+dsb-isb.c index da93385..21782f5 100644 --- a/litmus/litmus_tests/pgtable/MP.TT.inv+dmb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.TT.inv+dmb+dsb-isb.c @@ -68,6 +68,6 @@ litmus_test_t MPTTinv_dmb_dsbisb = { /* p0:x0 =*/1, /* p0:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.TT.inv+dmb+tpo.c b/litmus/litmus_tests/pgtable/MP.TT.inv+dmb+tpo.c index 705f36d..0137b53 100644 --- a/litmus/litmus_tests/pgtable/MP.TT.inv+dmb+tpo.c +++ b/litmus/litmus_tests/pgtable/MP.TT.inv+dmb+tpo.c @@ -66,6 +66,6 @@ litmus_test_t MPTTinv_dmb_tpo = { /* p0:x0 =*/1, /* p0:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.invRT+dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.invRT+dsb+dsb-isb.c index a5570ea..85822b9 100644 --- a/litmus/litmus_tests/pgtable/MP.invRT+dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.invRT+dsb+dsb-isb.c @@ -61,6 +61,6 @@ litmus_test_t MPinvRT_dsb_dsbisb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, (u32*)sync_handler }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.invRT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.invRT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c index d8489c0..db0acea 100644 --- a/litmus/litmus_tests/pgtable/MP.invRT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.invRT1+dsb-isb-tlbiis-dsb-isb+dsb-isb.c @@ -66,6 +66,6 @@ litmus_test_t MPinvRT1_dsbisbtlbiisdsbisb_dsbisb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, (u32*)sync_handler }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb-isb.c index 765b69d..856d2e7 100644 --- a/litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb-isb.c @@ -64,6 +64,6 @@ litmus_test_t MPinvRT1_dsbtlbiisdsb_dsbisb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, (u32*)sync_handler }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb.c b/litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb.c index 395cf49..89f9129 100644 --- a/litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb.c +++ b/litmus/litmus_tests/pgtable/MP.invRT1+dsb-tlbiis-dsb+dsb.c @@ -63,6 +63,6 @@ litmus_test_t MPinvRT1_dsbtlbiisdsb_dsb = { (u32*[]){ NULL, NULL }, (u32*[]){ (u32*)sync_handler, (u32*)sync_handler }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.AT+ctrl+dsb.c b/litmus/litmus_tests/pgtable/WRC.AT+ctrl+dsb.c index c2942ea..9d4f5f9 100644 --- a/litmus/litmus_tests/pgtable/WRC.AT+ctrl+dsb.c +++ b/litmus/litmus_tests/pgtable/WRC.AT+ctrl+dsb.c @@ -69,6 +69,6 @@ litmus_test_t WRCat_ctrl_dsb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; diff --git a/litmus/litmus_tests/pgtable/WRC.TRR+addr+dmb.c b/litmus/litmus_tests/pgtable/WRC.TRR+addr+dmb.c index c6c04b9..3c42282 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRR+addr+dmb.c +++ b/litmus/litmus_tests/pgtable/WRC.TRR+addr+dmb.c @@ -71,6 +71,6 @@ litmus_test_t WRCtrr_addr_dmb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRR.inv+addrs.c b/litmus/litmus_tests/pgtable/WRC.TRR.inv+addrs.c index b23c58d..7a2286f 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRR.inv+addrs.c +++ b/litmus/litmus_tests/pgtable/WRC.TRR.inv+addrs.c @@ -84,6 +84,6 @@ litmus_test_t WRCtrrinv_addrs = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT+addr+dmb.c b/litmus/litmus_tests/pgtable/WRC.TRT+addr+dmb.c index 5bc7298..991bf50 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT+addr+dmb.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT+addr+dmb.c @@ -65,6 +65,6 @@ litmus_test_t WRCtrt_addr_dmb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT+dmbs.c b/litmus/litmus_tests/pgtable/WRC.TRT+dmbs.c index d14ee75..d25541d 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT+dmbs.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT+dmbs.c @@ -64,6 +64,6 @@ litmus_test_t WRCtrt_dmbs = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT+dsb-isbs.c b/litmus/litmus_tests/pgtable/WRC.TRT+dsb-isbs.c index 452bf25..42d15c4 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT+dsb-isbs.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT+dsb-isbs.c @@ -66,6 +66,6 @@ litmus_test_t WRCtrt_dsbisbs = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT.inv+addrs.c b/litmus/litmus_tests/pgtable/WRC.TRT.inv+addrs.c index d7cf068..f387dd3 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT.inv+addrs.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT.inv+addrs.c @@ -85,6 +85,6 @@ litmus_test_t WRCtrtinv_addrs = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT.inv+dsb-isbs.c b/litmus/litmus_tests/pgtable/WRC.TRT.inv+dsb-isbs.c index d613538..b66cfbb 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT.inv+dsb-isbs.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT.inv+dsb-isbs.c @@ -83,6 +83,6 @@ litmus_test_t WRCtrtinv_dsbisbs = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT.inv+po+addr.c b/litmus/litmus_tests/pgtable/WRC.TRT.inv+po+addr.c index fa746b6..ebd8b51 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT.inv+po+addr.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT.inv+po+addr.c @@ -80,6 +80,6 @@ litmus_test_t WRCtrtinv_po_addr = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT.inv+po+dmb.c b/litmus/litmus_tests/pgtable/WRC.TRT.inv+po+dmb.c index 86a324f..f14cede 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT.inv+po+dmb.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT.inv+po+dmb.c @@ -80,6 +80,6 @@ litmus_test_t WRCtrtinv_po_dmb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dmb.c b/litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dmb.c index 9ce1ec3..5d93d03 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dmb.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dmb.c @@ -68,6 +68,6 @@ litmus_test_t WRCtrt1_dsbtlbiisdsb_dmb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dsb-isb.c b/litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dsb-isb.c index 55236d9..55cd854 100644 --- a/litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/WRC.TRT1+dsb-tlbiis-dsb+dsb-isb.c @@ -69,6 +69,6 @@ litmus_test_t WRCtrt1_dsbtlbiisdsb_dsbisb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 7, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/aliasing/CoWR.alias.c b/litmus/litmus_tests/pgtable/aliasing/CoWR.alias.c index 24088eb..2dd1323 100644 --- a/litmus/litmus_tests/pgtable/aliasing/CoWR.alias.c +++ b/litmus/litmus_tests/pgtable/aliasing/CoWR.alias.c @@ -33,6 +33,6 @@ litmus_test_t CoWRalias = { .interesting_result = (u64[]){ /* p0:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/MP.NC+dsb-dc-dsb-dmb+dmb.c b/litmus/litmus_tests/pgtable/cacheability/MP.NC+dsb-dc-dsb-dmb+dmb.c index c066b70..c691c9d 100644 --- a/litmus/litmus_tests/pgtable/cacheability/MP.NC+dsb-dc-dsb-dmb+dmb.c +++ b/litmus/litmus_tests/pgtable/cacheability/MP.NC+dsb-dc-dsb-dmb+dmb.c @@ -63,6 +63,6 @@ litmus_test_t MPNC_dsbdcdsbdmb_dmb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/MP.NC+po-dmb+dmb.c b/litmus/litmus_tests/pgtable/cacheability/MP.NC+po-dmb+dmb.c index 156a887..af29c09 100644 --- a/litmus/litmus_tests/pgtable/cacheability/MP.NC+po-dmb+dmb.c +++ b/litmus/litmus_tests/pgtable/cacheability/MP.NC+po-dmb+dmb.c @@ -60,6 +60,6 @@ litmus_test_t MPNC_podmb_dmb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dc-dsb-dmb+dmb.c b/litmus/litmus_tests/pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dc-dsb-dmb+dmb.c index 9ad8dca..be69091 100644 --- a/litmus/litmus_tests/pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dc-dsb-dmb+dmb.c +++ b/litmus/litmus_tests/pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dc-dsb-dmb+dmb.c @@ -67,6 +67,6 @@ litmus_test_t MPNC1_dsbtlbiisdsbdcdsbdmb_dmb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dmb+dmb.c b/litmus/litmus_tests/pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dmb+dmb.c index 72acf22..023d4ce 100644 --- a/litmus/litmus_tests/pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dmb+dmb.c +++ b/litmus/litmus_tests/pgtable/cacheability/MP.NC1+dsb-tlbiis-dsb-dmb+dmb.c @@ -65,6 +65,6 @@ litmus_test_t MPNC1_dsbtlbiisdsbdmb_dmb = { /* p2:x0 =*/1, /* p2:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/WR.NC+dsb.c b/litmus/litmus_tests/pgtable/cacheability/WR.NC+dsb.c index 7e6d63f..2a9b2cc 100644 --- a/litmus/litmus_tests/pgtable/cacheability/WR.NC+dsb.c +++ b/litmus/litmus_tests/pgtable/cacheability/WR.NC+dsb.c @@ -39,6 +39,6 @@ litmus_test_t WRNC_dsb = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/WR.NC+po.c b/litmus/litmus_tests/pgtable/cacheability/WR.NC+po.c index 42fb6f3..7cce41e 100644 --- a/litmus/litmus_tests/pgtable/cacheability/WR.NC+po.c +++ b/litmus/litmus_tests/pgtable/cacheability/WR.NC+po.c @@ -38,6 +38,6 @@ litmus_test_t WRNC_po = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+dsb.c b/litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+dsb.c index 547422a..8eac651 100644 --- a/litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+dsb.c +++ b/litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+dsb.c @@ -39,6 +39,6 @@ litmus_test_t WRWARANC_dsb = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+po.c b/litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+po.c index ece0bed..4c78b85 100644 --- a/litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+po.c +++ b/litmus/litmus_tests/pgtable/cacheability/WR.WARA-NC+po.c @@ -38,6 +38,6 @@ litmus_test_t WRWARANC_po = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/cacheability/WWR.NC+po-po.c b/litmus/litmus_tests/pgtable/cacheability/WWR.NC+po-po.c index ac95a2b..8b8cc39 100644 --- a/litmus/litmus_tests/pgtable/cacheability/WWR.NC+po-po.c +++ b/litmus/litmus_tests/pgtable/cacheability/WWR.NC+po-po.c @@ -45,6 +45,6 @@ litmus_test_t WWRNC_popo = { /* p1:x4 =*/1, }, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/pmds/CoWT.L23+dsb-isb.c b/litmus/litmus_tests/pgtable/pmds/CoWT.L23+dsb-isb.c index ba6d885..7559093 100644 --- a/litmus/litmus_tests/pgtable/pmds/CoWT.L23+dsb-isb.c +++ b/litmus/litmus_tests/pgtable/pmds/CoWT.L23+dsb-isb.c @@ -38,6 +38,6 @@ litmus_test_t CoWTL23_dsbisb = { .interesting_result = (u64[]){ /* p0:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/pmds/CoWT.L23+po.c b/litmus/litmus_tests/pgtable/pmds/CoWT.L23+po.c index 4100c14..61eb5b3 100644 --- a/litmus/litmus_tests/pgtable/pmds/CoWT.L23+po.c +++ b/litmus/litmus_tests/pgtable/pmds/CoWT.L23+po.c @@ -36,6 +36,6 @@ litmus_test_t CoWTL23po = { .interesting_result = (u64[]){ /* p0:x2 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/pmds/CoWT1.L23+dsb-tlbi-dsb-isb.c b/litmus/litmus_tests/pgtable/pmds/CoWT1.L23+dsb-tlbi-dsb-isb.c index eeba946..5e3963a 100644 --- a/litmus/litmus_tests/pgtable/pmds/CoWT1.L23+dsb-tlbi-dsb-isb.c +++ b/litmus/litmus_tests/pgtable/pmds/CoWT1.L23+dsb-tlbi-dsb-isb.c @@ -44,6 +44,6 @@ litmus_test_t CoWT1L23_dsbtlbidsbisb = { (int[]){ 1, }, /* start at El1 for TLBI */ - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/pmds/ROT+dsb-dsb.c b/litmus/litmus_tests/pgtable/pmds/ROT+dsb-dsb.c index d0f48f2..04062c3 100644 --- a/litmus/litmus_tests/pgtable/pmds/ROT+dsb-dsb.c +++ b/litmus/litmus_tests/pgtable/pmds/ROT+dsb-dsb.c @@ -42,6 +42,6 @@ litmus_test_t ROT_dsbdsb = { .interesting_result = (u64[]){ /* p0:x2 =*/1, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 2, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/pmds/ROT+po-po.c b/litmus/litmus_tests/pgtable/pmds/ROT+po-po.c index c4cf890..6c1537d 100644 --- a/litmus/litmus_tests/pgtable/pmds/ROT+po-po.c +++ b/litmus/litmus_tests/pgtable/pmds/ROT+po-po.c @@ -40,6 +40,6 @@ litmus_test_t ROT_popo = { .interesting_result = (u64[]){ /* p0:x2 =*/1, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 2, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbi-dsb.c b/litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbi-dsb.c index 446d13c..70984a2 100644 --- a/litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbi-dsb.c +++ b/litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbi-dsb.c @@ -46,6 +46,6 @@ litmus_test_t ROT1_dsbtlbidsb = { /* p0:x2 =*/1, }, .start_els = (int[]){ 1 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 2, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbivaa-dsb.c b/litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbivaa-dsb.c index 02002e2..53592b3 100644 --- a/litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbivaa-dsb.c +++ b/litmus/litmus_tests/pgtable/pmds/ROT1+dsb-dsb-tlbivaa-dsb.c @@ -46,6 +46,6 @@ litmus_test_t ROT1_dsbtlbivaadsb = { /* p0:x2 =*/1, }, .start_els = (int[]){ 1 }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 2, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/same_page/CoTT+dsb-popage.c b/litmus/litmus_tests/pgtable/same_page/CoTT+dsb-popage.c index 3ceb481..a3e22ea 100644 --- a/litmus/litmus_tests/pgtable/same_page/CoTT+dsb-popage.c +++ b/litmus/litmus_tests/pgtable/same_page/CoTT+dsb-popage.c @@ -38,6 +38,6 @@ litmus_test_t CoTT_dsbpopage = { /* p0:x2 =*/1, /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/same_page/CoTT+po-popage.c b/litmus/litmus_tests/pgtable/same_page/CoTT+po-popage.c index 60401e8..1a1a7f8 100644 --- a/litmus/litmus_tests/pgtable/same_page/CoTT+po-popage.c +++ b/litmus/litmus_tests/pgtable/same_page/CoTT+po-popage.c @@ -37,6 +37,6 @@ litmus_test_t CoTT_popopage = { /* p0:x2 =*/1, /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 3, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-dc-dsb.c b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-dc-dsb.c index 2076652..7dbac31 100644 --- a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-dc-dsb.c +++ b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-dc-dsb.c @@ -54,6 +54,6 @@ litmus_test_t WRMAIR1_dsbisbdcdsb = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-po.c b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-po.c index 8503430..79ca522 100644 --- a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-po.c +++ b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-isb-po.c @@ -52,6 +52,6 @@ litmus_test_t WRMAIR1_dsbisbpo = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-dc-dsb.c b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-dc-dsb.c index f7a62d8..9cec719 100644 --- a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-dc-dsb.c +++ b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-dc-dsb.c @@ -57,6 +57,6 @@ litmus_test_t WRMAIR1_dsbtlbidsbisbdcdsb = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-po.c b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-po.c index daf812f..2b2489e 100644 --- a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-po.c +++ b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+dsb-tlbi-dsb-isb-po.c @@ -55,6 +55,6 @@ litmus_test_t WRMAIR1_dsbtlbidsbisbpo = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+po-po.c b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+po-po.c index 944f677..70e9c58 100644 --- a/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+po-po.c +++ b/litmus/litmus_tests/pgtable/sysreg/WR.MAIR1+po-po.c @@ -50,6 +50,6 @@ litmus_test_t WRMAIR1_popo = { .interesting_result = (u64[]){ /* p0:x4 =*/0, }, - .requires_pgtable = 1, + .requires=REQUIRES_PGTABLE, .no_sc_results = 1, }; \ No newline at end of file diff --git a/litmus/litmus_tests/timing/MP.times+pos.c b/litmus/litmus_tests/timing/MP.times+pos.c index fa8b3fc..0ab5f12 100644 --- a/litmus/litmus_tests/timing/MP.times+pos.c +++ b/litmus/litmus_tests/timing/MP.times+pos.c @@ -60,5 +60,5 @@ litmus_test_t MPtimes_pos = { MAKE_REGS(REGS), INIT_STATE(2, INIT_VAR(x, 0), INIT_VAR(y, 0)), .interesting_result = NULL, - .requires_perf = 1, + .requires=REQUIRES_PERF, };