Skip to content

Commit b8a2d62

Browse files
smarrsmarr
committed
Add inlining #ifNil:* and #ifNotNil:* in the BC interpreter
Signed-off-by: Stefan Marr <git@stefan-marr.de>
1 parent 345d42d commit b8a2d62

7 files changed

Lines changed: 197 additions & 21 deletions

File tree

‎src/som/compiler/bc/bytecode_generator.py‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@
33
from som.vm.symbols import sym_nil, sym_true, sym_false
44

55

6+
class JumpCondition(object):
7+
on_nil = 0
8+
on_not_nil = 1
9+
on_true = 2
10+
on_false = 3
11+
12+
613
def emit_inc(mgenc):
714
emit1(mgenc, BC.inc, 0)
815

@@ -186,18 +193,27 @@ def emit_push_constant_index(mgenc, lit_index):
186193
emit2(mgenc, BC.push_constant, lit_index, 1)
187194

188195

189-
def emit_jump_on_bool_with_dummy_offset(mgenc, is_if_true, needs_pop):
196+
def emit_jump_on_with_dummy_offset(mgenc, condition, needs_pop):
190197
# Remember: true and false seem flipped here.
191198
# This is because if the test passes, the block is inlined directly.
192199
# But if the test fails, we need to jump.
193200
# Thus, an `#ifTrue:` needs to generated a jump_on_false.
194201
if needs_pop:
195-
bc = BC.jump_on_false_pop if is_if_true else BC.jump_on_true_pop
196202
stack_effect = -1
197203
else:
198-
bc = BC.jump_on_false_top_nil if is_if_true else BC.jump_on_true_top_nil
199204
stack_effect = 0
200205

206+
if condition == JumpCondition.on_true:
207+
bc = BC.jump_on_true_pop if needs_pop else BC.jump_on_true_top_nil
208+
elif condition == JumpCondition.on_false:
209+
bc = BC.jump_on_false_pop if needs_pop else BC.jump_on_false_top_nil
210+
elif condition == JumpCondition.on_not_nil:
211+
bc = BC.jump_on_not_nil_pop if needs_pop else BC.jump_on_not_nil_top_top
212+
elif condition == JumpCondition.on_nil:
213+
bc = BC.jump_on_nil_pop if needs_pop else BC.jump_on_nil_top_top
214+
else:
215+
raise NotImplementedError("Unknown condition: " + str(condition))
216+
201217
emit1(mgenc, bc, stack_effect)
202218
idx = mgenc.add_bytecode_argument_and_get_index(0)
203219
mgenc.add_bytecode_argument(0)

‎src/som/compiler/bc/method_generation_context.py‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
from rlib.debug import make_sure_not_resized
22
from som.compiler.bc.bytecode_generator import (
3-
emit_jump_on_bool_with_dummy_offset,
3+
emit_jump_on_with_dummy_offset,
44
emit_jump_with_dummy_offset,
55
emit_pop,
66
emit_push_constant,
77
emit_jump_backward_with_offset,
88
emit_inc_field_push,
99
emit_return_field,
10+
JumpCondition,
1011
)
1112

1213
from som.compiler.method_generation_context import MethodGenerationContextBase
@@ -583,7 +584,7 @@ def _assemble_field_setter(self, return_candidate):
583584
arg_idx = self._bytecode[-(pop_len + return_len + 2)]
584585
return FieldWrite(self.signature, field_idx, arg_idx)
585586

586-
def inline_if_true_or_if_false(self, parser, is_if_true):
587+
def inline_then_branch(self, parser, condition):
587588
# HACK: We do assume that the receiver on the stack is a boolean,
588589
# HACK: similar to the IfTrueIfFalseNode.
589590
# HACK: We don't support anything but booleans at the moment.
@@ -596,8 +597,8 @@ def inline_if_true_or_if_false(self, parser, is_if_true):
596597

597598
self._remove_last_bytecodes(1) # remove push_block*
598599

599-
jump_offset_idx_to_skip_true_branch = emit_jump_on_bool_with_dummy_offset(
600-
self, is_if_true, False
600+
jump_offset_idx_to_skip_true_branch = emit_jump_on_with_dummy_offset(
601+
self, condition, False
601602
)
602603

603604
# TODO: remove the block from the literal list
@@ -624,7 +625,7 @@ def _has_two_literal_block_arguments(self):
624625
self._last_bytecode_is_one_of(1, PUSH_BLOCK_BYTECODES) != Bytecodes.invalid
625626
)
626627

