Skip to content

Wasm various fixes #122627

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

Open
AndyAyersMS wants to merge 10 commits into
base: main
Choose a base branch
from
+94 −35
Open

Wasm various fixes #122627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c658d37
wasm has 64 bit division
AndyAyersMS Dec 16, 2025
224603c
fix scc transform to be able to run in LIR
AndyAyersMS Dec 16, 2025
0e423c2
fixes/workarounds for 64 bit math
AndyAyersMS Dec 17, 2025
1e699ec
fix fgValueNumberTreeConst for long constants
AndyAyersMS Dec 17, 2025
979dead
disable TryLowerConstIntDivOrMod for wasm, for now
AndyAyersMS Dec 17, 2025
0a2ae69
fix assumptions in Lower::OptimizeConstCompare
AndyAyersMS Dec 17, 2025
0fbd4c3
fix full int reg size in Lowering::FindInducedParameterRegisterLocals
AndyAyersMS Dec 17, 2025
87dd7b7
adjust fix to OptimizeConstCompare
AndyAyersMS Dec 17, 2025
1e3c413
fix GetIndirectionCellArgKind
AndyAyersMS Dec 17, 2025
36281af
Merge branch 'main' into WasmVariousFixes
AndyAyersMS Dec 18, 2025
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
47 changes: 37 additions & 10 deletions src/coreclr/jit/fgwasm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -632,12 +632,28 @@ class Scc
transferBlock = m_comp->fgSplitEdge(pred, header);
}

GenTree* const targetIndex = m_comp->gtNewIconNode(headerNumber);
GenTree* const storeControlVar = m_comp->gtNewStoreLclVarNode(controlVarNum, targetIndex);
Statement* const assignStmt = m_comp->fgNewStmtNearEnd(transferBlock, storeControlVar);
GenTree* const targetIndex = m_comp->gtNewIconNode(headerNumber);
GenTree* const storeControlVar = m_comp->gtNewStoreLclVarNode(controlVarNum, targetIndex);

m_comp->gtSetStmtInfo(assignStmt);
m_comp->fgSetStmtSeq(assignStmt);
if (transferBlock->IsLIR())
{
LIR::Range range = LIR::SeqTree(m_comp, storeControlVar);

if (transferBlock->isEmpty())
{
LIR::AsRange(transferBlock).InsertAtEnd(std::move(range));
}
else
{
LIR::InsertBeforeTerminator(transferBlock, std::move(range));
}
}
else
{
Statement* const assignStmt = m_comp->fgNewStmtNearEnd(transferBlock, storeControlVar);
m_comp->gtSetStmtInfo(assignStmt);
m_comp->fgSetStmtSeq(assignStmt);
}

m_comp->fgReplaceJumpTarget(transferBlock, header, dispatcher);
}
Expand Down Expand Up @@ -675,12 +691,23 @@ class Scc
new (m_comp, CMK_BasicBlock) BBswtDesc(succs, numHeaders, cases, numHeaders, true);
dispatcher->SetSwitch(swtDesc);

GenTree* const controlVar = m_comp->gtNewLclvNode(controlVarNum, TYP_INT);
GenTree* const switchNode = m_comp->gtNewOperNode(GT_SWITCH, TYP_VOID, controlVar);
Statement* const switchStmt = m_comp->fgNewStmtAtEnd(dispatcher, switchNode);
GenTree* const controlVar = m_comp->gtNewLclvNode(controlVarNum, TYP_INT);
GenTree* const switchNode = m_comp->gtNewOperNode(GT_SWITCH, TYP_VOID, controlVar);

assert(dispatcher->isEmpty());

m_comp->gtSetStmtInfo(switchStmt);
m_comp->fgSetStmtSeq(switchStmt);
if (dispatcher->IsLIR())
{
LIR::Range range = LIR::SeqTree(m_comp, switchNode);
LIR::AsRange(dispatcher).InsertAtEnd(std::move(range));
}
else
{
Statement* const switchStmt = m_comp->fgNewStmtAtEnd(dispatcher, switchNode);

m_comp->gtSetStmtInfo(switchStmt);
m_comp->fgSetStmtSeq(switchStmt);
}
}

// Handle nested Sccs
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/gentree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5611,7 +5611,7 @@ struct GenTreeCall final : public GenTree
return WellKnownArg::VirtualStubCell;
}

