remove _specialized_instructions, we have the same in _specialized_op…

…map now
iritkatriel · Aug 15, 2023 · d6ecee1 · d6ecee1
1 parent 2f67ea8
commit d6ecee1
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 16 deletions.
diff --git a/Lib/_opcode_metadata.py b/Lib/_opcode_metadata.py
diff --git a/Lib/dis.py b/Lib/dis.py
@@ -14,7 +14,6 @@
     _intrinsic_1_descs,
     _intrinsic_2_descs,
     _specializations,
-    _specialized_instructions,
     _specialized_opmap,
 )
 

diff --git a/Lib/opcode.py b/Lib/opcode.py
@@ -14,7 +14,7 @@
 import sys
 # The build uses older versions of Python which do not have _opcode_metadata
 if sys.version_info[:2] >= (3, 13):
-    from _opcode_metadata import _specializations, _specialized_instructions, _specialized_opmap
+    from _opcode_metadata import _specializations, _specialized_opmap
     from _opcode_metadata import opmap, HAVE_ARGUMENT, MIN_INSTRUMENTED_OPCODE
     EXTENDED_ARG = opmap['EXTENDED_ARG']
 

diff --git a/Lib/test/test_dis.py b/Lib/test/test_dis.py
@@ -1942,7 +1942,7 @@ def test_baseopname_and_baseopcode(self):
             self.assertEqual(code, baseopcode)
 
         # Specialized instructions
-        for name in opcode._specialized_instructions:
+        for name in opcode._specialized_opmap:
             instruction = Instruction(opname=name, opcode=dis._all_opmap[name], arg=None, argval=None, argrepr='',
                                       offset=0, start_offset=0, starts_line=1, is_jump_target=False, positions=None)
             baseopname = instruction.baseopname

diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py
@@ -361,7 +361,7 @@ def is_specialized(f):
                 for instruction in dis.get_instructions(f, adaptive=True):
                     opname = instruction.opname
                     if (
-                        opname in opcode._specialized_instructions
+                        opname in opcode._specialized_opmap
                         # Exclude superinstructions:
                         and "__" not in opname
                     ):

diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py
@@ -550,14 +550,6 @@ def write_metadata(self, metadata_filename: str, pymetadata_filename: str) -> No
             )
             specialized_ops.add("BINARY_OP_INPLACE_ADD_UNICODE")
 
-            # Make list of specialized instructions
-            self.out.emit("")
-            self.out.emit(
-                "_specialized_instructions = ["
-                "opcode for family in _specializations.values() for opcode in family"
-                "]"
-            )
-
             # emit specialized opmap
             self.out.emit("")
             with self.out.block("_specialized_opmap ="):

diff --git a/Tools/scripts/summarize_stats.py b/Tools/scripts/summarize_stats.py
@@ -17,7 +17,7 @@
     DEFAULT_DIR = "/tmp/py_stats/"
 
 #Create list of all instruction names
-specialized = iter(opcode._specialized_instructions)
+specialized = iter(opcode._specialized_opmap.keys())
 opname = ["<0>"]
 for name in opcode.opname[1:]:
     if name.startswith("<"):
@@ -244,7 +244,7 @@ def categorized_counts(opcode_stats):
     specialized = 0
     not_specialized = 0
     specialized_instructions = {
-        op for op in opcode._specialized_instructions
+        op for op in opcode._specialized_opmap.keys()
         if "__" not in op}
     for i, opcode_stat in enumerate(opcode_stats):
         if "execution_count" not in opcode_stat: