openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-27 12:10:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

???: build a common stub for stringadd

Browse Source 
Signed-off-by: bdf1 <baodongfang2@huawei.com>
This commit is contained in:
bdf1 2023-11-09 20:33:34 +10:00
parent f0b3e47695
commit 0f42b39bf2
7 changed files with 36 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ecmascript/compiler/builtins/builtins_string_stub_builder.h
View File

@ -25,6 +25,8 @@ class BuiltinsStringStubBuilder : public BuiltinsStubBuilder {
public:
explicit BuiltinsStringStubBuilder(StubBuilder *parent)
: BuiltinsStubBuilder(parent) {}
BuiltinsStringStubBuilder(CallSignature *callSignature, Environment *env)
: BuiltinsStubBuilder(callSignature, env) {}
~BuiltinsStringStubBuilder() override = default;
NO_MOVE_SEMANTIC(BuiltinsStringStubBuilder);
NO_COPY_SEMANTIC(BuiltinsStringStubBuilder);

16
ecmascript/compiler/call_signature.cpp
View File

@ -2198,4 +2198,20 @@ DEF_CALL_SIGNATURE(FastStringEqual)
callSign->SetParameters(params.data());
callSign->SetCallConv(CallSignature::CallConv::CCallConv);
}
DEF_CALL_SIGNATURE(FastStringAdd)
{
// 3 : 3 input parameters
CallSignature signature("FastStringAdd", 0, 3,
ArgumentsOrder::DEFAULT_ORDER, VariableType::JS_ANY());
*callSign = signature;
// 3 : 3 input parameters
std::array<VariableType, 3> params = {
VariableType::NATIVE_POINTER(), // glue
VariableType::JS_ANY(), // ecmaString1
VariableType::JS_ANY(), // ecmaString2
};
callSign->SetParameters(params.data());
callSign->SetCallConv(CallSignature::CallConv::CCallConv);
}
} // namespace panda::ecmascript::kungfu

1
ecmascript/compiler/call_signature.h
View File

@ -465,6 +465,7 @@ private:
V(GetSingleCharCodeByIndex) \
V(CreateStringBySingleCharCode) \
V(FastStringEqual) \
V(FastStringAdd) \
V(Getpropiterator) \
V(Getnextpropname) \
V(CreateJSSetIterator) \

11
ecmascript/compiler/common_stubs.cpp
View File

