mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gh-104610: Stop looking for PREDICT() in the cases generator (#105459) 

We no longer use `PREDICT()`, it doesn't have any benefits.
This commit is contained in:
Guido van Rossum 2023-06-07 10:00:10 -07:00 committed by GitHub
parent f339ec5ddf
commit c85be33acc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Tools/cases_generator/generate_cases.py
View File

@ -29,7 +29,7 @@
BEGIN_MARKER = "// BEGIN BYTECODES //" BEGIN_MARKER = "// BEGIN BYTECODES //"
END_MARKER = "// END BYTECODES //" END_MARKER = "// END BYTECODES //"
RE_PREDICTED = ( RE_PREDICTED = (
r"^\s*(?:PREDICT\(|GO_TO_INSTRUCTION\(|DEOPT_IF\(.*?,\s*)(\w+)\);\s*(?://.*)?$" r"^\s*(?:GO_TO_INSTRUCTION\(|DEOPT_IF\(.*?,\s*)(\w+)\);\s*(?://.*)?$"
) )
UNUSED = "unused" UNUSED = "unused"
BITS_PER_CODE_UNIT = 16 BITS_PER_CODE_UNIT = 16
@ -234,7 +234,6 @@ class Instruction:
name: str name: str
block: parser.Block block: parser.Block
block_text: list[str] # Block.text, less curlies, less PREDICT() calls block_text: list[str] # Block.text, less curlies, less PREDICT() calls
predictions: list[str] # Prediction targets (instruction names)
block_line: int # First line of block in original code block_line: int # First line of block in original code
# Computed by constructor # Computed by constructor
@ -255,7 +254,7 @@ def __init__(self, inst: parser.InstDef):
self.kind = inst.kind self.kind = inst.kind
self.name = inst.name self.name = inst.name
self.block = inst.block self.block = inst.block
self.block_text, self.check_eval_breaker, self.predictions, self.block_line = \ self.block_text, self.check_eval_breaker, self.block_line = \
extract_block_text(self.block) extract_block_text(self.block)
self.always_exits = always_exits(self.block_text) self.always_exits = always_exits(self.block_text)
self.cache_effects = [ self.cache_effects = [
@ -642,7 +641,7 @@ def analyze(self) -> None:
def find_predictions(self) -> None: def find_predictions(self) -> None:
"""Find the instructions that need PREDICTED() labels.""" """Find the instructions that need PREDICTED() labels."""
for instr in self.instrs.values(): for instr in self.instrs.values():
targets = set(instr.predictions) targets = set()
for line in instr.block_text: for line in instr.block_text:
if m := re.match(RE_PREDICTED, line): if m := re.match(RE_PREDICTED, line):
targets.add(m.group(1)) targets.add(m.group(1))
@ -1117,8 +1116,6 @@ def write_instr(self, instr: Instruction) -> None:
self.out.emit(f"PREDICTED({name});") self.out.emit(f"PREDICTED({name});")
instr.write(self.out) instr.write(self.out)
if not instr.always_exits: if not instr.always_exits:
for prediction in instr.predictions:
self.out.emit(f"PREDICT({prediction});")
if instr.check_eval_breaker: if instr.check_eval_breaker:
self.out.emit("CHECK_EVAL_BREAKER();") self.out.emit("CHECK_EVAL_BREAKER();")
self.out.emit(f"DISPATCH();") self.out.emit(f"DISPATCH();")
@ -1195,7 +1192,7 @@ def wrap_super_or_macro(self, up: SuperOrMacroInstruction):
self.out.emit(f"DISPATCH();") self.out.emit(f"DISPATCH();")
def extract_block_text(block: parser.Block) -> tuple[list[str], bool, list[str], int]: def extract_block_text(block: parser.Block) -> tuple[list[str], bool, int]:
# Get lines of text with proper dedent # Get lines of text with proper dedent
blocklines = block.text.splitlines(True) blocklines = block.text.splitlines(True)
first_token: lx.Token = block.tokens[0] # IndexError means the context is broken first_token: lx.Token = block.tokens[0] # IndexError means the context is broken
@ -1225,15 +1222,7 @@ def extract_block_text(block: parser.Block) -> tuple[list[str], bool, list[str],
if check_eval_breaker: if check_eval_breaker:
del blocklines[-1] del blocklines[-1]
# Separate PREDICT(...) macros from end return blocklines, check_eval_breaker, block_line
predictions: list[str] = []
while blocklines and (
m := re.match(r"^\s*PREDICT\((\w+)\);\s*(?://.*)?$", blocklines[-1])
):
predictions.insert(0, m.group(1))
blocklines.pop()
return blocklines, check_eval_breaker, predictions, block_line
def always_exits(lines: list[str]) -> bool: def always_exits(lines: list[str]) -> bool: