LibJS/Bytecode: Fuse [Not, JumpIf] instructions into JumpIfNot
This commit is contained in:
parent
4438ec481c
commit
795149e585
Notes:
sideshowbarker
2024-07-16 20:05:14 +09:00
Author: https://github.com/awesomekling Commit: https://github.com/SerenityOS/serenity/commit/795149e585 Pull-request: https://github.com/SerenityOS/serenity/pull/23462 Reviewed-by: https://github.com/Hendiadyoin1
5 changed files with 53 additions and 0 deletions
|
@ -69,6 +69,7 @@
|
|||
O(IteratorToArray) \
|
||||
O(Jump) \
|
||||
O(JumpIf) \
|
||||
O(JumpIfNot) \
|
||||
O(JumpGreaterThan) \
|
||||
O(JumpGreaterThanEquals) \
|
||||
O(JumpLessThan) \
|
||||
|
|
|
@ -344,6 +344,12 @@ void Interpreter::run_bytecode()
|
|||
else
|
||||
m_current_block = &static_cast<Op::JumpIf const&>(instruction).false_target()->block();
|
||||
goto start;
|
||||
case Instruction::Type::JumpIfNot:
|
||||
if (!get(static_cast<Op::JumpIfNot const&>(instruction).condition()).to_boolean())
|
||||
m_current_block = &static_cast<Op::JumpIfNot const&>(instruction).true_target()->block();
|
||||
else
|
||||
m_current_block = &static_cast<Op::JumpIfNot const&>(instruction).false_target()->block();
|
||||
goto start;
|
||||
|
||||
#define JS_HANDLE_FUSABLE_BINARY_JUMP(PreOp, int32_operator, slow_case) \
|
||||
case Instruction::Type::Jump##PreOp: { \
|
||||
|
@ -1252,6 +1258,12 @@ ThrowCompletionOr<void> JumpIf::execute_impl(Bytecode::Interpreter&) const
|
|||
__builtin_unreachable();
|
||||
}
|
||||
|
||||
ThrowCompletionOr<void> JumpIfNot::execute_impl(Bytecode::Interpreter&) const
|
||||
{
|
||||
// Handled in the interpreter loop.
|
||||
__builtin_unreachable();
|
||||
}
|
||||
|
||||
#define JS_DEFINE_FUSABLE_BINARY_OP(PreOp, ...) \
|
||||
ThrowCompletionOr<void> Jump##PreOp::execute_impl(Bytecode::Interpreter&) const { __builtin_unreachable(); } \
|
||||
\
|
||||
|
@ -1932,6 +1944,14 @@ ByteString JumpIf::to_byte_string_impl(Bytecode::Executable const& executable) c
|
|||
true_string, false_string);
|
||||
}
|
||||
|
||||
ByteString JumpIfNot::to_byte_string_impl(Bytecode::Executable const& executable) const
|
||||
{
|
||||
return ByteString::formatted("JumpIfNot {}, \033[32mtrue\033[0m:{} \033[32mfalse\033[0m:{}",
|
||||
format_operand("condition"sv, m_condition, executable),
|
||||
*m_true_target,
|
||||
*m_false_target);
|
||||
}
|
||||
|
||||
ByteString JumpNullish::to_byte_string_impl(Bytecode::Executable const& executable) const
|
||||
{
|
||||
auto true_string = m_true_target.has_value() ? ByteString::formatted("{}", *m_true_target) : "<empty>";
|
||||
|
|
|
@ -1123,6 +1123,23 @@ private:
|
|||
Operand m_condition;
|
||||
};
|
||||
|
||||
class JumpIfNot final : public Jump {
|
||||
public:
|
||||
explicit JumpIfNot(Operand condition, Label true_target, Label false_target)
|
||||
: Jump(Type::JumpIfNot, move(true_target), move(false_target), sizeof(*this))
|
||||
, m_condition(condition)
|
||||
{
|
||||
}
|
||||
|
||||
ThrowCompletionOr<void> execute_impl(Bytecode::Interpreter&) const;
|
||||
ByteString to_byte_string_impl(Bytecode::Executable const&) const;
|
||||
|
||||
Operand condition() const { return m_condition; }
|
||||
|
||||
private:
|
||||
Operand m_condition;
|
||||
};
|
||||
|
||||
// NOTE: The raw operator is used for comparing two Int32 values.
|
||||
#define JS_ENUMERATE_FUSABLE_BINARY_OPS(X) \
|
||||
X(GreaterThan, >, greater_than) \
|
||||
|
|
|
@ -71,6 +71,7 @@ static void generate_cfg_for_block(BasicBlock const& current_block, PassPipeline
|
|||
#undef JS_ENUMERATE_FUSABLE_BINARY_OP
|
||||
|
||||
case JumpIf:
|
||||
case JumpIfNot:
|
||||
case JumpNullish:
|
||||
case JumpUndefined: {
|
||||
// FIXME: It would be nice if we could avoid this copy, if we know that the unwind context stays the same in both paths
|
||||
|
|
|
@ -38,6 +38,20 @@ void Peephole::perform(PassPipelineExecutable& executable)
|
|||
if (next_instruction.type() == Instruction::Type::JumpIf) {
|
||||
auto const& jump = static_cast<Op::JumpIf const&>(next_instruction);
|
||||
|
||||
if (instruction.type() == Instruction::Type::Not) {
|
||||
auto const& not_ = static_cast<Op::Not const&>(instruction);
|
||||
VERIFY(jump.condition() == not_.dst());
|
||||
new_block->append<Op::JumpIfNot>(
|
||||
not_.source_record().source_start_offset,
|
||||
not_.source_record().source_end_offset,
|
||||
not_.src(),
|
||||
*jump.true_target(),
|
||||
*jump.false_target());
|
||||
++it;
|
||||
VERIFY(it.at_end());
|
||||
continue;
|
||||
}
|
||||
|
||||
#define DO_FUSE_JUMP(PreOp, ...) \
|
||||
if (instruction.type() == Instruction::Type::PreOp) { \
|
||||
auto const& compare = static_cast<Op::PreOp const&>(instruction); \
|
||||
|
|
Loading…
Add table
Reference in a new issue