Merge pull request #3722 from alyssarosenzweig/instcountci/disable-afp

InstCountCI: explicitly disable AFP everywhere
FEX-Emu · Jun 18, 2024 · 7c7d767 · 7c7d767
2 parents 13ebfb1 + 27c8bf3
commit 7c7d767
Show file tree

Hide file tree

Showing 27 changed files with 43 additions and 15 deletions.
diff --git 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
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "RPRES"
     ]
   },

diff --git 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
@@ -6,7 +6,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {

diff --git 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
@@ -7,7 +7,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {

diff --git 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
@@ -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
@@ -7,7 +7,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {

diff --git 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
@@ -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
@@ -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
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2",
       "CRYPTO"

diff --git 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
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2"
     ]

diff --git 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
@@ -5,6 +5,7 @@
     "DisabledHostFeatures": [
       "SVE128",
       "SVE256",
+      "AFP",
       "FLAGM",
       "FLAGM2",
       "CRYPTO"

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -6,7 +6,8 @@
     ],
     "DisabledHostFeatures": [
       "SVE128",
-      "SVE256"
+      "SVE256",
+      "AFP"
     ]
   },
   "Instructions": {

diff --git 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
@@ -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
@@ -5,6 +5,7 @@
       "SVE256"
     ],
     "DisabledHostFeatures": [
+      "AFP",
       "FLAGM",
       "FLAGM2"
     ]
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,6 +5,7 @@ @@
         "DisabledHostFeatures": [
           "SVE128",
           "SVE256",
+          "AFP",
           "RPRES"
         ]
       },
@@ Expand Down @@