@ -923,6 +923,17 @@ void FastStringEqualStubBuilder::GenerateCircuit()
Return(result);
}
void FastStringAddStubBuilder::GenerateCircuit()
{
GateRef glue = PtrArgument(0);
GateRef str1 = TaggedArgument(1);
GateRef str2 = Int32Argument(2);
BuiltinsStringStubBuilder builtinsStringStubBuilder(this);
GateRef result = builtinsStringStubBuilder.StringConcat(glue, str1, str2);
Return(result);
}
void GetpropiteratorStubBuilder::GenerateCircuit()
{
GateRef glue = PtrArgument(0);

3
ecmascript/compiler/common_stubs.h
View File

@ -83,7 +83,8 @@ namespace panda::ecmascript::kungfu {
V(CreateJSSetIterator) \
V(CreateJSMapIterator) \
V(GetSingleCharCodeByIndex) \
V(FastStringEqual)
V(FastStringEqual) \
V(FastStringAdd)
#define COMMON_STUB_ID_LIST(V) \
COMMON_STUB_LIST(V)

2
ecmascript/compiler/number_speculative_lowering.h
View File

@ -92,8 +92,6 @@ private:
template<TypedUnOp Op>
GateRef MonocularDouble(GateRef gate);
GateRef VisitStringEqual(GateRef left, GateRef right);
TypeInfo GetOutputType(GateRef gate) const
{
auto index = acc_.GetId(gate);

83
ecmascript/compiler/type_hcr_lowering.cpp
View File

@ -17,10 +17,10 @@
#include "ecmascript/compiler/builtins_lowering.h"
#include "ecmascript/compiler/share_gate_meta_data.h"
#include "ecmascript/compiler/new_object_stub_builder.h"
#include "ecmascript/compiler/builtins/builtins_string_stub_builder.h"
#include "ecmascript/deoptimizer/deoptimizer.h"
#include "ecmascript/js_arraybuffer.h"
#include "ecmascript/js_native_pointer.h"
#include "ecmascript/mem/mem.h"
#include "ecmascript/subtyping_operator.h"
#include "ecmascript/vtable.h"
#include "ecmascript/message_string.h"
@ -1609,88 +1609,13 @@ void TypeHCRLowering::LowerStringEqual(GateRef gate, GateRef glue)
acc_.ReplaceGate(gate, builder_.GetState(), builder_.GetDepend(), *result);
}
void TypeHCRLowering::LowerStringAdd(GateRef gate, [[maybe_unused]]GateRef glue)
void TypeHCRLowering::LowerStringAdd(GateRef gate, GateRef glue)
{
Environment env(gate, circuit_, &builder_);
GateRef left = acc_.GetValueIn(gate, 0);
GateRef right = acc_.GetValueIn(gate, 1);
GateRef leftIsUtf8 = builder_.BoolNot(builder_.IsUtf16String(left));
GateRef rightIsUtf8 = builder_.BoolNot(builder_.IsUtf16String(right));
GateRef leftLen = builder_.GetLengthFromString(left);
GateRef rightLen = builder_.GetLengthFromString(right);
GateRef length = builder_.Int32Add(leftLen, rightLen);
GateRef canBeCompressed = builder_.BoolAnd(leftIsUtf8, rightIsUtf8);
Label leftEmpty(&builder_);
Label leftNotEmpty(&builder_);
Label exitEmpty(&builder_);
DEFVALUE(mixLength, (&builder_), VariableType::INT32(), builder_.Int32(0));
DEFVALUE(res, (&builder_), VariableType::JS_POINTER(), right);
builder_.Branch(builder_.Equal(leftLen, builder_.Int32(0)), &leftEmpty, &leftNotEmpty);
builder_.Bind(&leftEmpty);
{
res = right;
builder_.Jump(&exitEmpty);
}
builder_.Bind(&leftNotEmpty);
{
Label rightEmpty(&builder_);
Label rightNotEmpty(&builder_);
builder_.Branch(builder_.Equal(rightLen, builder_.Int32(0)), &rightEmpty, &rightNotEmpty);
builder_.Bind(&rightEmpty);
{
res = left;
builder_.Jump(&exitEmpty);
}
builder_.Bind(&rightNotEmpty);
{
Label goLineString(&builder_);
Label goTreeString(&builder_);
builder_.Branch(builder_.Int32LessThan(length, builder_.Int32(TreeEcmaString::MIN_TREE_ECMASTRING_LENGTH)), &goLineString, &goTreeString);
builder_.Bind(&goLineString);
{
res = builder_.CallStub(glue, gate, CommonStubCSigns::Add, { glue, left, right });
builder_.Jump(&exitEmpty);
}
builder_.Bind(&goTreeString);
{
Label isUtf8(&builder_);
Label isUtf16(&builder_);
Label exit(&builder_);
GateRef elementsHclass = builder_.GetGlobalConstantValue(ConstantIndex::TREE_STRING_CLASS_INDEX);
GateRef size = builder_.IntPtr(AlignUp(TreeEcmaString::SIZE, static_cast<size_t>(MemAlignment::MEM_ALIGN_OBJECT)));
builder_.StartAllocate();
GateRef result = builder_.HeapAlloc(size, GateType::TaggedValue(), RegionSpaceFlag::IN_YOUNG_SPACE);
builder_.StoreConstOffset(VariableType::JS_POINTER(), result, 0, elementsHclass); // StoreHClass
GateRef len = builder_.Int32LSL(length, builder_.Int32(EcmaString::STRING_LENGTH_SHIFT_COUNT));
builder_.Branch(canBeCompressed, &isUtf8, &isUtf16);
builder_.Bind(&isUtf8);
{
mixLength = builder_.Int32Or(len, builder_.Int32(EcmaString::STRING_COMPRESSED));
builder_.Jump(&exit);
}
builder_.Bind(&isUtf16);
{
mixLength = builder_.Int32Or(len, builder_.Int32(EcmaString::STRING_UNCOMPRESSED));
builder_.Jump(&exit);
}
builder_.Bind(&exit);
builder_.StoreConstOffset(VariableType::INT32(), result, EcmaString::MIX_LENGTH_OFFSET, *mixLength);
builder_.StoreConstOffset(VariableType::INT32(), result, EcmaString::MIX_HASHCODE_OFFSET, builder_.Int32(0));
builder_.StoreConstOffset(VariableType::JS_POINTER(), result, TreeEcmaString::FIRST_OFFSET, left);
builder_.StoreConstOffset(VariableType::JS_POINTER(), result, TreeEcmaString::SECOND_OFFSET, right);
builder_.FinishAllocate();
res = result;
builder_.Jump(&exitEmpty);
}
}
}
builder_.Bind(&exitEmpty);
acc_.ReplaceGate(gate, builder_.GetState(), builder_.GetDepend(), *res);
GateRef result = builder_.CallStub(glue, gate, CommonStubCSigns::FastStringAdd, { glue, left, right });;
acc_.ReplaceGate(gate, builder_.GetState(), builder_.GetDepend(), result);
}
void TypeHCRLowering::LowerTypeOfCheck(GateRef gate)