Aug 15, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023 · Aug 2, 2023
diff --git a/Include/internal/pycore_uops.h b/Include/internal/pycore_uops.h
 #  error "this header requires Py_BUILD_CORE define"
 #endif

 #define _Py_UOP_MAX_TRACE_LENGTH256
 #define _Py_UOP_MAX_TRACE_LENGTH64

 typedef struct {
    int32_t opcode;
diff --git a/Lib/test/test_capi/test_misc.py b/Lib/test/test_capi/test_misc.py
        binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
        self.assertEqual(len(binop_count), 1)


 if __name__ == "__main__":
    unittest.main()
diff --git a/Makefile.pre.in b/Makefile.pre.in
 -m $(srcdir)/Include/internal/pycore_opcode_metadata.h.new \
 -e $(srcdir)/Python/executor_cases.c.h.new \
 -p $(srcdir)/Lib/_opcode_metadata.py.new \
 -a $(srcdir)/Python/abstract_interp_cases.c.h.new \
 $(srcdir)/Python/bytecodes.c
 $(UPDATE_FILE) $(srcdir)/Python/generated_cases.c.h $(srcdir)/Python/generated_cases.c.h.new
 $(UPDATE_FILE) $(srcdir)/Include/internal/pycore_opcode_metadata.h $(srcdir)/Include/internal/pycore_opcode_metadata.h.new
 $(UPDATE_FILE) $(srcdir)/Python/executor_cases.c.h $(srcdir)/Python/executor_cases.c.h.new
 $(UPDATE_FILE) $(srcdir)/Python/abstract_interp_cases.c.h $(srcdir)/Python/abstract_interp_cases.c.h.new
 $(UPDATE_FILE) $(srcdir)/Lib/_opcode_metadata.py $(srcdir)/Lib/_opcode_metadata.py.new

 Python/compile.o: $(srcdir)/Include/internal/pycore_opcode_metadata.h
diff --git a/Python/abstract_interp_cases.c.h b/Python/abstract_interp_cases.c.h
diff --git a/Python/bytecodes.c b/Python/bytecodes.c
            return frame;
        }

        op(INSERT, (--)) {
        op(INSERT, (stuff[oparg], top -- top, stuff[oparg])) {
            // Inserts TOS at position specified by oparg
            PyObject *tos = TOP();
            for (int i = 1; i < oparg + 1; i++) {
                stack_pointer[i] = stack_pointer[i - 1];
            }
            POKE(oparg, tos);
        }


diff --git a/Python/executor_cases.c.h b/Python/executor_cases.c.h
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
        return NULL;
    }

    for (int i = 0; i < (locals_len + stack_len) * 2; i++) {
    for (int i = 0; i < (locals_len + stack_len); i++) {
        locals_with_stack[i] = PARTITIONNODE_NULLROOT;
    }

diff --git a/Tools/cases_generator/generate_cases.py b/Tools/cases_generator/generate_cases.py

 INSTR_FMT_PREFIX = "INSTR_FMT_"

 #@TODO generate all these after updating the DSL
 # TODO: generate all these after updating the DSL
 SPECIALLY_HANDLED_ABSTRACT_INSTR = {
    "LOAD_FAST",
    "LOAD_FAST_CHECK",
        pushed: str | None
        match thing:
            case parsing.InstDef():
                if thing.kind!= "op" or(thing.kind != "inst" andself.instrs[thing.name].is_viable_uop()):
                if thing.kind== "instr" or self.instrs[thing.name].is_viable_uop():
                    instr = self.instrs[thing.name]
                    popped = effect_str(instr.input_effects)
                    pushed = effect_str(instr.output_effects)
            for thing in self.everything:
                match thing:
                    case OverriddenInstructionPlaceHolder():
                        # TODO: Is this helpful?
                        self.write_overridden_instr_place_holder(thing)
                        pass
                    case parsing.InstDef():
                        instr = AbstractInstruction(self.instrs[thing.name].inst)
                        if instr.is_viable_uop() and instr.name not in SPECIALLY_HANDLED_ABSTRACT_INSTR:
                            self.out.emit("")
                            with self.out.block(f"case {thing.name}:"):
                                instr.write(self.out, tier=TIER_TWO)
                                self.out.emit("break;")
                            # elif instr.kind != "op":
                            #     print(f"NOTE: {thing.name} is not a viable uop")
                    case parsing.Macro():
                        pass
                    case parsing.Pseudo():
diff --git a/Tools/cases_generator/instructions.py b/Tools/cases_generator/instructions.py

    def write(self, out: Formatter, tier: Tiers = TIER_ONE) -> None:
        """Write one abstract instruction, sans prologue and epilogue."""
        # Write a static assertion that a family's cache size is correct
        if family := self.family:
            if self.name == family.name:
                if cache_size := family.size:
                    out.emit(
                        f"static_assert({cache_size} == "
                        f'{self.cache_offset}, "incorrect cache size");'
                    )

        stacking.write_single_instr_for_abstract_interp(self, out)

    def write_body(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -8,7 +8,7 @@ extern "C" {
		# error "this header requires Py_BUILD_CORE define"
		#endif

		#define _Py_UOP_MAX_TRACE_LENGTH256
		#define _Py_UOP_MAX_TRACE_LENGTH64

		typedef struct {
		int32_t opcode;
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2643,5 +2643,6 @@ def testfunc(loops):
		binop_count = [opname for opname, _, _ in ex if opname == "_BINARY_OP_ADD_INT"]
		self.assertEqual(len(binop_count), 1)

Fidget-Spinner marked this conversation as resolved. OutdatedShow resolvedHide resolved

		if __name__ == "__main__":
		unittest.main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1553,10 +1553,12 @@ regen-cases:
		-m $(srcdir)/Include/internal/pycore_opcode_metadata.h.new \
		-e $(srcdir)/Python/executor_cases.c.h.new \
		-p $(srcdir)/Lib/_opcode_metadata.py.new \
		-a $(srcdir)/Python/abstract_interp_cases.c.h.new \
		$(srcdir)/Python/bytecodes.c
		$(UPDATE_FILE) $(srcdir)/Python/generated_cases.c.h $(srcdir)/Python/generated_cases.c.h.new
		$(UPDATE_FILE) $(srcdir)/Include/internal/pycore_opcode_metadata.h $(srcdir)/Include/internal/pycore_opcode_metadata.h.new
		$(UPDATE_FILE) $(srcdir)/Python/executor_cases.c.h $(srcdir)/Python/executor_cases.c.h.new
		$(UPDATE_FILE) $(srcdir)/Python/abstract_interp_cases.c.h $(srcdir)/Python/abstract_interp_cases.c.h.new
		$(UPDATE_FILE) $(srcdir)/Lib/_opcode_metadata.py $(srcdir)/Lib/_opcode_metadata.py.new

		Python/compile.o: $(srcdir)/Include/internal/pycore_opcode_metadata.h
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -3743,13 +3743,12 @@ dummy_func(
		return frame;
		}

		op(INSERT, (--)) {
		op(INSERT, (stuff[oparg], top -- top, stuff[oparg])) {
Fidget-Spinner marked this conversation as resolved. OutdatedShow resolvedHide resolved
		// Inserts TOS at position specified by oparg
		PyObject *tos = TOP();
		for (int i = 1; i < oparg + 1; i++) {
		stack_pointer[i] = stack_pointer[i - 1];
Copy link Member gvanrossumAug 14, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Hm, doesn't this repeat the first stack element over and over? Maybe`memmove()` would do what you want? (It is supposed to be good at overlaps, unlike`memcpy()`.) Copy link MemberAuthor Fidget-SpinnerAug 15, 2023• edited Loading Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Woops yeah thanks for catching this! Forgot to negate the indexes. gvanrossum reacted with laugh emoji
		}
		POKE(oparg, tos);
		}


Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -173,7 +173,7 @@ _Py_UOpsAbstractInterpContext_New(int stack_len, int locals_len, int curr_stackl
		return NULL;
		}

		for (int i = 0; i < (locals_len + stack_len) * 2; i++) {
		for (int i = 0; i < (locals_len + stack_len); i++) {
		locals_with_stack[i] = PARTITIONNODE_NULLROOT;
		}

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -61,7 +61,7 @@

		INSTR_FMT_PREFIX = "INSTR_FMT_"

		#@TODO generate all these after updating the DSL
		# TODO: generate all these after updating the DSL
		SPECIALLY_HANDLED_ABSTRACT_INSTR = {
		"LOAD_FAST",
		"LOAD_FAST_CHECK",
Expand DownExpand Up		@@ -135,7 +135,7 @@ def effect_str(effects: list[StackEffect]) -> str:
		pushed: str \| None
		match thing:
		case parsing.InstDef():
		if thing.kind!= "op" or(thing.kind != "inst" andself.instrs[thing.name].is_viable_uop()):
		if thing.kind== "instr" or self.instrs[thing.name].is_viable_uop():
		instr = self.instrs[thing.name]
		popped = effect_str(instr.input_effects)
		pushed = effect_str(instr.output_effects)
Expand DownExpand Up		@@ -641,17 +641,14 @@ def write_abstract_interpreter_instructions(
		for thing in self.everything:
		match thing:
		case OverriddenInstructionPlaceHolder():
		# TODO: Is this helpful?
		self.write_overridden_instr_place_holder(thing)
		pass
		case parsing.InstDef():
		instr = AbstractInstruction(self.instrs[thing.name].inst)
		if instr.is_viable_uop() and instr.name not in SPECIALLY_HANDLED_ABSTRACT_INSTR:
		self.out.emit("")
		with self.out.block(f"case {thing.name}:"):
		instr.write(self.out, tier=TIER_TWO)
Copy link Member gvanrossumAug 13, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Note that ingh-107760 I'm removing`Instruction.write` altogether. Copy link Member gvanrossumAug 14, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I wonder if you even need the`AbstractInstruction` class. Maybe you could just call a different method on`Instruction`? Copy link MemberAuthor Fidget-SpinnerAug 15, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. I was thinking of how we might need to expand on it more in the future, so a separate class might be better. Copy link Member gvanrossumAug 15, 2023 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. When that happens in the future you can refactor the code. Until then, I recommend less code. As you may have noticed this code gets refactored a lot. :-) It's easy because the generator is not a public API -- all we care about is whether it generates a handful of files correctly from bytecodes.c at build time. But I worry about copying and pasting code, because that's harder to refactor.
		self.out.emit("break;")
		# elif instr.kind != "op":
		# print(f"NOTE: {thing.name} is not a viable uop")
		case parsing.Macro():
		pass
		case parsing.Pseudo():
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -255,15 +255,6 @@ def __init__(self, inst: parsing.InstDef):

		def write(self, out: Formatter, tier: Tiers = TIER_ONE) -> None:
		"""Write one abstract instruction, sans prologue and epilogue."""
		# Write a static assertion that a family's cache size is correct
		if family := self.family:
		if self.name == family.name:
		if cache_size := family.size:
		out.emit(
		f"static_assert({cache_size} == "
		f'{self.cache_offset}, "incorrect cache size");'
		)

		stacking.write_single_instr_for_abstract_interp(self, out)

		def write_body(
Expand Down