[litmus] Enable check_dic_idc for presi and kvm modes

Author: diaolo01

Makefile.aarch64

@@ -142,7 +142,7 @@ litmus-cata-aarch64-VMSA-test-kvm: litmus-aarch64-dep
 	$(RM) -r $(KUT_DIR_AARCH64)/kvm-unit-tests/t
 	@ echo "litmus7 in -mode kvm catalogue aarch64-VMSA tests: OK"
 
-litmus-aarch64-run:: litmus-cata-aarch64-ifetch-test-kvm
+litmus-aarch64-norun:: litmus-cata-aarch64-ifetch-test-kvm
 
 # Test UDF+2H is not terminating, do not execute it.
 # See NORUN below.

litmus/libdir/_aarch64/self.c

@@ -50,8 +50,8 @@ inline static void check_dic_idc(int need_dic, int need_idc) {
   int idc = (ctr_el0 >> 28) & 1;
   int dic = (ctr_el0 >> 29) & 1;
   if ((need_dic && !dic) || (need_idc && !idc)) {
-    fprintf(stderr, "Fatal error: hardware does not support the CacheType "
-            "feature IDC=%d, DIC=%d\n", need_idc, need_dic);
+    printf("Required hardware features not available on this system: \n"
+           "IDC=%d, DIC=%d\n", idc, dic);
     exit(0);
   }
 }

litmus/preSi.ml

@@ -2329,6 +2329,22 @@ module Make
         end ;
         if Cfg.variant Variant_litmus.ConstPacField then
           O.fi "if (!check_const_pac_field_variant(%S)) return 0;" doc.Name.name;
+        if do_self then begin
+          let cache_type = CacheType.get test.T.info in
+          let needs_dic, needs_idc =
+            let open CacheType in
+            match cache_type with
+            | None -> (fun _ -> false), (fun _ -> false)
+            | Some cache_type -> cache_type.dic, cache_type.idc in
+          (* Arm ARM: CTR_EL0.DIC/IDC are common within an Inner Shareable domain. *)
+          begin match forall_procs test needs_dic, forall_procs test needs_idc with
+          | Some dic, Some idc ->
+              O.fi "check_dic_idc(%d, %d);"
+                (if dic then 1 else 0)
+                (if idc then 1 else 0)
+          | _ -> ()
+          end
+        end ;
         if Cfg.is_kvm then begin
           match db with
           | None ->