openharmony/arkcompiler_runtime_core
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_runtime_core synced 2024-11-27 08:50:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix code style in compiler

Browse Source 
Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/IAI0RA

Signed-off-by: Andrey Efremov <efremov.andrey@huawei-partners.com>
This commit is contained in:
Andrey Efremov 2024-08-05 20:59:00 +08:00
parent 48e2f53e1e
commit 7eecbfeef8
2 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
static_core/plugins/ets/tests/interop_js/tests/compiler/interop_intrinsics_opt_test.cpp
View File

@ -47,6 +47,14 @@ public:
void SingleBlockBuildInitialGraph();
Graph *SingleBlockBuildExpectedGraph();
void BuildCall(size_t callId, size_t ssId)
{
INST(ssId, Opcode::SaveState).NoVregs();
INST(callId, Opcode::CallStatic).v0id().InputsAutoType(ssId);
}
void BuildGraphChainOfBlocks();
void BuildGraphTriangleOfBlocks();
};
std::string GetTestName(const testing::TestParamInfo<InteropIntrnsicsOptTest::ParamType> &info)
@ -182,8 +190,7 @@ TEST_F(InteropIntrnsicsOptTest, SingleBlockNotApplied)
ASSERT_TRUE(GraphComparator().Compare(GetGraph(), initial));
}
PARAM_TEST(InteropIntrnsicsOptTest, ChainOfBlocks,
::testing::Values(BlockPos::PRED, BlockPos::LEFT, BlockPos::NEXT, BlockPos::NONE), GetTestName)
void InteropIntrnsicsOptTest::BuildGraphChainOfBlocks()
{
GRAPH(GetGraph())
{
@ -207,8 +214,7 @@ PARAM_TEST(InteropIntrnsicsOptTest, ChainOfBlocks,
INTRINSIC(10U, COMPILER_DESTROY_LOCAL_SCOPE).v0id().InputsAutoType(9U);
if (BlockEnabled(BlockPos::PRED)) {
INST(23U, Opcode::SaveState).NoVregs();
INST(24U, Opcode::CallStatic).v0id().InputsAutoType(23U);
BuildCall(24U, 23U);
}
INST(19U, Opcode::Add).s32().Inputs(18U, 0U);
}
@ -238,6 +244,12 @@ PARAM_TEST(InteropIntrnsicsOptTest, ChainOfBlocks,
INST(22U, Opcode::ReturnVoid).v0id();
}
}
}
PARAM_TEST(InteropIntrnsicsOptTest, ChainOfBlocks,
::testing::Values(BlockPos::PRED, BlockPos::LEFT, BlockPos::NEXT, BlockPos::NONE), GetTestName)
{
BuildGraphChainOfBlocks();
GraphChecker(GetGraph()).Check();
if (GetParam() == BlockPos::NONE) {
Graph *graph = CreateEmptyGraph();
@ -283,11 +295,7 @@ PARAM_TEST(InteropIntrnsicsOptTest, ChainOfBlocks,
}
}
// Param specifies for which blocks there is a local scope
PARAM_TEST(InteropIntrnsicsOptTest, TriangleOfBlocks,
::testing::Values(BlockPos::PRED | BlockPos::LEFT | BlockPos::NEXT, BlockPos::PRED | BlockPos::LEFT,
BlockPos::PRED | BlockPos::NEXT, BlockPos::LEFT | BlockPos::NEXT),
GetTestName)
void InteropIntrnsicsOptTest::BuildGraphTriangleOfBlocks()
{
GRAPH(GetGraph())
{
@ -335,6 +343,15 @@ PARAM_TEST(InteropIntrnsicsOptTest, TriangleOfBlocks,
INST(22U, Opcode::Return).s64().Inputs(30U);
}
}
}
// Param specifies for which blocks there is a local scope
PARAM_TEST(InteropIntrnsicsOptTest, TriangleOfBlocks,
::testing::Values(BlockPos::PRED | BlockPos::LEFT | BlockPos::NEXT, BlockPos::PRED | BlockPos::LEFT,
BlockPos::PRED | BlockPos::NEXT, BlockPos::LEFT | BlockPos::NEXT),
GetTestName)
{
BuildGraphTriangleOfBlocks();
GraphChecker(GetGraph()).Check();
if (BlockEnabled(BlockPos::PRED) && BlockEnabled(BlockPos::NEXT)) {
Graph *graph = CreateEmptyGraph();

6
static_core/scripts/compiler_bisect.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python3
#!/usr/bin/env python3
# -- coding: utf-8 --
# Copyright (c) 2024 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
@ -241,13 +241,13 @@ def parse_methods():
exit_fail('Failed to parse IR dumps')
parts = re.split('(?<!_)_(?!_*$)', method)
if parts[-1] in ['_ctor_', '_cctor_']:
parts[-1] = '<' + parts[-1].strip('_') + '>'
parts[-1] = f'<{parts[-1].strip("_")}>'
dest = compiled
if parts[0] == 'inlined':
dest = inlined
parts.pop(0)
qname = '.'.join(parts[:-1]) + '::' + parts[-1]
qname = '::'.join(('.'.join(parts[:-1]), parts[-1]))
dest.add(qname)
return (compiled, inlined)