Skip to content

regalloc: removes map use for less memory pressure #2211

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
merged 2 commits into from
May 21, 2024
Merged

regalloc: removes map use for less memory pressure #2211

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ecc28fa
regalloc: removes map use for less memory pressure
mathetake May 21, 2024
9d77b6a
regalloc: simplifies the for loop over possible Real regs
mathetake May 21, 2024
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
21 changes: 5 additions & 16 deletions internal/engine/wazevo/backend/regalloc/regalloc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,8 +944,7 @@ func (a *Allocator) allocBlock(f Function, blk Block) {
func (a *Allocator) releaseCallerSavedRegs(addrReg RealReg) {
s := &a.state

for i := 0; i < 64; i++ {
allocated := RealReg(i)
for allocated := RealReg(0); allocated < 64; allocated++ {
if allocated == addrReg { // If this is the call indirect, we should not touch the addr register.
continue
}
Expand Down Expand Up @@ -974,13 +973,6 @@ func (a *Allocator) fixMergeState(f Function, blk Block) {
bID := blk.ID()
blkSt := a.getOrAllocateBlockState(bID)
desiredOccupants := &blkSt.startRegs
aliveOnRegVRegs := make(map[VReg]RealReg)
for i := 0; i < 64; i++ {
r := RealReg(i)
if v := blkSt.startRegs.get(r); v.Valid() {
aliveOnRegVRegs[v] = r
}
}

if wazevoapi.RegAllocLoggingEnabled {
fmt.Println("fixMergeState", blk.ID(), ":", desiredOccupants.format(a.regInfo))
Expand All @@ -999,10 +991,9 @@ func (a *Allocator) fixMergeState(f Function, blk Block) {
currentOccupantsRev := make(map[VReg]RealReg)
pred := blk.Pred(i)
predSt := a.getOrAllocateBlockState(pred.ID())
for ii := 0; ii < 64; ii++ {
r := RealReg(ii)
for r := RealReg(0); r < 64; r++ {
if v := predSt.endRegs.get(r); v.Valid() {
if _, ok := aliveOnRegVRegs[v]; !ok {
if _v := blkSt.startRegs.get(r); !_v.Valid() {
continue
}
currentOccupants.add(r, v)
Expand All @@ -1029,8 +1020,7 @@ func (a *Allocator) fixMergeState(f Function, blk Block) {
fmt.Println("\t", pred.ID(), ":", currentOccupants.format(a.regInfo))
}

for ii := 0; ii < 64; ii++ {
r := RealReg(ii)
for r := RealReg(0); r < 64; r++ {
desiredVReg := desiredOccupants.get(r)
if !desiredVReg.Valid() {
continue
Expand Down Expand Up @@ -1169,8 +1159,7 @@ func (a *Allocator) scheduleSpill(f Function, vs *vrState) {
}
for pos != definingBlk {
st := a.getOrAllocateBlockState(pos.ID())
for ii := 0; ii < 64; ii++ {
rr := RealReg(ii)
for rr := RealReg(0); rr < 64; rr++ {
if st.startRegs.get(rr) == v {
r = rr
// Already in the register, so we can place the spill at the beginning of the block.
Expand Down
Loading