Partially implemented type propagation #48

JuliaPoo · 2023-10-11T15:42:51Z

This branch will be continually updated until it is convenient to merge with ssa_graphs

implements the types for the symbolics relevant to the current guards
modifies the dsl and bytecodes.c to encode the type prop rules
changes abstract interpreter for impure ops to only track stack pointer changes
added type initialisation of symbolics from constants (sym_const_init)
added type propagation for pure operations

Fidget-Spinner · 2023-10-12T08:29:27Z

Python/optimizer_analysis.c

+    // bitmask of types
+    uint32_t types;
+    // auxillary data for the types
+    uint32_t aux[MAX_TYPE + 1];


Is this due to the fact that a single thing could be of multiple positive types?

Would it be possible to not have this, and only have something identify as a single positive type?

Nope, its bcuz multiple guards has to pass for some cases inorder to fully eliminate the entire guard region. I dont see whats the disadvantage of doing this either

Every time we add a new type, all sym expressions become 32 bits bigger. I would like to save memory somehow. But ok lets go with this for now.

Fidget-Spinner

Just one code nit from me, thank you.

Fidget-Spinner · 2023-10-12T09:52:41Z

Python/optimizer_analysis.c

+static void
+symtype_set_from_const(_Py_UOpsSymType* sym_type, PyObject* obj)
+{
+    PyTypeObject *tp = obj->ob_type;


Usually these are accessed through macros

Suggested change

PyTypeObject *tp = obj->ob_type;

PyTypeObject *tp = Py_TYPE(obj);

Fidget-Spinner

Also bunch of whitespaces are failing the CI

Fidget-Spinner · 2023-10-12T09:55:53Z

Python/optimizer_analysis.c

+
+/*
+static _Py_UOpsSymExprTypeEnum 
+symtype_guard_to_type_enum(int guard_opcde) 


Suggested change

symtype_guard_to_type_enum(int guard_opcde)

symtype_guard_to_type_enum(int guard_opcde)

Fidget-Spinner · 2023-10-12T09:56:03Z

Python/optimizer_analysis.c

+}
+
+static bool
+symtype_passes_guard(_Py_UOpsSymType* sym_type, int guard_opcode, uint32_t aux) 


Suggested change

symtype_passes_guard(_Py_UOpsSymType* sym_type, int guard_opcode, uint32_t aux)

symtype_passes_guard(_Py_UOpsSymType* sym_type, int guard_opcode, uint32_t aux)

Fidget-Spinner · 2023-10-12T09:56:13Z

Python/optimizer_analysis.c

+*/
+
+static void
+symtype_set_type(_Py_UOpsSymType* sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux) 


Suggested change

symtype_set_type(_Py_UOpsSymType* sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)

symtype_set_type(_Py_UOpsSymType* sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)

Fidget-Spinner · 2023-10-12T09:56:35Z

Python/optimizer_analysis.c

+
+    if (tp == &PyLong_Type) {
+        sym_type->types |= 1 << PYINT_TYPE;
+    } 


Suggested change

}

}

Fidget-Spinner · 2023-10-12T09:56:55Z

Python/optimizer_analysis.c

+        if (_PyDictOrValues_IsValues(*dorv) ||
+            _PyObject_MakeInstanceAttributesFromDict(obj, dorv)) {
+            sym_type->types |= 1 << GUARD_DORV_VALUES_INST_ATTR_FROM_DICT_TYPE;
+


Suggested change

Fidget-Spinner · 2023-10-12T10:20:39Z

Tools/cases_generator/stacking.py

+            self.peeks.append(
+                StackItem(offset=self.final_offset.clone(), effect=eff))


Lets reduce the diff

Suggested change

self.peeks.append(

StackItem(offset=self.final_offset.clone(), effect=eff))

self.peeks.append(StackItem(offset=self.final_offset.clone(), effect=eff))

Ah I didn't realise but at some point during the buggy vscode fiasco it ran the autoformatter

Fidget-Spinner · 2023-10-12T10:21:00Z

Tools/cases_generator/stacking.py

+            self.pokes.append(
+                StackItem(offset=self.final_offset.clone(), effect=eff))


Suggested change

self.pokes.append(

StackItem(offset=self.final_offset.clone(), effect=eff))

self.pokes.append(StackItem(offset=self.final_offset.clone(), effect=eff))

Fidget-Spinner · 2023-10-12T10:21:57Z

Tools/cases_generator/parsing.py

@@ -262,14 +270,24 @@ def cache_effect(self) -> CacheEffect | None:

    @contextual
    def stack_effect(self) -> StackEffect | None:
-        #   IDENTIFIER [':' IDENTIFIER [TIMES]] ['if' '(' expression ')']
+        #   IDENTIFIER [':' [IDENTIFIER [TIMES]] ['~' '(' IDENTIFIER [',' IDENTIFIER] ')']] ['if' '(' expression ')']


The MINUS isn't documented.

Co-authored-by: Fidget-Spinner

Tools/cases_generator/stacking.py

Fidget-Spinner · 2023-10-12T14:09:49Z

Thanks for all your work on this.

Fidget-Spinner

PEP 7 nits

Fidget-Spinner · 2023-10-12T14:17:49Z

Python/optimizer_analysis.c

+} _Py_UOpsSymType;
+
+static void
+symtype_set_type(_Py_UOpsSymType* sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)


Suggested change

symtype_set_type(_Py_UOpsSymType* sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)

symtype_set_type(_Py_UOpsSymType *sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)

