Skip to content
Merged
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions src/coreclr/jit/hwintrinsiccodegenarm64.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,8 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
{
case 2:
{
assert(!isRMW);

HWIntrinsicImmOpHelper helper(this, intrin.op2, node);

for (helper.EmitBegin(); !helper.Done(); helper.EmitCaseEnd())
Expand All @@ -454,6 +456,8 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)

case 3:
{
assert(!isRMW);

HWIntrinsicImmOpHelper helper(this, intrin.op3, node);

for (helper.EmitBegin(); !helper.Done(); helper.EmitCaseEnd())
Expand All @@ -469,7 +473,10 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
{
assert(isRMW);

HWIntrinsicImmOpHelper helper(this, intrin.op4, node);
// emitIns_R_R_R_R_I may emit a mov (when not redundant) for RMW instructions;
// the ImmOpHelper must account for that mov
int numInstrs = (targetReg != op1Reg) ? 2 : 1;
Comment thread
dhartglassMSFT marked this conversation as resolved.
HWIntrinsicImmOpHelper helper(this, intrin.op4, node, numInstrs);

for (helper.EmitBegin(); !helper.Done(); helper.EmitCaseEnd())
{
Expand Down Expand Up @@ -499,8 +506,9 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
{
assert(hasImmediateOperand);

GenTree* shiftOp = isRMW ? intrin.op3 : intrin.op2;
HWIntrinsicImmOpHelper helper(this, shiftOp, node);
GenTree* shiftOp = isRMW ? intrin.op3 : intrin.op2;
int numInstrs = (isRMW && (targetReg != op1Reg)) ? 2 : 1;
HWIntrinsicImmOpHelper helper(this, shiftOp, node, numInstrs);

for (helper.EmitBegin(); !helper.Done(); helper.EmitCaseEnd())
{
Expand Down
Loading