Adding supernodes #185

smarr · 2023-04-24T20:36:39Z

This PR attempts to merge all the supernodes that were developed into the main branch.

Though, at this point, it's still a work in progress, and this PR is helping to track the work that needs to be done.

TODOs

have full list of supported supernode patterns
have full test coverage for all supported supernode pattern
ensure we do not regress performance of the bytecode interpreter, which seems to be currently the case
make sure all supernodes from all the branches are included

List of Supernodes

Increment/Decrement Nodes

add/subtract literal (implemented with Implement more supernodes for incrementing/decrementing #221)
- e - k or e + k (e: arbitrary expression, k: constant integer)
- for field inc/dec: field := field + 1 and field := field - 323
- for field with arbitrary expression: field := field + e, field := field - e.

Square Nodes

implemented with Add Square supernodes #220
- basic multiplication of a variable with itself:
  - local * local
  - | l | [ l * l ]
- multiplication and assigning result to local
  - b := l * l
  - also for non-local variants

Literal Comparison Nodes

Add supernode for comparing a literal string #196
- "someString" = var and var = "someString"
- the various variations with locals, arguments, non-locals, and fields
  - fields for local and non-local access to self

The most common version of this is sending to self. Signed-off-by: Stefan Marr <[email protected]>

This also adds the support in the bytecode interpreter (this is mostly incidental, since I had to remove it completely, too) Signed-off-by: Stefan Marr <[email protected]>

- also supports `-` as operator in parser - add tests - add fallback support Signed-off-by: Stefan Marr <[email protected]>

Signed-off-by: Stefan Marr <[email protected]>

Cherry-picked from supernodes branch

Signed-off-by: Stefan Marr <[email protected]>

- do specialization in the parser to do it as early as possible - remove AssignLocalSquareToLocalNode which is the run-time specialization version Signed-off-by: Stefan Marr <[email protected]>

…string comparions. For the nil case in the string comparison, we store `nil` in a local static field to avoid type restrictions of the DSL. Signed-off-by: Stefan Marr <[email protected]>

This node inlines the argument and field reading and does the string equal. There's theoretical an early abort for non-object fields. Though, we don't have those in our benchmarks. Well, perhaps uninitialized fields. Though, the structure of the lookup, and caching makes that tricky. Not sure it's worth optimizing that. Signed-off-by: Stefan Marr <[email protected]>

Signed-off-by: Stefan Marr <[email protected]>

… some other expression Signed-off-by: Stefan Marr <[email protected]>

SomSom's parser also has `text := text + self currentChar.` where `text` is a field in the lexer. Signed-off-by: Stefan Marr <[email protected]>

Signed-off-by: Stefan Marr <[email protected]>

… remaining use

…ntexts… Make sure we track the context correctly for each variable. Add a specialization that fetches the context only once if possible.

This avoids issues in Eclipse with the SomTests interferring with the context of TruffleTestSetup

Should be ensured in the caller.

The BC interpreter doesn’t need them.

smarr and others added 30 commits April 23, 2023 21:57

Add specialized n-ary send nodes that send to an argument

f7fbb14

The most common version of this is sending to self. Signed-off-by: Stefan Marr <[email protected]>

Implement IntIncrementNode and needed field access/storage support

741fc3c

This also adds the support in the bytecode interpreter (this is mostly incidental, since I had to remove it completely, too) Signed-off-by: Stefan Marr <[email protected]>

Generalize the IncOperationNode to arbitary values

9377f1d

- also supports `-` as operator in parser - add tests - add fallback support Signed-off-by: Stefan Marr <[email protected]>

Rename field to more consistent and explicit incValue

51e9a6a

Signed-off-by: Stefan Marr <[email protected]>

Added LocalVariableIncNode and NonLocalVariableIncNode

9a2483c

Signed-off-by: Stefan Marr <[email protected]>

Add AssignLocalSquareToLocalNode

9931e1a

Cherry-picked from supernodes branch

Added initial tests, the todo list

6526cc6

Signed-off-by: Stefan Marr <[email protected]>

Added [Non]LocalVariableSquareNode

89377b2

Signed-off-by: Stefan Marr <[email protected]>

Add [Non]LocalVariableReadSquareWriteNode

e72ba5b

- do specialization in the parser to do it as early as possible - remove AssignLocalSquareToLocalNode which is the run-time specialization version Signed-off-by: Stefan Marr <[email protected]>

Add StringEqualsNode, which is used for expr = 'str', i.e. literal …

bd3d369

…string comparions. For the nil case in the string comparison, we store `nil` in a local static field to avoid type restrictions of the DSL. Signed-off-by: Stefan Marr <[email protected]>

Adapt to use createGenericBinary

57b868f

Signed-off-by: Stefan Marr <[email protected]>

Move all supernodes to same package

e9a6922

Signed-off-by: Stefan Marr <[email protected]>

Restructure the Increment super nodes to support field increment with…

348f90a

… some other expression Signed-off-by: Stefan Marr <[email protected]>

Add fallback code for UninitIncFieldNode, SomSom needs it...

e004bea

SomSom's parser also has `text := text + self currentChar.` where `text` is a field in the lexer. Signed-off-by: Stefan Marr <[email protected]>

Rename increment nodes for variables that use an int constant

19bb759

Signed-off-by: Stefan Marr <[email protected]>

Add Inc[Non]LocalVariableNode

f15d40b

Signed-off-by: Stefan Marr <[email protected]>

Fix test regression after Invokable changes being merged in

87d590c

Signed-off-by: Stefan Marr <[email protected]>

Adapt to use of frame slot index instead of FrameSlot

8192c97

Signed-off-by: Stefan Marr <[email protected]>

Merge PR #144: Update Truffle and MX, and rename bd package to bdt

d95dde2

Signed-off-by: Stefan Marr <[email protected]>

Add super node for local := local foo

9215df5

Signed-off-by: Stefan Marr <[email protected]>

Add supernode for isNil ifTrue: sequence

00f29ba

Signed-off-by: Stefan Marr <[email protected]>

Add LocalArgGreaterThanInt

a55017a

Signed-off-by: Stefan Marr <[email protected]>

Add GreaterThanIntNode, LessThanIntNode, and LocalArgLessThanInt

e532691

Signed-off-by: Stefan Marr <[email protected]>

Remove unsafe getFieldOffset use and suppress deprecation warning for…

92f450f

… remaining use

Adapt to changes in send nodes

72626a1

Fix merge issues in IntIncrementNode

3223c68

Fix based on changes in send nodes

a7d9b2f

Things changed around the increment nodes

2186057

Bump Java version in Eclipse project to Java 19

450fcf7

smarr added 3 commits April 23, 2023 23:12

Fix class not moved in merge, deleted now

d96d677

The read+write square nodes may access locals in different lexical co…

853f0c9

…ntexts… Make sure we track the context correctly for each variable. Add a specialization that fetches the context only once if possible.

Initialize separte test context for each test class

c10025b

This avoids issues in Eclipse with the SomTests interferring with the context of TruffleTestSetup

smarr added enhancement supernodes labels Apr 24, 2023

smarr added 5 commits April 24, 2023 21:51

Remove redundant transferToInterpreterAndInvalidate()

87ca852

Should be ensured in the caller.

Whitespace

fecb6b1

Keep child nodes only in AST interpreter

5d3dbf6

The BC interpreter doesn’t need them.

Use instanceof pattern matching, and other code simplifications

4e2df51

Added more tests for the string literal equality supernode

274c0e6

smarr mentioned this pull request Dec 3, 2023

Add supernode for comparing a literal string #196

Merged

This was referenced Oct 4, 2024

Add Square supernodes #220

Merged

Implement more supernodes for incrementing/decrementing #221

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding supernodes #185

Adding supernodes #185

smarr commented Apr 24, 2023 •

edited

Loading

Adding supernodes #185

Are you sure you want to change the base?

Adding supernodes #185

Conversation

smarr commented Apr 24, 2023 • edited Loading

TODOs

List of Supernodes

Increment/Decrement Nodes

Square Nodes

Literal Comparison Nodes

smarr commented Apr 24, 2023 •

edited

Loading