Merge pull request #2896 from Sonicadvance1/primary_table

InstCountCI: Adds primary tables

Scripts/InstructionCountParser.py

@@ -102,7 +102,7 @@ def parse_json_data(json_data, output_binary_path):
         logging.info("'{}' -> '{}' -> '{}'".format(key, tmp_asm, tmp_asm_out))
 
         with open(tmp_asm, "w") as tmp_asm_file:
-            tmp_asm_file.write("BITS 64;\n")
+            tmp_asm_file.write("BITS {};\n".format(Bitness))
             tmp_asm_file.write("{}\n".format(key))
 
         Process = subprocess.Popen(["nasm", tmp_asm, "-o", tmp_asm_out])

unittests/InstructionCountCI/Primary_32Bit.json

@@ -0,0 +1,138 @@
+{
+  "Features": {
+    "Bitness": 32,
+    "EnabledHostFeatures": [],
+    "DisabledHostFeatures": [
+      "SVE128",
+      "SVE256"
+    ]
+  },
+  "Instructions": {
+    "push es": {
+      "ExpectedInstructionCount": 5,
+      "Optimal": "No",
+      "Comment": "0x06"
+    },
+    "pop es": {
+      "ExpectedInstructionCount": 9,
+      "Optimal": "No",
+      "Comment": "0x07"
+    },
+    "push cs": {
+      "ExpectedInstructionCount": 5,
+      "Optimal": "No",
+      "Comment": "0x0e"
+    },
+    "push ss": {
+      "ExpectedInstructionCount": 5,
+      "Optimal": "No",
+      "Comment": "0x16"
+    },
+    "pop ss": {
+      "ExpectedInstructionCount": 9,
+      "Optimal": "No",
+      "Comment": "0x17"
+    },
+    "push ds": {
+      "ExpectedInstructionCount": 5,
+      "Optimal": "No",
+      "Comment": "0x1e"
+    },
+    "pop ds": {
+      "ExpectedInstructionCount": 9,
+      "Optimal": "No",
+      "Comment": "0x1f"
+    },
+    "daa": {
+      "ExpectedInstructionCount": 70,
+      "Optimal": "No",
+      "Comment": "0x27"
+    },
+    "das": {
+      "ExpectedInstructionCount": 70,
+      "Optimal": "No",
+      "Comment": "0x2f"
+    },
+    "aaa": {
+      "ExpectedInstructionCount": 36,
+      "Optimal": "No",
+      "Comment": "0x37"
+    },
+    "aas": {
+      "ExpectedInstructionCount": 37,
+      "Optimal": "No",
+      "Comment": "0x3f"
+    },
+    "inc ax": {
+      "ExpectedInstructionCount": 27,
+      "Optimal": "No",
+      "Comment": "0x40"
+    },
+    "inc eax": {
+      "ExpectedInstructionCount": 20,
+      "Optimal": "No",
+      "Comment": "0x40"
+    },
+    "dec ax": {
+      "ExpectedInstructionCount": 27,
+      "Optimal": "No",
+      "Comment": "0x48"
+    },
+    "dec eax": {
+      "ExpectedInstructionCount": 20,
+      "Optimal": "No",
+      "Comment": "0x48"
+    },
+    "pusha": {
+      "ExpectedInstructionCount": "25",
+      "Optimal": "No",
+      "Comment": "0x60"
+    },
+    "pushad": {
+      "ExpectedInstructionCount": "25",
+      "Optimal": "No",
+      "Comment": "0x60"
+    },
+    "popa": {
+      "ExpectedInstructionCount": 23,
+      "Optimal": "No",
+      "Comment": "0x61"
+    },
+    "popad": {
+      "ExpectedInstructionCount": 23,
+      "Optimal": "No",
+      "Comment": "0x61"
+    },
+    "aam": {
+      "ExpectedInstructionCount": 29,
+      "Optimal": "No",
+      "Comment": "0xd4"
+    },
+    "aad": {
+      "ExpectedInstructionCount": 30,
+      "Optimal": "No",
+      "Comment": "0xd5"
+    },
+    "db 0xd4, 0x40": {
+      "ExpectedInstructionCount": 29,
+      "Optimal": "No",
+      "Comment": [
+        "aam with a different immediate byte base",
+        "0xd4"
+      ]
+    },
+    "db 0xd5, 0x40": {
+      "ExpectedInstructionCount": 29,
+      "Optimal": "No",
+      "Comment": [
+        "aad with a different immediate byte base",
+        "0xd5"
+      ]
+    },
+    "salc": {
+      "ExpectedInstructionCount": 14,
+      "Optimal": "No",
+      "Comment": "0xd6"
+    }
+  }
+}

unittests/InstructionCountCI/VEX_map2.json

@@ -2494,4 +2494,4 @@
       ]
     }
   }
-}
+}