diff --git a/unittests/InstructionCountCI/Atomics.json b/unittests/InstructionCountCI/Atomics.json
index c3abb79d9..214eb5508 100644
--- a/unittests/InstructionCountCI/Atomics.json
+++ b/unittests/InstructionCountCI/Atomics.json
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2"
     ]
diff --git a/unittests/InstructionCountCI/DDD.json b/unittests/InstructionCountCI/DDD.json
index d73d5630a..c4f252daa 100644
--- a/unittests/InstructionCountCI/DDD.json
+++ b/unittests/InstructionCountCI/DDD.json
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "RPRES"
     ]
   },
diff --git a/unittests/InstructionCountCI/FlagM/Atomics.json b/unittests/InstructionCountCI/FlagM/Atomics.json
index 55f4557c7..8a82e9b60 100644
--- a/unittests/InstructionCountCI/FlagM/Atomics.json
+++ b/unittests/InstructionCountCI/FlagM/Atomics.json
@@ -7,7 +7,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/FlagM/FlagOpts.json b/unittests/InstructionCountCI/FlagM/FlagOpts.json
index 117de49ac..653b3e9d4 100644
--- a/unittests/InstructionCountCI/FlagM/FlagOpts.json
+++ b/unittests/InstructionCountCI/FlagM/FlagOpts.json
@@ -6,7 +6,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/FlagM/H0F38.json b/unittests/InstructionCountCI/FlagM/H0F38.json
index fe2d76bb4..b81f7e422 100644
--- a/unittests/InstructionCountCI/FlagM/H0F38.json
+++ b/unittests/InstructionCountCI/FlagM/H0F38.json
@@ -7,7 +7,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/FlagM/HotBlocks_32Bit.json b/unittests/InstructionCountCI/FlagM/HotBlocks_32Bit.json
index 83866442e..591fbae3d 100644
--- a/unittests/InstructionCountCI/FlagM/HotBlocks_32Bit.json
+++ b/unittests/InstructionCountCI/FlagM/HotBlocks_32Bit.json
@@ -7,7 +7,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/FlagM/Primary.json b/unittests/InstructionCountCI/FlagM/Primary.json
index 66eae54d5..9c79b17a2 100644
--- a/unittests/InstructionCountCI/FlagM/Primary.json
+++ b/unittests/InstructionCountCI/FlagM/Primary.json
@@ -7,7 +7,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/FlagM/PrimaryGroup.json b/unittests/InstructionCountCI/FlagM/PrimaryGroup.json
index 7d1131eda..44a94f971 100644
--- a/unittests/InstructionCountCI/FlagM/PrimaryGroup.json
+++ b/unittests/InstructionCountCI/FlagM/PrimaryGroup.json
@@ -7,7 +7,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/FlagM/Primary_32Bit.json b/unittests/InstructionCountCI/FlagM/Primary_32Bit.json
index 0b80c363b..6b6a2974a 100644
--- a/unittests/InstructionCountCI/FlagM/Primary_32Bit.json
+++ b/unittests/InstructionCountCI/FlagM/Primary_32Bit.json
@@ -7,7 +7,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/FlagM/SecondaryGroup.json b/unittests/InstructionCountCI/FlagM/SecondaryGroup.json
index 91e2f4f7c..d1051cf64 100644
--- a/unittests/InstructionCountCI/FlagM/SecondaryGroup.json
+++ b/unittests/InstructionCountCI/FlagM/SecondaryGroup.json
@@ -8,7 +8,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/FlagM/Secondary_OpSize.json b/unittests/InstructionCountCI/FlagM/Secondary_OpSize.json
index 2317ea463..72aa22289 100644
--- a/unittests/InstructionCountCI/FlagM/Secondary_OpSize.json
+++ b/unittests/InstructionCountCI/FlagM/Secondary_OpSize.json
@@ -8,6 +8,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FCMA"
     ]
   },
diff --git a/unittests/InstructionCountCI/FlagM/VEX_map_group.json b/unittests/InstructionCountCI/FlagM/VEX_map_group.json
index 277bfad73..a26c2bad3 100644
--- a/unittests/InstructionCountCI/FlagM/VEX_map_group.json
+++ b/unittests/InstructionCountCI/FlagM/VEX_map_group.json
@@ -6,7 +6,9 @@
       "FLAGM",
       "FLAGM2"
     ],
-    "DisabledHostFeatures": []
+    "DisabledHostFeatures": [
+      "AFP"
+    ]
   },
   "Instructions": {
     "blsr eax, ebx": {
diff --git a/unittests/InstructionCountCI/H0F38.json b/unittests/InstructionCountCI/H0F38.json
index 23bd27316..38bbde2d6 100644
--- a/unittests/InstructionCountCI/H0F38.json
+++ b/unittests/InstructionCountCI/H0F38.json
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2",
       "CRYPTO"
diff --git a/unittests/InstructionCountCI/Primary.json b/unittests/InstructionCountCI/Primary.json
index cdada83de..482247cf9 100644
--- a/unittests/InstructionCountCI/Primary.json
+++ b/unittests/InstructionCountCI/Primary.json
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2"
     ]
diff --git a/unittests/InstructionCountCI/PrimaryGroup.json b/unittests/InstructionCountCI/PrimaryGroup.json
index 7ab863de0..986497762 100644
--- a/unittests/InstructionCountCI/PrimaryGroup.json
+++ b/unittests/InstructionCountCI/PrimaryGroup.json
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2"
     ]
