Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-07-06 00:05:59 +02:00
Code Activity

Improved spaceship- const evaluation, subtraction optimization

Browse source
This commit is contained in:
Brian Fiete 2020-02-23 07:41:06 -08:00
parent 292e0992a4
commit 2bcfdcc06c
2 changed files with 68 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

68
IDEHelper/Compiler/BfExprEvaluator.cpp
View file

@ -18514,33 +18514,59 @@ void BfExprEvaluator::PerformBinaryOperation(BfType* resultType, BfIRValue convL
case BfBinaryOp_Compare: case BfBinaryOp_Compare:
{ {
auto intType = mModule->GetPrimitiveType(BfTypeCode_IntPtr); auto intType = mModule->GetPrimitiveType(BfTypeCode_IntPtr);
if ((convLeftValue.IsConst()) && (convRightValue.IsConst()))
{
auto cmpLtVal = mModule->mBfIRBuilder->CreateCmpLT(convLeftValue, convRightValue, resultType->IsSignedInt());
auto ltConstant = mModule->mBfIRBuilder->GetConstant(cmpLtVal);
if (ltConstant->mBool)
{
mResult = BfTypedValue(mModule->GetConstValue(-1, mModule->GetPrimitiveType(BfTypeCode_IntPtr)), intType);
}
else
{
auto cmpGtVal = mModule->mBfIRBuilder->CreateCmpGT(convLeftValue, convRightValue, resultType->IsSignedInt());
auto rtConstant = mModule->mBfIRBuilder->GetConstant(cmpGtVal);
if (rtConstant->mBool)
mResult = BfTypedValue(mModule->GetConstValue(1, mModule->GetPrimitiveType(BfTypeCode_IntPtr)), intType);
else
mResult = BfTypedValue(mModule->GetConstValue(0, mModule->GetPrimitiveType(BfTypeCode_IntPtr)), intType);
}
}
else if ((resultType->IsIntegral()) && (resultType->mSize < intType->mSize))
{
auto leftIntValue = mModule->mBfIRBuilder->CreateNumericCast(convLeftValue, resultType->IsSignedInt(), BfTypeCode_IntPtr);
auto rightIntValue = mModule->mBfIRBuilder->CreateNumericCast(convRightValue, resultType->IsSignedInt(), BfTypeCode_IntPtr);
mResult = BfTypedValue(mModule->mBfIRBuilder->CreateSub(leftIntValue, rightIntValue), intType);
}
else
{
BfIRBlock checkGtBlock = mModule->mBfIRBuilder->CreateBlock("cmpCheckGt");
BfIRBlock eqBlock = mModule->mBfIRBuilder->CreateBlock("cmpEq");
BfIRBlock endBlock = mModule->mBfIRBuilder->CreateBlock("cmpEnd");
BfIRBlock checkGtBlock = mModule->mBfIRBuilder->CreateBlock("cmpCheckGt"); auto startBlock = mModule->mBfIRBuilder->GetInsertBlock();
BfIRBlock eqBlock = mModule->mBfIRBuilder->CreateBlock("cmpEq");
BfIRBlock endBlock = mModule->mBfIRBuilder->CreateBlock("cmpEnd");
auto startBlock = mModule->mBfIRBuilder->GetInsertBlock(); auto cmpLtVal = mModule->mBfIRBuilder->CreateCmpLT(convLeftValue, convRightValue, resultType->IsSignedInt());
mModule->mBfIRBuilder->CreateCondBr(cmpLtVal, endBlock, checkGtBlock);
auto cmpLtVal = mModule->mBfIRBuilder->CreateCmpLT(convLeftValue, convRightValue, resultType->IsSignedInt()); mModule->mBfIRBuilder->AddBlock(checkGtBlock);
mModule->mBfIRBuilder->CreateCondBr(cmpLtVal, endBlock, checkGtBlock); mModule->mBfIRBuilder->SetInsertPoint(checkGtBlock);
auto cmpGtVal = mModule->mBfIRBuilder->CreateCmpGT(convLeftValue, convRightValue, resultType->IsSignedInt());
mModule->mBfIRBuilder->CreateCondBr(cmpGtVal, endBlock, eqBlock);
mModule->mBfIRBuilder->AddBlock(checkGtBlock); mModule->mBfIRBuilder->AddBlock(eqBlock);
mModule->mBfIRBuilder->SetInsertPoint(checkGtBlock); mModule->mBfIRBuilder->SetInsertPoint(eqBlock);
auto cmpGtVal = mModule->mBfIRBuilder->CreateCmpGT(convLeftValue, convRightValue, resultType->IsSignedInt()); mModule->mBfIRBuilder->CreateBr(endBlock);
mModule->mBfIRBuilder->CreateCondBr(cmpGtVal, endBlock, eqBlock);
mModule->mBfIRBuilder->AddBlock(eqBlock); mModule->mBfIRBuilder->AddBlock(endBlock);
mModule->mBfIRBuilder->SetInsertPoint(eqBlock); mModule->mBfIRBuilder->SetInsertPoint(endBlock);
mModule->mBfIRBuilder->CreateBr(endBlock); auto phiVal = mModule->mBfIRBuilder->CreatePhi(mModule->mBfIRBuilder->MapType(intType), 3);
mModule->mBfIRBuilder->AddPhiIncoming(phiVal, mModule->mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, -1), startBlock);
mModule->mBfIRBuilder->AddPhiIncoming(phiVal, mModule->mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, 1), checkGtBlock);
mModule->mBfIRBuilder->AddPhiIncoming(phiVal, mModule->mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, 0), eqBlock);
mModule->mBfIRBuilder->AddBlock(endBlock); mResult = BfTypedValue(phiVal, intType);
mModule->mBfIRBuilder->SetInsertPoint(endBlock); }
auto phiVal = mModule->mBfIRBuilder->CreatePhi(mModule->mBfIRBuilder->MapType(intType), 3);
mModule->mBfIRBuilder->AddPhiIncoming(phiVal, mModule->mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, -1), startBlock);
mModule->mBfIRBuilder->AddPhiIncoming(phiVal, mModule->mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, 1), checkGtBlock);
mModule->mBfIRBuilder->AddPhiIncoming(phiVal, mModule->mBfIRBuilder->CreateConst(BfTypeCode_IntPtr, 0), eqBlock);
mResult = BfTypedValue(phiVal, intType);
} }
break; break;
default: default:

21
IDEHelper/Tests/src/Spaceship.bf Normal file
View file

@ -0,0 +1,21 @@
using System;
namespace Tests
{
class Spaceship
{
const bool sLess0 = 1.0 <=> 2.0 < 0;
[Test]
public static void TestBasics()
{
Test.Assert(1 <=> 2 < 0);
Test.Assert(1.0 <=> 2.0 < 0);
int8 i8a = -120;
int8 i8b = 100;
Test.Assert(i8a <=> i8b < 0);
}
}
}