Fidget-Spinner · 2023-10-12T14:17:59Z

Python/optimizer_analysis.c

+}
+
+static void
+symtype_set_from_const(_Py_UOpsSymType* sym_type, PyObject* obj)


Suggested change

symtype_set_from_const(_Py_UOpsSymType* sym_type, PyObject* obj)

symtype_set_from_const(_Py_UOpsSymType *sym_type, PyObject *obj)

# Conflicts: # Python/abstract_interp_cases.c.h # Python/bytecodes.c # Tools/cases_generator/stacking.py

JuliaPoo added 6 commits October 3, 2023 11:26

Feat: Added typeprop annotations to dsl

53155ec

Feat: Implemented symbolic expression type

e68ac4b

Feat: Added typeprop for pure regions

aceb231

Fix: Buncha stupid issues

eee47f9

In the process of debugging

486d7f4

Fix: Bufferoverflow off by 1

252e775

Fidget-Spinner reviewed Oct 12, 2023

View reviewed changes

JuliaPoo added 6 commits October 12, 2023 20:08

Cleanup: Type prop

68adf73

Cleanup: Reduce diff

7cf4b5d

Cleanup: Type prop

9103ef2

Refactor: Changed - to + in new cursed DSL syntax

926349f

Resolve conflict for stacking.py

ecc9124

Co-authored-by: Fidget-Spinner

More merge stuff

b2cf9c0

Fidget-Spinner reviewed Oct 12, 2023

View reviewed changes

Tools/cases_generator/stacking.py Outdated Show resolved Hide resolved

lint again

c2b71df

Fidget-Spinner reviewed Oct 12, 2023

View reviewed changes

Tools/cases_generator/stacking.py Outdated Show resolved Hide resolved

Fidget-Spinner approved these changes Oct 12, 2023

View reviewed changes

Fidget-Spinner reviewed Oct 12, 2023

View reviewed changes

JuliaPoo added 3 commits October 12, 2023 22:37

Merge branch 'ssa_graphs' into ssa_graphs_jules

af96b88

# Conflicts: # Python/abstract_interp_cases.c.h # Python/bytecodes.c # Tools/cases_generator/stacking.py

Fix: Missing semicolon

75284c1

Fix: Build error in msvc due to name conflict

29995a9

JuliaPoo force-pushed the ssa_graphs_jules branch from dfe515c to 29995a9 Compare October 12, 2023 14:46

Fidget-Spinner merged commit 161c271 into ssa_graphs Oct 12, 2023
5 of 7 checks passed

Fidget-Spinner deleted the ssa_graphs_jules branch October 12, 2023 14:46

JuliaPoo restored the ssa_graphs_jules branch October 12, 2023 15:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Partially implemented type propagation #48

Partially implemented type propagation #48

JuliaPoo commented Oct 11, 2023

Fidget-Spinner Oct 12, 2023

JuliaPoo Oct 12, 2023

Fidget-Spinner Oct 12, 2023

Fidget-Spinner left a comment

Fidget-Spinner Oct 12, 2023

Fidget-Spinner left a comment

Fidget-Spinner Oct 12, 2023

Fidget-Spinner Oct 12, 2023

Fidget-Spinner Oct 12, 2023

Fidget-Spinner Oct 12, 2023

Fidget-Spinner Oct 12, 2023

Fidget-Spinner Oct 12, 2023

JuliaPoo Oct 12, 2023

Fidget-Spinner Oct 12, 2023

Fidget-Spinner Oct 12, 2023

Fidget-Spinner commented Oct 12, 2023

Fidget-Spinner left a comment

Fidget-Spinner Oct 12, 2023

Fidget-Spinner Oct 12, 2023

	PyTypeObject *tp = obj->ob_type;
	PyTypeObject *tp = Py_TYPE(obj);

	symtype_guard_to_type_enum(int guard_opcde)
	symtype_guard_to_type_enum(int guard_opcde)

	symtype_passes_guard(_Py_UOpsSymType* sym_type, int guard_opcode, uint32_t aux)
	symtype_passes_guard(_Py_UOpsSymType* sym_type, int guard_opcode, uint32_t aux)

	symtype_set_type(_Py_UOpsSymType* sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)
	symtype_set_type(_Py_UOpsSymType* sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)

		self.peeks.append(
		StackItem(offset=self.final_offset.clone(), effect=eff))

	self.peeks.append(
	StackItem(offset=self.final_offset.clone(), effect=eff))
	self.peeks.append(StackItem(offset=self.final_offset.clone(), effect=eff))

		self.pokes.append(
		StackItem(offset=self.final_offset.clone(), effect=eff))

	self.pokes.append(
	StackItem(offset=self.final_offset.clone(), effect=eff))
	self.pokes.append(StackItem(offset=self.final_offset.clone(), effect=eff))

	symtype_set_type(_Py_UOpsSymType* sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)
	symtype_set_type(_Py_UOpsSymType *sym_type, _Py_UOpsSymExprTypeEnum typ, uint32_t aux)

	symtype_set_from_const(_Py_UOpsSymType* sym_type, PyObject* obj)
	symtype_set_from_const(_Py_UOpsSymType sym_type, PyObject obj)

Partially implemented type propagation #48

Partially implemented type propagation #48

Conversation

JuliaPoo commented Oct 11, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Fidget-Spinner left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Fidget-Spinner left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Fidget-Spinner commented Oct 12, 2023

Fidget-Spinner left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment