1913413 - Move code from architecture-specific CodeGenerator into common CodeGenerator

Status: RESOLVED FIXED

(Core :: JavaScript Engine: JIT, task)

Description

[André Bargull [:anba]]

MacroAssembler now provides enough abstractions that we can move more code from architecture-specific CodeGenerator into the common CodeGenerator.

Comment 1

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 1: Move visitTestIAndBranch into shared CodeGenerator. r=#spidermonkey-reviewers!

Doesn't change generated code, but let's us share more code across all target
architectures.

Notes:

• If isNextBlock(lir->ifTrue()->lir()) is true, then jumpToBlock(lir->ifTrue())
  is a no-op, so it's not necessary to check isNextBlock and we can instead
  directly call jumpToBlock.
• branchTest32(cond, input, input) is handled by ARM targets to instead emit
  branch32(cond, input, Imm32(0)).

Also updated visitTestBIAndBranch to stay in-sync.

Comment 2

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 2: Move visitCompare into shared CodeGenerator. r=#spidermonkey-reviewers!

Some target architectures allow the right-hand side to be an Address, which
needs to be special-cased, because cmp{32,Ptr}Set only supports Address as
the left-hand side operand.

Comment 3

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 3: Move visitCompareAndBranch into shared CodeGenerator. r=#spidermonkey-reviewers!

Similar to the previous two parts, share more code across targets.

Comment 4

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 4: Remove unused testZeroEmitBranch method. r=#spidermonkey-reviewers!

Comment 5

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 5: Replace testNullEmitBranch with branchTestNull. r=#spidermonkey-reviewers!

Use branchTestNull to share the same code across all targets.

Comment 6

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 6: Replace testUndefinedEmitBranch with branchTestUndefined. r=#spidermonkey-reviewers!

Comment 7

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 7: Replace testObjectEmitBranch with branchTestObject. r=#spidermonkey-reviewers!

Comment 8

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 8: Add definition for emitBranch(DoubleCondition). r=#spidermonkey-reviewers!

Move the NaN handling code into a separate method.

Comment 9

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 9: Consistently use branchPtr for branch64 methods on ARM64. r=#spidermonkey-reviewers!

Some branch64 methods were already calling into their branchPtr
counterparts. Do this consistently to avoid duplicating code.

Comment 10

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 10: Remove Imm64::{first,second}Half. r=#spidermonkey-reviewers!

Instead directly call either low or hi.

Comment 11

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 11: Support additional condition codes for branch64. r=#spidermonkey-reviewers!

Support additional condition codes for part 13.

Drive-by change:

• Move jump(fail) for ARM32/x86 to the end to avoid duplicate code.

Comment 12

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 12: Add IsRegister64 and ToAddress for LInt64Allocation. r=#spidermonkey-reviewers!

The next part will use these functions.

Comment 13

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 13: Move visitCompareI64AndBranch into shared CodeGenerator. r=#spidermonkey-reviewers!

Share visitCompareI64AndBranch across all target architectures.

Drive-by change:

• Move const for getInt64Operand to the correct position, because returning
  a const value isn't really useful.

Comment 14

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 14: Move lowering for LCompareI64AndBranch into shared code. r=#spidermonkey-reviewers!

All architectures expect for ARM64 used useInt64OrConstant, whereas ARM64 used
useInt64RegisterOrConstant. The previous part ensures that Address operands are
correctly handled on all platforms, so useInt64OrConstant is now also supported
for ARM64 and we can move the lowering back into the shared code.

Comment 15

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 15: Remove unused `template` argument from branch methods. r=#spidermonkey-reviewers!

Comment 16

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 16: Add branchTestPtr with ImmWord operand. r=#spidermonkey-reviewers!

Used in the next part.

Comment 17

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 17: Add branchTest64 with an immediate operand. r=#spidermonkey-reviewers!

And extend the existing branchTest64 on x86 and ARM32 to handle the case when
temp is an invalid register or lhs != rhs.

Comment 18

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 18: Move visitTestI64AndBranch into shared CodeGenerator. r=#spidermonkey-reviewers!

Using branchTest64 from the previous part, it's now possible to use a single
definition of visitTestI64AndBranch.

Comment 19

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 19: Remove lowerForBitAndAndBranch. r=#spidermonkey-reviewers!

lowerForBitAndAndBranch is exactly the same across all targets, so there's
no reason to duplicate this code.

Drive-by change:

• Rename some variable to be consistent with other code in visitTest.

Comment 20

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 20: Move visitBitAndAndBranch into shared CodeGenerator. r=#spidermonkey-reviewers!

Requires adding LBitAnd64AndBranch to cleanly handle 32- and 64-bit targets.

Comment 21

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 21: Use {Low,High}Word in more places. r=#spidermonkey-reviewers!

Comment 22

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 22: Move visit{Double,Float32,Value} into shared CodeGenerator. r=#spidermonkey-reviewers!

Comment 23

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 23: Support Register64 operands in cmp64Set. r=#spidermonkey-reviewers!

Used in the next part.

Comment 24

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 24: Move visitCompareI64 into shared CodeGenerator. r=#spidermonkey-reviewers!

Comment 25

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 25: Write c{lt}z64 result into Register64. r=#spidermonkey-reviewers!

All callers use Register64 outputs, so it's easier to pass Register64 to
the MacroAssembler.

Comment 26

[André Bargull [:anba]]

Attachment: Bug 1913413 - Part 26: Move visit{Clz,Ctz,Popcnt}{I,I64} into shared CodeGenerator. r=#spidermonkey-reviewers!

Comment 27

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/0d102f00d0d7
Part 1: Move visitTestIAndBranch into shared CodeGenerator. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/8f9328e21fa7
Part 2: Move visitCompare into shared CodeGenerator. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/bd7b76800a95
Part 3: Move visitCompareAndBranch into shared CodeGenerator. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/00221f811b82
Part 4: Remove unused testZeroEmitBranch method. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/ef6def483963
Part 5: Replace testNullEmitBranch with branchTestNull. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/09a7c6105499
Part 6: Replace testUndefinedEmitBranch with branchTestUndefined. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/5dfd87ed05b4
Part 7: Replace testObjectEmitBranch with branchTestObject. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/2bac091fec61
Part 8: Add definition for emitBranch(DoubleCondition). r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/9cb172f866f5
Part 9: Consistently use branchPtr for branch64 methods on ARM64. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/667435a5c4f7
Part 10: Remove Imm64::{first,second}Half. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/4ca179b8636f
Part 11: Support additional condition codes for branch64. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/93bfcf8e8706
Part 12: Add IsRegister64 and ToAddress for LInt64Allocation. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/f0fbaabaa131
Part 13: Move visitCompareI64AndBranch into shared CodeGenerator. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/4f8dd358e534
Part 14: Move lowering for LCompareI64AndBranch into shared code. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/c5923db1a7d7
Part 15: Remove unused `template` argument from branch methods. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/517a6a9add34
Part 16: Add branchTestPtr with ImmWord operand. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/190893e0c9c2
Part 17: Add branchTest64 with an immediate operand. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/7c69fd0c5de7
Part 18: Move visitTestI64AndBranch into shared CodeGenerator. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/6b57333f3d76
Part 19: Remove lowerForBitAndAndBranch. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/e50e1cfff284
Part 20: Move visitBitAndAndBranch into shared CodeGenerator. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/4ff89086adc6
Part 21: Use {Low,High}Word in more places. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/a7ce2906337d
Part 22: Move visit{Double,Float32,Value} into shared CodeGenerator. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/4d4c4c4e791d
Part 23: Support Register64 operands in cmp64Set. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/6ae14ffaa8c4
Part 24: Move visitCompareI64 into shared CodeGenerator. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/cf3241eb6da8
Part 25: Write c{lt}z64 result into Register64. r=spidermonkey-reviewers,iain
https://hg.mozilla.org/integration/autoland/rev/e812df518f63
Part 26: Move visit{Clz,Ctz,Popcnt}{I,I64} into shared CodeGenerator. r=spidermonkey-reviewers,iain

Comment 28

[Cristian Tuns]

https://hg.mozilla.org/mozilla-central/rev/0d102f00d0d7
https://hg.mozilla.org/mozilla-central/rev/8f9328e21fa7
https://hg.mozilla.org/mozilla-central/rev/bd7b76800a95
https://hg.mozilla.org/mozilla-central/rev/00221f811b82
https://hg.mozilla.org/mozilla-central/rev/ef6def483963
https://hg.mozilla.org/mozilla-central/rev/09a7c6105499
https://hg.mozilla.org/mozilla-central/rev/5dfd87ed05b4
https://hg.mozilla.org/mozilla-central/rev/2bac091fec61
https://hg.mozilla.org/mozilla-central/rev/9cb172f866f5
https://hg.mozilla.org/mozilla-central/rev/667435a5c4f7
https://hg.mozilla.org/mozilla-central/rev/4ca179b8636f
https://hg.mozilla.org/mozilla-central/rev/93bfcf8e8706
https://hg.mozilla.org/mozilla-central/rev/f0fbaabaa131
https://hg.mozilla.org/mozilla-central/rev/4f8dd358e534
https://hg.mozilla.org/mozilla-central/rev/c5923db1a7d7
https://hg.mozilla.org/mozilla-central/rev/517a6a9add34
https://hg.mozilla.org/mozilla-central/rev/190893e0c9c2
https://hg.mozilla.org/mozilla-central/rev/7c69fd0c5de7
https://hg.mozilla.org/mozilla-central/rev/6b57333f3d76
https://hg.mozilla.org/mozilla-central/rev/e50e1cfff284
https://hg.mozilla.org/mozilla-central/rev/4ff89086adc6
https://hg.mozilla.org/mozilla-central/rev/a7ce2906337d
https://hg.mozilla.org/mozilla-central/rev/4d4c4c4e791d
https://hg.mozilla.org/mozilla-central/rev/6ae14ffaa8c4
https://hg.mozilla.org/mozilla-central/rev/cf3241eb6da8
https://hg.mozilla.org/mozilla-central/rev/e812df518f63