627-
def inline_if_true_false(self, parser, is_if_true):
628+
def inline_then_else_branches(self, parser, condition):
628629
# HACK: We do assume that the receiver on the stack is a boolean,
629630
# HACK: similar to the IfTrueIfFalseNode.
630631
# HACK: We don't support anything but booleans at the moment.
@@ -642,8 +643,8 @@ def inline_if_true_false(self, parser, is_if_true):
642643
to_be_inlined_2,
643644
) = self._extract_block_methods_and_remove_bytecodes()
644645

645-
jump_offset_idx_to_skip_true_branch = emit_jump_on_bool_with_dummy_offset(
646-
self, is_if_true, True
646+
jump_offset_idx_to_skip_true_branch = emit_jump_on_with_dummy_offset(
647+
self, condition, True
647648
)
648649

649650
self._is_currently_inlining_a_block = True
@@ -698,8 +699,10 @@ def inline_while(self, parser, is_while_true):
698699
self._is_currently_inlining_a_block = True
699700
cond_method.inline(self)
700701

701-
jump_offset_idx_to_skip_loop_body = emit_jump_on_bool_with_dummy_offset(
702-
self, is_while_true, True
702+
jump_offset_idx_to_skip_loop_body = emit_jump_on_with_dummy_offset(
703+
self,
704+
JumpCondition.on_false if is_while_true else JumpCondition.on_true,
705+
True,
703706
)
704707

705708
body_method.inline(self)
@@ -725,8 +728,8 @@ def inline_andor(self, parser, is_or):
725728

726729
self._remove_last_bytecodes(1) # remove push_block*
727730

728-
jump_offset_idx_to_skip_branch = emit_jump_on_bool_with_dummy_offset(
729-
self, not is_or, True
731+
jump_offset_idx_to_skip_branch = emit_jump_on_with_dummy_offset(
732+
self, JumpCondition.on_true if is_or else JumpCondition.on_false, True
730733
)
731734

732735
to_be_inlined = self._literals[block_literal_idx]

‎src/som/compiler/bc/parser.py‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
emit_push_constant_index,
2020
emit_return_non_local,
2121
)
22-
from som.compiler.bc.method_generation_context import MethodGenerationContext
22+
from som.compiler.bc.method_generation_context import (
23+
MethodGenerationContext,
24+
JumpCondition,
25+
)
2326
from som.compiler.parser import ParserBase
2427
from som.compiler.symbol import Symbol
2528
from som.vm.symbols import (
@@ -269,10 +272,21 @@ def _keyword_message(self, mgenc):
269272

270273
if not is_super_send:
271274
if num_args == 1 and (
272-
(keyword == "ifTrue:" and mgenc.inline_if_true_or_if_false(self, True))
275+
(
276+
keyword == "ifTrue:"
277+
and mgenc.inline_then_branch(self, JumpCondition.on_false)
278+
)
273279
or (
274280
keyword == "ifFalse:"
275-
and mgenc.inline_if_true_or_if_false(self, False)
281+
and mgenc.inline_then_branch(self, JumpCondition.on_true)
282+
)
283+
or (
284+
keyword == "ifNil:"
285+
and mgenc.inline_then_branch(self, JumpCondition.on_not_nil)
286+
)
287+
or (
288+
keyword == "ifNotNil:"
289+
and mgenc.inline_then_branch(self, JumpCondition.on_nil)
276290
)
277291
or (keyword == "whileTrue:" and mgenc.inline_while(self, True))
278292
or (keyword == "whileFalse:" and mgenc.inline_while(self, False))
@@ -284,11 +298,19 @@ def _keyword_message(self, mgenc):
284298
if num_args == 2 and (
285299
(
286300
keyword == "ifTrue:ifFalse:"
287-
and mgenc.inline_if_true_false(self, True)
301+
and mgenc.inline_then_else_branches(self, JumpCondition.on_false)
288302
)
289303
or (
290304
keyword == "ifFalse:ifTrue:"
291-
and mgenc.inline_if_true_false(self, False)
305+
and mgenc.inline_then_else_branches(self, JumpCondition.on_true)
306+
)
307+
or (
308+
keyword == "ifNil:ifNotNil:"
309+
and mgenc.inline_then_else_branches(self, JumpCondition.on_not_nil)
310+
)
311+
or (
312+
keyword == "ifNotNil:ifNil:"
313+
and mgenc.inline_then_else_branches(self, JumpCondition.on_nil)
292314
)
293315
):
294316
return

‎src/som/interpreter/bc/bytecodes.py‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,13 +80,21 @@ class Bytecodes(object):
8080
jump_on_false_top_nil = jump_on_true_top_nil + 1
8181
jump_on_true_pop = jump_on_false_top_nil + 1
8282
jump_on_false_pop = jump_on_true_pop + 1
83-
jump_backward = jump_on_false_pop + 1
83+
jump_on_not_nil_top_top = jump_on_false_pop + 1
84+
jump_on_nil_top_top = jump_on_not_nil_top_top + 1
85+
jump_on_not_nil_pop = jump_on_nil_top_top + 1
86+
jump_on_nil_pop = jump_on_not_nil_pop + 1
87+
jump_backward = jump_on_nil_pop + 1
8488
jump2 = jump_backward + 1
8589
jump2_on_true_top_nil = jump2 + 1
8690
jump2_on_false_top_nil = jump2_on_true_top_nil + 1
8791
jump2_on_true_pop = jump2_on_false_top_nil + 1
8892
jump2_on_false_pop = jump2_on_true_pop + 1
89-
jump2_backward = jump2_on_false_pop + 1
93+
jump2_on_not_nil_top_top = jump2_on_false_pop + 1
94+
jump2_on_nil_top_top = jump2_on_not_nil_top_top + 1
95+
jump2_on_not_nil_pop = jump2_on_nil_top_top + 1
96+
jump2_on_nil_pop = jump2_on_not_nil_pop + 1
97+
jump2_backward = jump2_on_nil_pop + 1
9098

9199
q_super_send_1 = jump2_backward + 1
92100
q_super_send_2 = q_super_send_1 + 1
@@ -154,12 +162,20 @@ def is_one_of(bytecode, candidates):
154162
Bytecodes.jump_on_true_pop,
155163
Bytecodes.jump_on_false_pop,
156164
Bytecodes.jump_on_false_top_nil,
165+
Bytecodes.jump_on_not_nil_top_top,
166+
Bytecodes.jump_on_nil_top_top,
167+
Bytecodes.jump_on_not_nil_pop,
168+
Bytecodes.jump_on_nil_pop,
157169
Bytecodes.jump_backward,
158170
Bytecodes.jump2,
159171
Bytecodes.jump2_on_true_top_nil,
160172
Bytecodes.jump2_on_true_pop,
161173
Bytecodes.jump2_on_false_pop,
162174
Bytecodes.jump2_on_false_top_nil,
175+
Bytecodes.jump2_on_not_nil_top_top,
176+
Bytecodes.jump2_on_nil_top_top,
177+
Bytecodes.jump2_on_not_nil_pop,
178+
Bytecodes.jump2_on_nil_pop,
163179
Bytecodes.jump2_backward,
164180
]
165181

@@ -258,12 +274,20 @@ def is_one_of(bytecode, candidates):
258274
LEN_TWO_ARGS, # jump_on_false_top_nil
259275
LEN_TWO_ARGS, # jump_on_true_pop
260276
LEN_TWO_ARGS, # jump_on_false_pop
277+
LEN_TWO_ARGS, # jump_on_not_nil_top_top,
278+
LEN_TWO_ARGS, # jump_on_nil_top_top,
279+
LEN_TWO_ARGS, # jump_on_not_nil_pop,
280+
LEN_TWO_ARGS, # jump_on_nil_pop,
261281
LEN_TWO_ARGS, # jump_backward
262282
LEN_TWO_ARGS, # jump2
263283
LEN_TWO_ARGS, # jump2_on_true_top_nil
264284
LEN_TWO_ARGS, # jump2_on_false_top_nil
265285
LEN_TWO_ARGS, # jump2_on_true_pop
266286
LEN_TWO_ARGS, # jump2_on_false_pop
287+
LEN_TWO_ARGS, # jump2_on_not_nil_top_top,
288+
LEN_TWO_ARGS, # jump2_on_nil_top_top,
289+
LEN_TWO_ARGS, # jump2_on_not_nil_pop,
290+
LEN_TWO_ARGS, # jump2_on_nil_pop,
267291
LEN_TWO_ARGS, # jump2_backward
268292
LEN_ONE_ARG, # q_super_send_1
269293
LEN_ONE_ARG, # q_super_send_2

‎src/som/interpreter/bc/interpreter.py‎

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,48 @@ def interpret(method, frame, max_stack_size):
584584
stack[stack_ptr] = None
585585
stack_ptr -= 1
586586

587+
elif bytecode == Bytecodes.jump_on_not_nil_top_top:
588+
val = stack[stack_ptr]
589+
if val is not nilObject:
590+
current_bc_idx += method.get_bytecode(current_bc_idx + 1)
591+
# stack[stack_ptr] = val
592+
else:
593+
if we_are_jitted():
594+
stack[stack_ptr] = None
595+
stack_ptr -= 1
596+
current_bc_idx += LEN_TWO_ARGS
597+
598+
elif bytecode == Bytecodes.jump_on_nil_top_top:
599+
val = stack[stack_ptr]
600+
if val is nilObject:
601+
current_bc_idx += method.get_bytecode(current_bc_idx + 1)
602+
# stack[stack_ptr] = val
603+
else:
604+
if we_are_jitted():
605+
stack[stack_ptr] = None
606+
stack_ptr -= 1
607+
current_bc_idx += LEN_TWO_ARGS
608+
609+
elif bytecode == Bytecodes.jump_on_not_nil_pop:
610+
val = stack[stack_ptr]
611+
if val is not nilObject:
612+
current_bc_idx += method.get_bytecode(current_bc_idx + 1)
613+
else:
614+
current_bc_idx += LEN_TWO_ARGS
615+
if we_are_jitted():
616+
stack[stack_ptr] = None
617+
stack_ptr -= 1
618+
619+
elif bytecode == Bytecodes.jump_on_nil_pop:
620+
val = stack[stack_ptr]
621+
if val is nilObject:
622+
current_bc_idx += method.get_bytecode(current_bc_idx + 1)
623+
else:
624+
current_bc_idx += LEN_TWO_ARGS
625+
if we_are_jitted():
626+
stack[stack_ptr] = None
627+
stack_ptr -= 1
628+
587629
elif bytecode == Bytecodes.jump_backward:
588630
current_bc_idx -= method.get_bytecode(current_bc_idx + 1)
589631
jitdriver.can_enter_jit(
@@ -649,6 +691,55 @@ def interpret(method, frame, max_stack_size):
649691
stack[stack_ptr] = None
650692
stack_ptr -= 1
651693

694+
elif bytecode == Bytecodes.jump2_on_not_nil_top_top:
695+
val = stack[stack_ptr]
696+
if val is not nilObject:
697+
current_bc_idx += method.get_bytecode(current_bc_idx + 1) + (
698+
method.get_bytecode(current_bc_idx + 2) << 8
699+
)
700+
# stack[stack_ptr] = val
701+
else:
702+
if we_are_jitted():
703+
stack[stack_ptr] = None
704+
stack_ptr -= 1
705+
current_bc_idx += LEN_TWO_ARGS
706+
707+
elif bytecode == Bytecodes.jump2_on_nil_top_top:
708+
val = stack[stack_ptr]
709+
if val is nilObject:
710+
current_bc_idx += method.get_bytecode(current_bc_idx + 1) + (
711+
method.get_bytecode(current_bc_idx + 2) << 8
712+
)
713+
# stack[stack_ptr] = val
714+
else:
715+
if we_are_jitted():
716+
stack[stack_ptr] = None
717+
stack_ptr -= 1
718+
current_bc_idx += LEN_TWO_ARGS
719+
720+
elif bytecode == Bytecodes.jump2_on_not_nil_pop:
721+
val = stack[stack_ptr]
722+
if val is not nilObject:
723+
current_bc_idx += method.get_bytecode(current_bc_idx + 1) + (
724+
method.get_bytecode(current_bc_idx + 2) << 8
725+
)
726+
else:
727+
current_bc_idx += LEN_TWO_ARGS
728+
if we_are_jitted():
729+
stack[stack_ptr] = None
730+
stack_ptr -= 1
731+
732+
elif bytecode == Bytecodes.jump2_on_nil_pop:
733+
val = stack[stack_ptr]
734+
if val is nilObject:
735+
current_bc_idx += method.get_bytecode(current_bc_idx + 1) + (
736+
method.get_bytecode(current_bc_idx + 2) << 8
737+
)
738+
else:
739+
current_bc_idx += LEN_TWO_ARGS
740+
if we_are_jitted():
741+
stack[stack_ptr] = None
742+
stack_ptr -= 1
652743
elif bytecode == Bytecodes.jump2_backward:
653744
current_bc_idx -= method.get_bytecode(current_bc_idx + 1) + (
654745
method.get_bytecode(current_bc_idx + 2) << 8

0 commit comments

Comments
 (0)