Skip to content

GH-98831: Update generate_cases.py: register inst, opcode_metadata.h #100735

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gvanrossum merged 15 commits into from
Jan 5, 2023
Merged

GH-98831: Update generate_cases.py: register inst, opcode_metadata.h #100735

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2254157
Add support for register instructions
gvanrossum Jan 4, 2023
61b8c8d
Allow unused registers (at the end)
gvanrossum Jan 4, 2023
bc75a34
Reformatted using black
gvanrossum Jan 4, 2023
dab4e92
Generate opcode_metadata.h
gvanrossum Jan 4, 2023
737a96a
Reformatted using black; fixed help for -m
gvanrossum Jan 4, 2023
e96562f
Add register directions to opcode_metadata.h
gvanrossum Jan 4, 2023
5670523
Fix enum and make metadata static const
gvanrossum Jan 4, 2023
f108288
Fix stack effect for YIELD_VALUE
gvanrossum Jan 4, 2023
1068f64
Generate metadata for macros, fixing END_FOR
gvanrossum Jan 4, 2023
a599886
Add a 'valid_entry' flag to opcode metadata
gvanrossum Jan 4, 2023
404053b
add sanity check for opcode metadata
iritkatriel Jan 4, 2023
b00ec7b
add print when assertion fails
iritkatriel Jan 4, 2023
88c67cd
assert entry is valid
iritkatriel Jan 4, 2023
2a56275
Add sanity check for opcode metadata
gvanrossum Jan 4, 2023
555589a
Add instr format metadata field
gvanrossum Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add sanity check for opcode metadata
  • Loading branch information
@iritkatriel
iritkatriel committed Jan 4, 2023
commit 404053b44578b10471e67093760cb056884e4d88
22 changes: 22 additions & 0 deletions Python/compile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8670,6 +8670,27 @@ no_redundant_jumps(cfg_builder *g) {
return true;
}

static bool
opcode_metadata_is_sane(cfg_builder *g) {
for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
for (int i = 0; i < b->b_iused; i++) {
struct instr *instr = &b->b_instr[i];
int opcode = instr->i_opcode;
assert(opcode <= MAX_REAL_OPCODE);
int pushed = _PyOpcode_opcode_metadata[opcode].n_pushed;
int popped = _PyOpcode_opcode_metadata[opcode].n_popped;
assert((pushed < 0) == (popped < 0));
if (pushed >= 0) {
int effect = stack_effect(opcode, instr->i_oparg, -1);
if (effect != pushed - popped) {
return false;
}
}
}
}
return true;
}

static bool
no_empty_basic_blocks(cfg_builder *g) {
for (basicblock *b = g->g_entryblock; b != NULL; b = b->b_next) {
Expand Down Expand Up @@ -8853,6 +8874,7 @@ assemble(struct compiler *c, int addNone)
}

assert(no_redundant_jumps(g));
assert(opcode_metadata_is_sane(g));

/* Can't modify the bytecode after computing jump offsets. */
assemble_jump_offsets(g->g_entryblock);
Expand Down