#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64) || defined(TARGET_LOONGARCH64)
#if defined(TARGET_ARMARCH) || defined(TARGET_RISCV64) || defined(TARGET_LOONGARCH64) || defined(TARGET_WASM)
// For ARM architectures, we always use an indirection cell for R2R calls.
if (IsR2RRelativeIndir() && !IsDelegateInvoke())
{
Expand Down
38 changes: 29 additions & 9 deletions src/coreclr/jit/lower.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1548,7 +1548,7 @@ void Lowering::LowerArg(GenTreeCall* call, CallArg* callArg)
JITDUMP("Passed in ");
DBEXEC(comp->verbose, abiInfo.Dump());

#if !defined(TARGET_64BIT)
#if !defined(TARGET_64BIT) && !defined(TARGET_WASM)
if (comp->opts.compUseSoftFP && arg->TypeIs(TYP_DOUBLE))
{
// Unlike TYP_LONG we do no decomposition for doubles, yet we maintain
Expand Down Expand Up @@ -1582,7 +1582,7 @@ void Lowering::LowerArg(GenTreeCall* call, CallArg* callArg)

JITDUMP("Transformed long arg on 32-bit to FIELD_LIST node\n");
}
#endif
#endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM)

#if FEATURE_ARG_SPLIT
// Structs can be split into register(s) and stack on some targets
Expand Down Expand Up @@ -4172,8 +4172,8 @@ GenTree* Lowering::OptimizeConstCompare(GenTree* cmp)
{
assert(cmp->gtGetOp2()->IsIntegralConst());

GenTree* op1 = cmp->gtGetOp1();
GenTreeIntCon* op2 = cmp->gtGetOp2()->AsIntCon();
GenTree* op1 = cmp->gtGetOp1();
GenTreeIntConCommon* op2 = cmp->gtGetOp2()->AsIntConCommon();

#if defined(TARGET_XARCH) || defined(TARGET_ARM64) || defined(TARGET_RISCV64)

Expand Down Expand Up @@ -4206,7 +4206,7 @@ GenTree* Lowering::OptimizeConstCompare(GenTree* cmp)
return false;
};

ssize_t op2Value = op2->IconValue();
INT64 op2Value = op2->IntegralValue();

#ifdef TARGET_XARCH
var_types op1Type = op1->TypeGet();
Expand Down Expand Up @@ -4260,7 +4260,7 @@ GenTree* Lowering::OptimizeConstCompare(GenTree* cmp)
bool cmpEq = cmp->OperIs(GT_EQ);

cmp->SetOperRaw(cmpEq ? GT_TEST_EQ : GT_TEST_NE);
op2->SetIconValue(0xff);
op2->SetIntegralValue(0xff);
op2->gtType = castOp->gtType;
#else
castOp->gtType = castToType;
Expand Down Expand Up @@ -4295,10 +4295,14 @@ GenTree* Lowering::OptimizeConstCompare(GenTree* cmp)
// If we don't have a 0 compare we can get one by transforming ((x AND mask) EQ|NE mask)
// into ((x AND mask) NE|EQ 0) when mask is a single bit.
//
if ((op2Value != 0) && isPow2(static_cast<target_size_t>(op2Value)) && andOp2->IsIntegralConst(op2Value))
// TODO-Wasm: would like to use
// andOp2->IsIntegralValue(op2Value);
//
if ((op2Value != 0) && genExactlyOneBit(op2Value) && andOp2->IsIntegralConst() &&
(andOp2->AsIntConCommon()->IntegralValue() == op2Value))
{
op2Value = 0;
op2->SetIconValue(0);
op2->SetIntegralValue(0);
cmp->SetOperRaw(GenTree::ReverseRelop(cmp->OperGet()));
}

Expand Down Expand Up @@ -8176,6 +8180,7 @@ bool Lowering::LowerUnsignedDivOrMod(GenTreeOp* divMod)
return false;
}

//------------------------------------------------------------------------
// LowerConstIntDivOrMod: Transform integer GT_DIV/GT_MOD nodes with a power of 2
// const divisor into equivalent but faster sequences.
//
Expand Down Expand Up @@ -8211,6 +8216,14 @@ bool Lowering::TryLowerConstIntDivOrMod(GenTree* node, GenTree** nextNode)
assert(!node->OperIs(GT_MOD));
#endif // TARGET_ARM64

#if defined(TARGET_WASM)
// TODO-Wasm: evaluate if this is worth doing for Wasm, since some cases will increase
// code size and the underlying engine may do something similar. If it is worth doing,
// fix the code below to work properly for a 32 bit target that supports 64 bit math.
//
return false;
#endif // TARGET_WASM

if (!divisor->IsCnsIntOrI())
{
return false; // no transformations to make
Expand Down Expand Up @@ -8450,6 +8463,7 @@ bool Lowering::TryLowerConstIntDivOrMod(GenTree* node, GenTree** nextNode)
*nextNode = newDivMod->gtNext;
return true;
}

//------------------------------------------------------------------------
// LowerSignedDivOrMod: transform integer GT_DIV/GT_MOD nodes with a power of 2
// const divisor into equivalent but faster sequences.
Expand Down Expand Up @@ -8975,8 +8989,14 @@ void Lowering::FindInducedParameterRegisterLocals()
// We always use the full width for integer registers even if the
// width is shorter, because various places in the JIT will type
// accesses larger to generate smaller code.

