Skip to content
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

[RISC-V] Clean up code gen for floating comparisons #111626

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+8 −47
Open

[RISC-V] Clean up code gen for floating comparisons #111626

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41d470b
Clean up code gen for floating comparisons
tomeksowi Jan 20, 2025
a711137
Don't allocate temp reg for floating comparisons
tomeksowi Jan 20, 2025
f67b60a
unreached()
tomeksowi Jan 31, 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
39 changes: 7 additions & 32 deletions src/coreclr/jit/codegenriscv64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3226,7 +3226,6 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)

if (isUnordered)
{
BasicBlock* skipLabel = nullptr;
if (tree->OperIs(GT_LT))
{
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_fle_s : INS_fle_d, cmpSize, targetReg, regOp2, regOp1);
Expand All @@ -3235,19 +3234,6 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
{
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_flt_s : INS_flt_d, cmpSize, targetReg, regOp2, regOp1);
}
else if (tree->OperIs(GT_EQ))
{
regNumber tempReg = internalRegisters.GetSingle(tree);
skipLabel = genCreateTempLabel();
emit->emitIns_R_R(cmpSize == EA_4BYTE ? INS_fclass_s : INS_fclass_d, cmpSize, targetReg, regOp1);
emit->emitIns_R_R(cmpSize == EA_4BYTE ? INS_fclass_s : INS_fclass_d, cmpSize, tempReg, regOp2);
emit->emitIns_R_R_R(INS_or, EA_8BYTE, tempReg, targetReg, tempReg);
emit->emitIns_R_R_I(INS_andi, EA_8BYTE, tempReg, tempReg, 0x300);
emit->emitIns_R_R_I(INS_addi, EA_8BYTE, targetReg, REG_R0, 1);
emit->emitIns_J(INS_bnez, skipLabel, tempReg);
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_feq_s : INS_feq_d, cmpSize, targetReg, regOp1, regOp2);
genDefineTempLabel(skipLabel);
}
else if (tree->OperIs(GT_NE))
{
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_feq_s : INS_feq_d, cmpSize, targetReg, regOp1, regOp2);
Expand All @@ -3260,11 +3246,11 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
{
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_flt_s : INS_flt_d, cmpSize, targetReg, regOp1, regOp2);
}
if (skipLabel == nullptr)
else
{
emit->emitIns_R_R_R(INS_sub, EA_8BYTE, targetReg, REG_R0, targetReg);
emit->emitIns_R_R_I(INS_addi, EA_8BYTE, targetReg, targetReg, 1);
unreached();
}
emit->emitIns_R_R_I(INS_xori, EA_8BYTE, targetReg, targetReg, 1);
}
else
{
Expand All @@ -3280,21 +3266,6 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
{
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_feq_s : INS_feq_d, cmpSize, targetReg, regOp1, regOp2);
}
else if (tree->OperIs(GT_NE))
{
regNumber tempReg = internalRegisters.GetSingle(tree);
emit->emitIns_R_R(cmpSize == EA_4BYTE ? INS_fclass_s : INS_fclass_d, cmpSize, targetReg, regOp1);
emit->emitIns_R_R(cmpSize == EA_4BYTE ? INS_fclass_s : INS_fclass_d, cmpSize, tempReg, regOp2);
emit->emitIns_R_R_R(INS_or, EA_8BYTE, tempReg, targetReg, tempReg);
emit->emitIns_R_R_I(INS_andi, EA_8BYTE, tempReg, tempReg, 0x300);
emit->emitIns_R_R_I(INS_addi, EA_8BYTE, targetReg, REG_R0, 0);
BasicBlock* skipLabel = genCreateTempLabel();
emit->emitIns_J(INS_bnez, skipLabel, tempReg);
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_feq_s : INS_feq_d, cmpSize, targetReg, regOp1, regOp2);
emit->emitIns_R_R_R(INS_sub, EA_8BYTE, targetReg, REG_R0, targetReg);
emit->emitIns_R_R_I(INS_addi, EA_8BYTE, targetReg, targetReg, 1);
genDefineTempLabel(skipLabel);
}
else if (tree->OperIs(GT_GT))
{
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_flt_s : INS_flt_d, cmpSize, targetReg, regOp2, regOp1);
Expand All @@ -3303,6 +3274,10 @@ void CodeGen::genCodeForCompare(GenTreeOp* tree)
{
emit->emitIns_R_R_R(cmpSize == EA_4BYTE ? INS_fle_s : INS_fle_d, cmpSize, targetReg, regOp2, regOp1);
}
else
{
unreached();
}
}
}
else
Expand Down
16 changes: 1 addition & 15 deletions src/coreclr/jit/lsrariscv64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,21 +394,7 @@ int LinearScan::BuildNode(GenTree* tree)
case GT_GT:
{
var_types op1Type = genActualType(tree->gtGetOp1()->TypeGet());
if (varTypeIsFloating(op1Type))
{
bool isUnordered = (tree->gtFlags & GTF_RELOP_NAN_UN) != 0;
if (isUnordered)
{
if (tree->OperIs(GT_EQ))
buildInternalIntRegisterDefForNode(tree);
}
else
{
if (tree->OperIs(GT_NE))
buildInternalIntRegisterDefForNode(tree);
}
}
else
if (!varTypeIsFloating(op1Type))
{
emitAttr cmpSize = EA_ATTR(genTypeSize(op1Type));
if (tree->gtGetOp2()->isContainedIntOrIImmed())
Expand Down
Loading