diff --git a/unittests/InstructionCountCI/Primary_32Bit.json b/unittests/InstructionCountCI/Primary_32Bit.json
index 0af0d22cd..6d6a19b12 100644
--- a/unittests/InstructionCountCI/Primary_32Bit.json
+++ b/unittests/InstructionCountCI/Primary_32Bit.json
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FlagM",
       "FlagM2"
     ]
diff --git a/unittests/InstructionCountCI/SSE42_Strings.json b/unittests/InstructionCountCI/SSE42_Strings.json
index 4987a5ac1..ae0a2d2b9 100644
--- a/unittests/InstructionCountCI/SSE42_Strings.json
+++ b/unittests/InstructionCountCI/SSE42_Strings.json
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2",
       "CRYPTO"
diff --git a/unittests/InstructionCountCI/SecondaryGroup.json b/unittests/InstructionCountCI/SecondaryGroup.json
index 23ef022c7..395847d7d 100644
--- a/unittests/InstructionCountCI/SecondaryGroup.json
+++ b/unittests/InstructionCountCI/SecondaryGroup.json
@@ -7,6 +7,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2"
     ]
diff --git a/unittests/InstructionCountCI/Secondary_32Bit.json b/unittests/InstructionCountCI/Secondary_32Bit.json
index 740ca1cc5..8452578cb 100644
--- a/unittests/InstructionCountCI/Secondary_32Bit.json
+++ b/unittests/InstructionCountCI/Secondary_32Bit.json
@@ -4,7 +4,8 @@
     "EnabledHostFeatures": [],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/Secondary_OpSize.json b/unittests/InstructionCountCI/Secondary_OpSize.json
index c0d6596e8..65649b0d7 100644
--- a/unittests/InstructionCountCI/Secondary_OpSize.json
+++ b/unittests/InstructionCountCI/Secondary_OpSize.json
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FCMA",
       "FLAGM",
       "FLAGM2"
diff --git a/unittests/InstructionCountCI/Secondary_OpSize_FCMA.json b/unittests/InstructionCountCI/Secondary_OpSize_FCMA.json
index e4353bb3c..10242b16e 100644
--- a/unittests/InstructionCountCI/Secondary_OpSize_FCMA.json
+++ b/unittests/InstructionCountCI/Secondary_OpSize_FCMA.json
@@ -6,7 +6,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/Secondary_OpSize_SVE128.json b/unittests/InstructionCountCI/Secondary_OpSize_SVE128.json
index 2ab3ee916..26073daff 100644
--- a/unittests/InstructionCountCI/Secondary_OpSize_SVE128.json
+++ b/unittests/InstructionCountCI/Secondary_OpSize_SVE128.json
@@ -5,7 +5,8 @@
       "SVE128"
     ],
     "DisabledHostFeatures": [
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/Secondary_OpSize_SVE256.json b/unittests/InstructionCountCI/Secondary_OpSize_SVE256.json
index 768bcf23c..8a08e5d2e 100644
--- a/unittests/InstructionCountCI/Secondary_OpSize_SVE256.json
+++ b/unittests/InstructionCountCI/Secondary_OpSize_SVE256.json
@@ -3,7 +3,8 @@
     "Bitness": 64,
     "EnabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ],
     "DisabledHostFeatures": []
   },
diff --git a/unittests/InstructionCountCI/Secondary_REPNE_FCMA.json b/unittests/InstructionCountCI/Secondary_REPNE_FCMA.json
index c3cb46884..09db2e0fd 100644
--- a/unittests/InstructionCountCI/Secondary_REPNE_FCMA.json
+++ b/unittests/InstructionCountCI/Secondary_REPNE_FCMA.json
@@ -6,7 +6,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/Secondary_SVE128.json b/unittests/InstructionCountCI/Secondary_SVE128.json
index e7dc32671..e52957261 100644
--- a/unittests/InstructionCountCI/Secondary_SVE128.json
+++ b/unittests/InstructionCountCI/Secondary_SVE128.json
@@ -5,7 +5,8 @@
       "SVE128"
     ],
     "DisabledHostFeatures": [
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {
diff --git a/unittests/InstructionCountCI/VEX_map1_FCMA.json b/unittests/InstructionCountCI/VEX_map1_FCMA.json
index b4aca9636..9faceb39f 100644
--- a/unittests/InstructionCountCI/VEX_map1_FCMA.json
+++ b/unittests/InstructionCountCI/VEX_map1_FCMA.json
@@ -4,6 +4,7 @@
     "EnabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FCMA"
     ],
     "DisabledHostFeatures": []
diff --git a/unittests/InstructionCountCI/VEX_map_group.json b/unittests/InstructionCountCI/VEX_map_group.json
index 21859ec7f..46835254f 100644
--- a/unittests/InstructionCountCI/VEX_map_group.json
+++ b/unittests/InstructionCountCI/VEX_map_group.json
@@ -5,6 +5,7 @@
       "SVE256"
     ],
     "DisabledHostFeatures": [
+      "AFP",
       "FLAGM",
       "FLAGM2"
     ]