#ifdef TARGET_WASM
var_types fullWidthType = TYP_LONG;
#else
var_types fullWidthType = TYP_I_IMPL;
#endif
var_types registerType =
genIsValidIntReg(regSegment->GetRegister()) ? TYP_I_IMPL : regSegment->GetRegisterType();
genIsValidIntReg(regSegment->GetRegister()) ? fullWidthType : regSegment->GetRegisterType();
if ((registerType == TYP_I_IMPL) && varTypeIsGC(fld))
{
registerType = fld->TypeGet();
Expand Down
40 changes: 26 additions & 14 deletions src/coreclr/jit/morph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7080,7 +7080,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
case GT_MUL:
noway_assert(op2 != nullptr);

#ifndef TARGET_64BIT
#if !defined(TARGET_64BIT) && !defined(TARGET_WASM)
if (typ == TYP_LONG)
{
// For (long)int1 * (long)int2, we dont actually do the
Expand Down Expand Up @@ -7115,7 +7115,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
goto USE_HELPER_FOR_ARITH;
}
}
#endif // !TARGET_64BIT
#endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM)
break;

case GT_ARR_LENGTH:
Expand Down Expand Up @@ -7191,7 +7191,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
return fgMorphSmpOp(tree, mac);
}

#ifndef TARGET_64BIT
#if !defined(TARGET_64BIT) && !defined(TARGET_WASM)
if (typ == TYP_LONG)
{
helper = CORINFO_HELP_LDIV;
Expand All @@ -7205,12 +7205,12 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
goto USE_HELPER_FOR_ARITH;
}
#endif
#endif // !TARGET_64BIT
#endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM)
break;

case GT_UDIV:

#ifndef TARGET_64BIT
#if !defined(TARGET_64BIT) && !defined(TARGET_WASM)
if (typ == TYP_LONG)
{
helper = CORINFO_HELP_ULDIV;
Expand All @@ -7223,7 +7223,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
goto USE_HELPER_FOR_ARITH;
}
#endif
#endif // TARGET_64BIT
#endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM)
break;

case GT_MOD:
Expand Down Expand Up @@ -7331,7 +7331,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
}
}

#ifndef TARGET_64BIT
#if !defined(TARGET_64BIT) && !defined(TARGET_WASM)
if (typ == TYP_LONG)
{
helper = (oper == GT_UMOD) ? CORINFO_HELP_ULMOD : CORINFO_HELP_LMOD;
Expand All @@ -7353,7 +7353,7 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
}
}
#endif
#endif // !TARGET_64BIT
#endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM)

if (tree->OperIs(GT_UMOD) && op2->IsIntegralConstUnsignedPow2())
{
Expand Down Expand Up @@ -7650,9 +7650,9 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA
}
}

#ifndef TARGET_64BIT
#if !defined(TARGET_64BIT) && !defined(TARGET_WASM)
DONE_MORPHING_CHILDREN:
#endif // !TARGET_64BIT
#endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM)

gtUpdateNodeOperSideEffects(tree);

Expand Down Expand Up @@ -7888,14 +7888,14 @@ GenTree* Compiler::fgMorphSmpOp(GenTree* tree, MorphAddrContext* mac, bool* optA

case GT_MUL:

#ifndef TARGET_64BIT
#if !defined(TARGET_64BIT) && !defined(TARGET_WASM)
if (typ == TYP_LONG)
{
// This must be GTF_MUL_64RSLT
INDEBUG(tree->AsOp()->DebugCheckLongMul());
return tree;
}
#endif // TARGET_64BIT
#endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM)
goto CM_OVF_OP;

case GT_SUB:
Expand Down Expand Up @@ -10379,6 +10379,18 @@ GenTree* Compiler::fgOptimizeAddition(GenTreeOp* add)
GenTree* Compiler::fgOptimizeMultiply(GenTreeOp* mul)
{
assert(mul->OperIs(GT_MUL));

#ifdef TARGET_WASM
// TODO-WASM: code below doesn't support a 32 bit target with 64 bit integer ops.
// For example, for wasm32 op2->IsCnsIntOrI() will return false for long constants,
// since both "int" and "I" are int32.
//
if (mul->TypeGet() == TYP_LONG)
{
return nullptr;
}
#endif

assert(varTypeIsIntOrI(mul) || varTypeIsFloating(mul));
assert(!mul->gtOverflow());

Expand Down Expand Up @@ -15287,14 +15299,14 @@ GenTree* Compiler::fgMorphReduceAddOps(GenTree* tree)
return tree;
}

#ifndef TARGET_64BIT
#if !defined(TARGET_64BIT) && !defined(TARGET_WASM)
// Transforming 64-bit ADD to 64-bit MUL on 32-bit system results in replacing
// ADD ops with a helper function call. Don't apply optimization in that case.
if (tree->TypeIs(TYP_LONG))
{
return tree;
}
#endif
#endif // !defined(TARGET_64BIT) && !defined(TARGET_WASM)

GenTree* lclVarTree = tree->AsOp()->gtOp2;
GenTree* consTree = tree->AsOp()->gtOp1;
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/jit/valuenum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11904,7 +11904,7 @@ void Compiler::fgValueNumberTreeConst(GenTree* tree)
}
else if ((typ == TYP_LONG) || (typ == TYP_ULONG))
{
tree->gtVNPair.SetBoth(vnStore->VNForLongCon(INT64(tree->AsIntConCommon()->LngValue())));
tree->gtVNPair.SetBoth(vnStore->VNForLongCon(tree->AsIntConCommon()->IntegralValue()));
}
else
{
Expand Down
Loading