From c4dcf6f751b35c7a2a3b46fa2d69b95d37d082a6 Mon Sep 17 00:00:00 2001 From: Cliff Click Date: Wed, 30 Sep 2026 19:25:04 -0700 Subject: Finish forward-port mem ops thru ch25 --- chapter23/README.md | 16 +- .../main/java/com/seaofnodes/simple/Parser.java | 111 +++++----- .../simple/codegen/GlobalCodeMotion.java | 55 +++-- .../com/seaofnodes/simple/node/BulkMemPhiNode.java | 240 +++++++++++++++++++++ .../java/com/seaofnodes/simple/node/LoadNode.java | 197 +++++++++-------- .../java/com/seaofnodes/simple/node/LoopNode.java | 11 +- .../com/seaofnodes/simple/node/MemMergeNode.java | 210 ++++++------------ .../java/com/seaofnodes/simple/node/MemOpNode.java | 35 +++ .../com/seaofnodes/simple/node/MemPhiNode.java | 44 ++++ .../java/com/seaofnodes/simple/node/NewNode.java | 66 ++---- .../main/java/com/seaofnodes/simple/node/Node.java | 13 +- .../java/com/seaofnodes/simple/node/PhiNode.java | 113 ++++++---- .../com/seaofnodes/simple/node/RegionNode.java | 2 +- .../com/seaofnodes/simple/node/ReturnNode.java | 13 +- .../java/com/seaofnodes/simple/node/ScopeNode.java | 90 ++++---- .../java/com/seaofnodes/simple/node/StartNode.java | 11 +- .../java/com/seaofnodes/simple/node/StoreNode.java | 35 ++- .../com/seaofnodes/simple/node/cpus/arm/arm.java | 2 + .../seaofnodes/simple/node/cpus/riscv/riscv.java | 2 + .../simple/node/cpus/x86_64_v2/LoadX86.java | 5 + .../simple/node/cpus/x86_64_v2/x86_64_v2.java | 7 +- .../simple/print/SimpleGraphAdapter.java | 2 +- .../java/com/seaofnodes/simple/Chapter10Test.java | 119 ++++++++++ .../java/com/seaofnodes/simple/Chapter10bTest.java | 60 ++++++ .../java/com/seaofnodes/simple/Chapter16Test.java | 23 ++ .../java/com/seaofnodes/simple/Chapter17Test.java | 2 +- .../java/com/seaofnodes/simple/Chapter18Test.java | 66 ++++++ .../java/com/seaofnodes/simple/Chapter19Test.java | 68 ++++++ .../java/com/seaofnodes/simple/Chapter20Test.java | 25 ++- .../src/test/java/com/seaofnodes/simple/Eval2.java | 8 +- .../test/java/com/seaofnodes/simple/EvalArm64.java | 7 +- .../com/seaofnodes/simple/MemoryEncodingTest.java | 178 +++++++++++++++ .../com/seaofnodes/simple/evaluator/Evaluator.java | 12 +- 33 files changed, 1306 insertions(+), 542 deletions(-) create mode 100644 chapter23/src/main/java/com/seaofnodes/simple/node/BulkMemPhiNode.java create mode 100644 chapter23/src/main/java/com/seaofnodes/simple/node/MemPhiNode.java create mode 100644 chapter23/src/test/java/com/seaofnodes/simple/Chapter10bTest.java create mode 100644 chapter23/src/test/java/com/seaofnodes/simple/MemoryEncodingTest.java (limited to 'chapter23') diff --git a/chapter23/README.md b/chapter23/README.md index c8961647..502387eb 100644 --- a/chapter23/README.md +++ b/chapter23/README.md @@ -43,6 +43,12 @@ Also in this chapter we revisit our Types and make some major changes: etc; only the implementation details change. +The lazy memory model from Chapter 10b continues through the new type system. +BulkMemPhi/MemPhi discover aliases during optimization. Each New covers only +instance fields; class-wide (`_one`) fields are excluded from its partial memory. +Field offsets stay symbolic until layout, and Loads retain cyclic field types +and deep-final information while querying the contents of a precise alias. + You can also read [this chapter](https://github.com/SeaOfNodes/Simple/tree/linear-chapter23) in a linear Git revision history on the [linear](https://github.com/SeaOfNodes/Simple/tree/linear) branch and [compare](https://github.com/SeaOfNodes/Simple/compare/linear-chapter22...linear-chapter23) it to the previous chapter. @@ -484,7 +490,7 @@ ranking remains for Chapter 25. Chapter 21's adjacent-copy forwarding also carries forward: after coloring, a sole use in the next instruction can read the source register when its operand mask permits it and no two-address tie is broken. The table below -includes this cleanup. Cohort 22 now also includes the two zero-move C return +includes this cleanup and the lazy memory forward port. Cohort 22 now also includes the two zero-move C return ABI checks added since the earlier audit (26 entries instead of 24). Run `make spill-stats` in this directory. All rows below use **this chapter's @@ -494,11 +500,11 @@ machine graphs are checked separately and do not contribute to the counts. | Program cohort | Compilations | Retained moves | Loop-weighted moves | |---|---:|---:|---:| -| Chapter 20 | 39 | 326 | 445 | -| Chapter 21 | 52 | 439 | 971 | +| Chapter 20 | 39 | 323 | 442 | +| Chapter 21 | 52 | 433 | 965 | | Chapter 22 | 26 | 67 | 67 | -| Chapter 23 | 30 | 81 | 228 | -| **Total** | **147** | **913** | **1,711** | +| Chapter 23 | 30 | 78 | 225 | +| **Total** | **147** | **901** | **1,699** | `_spills` counts retained SplitNodes, including register moves; `_spillScaled` weights them by `8^loopDepth`. These estimate compiler-generated moves, not diff --git a/chapter23/src/main/java/com/seaofnodes/simple/Parser.java b/chapter23/src/main/java/com/seaofnodes/simple/Parser.java index 5b3f4d1a..2dc83905 100644 --- a/chapter23/src/main/java/com/seaofnodes/simple/Parser.java +++ b/chapter23/src/main/java/com/seaofnodes/simple/Parser.java @@ -138,7 +138,7 @@ public class Parser { _scope.define(ScopeNode.ARG0, TypeInteger.BOT, false, null, _lexer); ctrl(XCTRL); - _scope.mem(new MemMergeNode(false)); + _scope.mem(con(TypeMem.BOT)); // Parse the sys import _lexer = new Lexer(com.seaofnodes.simple.sys.SYS); @@ -214,7 +214,7 @@ public class Parser { // Build a multi-exit return point for all function returns RegionNode r = new RegionNode( null,null,null).init(); assert r.inProgress(); - PhiNode rmem = new PhiNode(ScopeNode.MEM0,TypeMem.BOT,r,null).init(); + PhiNode rmem = new BulkMemPhiNode(ScopeNode.MEM0,r,null).init(); PhiNode rrez = new PhiNode(ScopeNode.ARG0,Type.BOTTOM,r,null).init(); ReturnNode ret = new ReturnNode(r, rmem, rrez, rpc, fun).init(); fun.setRet(ret); @@ -227,11 +227,8 @@ public class Parser { // external calls. _scope.push(new Kind.Func()); ctrl(fun); // Scope control from function - // Private mem alias tracking per function - MemMergeNode mem = new MemMergeNode(true); - mem.addDef(null); // Alias#0 - mem.addDef(new ParmNode(ScopeNode.MEM0,1,TypeMem.BOT,fun,con(TypeMem.BOT)).peephole()); // All aliases - _scope.mem(mem); + // Unknown callers supply whole memory; field aliases are discovered lazily. + _scope.mem(new ParmNode(ScopeNode.MEM0,1,TypeMem.BOT,fun,con(TypeMem.BOT)).peephole()); // All args, "as-if" called externally for( int i=0; i