-
Notifications
You must be signed in to change notification settings - Fork 171
LLVM: Support logical binop for strings, int, real #1506
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.
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
from ltypes import i32 | ||
|
||
def test_issue_1487_1(): | ||
a : i32 | ||
b : i32 | ||
x : i32 | ||
y : i32 | ||
or_op1 : i32 | ||
or_op2 : i32 | ||
a = 1 | ||
b = 2 | ||
x = 0 | ||
y = 4 | ||
or_op1 = a or b | ||
or_op2 = x or y | ||
assert or_op1 == 1 | ||
assert or_op2 == 4 | ||
y = 0 | ||
or_op2 = x or y | ||
assert or_op2 == 0 | ||
|
||
|
||
def test_issue_1487_2(): | ||
a : i32 | ||
b : i32 | ||
x : i32 | ||
y : i32 | ||
and_op1 : i32 | ||
and_op2 : i32 | ||
a = 100 | ||
b = 150 | ||
x = 175 | ||
y = 0 | ||
and_op1 = a and b | ||
and_op2 = y and x | ||
assert and_op1 == 150 | ||
assert and_op2 == 0 | ||
x = 0 | ||
and_op2 = y and x | ||
and_op1 = b and a | ||
assert and_op2 == 0 | ||
assert and_op1 == 100 | ||
|
||
|
||
def check(): | ||
test_issue_1487_1() | ||
test_issue_1487_2() | ||
|
||
|
||
check() |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4651,14 +4651,58 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor> | |
llvm::Value *left_val = tmp; | ||
this->visit_expr_wrapper(x.m_right, true); | ||
llvm::Value *right_val = tmp; | ||
LCOMPILERS_ASSERT(ASRUtils::is_logical(*x.m_type)) | ||
llvm::Value *zero, *cond; | ||
llvm::AllocaInst *result; | ||
if (ASRUtils::is_integer(*x.m_type)) { | ||
int a_kind = down_cast<ASR::Integer_t>(x.m_type)->m_kind; | ||
int init_value_bits = 8*a_kind; | ||
zero = llvm::ConstantInt::get(context, | ||
llvm::APInt(init_value_bits, 0)); | ||
cond = builder->CreateICmpEQ(left_val, zero); | ||
result = builder->CreateAlloca(getIntType(a_kind), nullptr); | ||
} else if (ASRUtils::is_real(*x.m_type)) { | ||
int a_kind = down_cast<ASR::Real_t>(x.m_type)->m_kind; | ||
int init_value_bits = 8*a_kind; | ||
if (init_value_bits == 32) { | ||
zero = llvm::ConstantFP::get(context, | ||
llvm::APFloat((float)0)); | ||
} else { | ||
zero = llvm::ConstantFP::get(context, | ||
llvm::APFloat((double)0)); | ||
} | ||
result = builder->CreateAlloca(getFPType(a_kind), nullptr); | ||
cond = builder->CreateFCmpUEQ(left_val, zero); | ||
} else if (ASRUtils::is_character(*x.m_type)) { | ||
zero = llvm::Constant::getNullValue(character_type); | ||
cond = lfortran_str_cmp(left_val, zero, "_lpython_str_compare_eq"); | ||
result = builder->CreateAlloca(character_type, nullptr); | ||
} else if (ASRUtils::is_logical(*x.m_type)) { | ||
zero = llvm::ConstantInt::get(context, | ||
llvm::APInt(1, 0)); | ||
cond = builder->CreateICmpEQ(left_val, zero); | ||
result = builder->CreateAlloca(llvm::Type::getInt1Ty(context), nullptr); | ||
Comment on lines
+4654
to
+4683
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I think this operation should not be done at the backend level. A backend should exactly follow what the ASR says. In this case, it should always return a logical result. This logical result can/should later be casted to the desired type. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Opened an issue here lfortran/lfortran#3620. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yes, this should be explicitly done in ASR, not in the backend. |
||
} else { | ||
throw CodeGenError("Only Integer, Real, Strings and Logical types are supported " | ||
"in logical binary operation.", x.base.base.loc); | ||
} | ||
switch (x.m_op) { | ||
case ASR::logicalbinopType::And: { | ||
tmp = builder->CreateAnd(left_val, right_val); | ||
create_if_else(cond, [&, result, left_val]() { | ||
LLVM::CreateStore(*builder, left_val, result); | ||
}, [&, result, right_val]() { | ||
LLVM::CreateStore(*builder, right_val, result); | ||
}); | ||
tmp = LLVM::CreateLoad(*builder, result); | ||
break; | ||
}; | ||
case ASR::logicalbinopType::Or: { | ||
tmp = builder->CreateOr(left_val, right_val); | ||
create_if_else(cond, [&, result, right_val]() { | ||
LLVM::CreateStore(*builder, right_val, result); | ||
|
||
}, [&, result, left_val]() { | ||
LLVM::CreateStore(*builder, left_val, result); | ||
}); | ||
tmp = LLVM::CreateLoad(*builder, result); | ||
break; | ||
}; | ||
case ASR::logicalbinopType::Xor: { | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we should explicitly be casting the operands to
bool()
(when are not already ofbool
type). For example:For
or_op1 = a or b
, sinceor_op1
is of typei32
, I think it should beor_op1 = i32(bool(a) or bool(b))
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems the result of
x or y
is an integer, I think we are fine in this case.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It looks like
or
here is not a logical operation, but instead a selective operation. I think we should have a separate ASR node for thisselective
or
operation.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe we can name it as
SelectiveOr
which takes two arguments both of any type (but equal types). The return value of thisSelectiveOr
is the same as that of the type of one of the operands.