From 68d8268b4835b156af92f565827f7449576d8564 Mon Sep 17 00:00:00 2001 From: Daniel Kofanov Date: Mon, 29 Jan 2024 17:12:58 +0300 Subject: [PATCH] [Compiler] Fix codestyle --- .../codegen_test_ecmascript.cpp | 34 +- .../reg_encoder_test_ecmascript.cpp | 24 +- .../compiler/branch_elimination_ecma_test.cpp | 202 +++---- .../compiler/checks_elimination_ecma_test.cpp | 430 +++++++------- tests/compiler/codegen_ecma_test.cpp | 18 +- .../compiler/inline_intrinsics_ecma_test.cpp | 548 +++++++++--------- tests/compiler/ir_builder_ecma_test.cpp | 18 +- tests/compiler/lowering_ecma_test.cpp | 34 +- tests/compiler/peepholes_ecma_test.cpp | 514 ++++++++-------- .../compiler/phi_type_resolving_ecma_test.cpp | 128 ++-- tests/compiler/vn_test_ecma.cpp | 74 +-- 11 files changed, 1012 insertions(+), 1012 deletions(-) diff --git a/tests/bytecode_optimizer/codegen_test_ecmascript.cpp b/tests/bytecode_optimizer/codegen_test_ecmascript.cpp index b9ffdad78..6ef6fb6d3 100644 --- a/tests/bytecode_optimizer/codegen_test_ecmascript.cpp +++ b/tests/bytecode_optimizer/codegen_test_ecmascript.cpp @@ -34,12 +34,12 @@ TEST_F(CommonTest, CodegenEcmaInt) graph->SetDynamicMethod(); GRAPH(graph) { - CONSTANT(0, 0).i32(); + CONSTANT(0, 0).I32(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(compiler::AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(2, Opcode::Return).any().Inputs(1); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(compiler::AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::Return).Any().Inputs(1); } } @@ -54,12 +54,12 @@ TEST_F(CommonTest, CodegenEcmaDouble) graph->SetDynamicMethod(); GRAPH(graph) { - CONSTANT(0, 0).f64(); + CONSTANT(0, 0).F64(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(compiler::AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); - INST(2, Opcode::Return).any().Inputs(1); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(compiler::AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(2, Opcode::Return).Any().Inputs(1); } } @@ -74,15 +74,15 @@ TEST_F(CommonTest, CodegenEcmaTaggedUndefined) graph->SetDynamicMethod(); GRAPH(graph) { - CONSTANT(0, 0).i32(); + CONSTANT(0, 0).I32(); BASIC_BLOCK(2, -1) { INST(1, Opcode::CastValueToAnyType) - .any() + .Any() .AnyType(compiler::AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE) .Inputs(0); - INST(2, Opcode::Return).any().Inputs(1); + INST(2, Opcode::Return).Any().Inputs(1); } } @@ -97,12 +97,12 @@ TEST_F(CommonTest, CodegenEcmaTaggedTrue) graph->SetDynamicMethod(); GRAPH(graph) { - CONSTANT(0, 1).i64(); + CONSTANT(0, 1).I64(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(compiler::AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(2, Opcode::Return).any().Inputs(1); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(compiler::AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(2, Opcode::Return).Any().Inputs(1); } } @@ -117,21 +117,21 @@ TEST_F(CommonTest, CodegenEcma_jtrue) graph->SetDynamicMethod(); GRAPH(graph) { - PARAMETER(0, 0).any(); - CONSTANT(1, 1).i64(); + PARAMETER(0, 0).Any(); + CONSTANT(1, 1).I64(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CastValueToAnyType).any().AnyType(compiler::AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(1); + INST(2, Opcode::CastValueToAnyType).Any().AnyType(compiler::AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(1); INST(3, Opcode::If).SrcType(compiler::DataType::ANY).CC(compiler::CC_EQ).Inputs(0, 2); } BASIC_BLOCK(3, -1) { - INST(4, Opcode::Return).any().Inputs(0); + INST(4, Opcode::Return).Any().Inputs(0); } BASIC_BLOCK(4, -1) { - INST(5, Opcode::Return).any().Inputs(2); + INST(5, Opcode::Return).Any().Inputs(2); } } diff --git a/tests/bytecode_optimizer/reg_encoder_test_ecmascript.cpp b/tests/bytecode_optimizer/reg_encoder_test_ecmascript.cpp index 4bacb2e54..c39a0a7a8 100644 --- a/tests/bytecode_optimizer/reg_encoder_test_ecmascript.cpp +++ b/tests/bytecode_optimizer/reg_encoder_test_ecmascript.cpp @@ -28,20 +28,20 @@ TEST_F(CommonTest, RegEncoderEcmaSuperCallIntrinsic) graph->InitUsedRegs(®Mask); GRAPH(graph) { - PARAMETER(0, 0).any().DstReg(compiler::ACC_REG_ID - 3); - PARAMETER(1, 1).any().DstReg(compiler::ACC_REG_ID - 2); - PARAMETER(2, 2).any().DstReg(compiler::ACC_REG_ID - 1); + PARAMETER(0, 0).Any().DstReg(compiler::ACC_REG_ID - 3); + PARAMETER(1, 1).Any().DstReg(compiler::ACC_REG_ID - 2); + PARAMETER(2, 2).Any().DstReg(compiler::ACC_REG_ID - 1); BASIC_BLOCK(2, -1) { INST(3, Opcode::SaveState).NoVregs(); INST(4, Opcode::Intrinsic) - .any() + .Any() .IntrinsicId(compiler::RuntimeInterface::IntrinsicId::INTRINSIC_LDTRUE) .Inputs({{compiler::DataType::NO_TYPE, 3}}) .DstReg(compiler::ACC_REG_ID); INST(5, Opcode::SaveState).NoVregs(); INST(6, Opcode::Intrinsic) - .any() + .Any() .IntrinsicId(compiler::RuntimeInterface::IntrinsicId::INTRINSIC_SUPER_CALL) .Inputs({{compiler::DataType::ANY, 0}, {compiler::DataType::ANY, 1}, @@ -49,7 +49,7 @@ TEST_F(CommonTest, RegEncoderEcmaSuperCallIntrinsic) {compiler::DataType::ANY, 4}, {compiler::DataType::NO_TYPE, 5}}) .DstReg(compiler::ACC_REG_ID); - INST(7, Opcode::Return).any().Inputs(6); + INST(7, Opcode::Return).Any().Inputs(6); } } @@ -66,21 +66,21 @@ TEST_F(CommonTest, RegEncoderEcmaSuperCallIntrinsic) expected->SetDynamicMethod(); GRAPH(expected) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); - PARAMETER(2, 2).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); + PARAMETER(2, 2).Any(); BASIC_BLOCK(2, -1) { INST(3, Opcode::SaveState).NoVregs(); INST(4, Opcode::Intrinsic) - .any() + .Any() .IntrinsicId(compiler::RuntimeInterface::IntrinsicId::INTRINSIC_LDTRUE) .Inputs({{compiler::DataType::NO_TYPE, 3}}) .DstReg(compiler::ACC_REG_ID); INST(5, Opcode::SaveState).NoVregs(); INST(8, Opcode::SpillFill); INST(6, Opcode::Intrinsic) - .any() + .Any() .IntrinsicId(compiler::RuntimeInterface::IntrinsicId::INTRINSIC_SUPER_CALL) .Inputs({{compiler::DataType::ANY, 0}, {compiler::DataType::ANY, 1}, @@ -88,7 +88,7 @@ TEST_F(CommonTest, RegEncoderEcmaSuperCallIntrinsic) {compiler::DataType::ANY, 4}, {compiler::DataType::NO_TYPE, 5}}) .DstReg(compiler::ACC_REG_ID); - INST(7, Opcode::Return).any().Inputs(6); + INST(7, Opcode::Return).Any().Inputs(6); } } diff --git a/tests/compiler/branch_elimination_ecma_test.cpp b/tests/compiler/branch_elimination_ecma_test.cpp index 55715cdc5..e31c1c409 100644 --- a/tests/compiler/branch_elimination_ecma_test.cpp +++ b/tests/compiler/branch_elimination_ecma_test.cpp @@ -30,36 +30,36 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNDiffTypesTrue) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, 6, 5) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -71,24 +71,24 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNDiffTypesTrue) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 3, 6) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -100,36 +100,36 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNDiffTypesFalse1) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 4, 3) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, 6, 5) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -148,36 +148,36 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNDiffTypesFalse2) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, 6, 5) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -196,36 +196,36 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNEqTypesTrue1) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, 6, 5) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -237,24 +237,24 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNEqTypesTrue1) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); BASIC_BLOCK(2, 3, 5) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } } @@ -266,36 +266,36 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNEqTypesTrue2) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 4, 3) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, 6, 5) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -307,24 +307,24 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNEqTypesTrue2) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 6, 3) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -336,20 +336,20 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNEqTypesTrue3) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, 6, 5) @@ -359,12 +359,12 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNEqTypesTrue3) BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -376,24 +376,24 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeVNEqTypesTrue3) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); BASIC_BLOCK(2, 3, 5) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } } @@ -405,36 +405,36 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeSubtype1) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, 6, 5) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } @@ -446,24 +446,24 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeSubtype1) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); BASIC_BLOCK(2, 3, 6) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(8); + INST(11, Opcode::Return).S32().Inputs(8); } } @@ -475,36 +475,36 @@ TEST_F(IrBranchEliminationTest, EliminateCompareAnyTypeSubtype2) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(4, 1).s32(); - PARAMETER(8, 2).s32(); - PARAMETER(10, 3).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(4, 1).S32(); + PARAMETER(8, 2).S32(); + PARAMETER(10, 3).S32(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, 6, 5) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(5, -1) { - INST(9, Opcode::Return).s32().Inputs(8); + INST(9, Opcode::Return).S32().Inputs(8); } BASIC_BLOCK(6, -1) { - INST(11, Opcode::Return).s32().Inputs(10); + INST(11, Opcode::Return).S32().Inputs(10); } } diff --git a/tests/compiler/checks_elimination_ecma_test.cpp b/tests/compiler/checks_elimination_ecma_test.cpp index ddcee6553..9252fc93c 100644 --- a/tests/compiler/checks_elimination_ecma_test.cpp +++ b/tests/compiler/checks_elimination_ecma_test.cpp @@ -31,14 +31,14 @@ public: auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(type1).Inputs(0, 2).AllowedInputType(inputType1); - INST(4, Opcode::AnyTypeCheck).any().AnyType(type2).Inputs(0, 2).AllowedInputType(inputType2); - INST(5, Opcode::ReturnVoid).v0id(); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(type1).Inputs(0, 2).AllowedInputType(inputType1); + INST(4, Opcode::AnyTypeCheck).Any().AnyType(type2).Inputs(0, 2).AllowedInputType(inputType2); + INST(5, Opcode::ReturnVoid).Void(); } } @@ -47,13 +47,13 @@ public: graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(type1).Inputs(0, 2).AllowedInputType(inputType1); - INST(5, Opcode::ReturnVoid).v0id(); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(type1).Inputs(0, 2).AllowedInputType(inputType1); + INST(5, Opcode::ReturnVoid).Void(); } } @@ -76,20 +76,20 @@ TEST_F(CheckEliminationEcmaTest, EliminateAnyTypeCheckAfterCastValueToAnyType) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1.0); BASIC_BLOCK(2, -1) { - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); INST(2, Opcode::SaveState).Inputs(0, 10).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); - INST(4, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10, 2); - INST(5, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); - INST(6, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); - INST(7, Opcode::Add).f64().Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); + INST(4, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10, 2); + INST(5, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); + INST(6, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); + INST(7, Opcode::Add).F64().Inputs(5, 6); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -101,19 +101,19 @@ TEST_F(CheckEliminationEcmaTest, EliminateAnyTypeCheckAfterCastValueToAnyType) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1.0); BASIC_BLOCK(2, -1) { - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); INST(2, Opcode::SaveState).Inputs(0, 10).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); - INST(5, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); - INST(6, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10); - INST(7, Opcode::Add).f64().Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); + INST(5, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); + INST(6, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10); + INST(7, Opcode::Add).F64().Inputs(5, 6); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -126,23 +126,23 @@ TEST_F(CheckEliminationEcmaTest, EliminateAnyTypeCheckAfterCastIntToAnyType) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).s32(); + PARAMETER(0, 0).S32(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(5, Opcode::SaveState).Inputs(1).SrcVregs({0}); INST(2, Opcode::AnyTypeCheck) - .any() + .Any() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .Inputs(1, 5) .IntegerWasSeen(intWasSeen); INST(3, Opcode::CastAnyTypeValue) - .f64() + .F64() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .Inputs(2) .IntegerWasSeen(intWasSeen); - INST(4, Opcode::Return).f64().Inputs(3); + INST(4, Opcode::Return).F64().Inputs(3); } } @@ -151,23 +151,23 @@ TEST_F(CheckEliminationEcmaTest, EliminateAnyTypeCheckAfterCastIntToAnyType) if (intWasSeen) { GRAPH(graphOpt) { - PARAMETER(0, 0).s32(); + PARAMETER(0, 0).S32(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); - INST(4, Opcode::Return).f64().Inputs(3); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); + INST(4, Opcode::Return).F64().Inputs(3); } } } else { GRAPH(graphOpt) { - PARAMETER(0, 0).s32(); + PARAMETER(0, 0).S32(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(5, Opcode::SaveState).Inputs(1).SrcVregs({0}); INST(6, Opcode::Deoptimize).DeoptimizeType(DeoptimizeType::ANY_TYPE_CHECK).Inputs(5); } @@ -186,19 +186,19 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateAnyTypeCheck) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); - INST(10, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3, 2); - INST(4, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); - INST(5, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10); - INST(6, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); - INST(7, Opcode::Add).f64().Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); + INST(10, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3, 2); + INST(4, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); + INST(5, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10); + INST(6, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); + INST(7, Opcode::Add).F64().Inputs(5, 6); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -211,17 +211,17 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateAnyTypeCheck) GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); - INST(5, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); - INST(6, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); - INST(7, Opcode::Add).f64().Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); + INST(5, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); + INST(6, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); + INST(7, Opcode::Add).F64().Inputs(5, 6); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -233,20 +233,20 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateAnyTypeCheckCase3) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0, 2); - INST(4, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_OBJECT_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0, 2); + INST(4, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_OBJECT_TYPE).Inputs(0, 2); - INST(5, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(3); - INST(6, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(4); - INST(7, Opcode::Add).f64().Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(5, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(3); + INST(6, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(4); + INST(7, Opcode::Add).F64().Inputs(5, 6); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -259,19 +259,19 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateAnyTypeCheckCase3) GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0, 2); - INST(5, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(3); - INST(6, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(3); - INST(7, Opcode::Add).f64().Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(5, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(3); + INST(6, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(3); + INST(7, Opcode::Add).F64().Inputs(5, 6); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -283,20 +283,20 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateAnyTypeCheckCase4) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); - INST(4, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); + INST(4, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); - INST(5, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); - INST(6, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(4); - INST(7, Opcode::Add).i32().Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(5, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); + INST(6, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(4); + INST(7, Opcode::Add).I32().Inputs(5, 6); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(7); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -307,13 +307,13 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateAnyTypeCheckCase4) GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); INST(4, Opcode::Deoptimize).DeoptimizeType(DeoptimizeType::ANY_TYPE_CHECK).Inputs(2); } @@ -327,32 +327,32 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateAnyTypeCheckIntWasSeen) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); INST(4, Opcode::AnyTypeCheck) - .any() + .Any() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .Inputs(0, 2) .IntegerWasSeen(true); - INST(5, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1, 2); + INST(5, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1, 2); INST(6, Opcode::AnyTypeCheck) - .any() + .Any() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .Inputs(1, 2) .IntegerWasSeen(true); - INST(7, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); - INST(8, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(6); - INST(9, Opcode::Add).f64().Inputs(7, 8); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(9); - INST(11, Opcode::Return).any().Inputs(10); + INST(7, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); + INST(8, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(6); + INST(9, Opcode::Add).F64().Inputs(7, 8); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(9); + INST(11, Opcode::Return).Any().Inputs(10); } } @@ -364,21 +364,21 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateAnyTypeCheckIntWasSeen) GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); - INST(5, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); + INST(5, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1, 2); - INST(7, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); - INST(8, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(5); - INST(9, Opcode::Add).f64().Inputs(7, 8); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(9); - INST(11, Opcode::Return).any().Inputs(10); + INST(7, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); + INST(8, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(5); + INST(9, Opcode::Add).F64().Inputs(7, 8); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(9); + INST(11, Opcode::Return).Any().Inputs(10); } } @@ -390,32 +390,32 @@ TEST_F(CheckEliminationEcmaTest, NotEliminateAnyTypeCheckIntWasSeen) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); INST(3, Opcode::AnyTypeCheck) - .any() + .Any() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .Inputs(0, 2) .IntegerWasSeen(true); - INST(4, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); + INST(4, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); INST(5, Opcode::AnyTypeCheck) - .any() + .Any() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .Inputs(1, 2) .IntegerWasSeen(true); - INST(6, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1, 2); + INST(6, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1, 2); - INST(7, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); - INST(8, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(6); - INST(9, Opcode::Add).f64().Inputs(7, 8); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(9); - INST(11, Opcode::Return).any().Inputs(10); + INST(7, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); + INST(8, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(6); + INST(9, Opcode::Add).F64().Inputs(7, 8); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(9); + INST(11, Opcode::Return).Any().Inputs(10); } } @@ -464,36 +464,36 @@ TEST_F(CheckEliminationEcmaTest, NotEliminateAnyTypeCheck) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(10, 1).any(); - PARAMETER(11, 2).any(); + PARAMETER(0, 0).Any(); + PARAMETER(10, 1).Any(); + PARAMETER(11, 2).Any(); BASIC_BLOCK(2, 3, 4) { - INST(12, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(11); + INST(12, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(11); INST(13, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(12); } BASIC_BLOCK(3, -1) { INST(2, Opcode::SaveState).Inputs(0, 10).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); - INST(4, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10, 2); - INST(5, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); - INST(6, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); - INST(7, Opcode::Add).f64().Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); + INST(4, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10, 2); + INST(5, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); + INST(6, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); + INST(7, Opcode::Add).F64().Inputs(5, 6); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(7); + INST(9, Opcode::Return).Any().Inputs(8); } BASIC_BLOCK(4, -1) { INST(22, Opcode::SaveState).Inputs(0, 10).SrcVregs({0, 1}); - INST(23, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 22); - INST(24, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10, 22); - INST(25, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(23); - INST(26, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(24); - INST(27, Opcode::Sub).f64().Inputs(25, 26); - INST(28, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(27); - INST(29, Opcode::Return).any().Inputs(28); + INST(23, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 22); + INST(24, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(10, 22); + INST(25, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(23); + INST(26, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(24); + INST(27, Opcode::Sub).F64().Inputs(25, 26); + INST(28, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(27); + INST(29, Opcode::Return).Any().Inputs(28); } } @@ -512,22 +512,22 @@ TEST_F(CheckEliminationEcmaTest, MoveAnyTypeCheckFromLoop) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(5, 1); BASIC_BLOCK(2, 3) { INST(1, Opcode::SaveState).Inputs(0).SrcVregs({0}).Pc(10U); - INST(7, Opcode::Intrinsic).v0id().Inputs({{DataType::NO_TYPE, 1}}).Pc(10U); + INST(7, Opcode::Intrinsic).Void().Inputs({{DataType::NO_TYPE, 1}}).Pc(10U); } BASIC_BLOCK(3, 3, 4) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}).Pc(20U); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2).Pc(20U); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2).Pc(20U); INST(6, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(5).Pc(20U); } BASIC_BLOCK(4, -1) { - INST(4, Opcode::ReturnVoid).v0id().Pc(30U); + INST(4, Opcode::ReturnVoid).Void().Pc(30U); } } @@ -550,13 +550,13 @@ TEST_F(CheckEliminationEcmaTest, MoveAnyTypeCheckFromLoop) GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(5, 1); BASIC_BLOCK(2, 3) { INST(1, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(30, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 1); - INST(7, Opcode::Intrinsic).v0id().Inputs({{DataType::NO_TYPE, 1}}); + INST(30, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 1); + INST(7, Opcode::Intrinsic).Void().Inputs({{DataType::NO_TYPE, 1}}); } BASIC_BLOCK(3, 3, 4) { @@ -564,7 +564,7 @@ TEST_F(CheckEliminationEcmaTest, MoveAnyTypeCheckFromLoop) } BASIC_BLOCK(4, -1) { - INST(4, Opcode::ReturnVoid).v0id(); + INST(4, Opcode::ReturnVoid).Void(); } } @@ -577,7 +577,7 @@ TEST_F(CheckEliminationEcmaTest, MoveAnyTypeCheckFromLoop2) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(5, 1); BASIC_BLOCK(2, 4, 5) { @@ -586,7 +586,7 @@ TEST_F(CheckEliminationEcmaTest, MoveAnyTypeCheckFromLoop2) BASIC_BLOCK(4, 2, 6) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(5); } BASIC_BLOCK(5, 2, 6) @@ -595,7 +595,7 @@ TEST_F(CheckEliminationEcmaTest, MoveAnyTypeCheckFromLoop2) } BASIC_BLOCK(6, -1) { - INST(4, Opcode::ReturnVoid).v0id(); + INST(4, Opcode::ReturnVoid).Void(); } } @@ -611,15 +611,15 @@ TEST_F(CheckEliminationEcmaTest, EliminateAnyTypeCheckWithUndefinedType) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::UNDEFINED_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::UNDEFINED_TYPE).Inputs(0, 2); - INST(4, Opcode::Return).any().Inputs(3); + INST(4, Opcode::Return).Any().Inputs(3); } } @@ -631,11 +631,11 @@ TEST_F(CheckEliminationEcmaTest, EliminateAnyTypeCheckWithUndefinedType) GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { - INST(4, Opcode::Return).any().Inputs(0); + INST(4, Opcode::Return).Any().Inputs(0); } } @@ -648,43 +648,43 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateHclassCheck) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); - CONSTANT(10, 0xa).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); + CONSTANT(10, 0xa).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(11, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); + INST(11, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); INST(12, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_CLASS_ID) .ObjectType(ObjectType::MEM_DYN_CLASS) .Inputs(11); INST(13, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_HCLASS_ID) .ObjectType(ObjectType::MEM_DYN_HCLASS) .Inputs(12); - INST(14, Opcode::HclassCheck).any().Inputs(13, 2).SetChecks(HclassChecks::ALL_CHECKS); - INST(5, Opcode::CallDynamic).any().InputsAutoType(11, 10, 10, 1, 2); + INST(14, Opcode::HclassCheck).Any().Inputs(13, 2).SetChecks(HclassChecks::ALL_CHECKS); + INST(5, Opcode::CallDynamic).Any().InputsAutoType(11, 10, 10, 1, 2); - INST(15, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); + INST(15, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); INST(16, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_CLASS_ID) .ObjectType(ObjectType::MEM_DYN_CLASS) .Inputs(15); INST(17, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_HCLASS_ID) .ObjectType(ObjectType::MEM_DYN_HCLASS) .Inputs(16); - INST(18, Opcode::HclassCheck).any().Inputs(17, 2).SetChecks(HclassChecks::ALL_CHECKS); - INST(8, Opcode::CallDynamic).any().InputsAutoType(15, 10, 10, 1, 2); + INST(18, Opcode::HclassCheck).Any().Inputs(17, 2).SetChecks(HclassChecks::ALL_CHECKS); + INST(8, Opcode::CallDynamic).Any().InputsAutoType(15, 10, 10, 1, 2); - INST(9, Opcode::Return).any().Inputs(8); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -696,31 +696,31 @@ TEST_F(CheckEliminationEcmaTest, EliminateDuplicateHclassCheck) GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); - CONSTANT(10, 0xa).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); + CONSTANT(10, 0xa).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(11, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); + INST(11, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); INST(12, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_CLASS_ID) .ObjectType(ObjectType::MEM_DYN_CLASS) .Inputs(11); INST(13, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_HCLASS_ID) .ObjectType(ObjectType::MEM_DYN_HCLASS) .Inputs(12); - INST(14, Opcode::HclassCheck).any().Inputs(13, 2).SetChecks(HclassChecks::ALL_CHECKS); + INST(14, Opcode::HclassCheck).Any().Inputs(13, 2).SetChecks(HclassChecks::ALL_CHECKS); - INST(5, Opcode::CallDynamic).any().InputsAutoType(11, 10, 10, 1, 2); - INST(8, Opcode::CallDynamic).any().InputsAutoType(11, 10, 10, 1, 2); + INST(5, Opcode::CallDynamic).Any().InputsAutoType(11, 10, 10, 1, 2); + INST(8, Opcode::CallDynamic).Any().InputsAutoType(11, 10, 10, 1, 2); - INST(9, Opcode::Return).any().Inputs(8); + INST(9, Opcode::Return).Any().Inputs(8); } } @@ -733,44 +733,44 @@ TEST_F(CheckEliminationEcmaTest, EliminateHclassCheckInlined) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); - CONSTANT(10, 0xa).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); + CONSTANT(10, 0xa).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); INST(4, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_CLASS_ID) .ObjectType(ObjectType::MEM_DYN_CLASS) .Inputs(3); INST(11, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_HCLASS_ID) .ObjectType(ObjectType::MEM_DYN_HCLASS) .Inputs(4); - INST(12, Opcode::HclassCheck).any().Inputs(11, 2).SetChecks(HclassChecks::ALL_CHECKS); + INST(12, Opcode::HclassCheck).Any().Inputs(11, 2).SetChecks(HclassChecks::ALL_CHECKS); INST(13, Opcode::LoadImmediate) - .ptr() + .Ptr() .Class(method) .ObjectTypeLoadImm(LoadImmediateInst::ObjectType::METHOD); INST(14, Opcode::LoadObject) - .ptr() + .Ptr() .TypeId(TypeIdMixin::MEM_DYN_METHOD_ID) .ObjectType(ObjectType::MEM_DYN_METHOD) .Inputs(3); - INST(15, Opcode::Compare).SrcType(DataType::POINTER).CC(CC_NE).b().Inputs(14, 13); + INST(15, Opcode::Compare).SrcType(DataType::POINTER).CC(CC_NE).B().Inputs(14, 13); INST(16, Opcode::DeoptimizeIf).DeoptimizeType(DeoptimizeType::INLINE_DYN).Inputs(15, 2); - INST(5, Opcode::CallDynamic).any().Inlined().InputsAutoType(3, 10, 10, 1, 2); + INST(5, Opcode::CallDynamic).Any().Inlined().InputsAutoType(3, 10, 10, 1, 2); INST(6, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}).Caller(5); // do something to prevent cleanup of call/return inlined - INST(7, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1, 6); + INST(7, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1, 6); INST(8, Opcode::ReturnInlined).Inputs(2); - INST(9, Opcode::Return).any().Inputs(5); + INST(9, Opcode::Return).Any().Inputs(5); } } @@ -781,44 +781,44 @@ TEST_F(CheckEliminationEcmaTest, EliminateHclassCheckInlined) GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); - CONSTANT(10, 0xa).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); + CONSTANT(10, 0xa).Any(); BASIC_BLOCK(2, -1) { INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); + INST(3, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(0, 2); INST(4, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_CLASS_ID) .ObjectType(ObjectType::MEM_DYN_CLASS) .Inputs(3); INST(11, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_HCLASS_ID) .ObjectType(ObjectType::MEM_DYN_HCLASS) .Inputs(4); - INST(12, Opcode::HclassCheck).any().Inputs(11, 2).SetChecks(HclassChecks::IS_FUNCTION); + INST(12, Opcode::HclassCheck).Any().Inputs(11, 2).SetChecks(HclassChecks::IS_FUNCTION); INST(13, Opcode::LoadImmediate) - .ptr() + .Ptr() .Class(method) .ObjectTypeLoadImm(LoadImmediateInst::ObjectType::METHOD); INST(14, Opcode::LoadObject) - .ptr() + .Ptr() .TypeId(TypeIdMixin::MEM_DYN_METHOD_ID) .ObjectType(ObjectType::MEM_DYN_METHOD) .Inputs(3); - INST(15, Opcode::Compare).SrcType(DataType::POINTER).CC(CC_NE).b().Inputs(14, 13); + INST(15, Opcode::Compare).SrcType(DataType::POINTER).CC(CC_NE).B().Inputs(14, 13); INST(16, Opcode::DeoptimizeIf).DeoptimizeType(DeoptimizeType::INLINE_DYN).Inputs(15, 2); - INST(5, Opcode::CallDynamic).any().Inlined().InputsAutoType(3, 10, 10, 1, 2); + INST(5, Opcode::CallDynamic).Any().Inlined().InputsAutoType(3, 10, 10, 1, 2); INST(6, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}).Caller(5); // do something to prevent cleanup of call/return inlined - INST(7, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1, 6); + INST(7, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1, 6); INST(8, Opcode::ReturnInlined).Inputs(2); - INST(9, Opcode::Return).any().Inputs(5); + INST(9, Opcode::Return).Any().Inputs(5); } } EXPECT_TRUE(GraphComparator().Compare(graph, graphOpt)); @@ -839,45 +839,45 @@ TEST_F(CheckEliminationEcmaTest, MoveHclassCheckFromLoop) { INST(3, Opcode::SaveState).Inputs(0, 1, 2).SrcVregs({0, 1, 2}); INST(4, Opcode::Intrinsic) - .any() + .Any() .IntrinsicId(compiler::RuntimeInterface::IntrinsicId::INTRINSIC_LDLEXENV_DYN) .Inputs({{compiler::DataType::NO_TYPE, 3}}); INST(5, Opcode::Intrinsic) - .any() + .Any() .IntrinsicId(compiler::RuntimeInterface::IntrinsicId::INTRINSIC_DEFINEFUNC_DYN) .Inputs({{compiler::DataType::ANY, 4}, {compiler::DataType::NO_TYPE, 3}}); INST(20, Opcode::SaveStateDeoptimize).Inputs(0, 1, 2, 4, 5).SrcVregs({0, 1, 2, 4, 5}); - INST(6, Opcode::Compare).SrcType(DataType::INT32).CC(CC_LT).b().Inputs(0, 2); // 0 < 10 + INST(6, Opcode::Compare).SrcType(DataType::INT32).CC(CC_LT).B().Inputs(0, 2); // 0 < 10 INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 3, 5) { - INST(8, Opcode::Phi).s32().Inputs(0, 13); + INST(8, Opcode::Phi).S32().Inputs(0, 13); INST(9, Opcode::SaveState).Inputs(0, 1, 2, 4, 5).SrcVregs({0, 1, 2, 4, 5}); - INST(10, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(5, 9); + INST(10, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(5, 9); INST(17, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_CLASS_ID) .ObjectType(ObjectType::MEM_DYN_CLASS) .Inputs(10); INST(18, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_HCLASS_ID) .ObjectType(ObjectType::MEM_DYN_HCLASS) .Inputs(17); - INST(11, Opcode::HclassCheck).any().Inputs(18, 9).SetChecks(HclassChecks::ALL_CHECKS); + INST(11, Opcode::HclassCheck).Any().Inputs(18, 9).SetChecks(HclassChecks::ALL_CHECKS); - INST(12, Opcode::CallDynamic).any().InputsAutoType(10, 2, 2, 8, 9); + INST(12, Opcode::CallDynamic).Any().InputsAutoType(10, 2, 2, 8, 9); - INST(13, Opcode::Add).s32().Inputs(8, 1); // i++ - INST(14, Opcode::Compare).CC(CC_LT).b().Inputs(13, 2); // i < 10 + INST(13, Opcode::Add).S32().Inputs(8, 1); // i++ + INST(14, Opcode::Compare).CC(CC_LT).B().Inputs(13, 2); // i < 10 INST(15, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(14); } BASIC_BLOCK(5, 1) { - INST(16, Opcode::ReturnVoid).v0id(); + INST(16, Opcode::ReturnVoid).Void(); } } @@ -895,44 +895,44 @@ TEST_F(CheckEliminationEcmaTest, MoveHclassCheckFromLoop) { INST(3, Opcode::SaveState).Inputs(0, 1, 2).SrcVregs({0, 1, 2}); INST(4, Opcode::Intrinsic) - .any() + .Any() .IntrinsicId(compiler::RuntimeInterface::IntrinsicId::INTRINSIC_LDLEXENV_DYN) .Inputs({{compiler::DataType::NO_TYPE, 3}}); INST(5, Opcode::Intrinsic) - .any() + .Any() .IntrinsicId(compiler::RuntimeInterface::IntrinsicId::INTRINSIC_DEFINEFUNC_DYN) .Inputs({{compiler::DataType::ANY, 4}, {compiler::DataType::NO_TYPE, 3}}); INST(20, Opcode::SaveStateDeoptimize).Inputs(0, 1, 2, 4, 5).SrcVregs({0, 1, 2, 4, 5}); - INST(10, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(5, 20); - INST(6, Opcode::Compare).SrcType(DataType::INT32).CC(CC_LT).b().Inputs(0, 2); // 0 < 10 + INST(10, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_HEAP_OBJECT_TYPE).Inputs(5, 20); + INST(6, Opcode::Compare).SrcType(DataType::INT32).CC(CC_LT).B().Inputs(0, 2); // 0 < 10 INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 3, 5) { - INST(8, Opcode::Phi).s32().Inputs(0, 13); + INST(8, Opcode::Phi).S32().Inputs(0, 13); INST(9, Opcode::SaveState).Inputs(0, 1, 2, 4, 5).SrcVregs({0, 1, 2, 4, 5}); INST(17, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_CLASS_ID) .ObjectType(ObjectType::MEM_DYN_CLASS) .Inputs(10); INST(18, Opcode::LoadObject) - .ref() + .Ref() .TypeId(TypeIdMixin::MEM_DYN_HCLASS_ID) .ObjectType(ObjectType::MEM_DYN_HCLASS) .Inputs(17); - INST(11, Opcode::HclassCheck).any().Inputs(18, 9).SetChecks(HclassChecks::ALL_CHECKS); + INST(11, Opcode::HclassCheck).Any().Inputs(18, 9).SetChecks(HclassChecks::ALL_CHECKS); - INST(12, Opcode::CallDynamic).any().InputsAutoType(10, 2, 2, 8, 9); + INST(12, Opcode::CallDynamic).Any().InputsAutoType(10, 2, 2, 8, 9); - INST(13, Opcode::Add).s32().Inputs(8, 1); // i++ - INST(14, Opcode::Compare).CC(CC_LT).b().Inputs(13, 2); // i < 10 + INST(13, Opcode::Add).S32().Inputs(8, 1); // i++ + INST(14, Opcode::Compare).CC(CC_LT).B().Inputs(13, 2); // i < 10 INST(15, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(14); } BASIC_BLOCK(5, 1) { - INST(16, Opcode::ReturnVoid).v0id(); + INST(16, Opcode::ReturnVoid).Void(); } } ASSERT_TRUE(GraphComparator().Compare(graph, graphOpt)); diff --git a/tests/compiler/codegen_ecma_test.cpp b/tests/compiler/codegen_ecma_test.cpp index 57928fba0..eaf796e94 100644 --- a/tests/compiler/codegen_ecma_test.cpp +++ b/tests/compiler/codegen_ecma_test.cpp @@ -82,12 +82,12 @@ void CodegenEcmaTest::TestCompareAnyType(AnyBaseType anyType, uint64_t val, bool graph->SetDynamicMethod(); GRAPH(graph) { - CONSTANT(0, val).any(); + CONSTANT(0, val).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CompareAnyType).b().AnyType(anyType).Inputs(0); - INST(3, Opcode::Return).b().Inputs(2); + INST(2, Opcode::CompareAnyType).B().AnyType(anyType).Inputs(0); + INST(3, Opcode::Return).B().Inputs(2); } } @@ -177,7 +177,7 @@ void CodegenEcmaTest::CastAnyTypeValue(AnyBaseType boxedType, TaggedValue boxedV graph->SetDynamicMethod(); GRAPH(graph) { - CONSTANT(0, boxedValue.GetRawData()).any(); + CONSTANT(0, boxedValue.GetRawData()).Any(); BASIC_BLOCK(2, -1) { @@ -259,10 +259,10 @@ void CodegenEcmaTest::CastValueToAnyType(T unboxedValue, AnyBaseType boxedType, CONSTANT(0, unboxedValue); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastValueToAnyType).any().AnyType(boxedType).Inputs(0); + INST(2, Opcode::CastValueToAnyType).Any().AnyType(boxedType).Inputs(0); INS(2).SetFlag(inst_flags::Flags::NO_CSE); INS(2).SetFlag(inst_flags::Flags::NO_HOIST); - INST(3, Opcode::Return).any().Inputs(2); + INST(3, Opcode::Return).Any().Inputs(2); } } @@ -334,14 +334,14 @@ void CodegenEcmaTest::TestAnyTypeCheck(AnyBaseType anyType, uint64_t val) #endif GRAPH(graph) { - CONSTANT(0, val).any(); + CONSTANT(0, val).Any(); CONSTANT(1, 1); BASIC_BLOCK(2, -1) { INST(4, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(2, Opcode::AnyTypeCheck).b().AnyType(anyType).Inputs(0, 4); - INST(3, Opcode::Return).b().Inputs(1); + INST(2, Opcode::AnyTypeCheck).B().AnyType(anyType).Inputs(0, 4); + INST(3, Opcode::Return).B().Inputs(1); } } diff --git a/tests/compiler/inline_intrinsics_ecma_test.cpp b/tests/compiler/inline_intrinsics_ecma_test.cpp index 52376ff3e..b6caed092 100644 --- a/tests/compiler/inline_intrinsics_ecma_test.cpp +++ b/tests/compiler/inline_intrinsics_ecma_test.cpp @@ -1,10 +1,10 @@ /** * Copyright (c) 2021-2022 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); + * Licensed under the Apache License, Version 2U.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2U.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -53,10 +53,10 @@ Graph *InlineIntrinsicsTest::ConstructGraphWithConst(AnyBaseType anyType, T cnst GRAPH(graph) { CONSTANT(0, cnst); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(3, Opcode::CastValueToAnyType).any().AnyType(anyType).Inputs(0); - INST(4, Opcode::Return).any().Inputs(3); + INST(3U, Opcode::CastValueToAnyType).Any().AnyType(anyType).Inputs(0); + INST(4U, Opcode::Return).Any().Inputs(3U); } } return graph; @@ -68,9 +68,9 @@ Graph *InlineIntrinsicsTest::ConstructGraphWithConst(DataType::Any cnst) GRAPH(graph) { CONSTANT(0, cnst); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(4, Opcode::Return).any().Inputs(0); + INST(4U, Opcode::Return).Any().Inputs(0); } } return graph; @@ -99,11 +99,11 @@ Graph *InlineIntrinsicsTest::ConstructGraphWithIntrinsic(RuntimeInterface::Intri auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs().SrcVregs({}); - INST(3, Opcode::Intrinsic).any().IntrinsicId(id).Inputs({{DataType::NO_TYPE, 2}}); - INST(4, Opcode::Return).any().Inputs(3); + INST(2U, Opcode::SaveState).Inputs().SrcVregs({}); + INST(3U, Opcode::Intrinsic).Any().IntrinsicId(id).Inputs({{DataType::NO_TYPE, 2U}}); + INST(4U, Opcode::Return).Any().Inputs(3U); } } return graph; @@ -115,15 +115,15 @@ Graph *InlineIntrinsicsTest::ConstructGraphWithIntrinsic(AnyBaseType type, Runti auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(4, Opcode::AnyTypeCheck).any().AnyType(type).AllowedInputType(allowedType).Inputs(0, 2); - INST(5, Opcode::Intrinsic).any().IntrinsicId(id).Inputs({{DataType::ANY, 4}, {DataType::NO_TYPE, 2}}); - INST(6, Opcode::Return).any().Inputs(5); + INST(2U, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); + INST(4U, Opcode::AnyTypeCheck).Any().AnyType(type).AllowedInputType(allowedType).Inputs(0, 2U); + INST(5U, Opcode::Intrinsic).Any().IntrinsicId(id).Inputs({{DataType::ANY, 4U}, {DataType::NO_TYPE, 2U}}); + INST(6U, Opcode::Return).Any().Inputs(5U); } } return graph; @@ -135,17 +135,17 @@ Graph *InlineIntrinsicsTest::ConstructGraphWithOpcode1(AnyBaseType type, Opcode auto dateType = AnyBaseTypeToDataType(type); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(type).Inputs(0, 2); - INST(5, Opcode::CastAnyTypeValue).SetType(dateType).AnyType(type).Inputs(3); - INST(7, opcode).SetType(dateType).Inputs(5); - INST(8, Opcode::CastValueToAnyType).any().AnyType(type).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(2U, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); + INST(3U, Opcode::AnyTypeCheck).Any().AnyType(type).Inputs(0, 2U); + INST(5U, Opcode::CastAnyTypeValue).SetType(dateType).AnyType(type).Inputs(3U); + INST(7U, opcode).SetType(dateType).Inputs(5U); + INST(8U, Opcode::CastValueToAnyType).Any().AnyType(type).Inputs(7U); + INST(9U, Opcode::Return).Any().Inputs(8U); } } return graph; @@ -157,19 +157,19 @@ Graph *InlineIntrinsicsTest::ConstructGraphWithOpcode2(AnyBaseType type, Opcode auto dateType = AnyBaseTypeToDataType(type); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(type).Inputs(0, 2); - INST(4, Opcode::AnyTypeCheck).any().AnyType(type).Inputs(1, 2); - INST(5, Opcode::CastAnyTypeValue).SetType(dateType).AnyType(type).Inputs(3); - INST(6, Opcode::CastAnyTypeValue).SetType(dateType).AnyType(type).Inputs(4); - INST(7, opcode).SetType(dateType).Inputs(5, 6); - INST(8, Opcode::CastValueToAnyType).any().AnyType(type).Inputs(7); - INST(9, Opcode::Return).any().Inputs(8); + INST(2U, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); + INST(3U, Opcode::AnyTypeCheck).Any().AnyType(type).Inputs(0, 2U); + INST(4U, Opcode::AnyTypeCheck).Any().AnyType(type).Inputs(1, 2U); + INST(5U, Opcode::CastAnyTypeValue).SetType(dateType).AnyType(type).Inputs(3U); + INST(6U, Opcode::CastAnyTypeValue).SetType(dateType).AnyType(type).Inputs(4U); + INST(7U, opcode).SetType(dateType).Inputs(5U, 6U); + INST(8U, Opcode::CastValueToAnyType).Any().AnyType(type).Inputs(7U); + INST(9U, Opcode::Return).Any().Inputs(8U); } } return graph; @@ -181,19 +181,19 @@ Graph *InlineIntrinsicsTest::ConstructGraphWithIntrinsic(AnyBaseType type1, AnyB auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(type1).Inputs(0, 2); - INST(4, Opcode::AnyTypeCheck).any().AnyType(type2).Inputs(1, 2); - INST(5, Opcode::Intrinsic) - .any() + INST(2U, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); + INST(3U, Opcode::AnyTypeCheck).Any().AnyType(type1).Inputs(0, 2U); + INST(4U, Opcode::AnyTypeCheck).Any().AnyType(type2).Inputs(1, 2U); + INST(5U, Opcode::Intrinsic) + .Any() .IntrinsicId(id) - .Inputs({{DataType::ANY, 3}, {DataType::ANY, 4}, {DataType::NO_TYPE, 2}}); - INST(6, Opcode::Return).any().Inputs(5); + .Inputs({{DataType::ANY, 3U}, {DataType::ANY, 4U}, {DataType::NO_TYPE, 2U}}); + INST(6U, Opcode::Return).Any().Inputs(5U); } } return graph; @@ -203,14 +203,14 @@ TEST_F(InlineIntrinsicsTest, LdConst) { using TaggedValue = ark::coretypes::TaggedValue; { - TestArray tests = {{ + TestArray tests = {{ {RuntimeInterface::IntrinsicId::INTRINSIC_LDTRUE, AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE, 1U}, {RuntimeInterface::IntrinsicId::INTRINSIC_LDFALSE, AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE, 0U}, }}; TestLdConsts(tests); } { - TestArray tests = {{ + TestArray tests = {{ {RuntimeInterface::IntrinsicId::INTRINSIC_LDHOLE, AnyBaseType::ECMASCRIPT_HOLE_TYPE, DataType::Any(TaggedValue::VALUE_HOLE)}, {RuntimeInterface::IntrinsicId::INTRINSIC_LDNULL, AnyBaseType::ECMASCRIPT_NULL_TYPE, @@ -221,7 +221,7 @@ TEST_F(InlineIntrinsicsTest, LdConst) TestLdConsts(tests); } { - TestArray tests = {{ + TestArray tests = {{ {RuntimeInterface::IntrinsicId::INTRINSIC_LDINFINITY, AnyBaseType::ECMASCRIPT_DOUBLE_TYPE, TaggedValue::VALUE_INFINITY}, {RuntimeInterface::IntrinsicId::INTRINSIC_LDNAN, AnyBaseType::ECMASCRIPT_DOUBLE_TYPE, @@ -244,14 +244,14 @@ TEST_F(InlineIntrinsicsTest, ToNumber) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2); - INST(9, Opcode::Return).any().Inputs(3); + INST(2U, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); + INST(3U, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0, 2U); + INST(9U, Opcode::Return).Any().Inputs(3U); } } @@ -270,20 +270,20 @@ TEST_F(InlineIntrinsicsTest, ToNumber) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck) - .any() + INST(2U, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); + INST(3U, Opcode::AnyTypeCheck) + .Any() .AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE) .AllowedInputType(profiling::AnyInputType::SPECIAL) - .Inputs(0, 2); - INST(4, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); - INST(5, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(4); - INST(9, Opcode::Return).any().Inputs(5); + .Inputs(0, 2U); + INST(4U, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3U); + INST(5U, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(4U); + INST(9U, Opcode::Return).Any().Inputs(5U); } } @@ -301,14 +301,14 @@ TEST_F(InlineIntrinsicsTest, ToNumber) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2); - INST(9, Opcode::Return).any().Inputs(3); + INST(2U, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); + INST(3U, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 2U); + INST(9U, Opcode::Return).Any().Inputs(3U); } } @@ -327,20 +327,20 @@ TEST_F(InlineIntrinsicsTest, ToNumber) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(3, Opcode::AnyTypeCheck) - .any() + INST(2U, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); + INST(3U, Opcode::AnyTypeCheck) + .Any() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .AllowedInputType(profiling::AnyInputType::SPECIAL) - .Inputs(0, 2); - INST(4, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); - INST(5, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4); - INST(9, Opcode::Return).any().Inputs(5); + .Inputs(0, 2U); + INST(4U, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3U); + INST(5U, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(4U); + INST(9U, Opcode::Return).Any().Inputs(5U); } } @@ -364,60 +364,60 @@ TEST_F(InlineIntrinsicsTest, ResolveLoopPhi) { auto graph = CreateGraphDynWithDefaultRuntime(); - // for (let x = 0; x < 10;) + // for (let x = 0; x < 10U;) // { - // if (x < 5) { + // if (x < 5U) { // x++; // } // } GRAPH(graph) { - CONSTANT(0, 0).i64(); - CONSTANT(1, 10).i64(); - CONSTANT(2, 5).i64(); + CONSTANT(0, 0).I64(); + CONSTANT(1, 10U).I64(); + CONSTANT(2U, 5U).I64(); - BASIC_BLOCK(2, 3) + BASIC_BLOCK(2U, 3U) { - INST(3, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3U, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); } - BASIC_BLOCK(3, 4, 5) + BASIC_BLOCK(3U, 4U, 5U) { - INST(4, Opcode::Phi).any().Inputs(3, 4, 19); - INST(5, Opcode::Phi).any().Inputs(3, 14, 4); - INST(6, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(7, Opcode::SaveState).NoVregs(); - INST(8, Opcode::Intrinsic) - .any() + INST(4U, Opcode::Phi).Any().Inputs(3U, 4U, 19U); + INST(5U, Opcode::Phi).Any().Inputs(3U, 14U, 4U); + INST(6U, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(7U, Opcode::SaveState).NoVregs(); + INST(8U, Opcode::Intrinsic) + .Any() .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_LESS_DYN) - .Inputs({{DataType::ANY, 4}, {DataType::ANY, 6}, {DataType::NO_TYPE, 7}}); - INST(9, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(10, Opcode::Compare).b().CC(CC_EQ).Inputs(8, 9); - INST(11, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(10); + .Inputs({{DataType::ANY, 4U}, {DataType::ANY, 6U}, {DataType::NO_TYPE, 7U}}); + INST(9U, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(10U, Opcode::Compare).B().CC(CC_EQ).Inputs(8U, 9U); + INST(11U, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(10U); } - BASIC_BLOCK(4, -1) + BASIC_BLOCK(4U, -1) { - INST(20, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE).Inputs(0); - INST(21, Opcode::Return).any().Inputs(20); + INST(20U, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE).Inputs(0); + INST(21U, Opcode::Return).Any().Inputs(20U); } - BASIC_BLOCK(5, 3, 6) + BASIC_BLOCK(5U, 3U, 6U) { - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(2); - INST(13, Opcode::SaveState).NoVregs(); - INST(14, Opcode::Intrinsic) - .any() + INST(12U, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(2U); + INST(13U, Opcode::SaveState).NoVregs(); + INST(14U, Opcode::Intrinsic) + .Any() .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_LESS_DYN) - .Inputs({{DataType::ANY, 4}, {DataType::ANY, 12}, {DataType::NO_TYPE, 13}}); - INST(15, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(16, Opcode::Compare).b().CC(CC_EQ).Inputs(14, 15); - INST(17, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(16); + .Inputs({{DataType::ANY, 4U}, {DataType::ANY, 12U}, {DataType::NO_TYPE, 13U}}); + INST(15U, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(16U, Opcode::Compare).B().CC(CC_EQ).Inputs(14U, 15U); + INST(17U, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(16U); } - BASIC_BLOCK(6, 3) + BASIC_BLOCK(6U, 3U) { - INST(18, Opcode::SaveState).NoVregs(); - INST(19, Opcode::Intrinsic) - .any() + INST(18U, Opcode::SaveState).NoVregs(); + INST(19U, Opcode::Intrinsic) + .Any() .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_INC_DYN) - .Inputs({{DataType::ANY, 4}, {DataType::NO_TYPE, 18}}); + .Inputs({{DataType::ANY, 4U}, {DataType::NO_TYPE, 18U}}); } } ASSERT_TRUE(graph->RunPass()); @@ -425,7 +425,7 @@ TEST_F(InlineIntrinsicsTest, ResolveLoopPhi) ASSERT_TRUE(graph->RunPass(false)); GraphChecker(graph).Check(); - auto &phi = INS(4); + auto &phi = INS(4U); ASSERT_EQ(phi.GetType(), DataType::INT32); ASSERT_EQ(phi.GetInput(1U).GetInst(), &phi); } @@ -438,17 +438,17 @@ TEST_F(InlineIntrinsicsTest, LdLexVarDynApply) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - BASIC_BLOCK(2, -1) + PARAMETER(0, 0).Any(); + BASIC_BLOCK(2U, -1) { - INST(1, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(2, Opcode::Intrinsic) + INST(1, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(2U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_LD_LEX_VAR_DYN) - .any() + .Any() .Inputs({{DataType::ANY, 1}}) .AddImm(level) .AddImm(SLOT); - INST(3, Opcode::Return).any().Inputs(2); + INST(3U, Opcode::Return).Any().Inputs(2U); } } @@ -459,30 +459,30 @@ TEST_F(InlineIntrinsicsTest, LdLexVarDynApply) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(11, 0).any(); + PARAMETER(11U, 0).Any(); CONSTANT(0, graphOpt->GetRuntime()->GetLexicalEnvParentEnvIndex()); CONSTANT(1, graphOpt->GetRuntime()->GetLexicalEnvStartDataIndex() + SLOT); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(11); - INST(3, Opcode::CastAnyTypeValue) - .ref() - .Inputs(2) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(11U); + INST(3U, Opcode::CastAnyTypeValue) + .Ref() + .Inputs(2U) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - int lastIndex = 3; + int lastIndex = 3U; for (auto curLevel = level; curLevel > 0U; --curLevel) { - INST(lastIndex + 1, Opcode::LoadArray).any().Inputs(lastIndex, 0); - INST(lastIndex + 2, Opcode::CastAnyTypeValue) - .ref() + INST(lastIndex + 1, Opcode::LoadArray).Any().Inputs(lastIndex, 0); + INST(lastIndex + 2U, Opcode::CastAnyTypeValue) + .Ref() .Inputs(lastIndex + 1) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - lastIndex += 2; + lastIndex += 2U; } - INST(lastIndex + 1, Opcode::LoadArray).any().Inputs(lastIndex, 1); - INST(lastIndex + 2, Opcode::Return).any().Inputs(lastIndex + 1); + INST(lastIndex + 1, Opcode::LoadArray).Any().Inputs(lastIndex, 1); + INST(lastIndex + 2U, Opcode::Return).Any().Inputs(lastIndex + 1); } } @@ -499,17 +499,17 @@ TEST_F(InlineIntrinsicsTest, LdLexVarDynSkip) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - BASIC_BLOCK(2, -1) + PARAMETER(0, 0).Any(); + BASIC_BLOCK(2U, -1) { - INST(1, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(2, Opcode::Intrinsic) + INST(1, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(2U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_LD_LEX_VAR_DYN) - .any() + .Any() .Inputs({{DataType::ANY, 1}}) .AddImm(LEVEL) .AddImm(SLOT); - INST(3, Opcode::Return).any().Inputs(2); + INST(3U, Opcode::Return).Any().Inputs(2U); } } @@ -520,17 +520,17 @@ TEST_F(InlineIntrinsicsTest, LdLexVarDynSkip) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - BASIC_BLOCK(2, -1) + PARAMETER(0, 0).Any(); + BASIC_BLOCK(2U, -1) { - INST(1, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(2, Opcode::Intrinsic) + INST(1, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(2U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_LD_LEX_VAR_DYN) - .any() + .Any() .Inputs({{DataType::ANY, 1}}) .AddImm(LEVEL) .AddImm(SLOT); - INST(3, Opcode::Return).any().Inputs(2); + INST(3U, Opcode::Return).Any().Inputs(2U); } } @@ -546,20 +546,20 @@ TEST_F(InlineIntrinsicsTest, LdLexDyn) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - BASIC_BLOCK(2, -1) - { - INST(1, Opcode::LoadConstantPool).any().Inputs(0); - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(3, Opcode::SaveState).NoVregs(); - INST(6, Opcode::LoadFromConstantPool).any().Inputs(1).TypeId(STRING_ID); - INST(4, Opcode::Intrinsic) + PARAMETER(0, 0).Any(); + BASIC_BLOCK(2U, -1) + { + INST(1, Opcode::LoadConstantPool).Any().Inputs(0); + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(3U, Opcode::SaveState).NoVregs(); + INST(6U, Opcode::LoadFromConstantPool).Any().Inputs(1).TypeId(STRING_ID); + INST(4U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_LD_LEX_DYN) - .any() - .Inputs({{DataType::ANY, 6}, {DataType::ANY, 2}, {DataType::NO_TYPE, 3}}) + .Any() + .Inputs({{DataType::ANY, 6U}, {DataType::ANY, 2U}, {DataType::NO_TYPE, 3U}}) .AddImm(LEVEL) .AddImm(SLOT); - INST(5, Opcode::Return).any().Inputs(4); + INST(5U, Opcode::Return).Any().Inputs(4U); } } @@ -570,23 +570,23 @@ TEST_F(InlineIntrinsicsTest, LdLexDyn) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, DataType::Any(ark::coretypes::TaggedValue::VALUE_HOLE)); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(3, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(4, Opcode::SaveState).NoVregs(); + INST(3U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(4U, Opcode::SaveState).NoVregs(); // We do not check LdLexVarDyn expansion in this test! - INST(5, Opcode::Intrinsic) + INST(5U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_LD_LEX_VAR_DYN) - .any() - .Inputs({{DataType::ANY, 3}}) + .Any() + .Inputs({{DataType::ANY, 3U}}) .AddImm(LEVEL) .AddImm(SLOT) .ClearFlag(inst_flags::REQUIRE_STATE); - INST(6, Opcode::Compare).b().Inputs(5, 1).SrcType(DataType::ANY).CC(ConditionCode::CC_EQ); - INST(7, Opcode::DeoptimizeIf).Inputs(6, 4).DeoptimizeType(DeoptimizeType::HOLE); - INST(8, Opcode::Return).any().Inputs(5); + INST(6U, Opcode::Compare).B().Inputs(5U, 1).SrcType(DataType::ANY).CC(ConditionCode::CC_EQ); + INST(7U, Opcode::DeoptimizeIf).Inputs(6U, 4U).DeoptimizeType(DeoptimizeType::HOLE); + INST(8U, Opcode::Return).Any().Inputs(5U); } } @@ -598,16 +598,16 @@ TEST_F(InlineIntrinsicsTest, InlineLdlexenvDyn) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - BASIC_BLOCK(2, -1) + PARAMETER(0, 0).Any(); + BASIC_BLOCK(2U, -1) { - INST(4, Opcode::SaveState).NoVregs(); + INST(4U, Opcode::SaveState).NoVregs(); INST(1, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_LDLEXENV_DYN) - .any() + .Any() .Inputs({{DataType::ANY, 0}}) .ClearFlag(inst_flags::REQUIRE_STATE); - INST(2, Opcode::Return).any().Inputs(1); + INST(2U, Opcode::Return).Any().Inputs(1); } } ASSERT_TRUE(graph->RunPass()); @@ -616,11 +616,11 @@ TEST_F(InlineIntrinsicsTest, InlineLdlexenvDyn) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - BASIC_BLOCK(2, -1) + PARAMETER(0, 0).Any(); + BASIC_BLOCK(2U, -1) { - INST(1, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(2, Opcode::Return).any().Inputs(1); + INST(1, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(2U, Opcode::Return).Any().Inputs(1); } } GraphChecker(graphOpt).Check(); @@ -635,19 +635,19 @@ TEST_F(InlineIntrinsicsTest, StLexVarDyn) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(3, Opcode::Intrinsic) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(3U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_ST_LEX_VAR_DYN) - .any() - .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2}}) + .Any() + .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2U}}) .AddImm(level) .AddImm(SLOT) .ClearFlag(inst_flags::REQUIRE_STATE); - INST(4, Opcode::ReturnVoid).v0id(); + INST(4U, Opcode::ReturnVoid).Void(); } } ASSERT_TRUE(graph->RunPass()); @@ -656,20 +656,20 @@ TEST_F(InlineIntrinsicsTest, StLexVarDyn) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1); - CONSTANT(7, graphOpt->GetRuntime()->GetLexicalEnvStartDataIndex() + SLOT); + CONSTANT(7U, graphOpt->GetRuntime()->GetLexicalEnvStartDataIndex() + SLOT); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(3, Opcode::CastAnyTypeValue) - .ref() - .Inputs(2) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(3U, Opcode::CastAnyTypeValue) + .Ref() + .Inputs(2U) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - INST(5, Opcode::StoreArray).any().Inputs(3).Inputs(7).Inputs(1).SetNeedBarrier(true); - INST(4, Opcode::ReturnVoid).v0id(); + INST(5U, Opcode::StoreArray).Any().Inputs(3U).Inputs(7U).Inputs(1).SetNeedBarrier(true); + INST(4U, Opcode::ReturnVoid).Void(); } } graphOpt->RunPass(); @@ -680,19 +680,19 @@ TEST_F(InlineIntrinsicsTest, StLexVarDyn) graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(3, Opcode::Intrinsic) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(3U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_ST_LEX_VAR_DYN) - .any() - .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2}}) + .Any() + .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2U}}) .AddImm(level) .AddImm(SLOT) .ClearFlag(inst_flags::REQUIRE_STATE); - INST(4, Opcode::ReturnVoid).v0id(); + INST(4U, Opcode::ReturnVoid).Void(); } } ASSERT_TRUE(graph->RunPass()); @@ -702,27 +702,27 @@ TEST_F(InlineIntrinsicsTest, StLexVarDyn) graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1); - CONSTANT(7, graphOpt->GetRuntime()->GetLexicalEnvParentEnvIndex()); - CONSTANT(10, graphOpt->GetRuntime()->GetLexicalEnvStartDataIndex() + SLOT); + CONSTANT(7U, graphOpt->GetRuntime()->GetLexicalEnvParentEnvIndex()); + CONSTANT(10U, graphOpt->GetRuntime()->GetLexicalEnvStartDataIndex() + SLOT); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(5, Opcode::CastAnyTypeValue) - .ref() - .Inputs(2) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(5U, Opcode::CastAnyTypeValue) + .Ref() + .Inputs(2U) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - INST(6, Opcode::LoadArray).any().Inputs(5, 7); - INST(8, Opcode::CastAnyTypeValue) - .ref() - .Inputs(6) + INST(6U, Opcode::LoadArray).Any().Inputs(5U, 7U); + INST(8U, Opcode::CastAnyTypeValue) + .Ref() + .Inputs(6U) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - INST(9, Opcode::StoreArray).any().Inputs(8).Inputs(10).Inputs(1).SetNeedBarrier(true); - INST(4, Opcode::ReturnVoid).v0id(); + INST(9U, Opcode::StoreArray).Any().Inputs(8U).Inputs(10U).Inputs(1).SetNeedBarrier(true); + INST(4U, Opcode::ReturnVoid).Void(); } } graphOpt->RunPass(); @@ -732,19 +732,19 @@ TEST_F(InlineIntrinsicsTest, StLexVarDyn) graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(3, Opcode::Intrinsic) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(3U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_ST_LEX_VAR_DYN) - .any() - .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2}}) + .Any() + .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2U}}) .AddImm(level) .AddImm(SLOT) .ClearFlag(inst_flags::REQUIRE_STATE); - INST(4, Opcode::ReturnVoid).v0id(); + INST(4U, Opcode::ReturnVoid).Void(); } } ASSERT_TRUE(graph->RunPass()); @@ -754,33 +754,33 @@ TEST_F(InlineIntrinsicsTest, StLexVarDyn) graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1); - CONSTANT(7, graphOpt->GetRuntime()->GetLexicalEnvParentEnvIndex()); - CONSTANT(12, graphOpt->GetRuntime()->GetLexicalEnvStartDataIndex() + SLOT); + CONSTANT(7U, graphOpt->GetRuntime()->GetLexicalEnvParentEnvIndex()); + CONSTANT(12U, graphOpt->GetRuntime()->GetLexicalEnvStartDataIndex() + SLOT); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(5, Opcode::CastAnyTypeValue) - .ref() - .Inputs(2) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(5U, Opcode::CastAnyTypeValue) + .Ref() + .Inputs(2U) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - INST(6, Opcode::LoadArray).any().Inputs(5, 7); - INST(8, Opcode::CastAnyTypeValue) - .ref() - .Inputs(6) + INST(6U, Opcode::LoadArray).Any().Inputs(5U, 7U); + INST(8U, Opcode::CastAnyTypeValue) + .Ref() + .Inputs(6U) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - INST(9, Opcode::LoadArray).any().Inputs(8, 7); - INST(10, Opcode::CastAnyTypeValue) - .ref() - .Inputs(9) + INST(9U, Opcode::LoadArray).Any().Inputs(8U, 7U); + INST(10U, Opcode::CastAnyTypeValue) + .Ref() + .Inputs(9U) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - INST(11, Opcode::StoreArray).any().Inputs(10).Inputs(12).Inputs(1).SetNeedBarrier(true); - INST(4, Opcode::ReturnVoid).v0id(); + INST(11U, Opcode::StoreArray).Any().Inputs(10U).Inputs(12U).Inputs(1).SetNeedBarrier(true); + INST(4U, Opcode::ReturnVoid).Void(); } } graphOpt->RunPass(); @@ -790,19 +790,19 @@ TEST_F(InlineIntrinsicsTest, StLexVarDyn) graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(3, Opcode::Intrinsic) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(3U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_ST_LEX_VAR_DYN) - .any() - .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2}}) + .Any() + .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2U}}) .AddImm(level) .AddImm(SLOT) .ClearFlag(inst_flags::REQUIRE_STATE); - INST(4, Opcode::ReturnVoid).v0id(); + INST(4U, Opcode::ReturnVoid).Void(); } } ASSERT_FALSE(graph->RunPass()); @@ -812,19 +812,19 @@ TEST_F(InlineIntrinsicsTest, StLexVarDyn) graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1); - BASIC_BLOCK(2, -1) + BASIC_BLOCK(2U, -1) { - INST(2, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(3, Opcode::Intrinsic) + INST(2U, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(3U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_ST_LEX_VAR_DYN) - .any() - .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2}}) + .Any() + .Inputs({{DataType::INT32, 1}, {DataType::ANY, 2U}}) .AddImm(level) .AddImm(SLOT) .ClearFlag(inst_flags::REQUIRE_STATE); - INST(4, Opcode::ReturnVoid).v0id(); + INST(4U, Opcode::ReturnVoid).Void(); } } graphOpt->RunPass(); @@ -836,16 +836,16 @@ TEST_F(InlineIntrinsicsTest, PopLexenvDyn) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - BASIC_BLOCK(2, -1) + PARAMETER(0, 0).Any(); + BASIC_BLOCK(2U, -1) { - INST(1, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(2, Opcode::SaveState).NoVregs(); - INST(3, Opcode::Intrinsic) + INST(1, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(2U, Opcode::SaveState).NoVregs(); + INST(3U, Opcode::Intrinsic) .IntrinsicId(RuntimeInterface::IntrinsicId::INTRINSIC_POP_LEXENV_DYN) - .any() - .Inputs({{DataType::ANY, 1}, {DataType::NO_TYPE, 2}}); - INST(4, Opcode::Return).any().Inputs(3); + .Any() + .Inputs({{DataType::ANY, 1}, {DataType::NO_TYPE, 2U}}); + INST(4U, Opcode::Return).Any().Inputs(3U); } } @@ -855,19 +855,19 @@ TEST_F(InlineIntrinsicsTest, PopLexenvDyn) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - CONSTANT(5, graphOpt->GetRuntime()->GetLexicalEnvParentEnvIndex()); - BASIC_BLOCK(2, -1) - { - INST(1, Opcode::LoadLexicalEnv).any().Inputs(0); - INST(2, Opcode::SaveState).NoVregs(); - INST(4, Opcode::CastAnyTypeValue) - .ref() + PARAMETER(0, 0).Any(); + CONSTANT(5U, graphOpt->GetRuntime()->GetLexicalEnvParentEnvIndex()); + BASIC_BLOCK(2U, -1) + { + INST(1, Opcode::LoadLexicalEnv).Any().Inputs(0); + INST(2U, Opcode::SaveState).NoVregs(); + INST(4U, Opcode::CastAnyTypeValue) + .Ref() .Inputs(1) .AnyType(AnyBaseType::ECMASCRIPT_ARRAY_TYPE) .SetFlag(inst_flags::NO_HOIST); - INST(6, Opcode::LoadArray).any().Inputs(4, 5); - INST(3, Opcode::Return).any().Inputs(6); + INST(6U, Opcode::LoadArray).Any().Inputs(4U, 5U); + INST(3U, Opcode::Return).Any().Inputs(6U); } } diff --git a/tests/compiler/ir_builder_ecma_test.cpp b/tests/compiler/ir_builder_ecma_test.cpp index 6c7c9851b..8642cb704 100644 --- a/tests/compiler/ir_builder_ecma_test.cpp +++ b/tests/compiler/ir_builder_ecma_test.cpp @@ -28,12 +28,12 @@ TEST_F(IrBuilderTest, CompareAnyType) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::Return).s32().Inputs(2); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::Return).S32().Inputs(2); } } @@ -51,12 +51,12 @@ TEST_F(IrBuilderTest, CastAnyTypeValue) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); - INST(3, Opcode::Return).f64().Inputs(2); + INST(2, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(3, Opcode::Return).F64().Inputs(2); } } @@ -74,12 +74,12 @@ TEST_F(IrBuilderTest, CastValueToAnyType) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).i32(); + PARAMETER(0, 0).I32(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::Return).any().Inputs(2); + INST(2, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::Return).Any().Inputs(2); } } diff --git a/tests/compiler/lowering_ecma_test.cpp b/tests/compiler/lowering_ecma_test.cpp index 8998d3c19..aaf48f5f0 100644 --- a/tests/compiler/lowering_ecma_test.cpp +++ b/tests/compiler/lowering_ecma_test.cpp @@ -36,21 +36,21 @@ TEST_F(LoweringEcmaTest, CastValueToAnyTypeWithConst) BASIC_BLOCK(2, -1) { INST(4, Opcode::SaveState).NoVregs(); - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(2, Opcode::Intrinsic).any().Inputs({{DataType::ANY, 1}, {DataType::NO_TYPE, 4}}); - INST(3, Opcode::Return).any().Inputs(2); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(2, Opcode::Intrinsic).Any().Inputs({{DataType::ANY, 1}, {DataType::NO_TYPE, 4}}); + INST(3, Opcode::Return).Any().Inputs(2); } } auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - CONSTANT(5, 0x6).any(); + CONSTANT(5, 0x6).Any(); BASIC_BLOCK(2, -1) { INST(4, Opcode::SaveState).NoVregs(); - INST(2, Opcode::Intrinsic).any().Inputs({{DataType::ANY, 5}, {DataType::NO_TYPE, 4}}); - INST(3, Opcode::Return).any().Inputs(2); + INST(2, Opcode::Intrinsic).Any().Inputs({{DataType::ANY, 5}, {DataType::NO_TYPE, 4}}); + INST(3, Opcode::Return).Any().Inputs(2); } } @@ -66,32 +66,32 @@ TEST_F(LoweringEcmaTest, CastValueToAnyTypeWithSaveState) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1.1); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); - INST(3, Opcode::Add).f64().Inputs(2, 1); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); + INST(2, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(3, Opcode::Add).F64().Inputs(2, 1); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(3); INST(5, Opcode::SaveState).Inputs(4).SrcVregs({0}); - INST(6, Opcode::Intrinsic).any().Inputs({{DataType::NO_TYPE, 5}}); - INST(7, Opcode::Return).any().Inputs(6); + INST(6, Opcode::Intrinsic).Any().Inputs({{DataType::NO_TYPE, 5}}); + INST(7, Opcode::Return).Any().Inputs(6); } } auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(1, 1.1); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).f64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); - INST(3, Opcode::Add).f64().Inputs(2, 1); + INST(2, Opcode::CastAnyTypeValue).F64().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(3, Opcode::Add).F64().Inputs(2, 1); INST(5, Opcode::SaveState).Inputs(3).SrcVregs({0}); - INST(6, Opcode::Intrinsic).any().Inputs({{DataType::NO_TYPE, 5}}); - INST(7, Opcode::Return).any().Inputs(6); + INST(6, Opcode::Intrinsic).Any().Inputs({{DataType::NO_TYPE, 5}}); + INST(7, Opcode::Return).Any().Inputs(6); } } diff --git a/tests/compiler/peepholes_ecma_test.cpp b/tests/compiler/peepholes_ecma_test.cpp index 99ffb885a..c0304937a 100644 --- a/tests/compiler/peepholes_ecma_test.cpp +++ b/tests/compiler/peepholes_ecma_test.cpp @@ -31,20 +31,20 @@ TEST_F(PeepholesTest, CastTrueSimple) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).S32(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::Add).s32().Inputs(1, 2); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); + INST(2, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::Add).S32().Inputs(1, 2); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); - INST(5, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(4); - INST(6, Opcode::Add).s32().Inputs(1, 5); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); + INST(5, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(4); + INST(6, Opcode::Add).S32().Inputs(1, 5); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); - INST(8, Opcode::Return).any().Inputs(7); + INST(8, Opcode::Return).Any().Inputs(7); } } @@ -55,18 +55,18 @@ TEST_F(PeepholesTest, CastTrueSimple) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).S32(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::Add).s32().Inputs(1, 2); + INST(2, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::Add).S32().Inputs(1, 2); - INST(6, Opcode::Add).s32().Inputs(1, 3); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); + INST(6, Opcode::Add).S32().Inputs(1, 3); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); - INST(8, Opcode::Return).any().Inputs(7); + INST(8, Opcode::Return).Any().Inputs(7); } } @@ -78,32 +78,32 @@ TEST_F(PeepholesTest, CastTrueComplex) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).S32(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::Add).s32().Inputs(1, 2); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); + INST(2, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::Add).S32().Inputs(1, 2); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); INST(13, Opcode::SaveState).NoVregs(); - INST(5, Opcode::CallDynamic).any().InputsAutoType(4, 13); - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(5); + INST(5, Opcode::CallDynamic).Any().InputsAutoType(4, 13); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(5); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(3, -1) { - INST(8, Opcode::Return).any().Inputs(0); + INST(8, Opcode::Return).Any().Inputs(0); } BASIC_BLOCK(4, -1) { - INST(9, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(4); - INST(10, Opcode::Add).s32().Inputs(1, 9); - INST(11, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(10); + INST(9, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(4); + INST(10, Opcode::Add).S32().Inputs(1, 9); + INST(11, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(10); - INST(12, Opcode::Return).any().Inputs(11); + INST(12, Opcode::Return).Any().Inputs(11); } } @@ -114,31 +114,31 @@ TEST_F(PeepholesTest, CastTrueComplex) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).S32(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::Add).s32().Inputs(1, 2); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); + INST(2, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::Add).S32().Inputs(1, 2); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); INST(13, Opcode::SaveState).NoVregs(); - INST(5, Opcode::CallDynamic).any().InputsAutoType(4, 13); - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(5); + INST(5, Opcode::CallDynamic).Any().InputsAutoType(4, 13); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(5); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(6); } BASIC_BLOCK(3, -1) { - INST(8, Opcode::Return).any().Inputs(0); + INST(8, Opcode::Return).Any().Inputs(0); } BASIC_BLOCK(4, -1) { - INST(10, Opcode::Add).s32().Inputs(1, 3); - INST(11, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(10); + INST(10, Opcode::Add).S32().Inputs(1, 3); + INST(11, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(10); - INST(12, Opcode::Return).any().Inputs(11); + INST(12, Opcode::Return).Any().Inputs(11); } } @@ -150,15 +150,15 @@ TEST_F(PeepholesTest, CastFalse) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).s32(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).S32(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::Add).s32().Inputs(1, 2); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); - INST(5, Opcode::Return).any().Inputs(4); + INST(2, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::Add).S32().Inputs(1, 2); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(3); + INST(5, Opcode::Return).Any().Inputs(4); } } @@ -176,23 +176,23 @@ TEST_F(PeepholesTest, CastIntToAnyToDouble) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).s32(); + PARAMETER(0, 0).S32(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(5, Opcode::SaveState).Inputs(1).SrcVregs({0}); INST(2, Opcode::AnyTypeCheck) - .any() + .Any() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .Inputs(1, 5) .IntegerWasSeen(true); INST(3, Opcode::CastAnyTypeValue) - .f64() + .F64() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .Inputs(2) .IntegerWasSeen(true); - INST(4, Opcode::Return).f64().Inputs(3); + INST(4, Opcode::Return).F64().Inputs(3); } } @@ -203,15 +203,15 @@ TEST_F(PeepholesTest, CastIntToAnyToDouble) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).s32(); + PARAMETER(0, 0).S32(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(5, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(2, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1, 5); - INST(6, Opcode::Cast).f64().SrcType(DataType::INT32).Inputs(0); - INST(4, Opcode::Return).f64().Inputs(6); + INST(2, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1, 5); + INST(6, Opcode::Cast).F64().SrcType(DataType::INT32).Inputs(0); + INST(4, Opcode::Return).F64().Inputs(6); } } @@ -223,13 +223,13 @@ TEST_F(PeepholesTest, CastBoolToAnyToInt) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).b(); + PARAMETER(0, 0).B(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(2, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(3, Opcode::Return).s32().Inputs(2); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(2, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(3, Opcode::Return).S32().Inputs(2); } } @@ -240,12 +240,12 @@ TEST_F(PeepholesTest, CastBoolToAnyToInt) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).b(); + PARAMETER(0, 0).B(); BASIC_BLOCK(2, -1) { - INST(4, Opcode::Cast).s32().SrcType(DataType::BOOL).Inputs(0); - INST(3, Opcode::Return).s32().Inputs(4); + INST(4, Opcode::Cast).S32().SrcType(DataType::BOOL).Inputs(0); + INST(3, Opcode::Return).S32().Inputs(4); } } @@ -258,13 +258,13 @@ TEST_F(PeepholesTest, CastAnyToValueAndBack) graph->SetUnrollComplete(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastAnyTypeValue).ref().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0); - INST(2, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(1); - INST(3, Opcode::Return).any().Inputs(2); + INST(1, Opcode::CastAnyTypeValue).Ref().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(0); + INST(2, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_STRING_TYPE).Inputs(1); + INST(3, Opcode::Return).Any().Inputs(2); } } @@ -275,11 +275,11 @@ TEST_F(PeepholesTest, CastAnyToValueAndBack) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { - INST(3, Opcode::Return).any().Inputs(0); + INST(3, Opcode::Return).Any().Inputs(0); } } @@ -292,17 +292,17 @@ TEST_F(PeepholesTest, CastAnyToValueAndBackNotApplied) graph->SetUnrollComplete(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(1, Opcode::CastAnyTypeValue) - .f64() + .F64() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .AllowedInputType(profiling::AnyInputType::INTEGER) .Inputs(0); - INST(2, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); - INST(3, Opcode::Return).any().Inputs(2); + INST(2, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); + INST(3, Opcode::Return).Any().Inputs(2); } } @@ -316,20 +316,20 @@ TEST_F(PeepholesTest, CompareCastToAnyAndCastToAny) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(4, Opcode::Compare).b().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); - INST(5, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); - INST(6, Opcode::Compare).b().CC(CC_GE).Inputs(2, 3).SrcType(DataType::INT32); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); - INST(8, Opcode::Compare).b().CC(CC_EQ).Inputs(5, 7).SrcType(DataType::ANY); - INST(9, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(8); - INST(10, Opcode::Return).any().Inputs(9); + INST(2, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(4, Opcode::Compare).B().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); + INST(5, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); + INST(6, Opcode::Compare).B().CC(CC_GE).Inputs(2, 3).SrcType(DataType::INT32); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); + INST(8, Opcode::Compare).B().CC(CC_EQ).Inputs(5, 7).SrcType(DataType::ANY); + INST(9, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(8); + INST(10, Opcode::Return).Any().Inputs(9); } } @@ -340,18 +340,18 @@ TEST_F(PeepholesTest, CompareCastToAnyAndCastToAny) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(4, Opcode::Compare).b().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); - INST(6, Opcode::Compare).b().CC(CC_GE).Inputs(2, 3).SrcType(DataType::INT32); - INST(8, Opcode::Compare).b().CC(CC_EQ).Inputs(4, 6).SrcType(DataType::BOOL); - INST(9, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(8); - INST(10, Opcode::Return).any().Inputs(9); + INST(2, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(4, Opcode::Compare).B().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); + INST(6, Opcode::Compare).B().CC(CC_GE).Inputs(2, 3).SrcType(DataType::INT32); + INST(8, Opcode::Compare).B().CC(CC_EQ).Inputs(4, 6).SrcType(DataType::BOOL); + INST(9, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(8); + INST(10, Opcode::Return).Any().Inputs(9); } } @@ -363,20 +363,20 @@ TEST_F(PeepholesTest, CompareCastToAnyAndCastToAnyNotApply) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(4, Opcode::Compare).b().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); - INST(5, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); - INST(6, Opcode::Add).i32().Inputs(2, 3); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); - INST(8, Opcode::Compare).b().CC(CC_EQ).Inputs(5, 7).SrcType(DataType::ANY); - INST(9, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(8); - INST(10, Opcode::Return).any().Inputs(9); + INST(2, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(4, Opcode::Compare).B().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); + INST(5, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); + INST(6, Opcode::Add).I32().Inputs(2, 3); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); + INST(8, Opcode::Compare).B().CC(CC_EQ).Inputs(5, 7).SrcType(DataType::ANY); + INST(9, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(8); + INST(10, Opcode::Return).Any().Inputs(9); } } auto graphOpt = GraphCloner(graph, graph->GetAllocator(), graph->GetLocalAllocator()).CloneGraph(); @@ -393,19 +393,19 @@ TEST_F(PeepholesTest, CompareCastToAnyAndConstTrue) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); - CONSTANT(9, TaggedValue::VALUE_TRUE).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); + CONSTANT(9, TaggedValue::VALUE_TRUE).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(4, Opcode::Compare).b().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); - INST(5, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); - INST(6, Opcode::Compare).b().CC(CC_EQ).Inputs(5, 9).SrcType(DataType::ANY); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); - INST(8, Opcode::Return).any().Inputs(7); + INST(2, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(4, Opcode::Compare).B().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); + INST(5, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); + INST(6, Opcode::Compare).B().CC(CC_EQ).Inputs(5, 9).SrcType(DataType::ANY); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); + INST(8, Opcode::Return).Any().Inputs(7); } } @@ -416,16 +416,16 @@ TEST_F(PeepholesTest, CompareCastToAnyAndConstTrue) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(4, Opcode::Compare).b().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); - INST(8, Opcode::Return).any().Inputs(7); + INST(2, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(4, Opcode::Compare).B().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); + INST(8, Opcode::Return).Any().Inputs(7); } } @@ -437,19 +437,19 @@ TEST_F(PeepholesTest, CompareCastToAnyAndConstFalse) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); - CONSTANT(9, TaggedValue::VALUE_FALSE).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); + CONSTANT(9, TaggedValue::VALUE_FALSE).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(4, Opcode::Compare).b().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); - INST(5, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); - INST(6, Opcode::Compare).b().CC(CC_EQ).Inputs(5, 9).SrcType(DataType::ANY); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); - INST(8, Opcode::Return).any().Inputs(7); + INST(2, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(4, Opcode::Compare).B().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); + INST(5, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); + INST(6, Opcode::Compare).B().CC(CC_EQ).Inputs(5, 9).SrcType(DataType::ANY); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); + INST(8, Opcode::Return).Any().Inputs(7); } } @@ -460,18 +460,18 @@ TEST_F(PeepholesTest, CompareCastToAnyAndConstFalse) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); CONSTANT(19, 0); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(4, Opcode::Compare).b().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); - INST(6, Opcode::Compare).b().CC(CC_EQ).Inputs(4, 19).SrcType(DataType::BOOL); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); - INST(8, Opcode::Return).any().Inputs(7); + INST(2, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(4, Opcode::Compare).B().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); + INST(6, Opcode::Compare).B().CC(CC_EQ).Inputs(4, 19).SrcType(DataType::BOOL); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); + INST(8, Opcode::Return).Any().Inputs(7); } } @@ -483,19 +483,19 @@ TEST_F(PeepholesTest, CompareCastToAnyAndConst) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); - CONSTANT(9, 10000).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); + CONSTANT(9, 10000).Any(); BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(4, Opcode::Compare).b().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); - INST(5, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); - INST(6, Opcode::Compare).b().CC(CC_EQ).Inputs(5, 9).SrcType(DataType::ANY); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); - INST(8, Opcode::Return).any().Inputs(7); + INST(2, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(3, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(4, Opcode::Compare).B().CC(CC_LT).Inputs(2, 3).SrcType(DataType::INT32); + INST(5, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(4); + INST(6, Opcode::Compare).B().CC(CC_EQ).Inputs(5, 9).SrcType(DataType::ANY); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(6); + INST(8, Opcode::Return).Any().Inputs(7); } } @@ -510,8 +510,8 @@ TEST_F(PeepholesTest, CompareCastToAnyAndConst) BASIC_BLOCK(2, -1) { - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(19); - INST(8, Opcode::Return).any().Inputs(7); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(19); + INST(8, Opcode::Return).Any().Inputs(7); } } @@ -527,26 +527,26 @@ TEST_F(PeepholesTest, CompareAnyTypeAfterCastValueToAny) BASIC_BLOCK(2, -1) { - INST(2, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(3, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE).Inputs(2); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(3); + INST(3, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE).Inputs(2); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(3); - INST(5, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_NULL_TYPE).Inputs(2); - INST(6, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(5); + INST(5, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_NULL_TYPE).Inputs(2); + INST(6, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(5); - INST(7, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(7); + INST(7, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(7); - INST(9, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(2); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(9); + INST(9, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(2); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(9); - INST(11, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(2); - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(11); + INST(11, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(2); + INST(12, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(11); INST(13, Opcode::SaveState).Inputs(0, 3, 5, 7, 9, 11).SrcVregs({0, 1, 2, 3, 4, 5}); - INST(14, Opcode::CallDynamic).any().InputsAutoType(4, 6, 8, 10, 12, 13); - INST(15, Opcode::Return).any().Inputs(14); + INST(14, Opcode::CallDynamic).Any().InputsAutoType(4, 6, 8, 10, 12, 13); + INST(15, Opcode::Return).Any().Inputs(14); } } @@ -562,15 +562,15 @@ TEST_F(PeepholesTest, CompareAnyTypeAfterCastValueToAny) BASIC_BLOCK(2, -1) { - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(6, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(1); - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(6, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(1); + INST(12, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); INST(13, Opcode::SaveState).Inputs(0, 0, 0, 0, 1, 0).SrcVregs({0, 1, 2, 3, 4, 5}); - INST(14, Opcode::CallDynamic).any().InputsAutoType(4, 6, 8, 10, 12, 13); - INST(15, Opcode::Return).any().Inputs(14); + INST(14, Opcode::CallDynamic).Any().InputsAutoType(4, 6, 8, 10, 12, 13); + INST(15, Opcode::Return).Any().Inputs(14); } } @@ -582,23 +582,23 @@ TEST_F(PeepholesTest, AddOverflowCheckXor) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); CONSTANT(2, 1); BASIC_BLOCK(2, -1) { INST(3, Opcode::SaveState).Inputs(0, 1, 2).SrcVregs({0, 1, 2}); - INST(4, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(5, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(6, Opcode::AddOverflowCheck).i32().Inputs(4, 5, 3); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); + INST(4, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(5, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(6, Opcode::AddOverflowCheck).I32().Inputs(4, 5, 3); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); INST(8, Opcode::SaveState).Inputs(0, 1, 2, 6).SrcVregs({0, 1, 2, 3}); - INST(9, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(7, 8); - INST(10, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(9); - INST(11, Opcode::Xor).i32().Inputs(10, 2); - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(11); - INST(13, Opcode::Return).any().Inputs(12); + INST(9, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(7, 8); + INST(10, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(9); + INST(11, Opcode::Xor).I32().Inputs(10, 2); + INST(12, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(11); + INST(13, Opcode::Return).Any().Inputs(12); } } ASSERT_TRUE(graph->RunPass()); @@ -608,21 +608,21 @@ TEST_F(PeepholesTest, AddOverflowCheckXor) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); CONSTANT(2, 1); BASIC_BLOCK(2, -1) { - INST(4, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(5, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(6, Opcode::Add).i32().Inputs(4, 5); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); + INST(4, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(5, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(6, Opcode::Add).I32().Inputs(4, 5); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); INST(8, Opcode::SaveState).Inputs(0, 1, 2, 6).SrcVregs({0, 1, 2, 3}); - INST(9, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(7, 8); - INST(11, Opcode::Xor).i32().Inputs(6, 2); - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(11); - INST(13, Opcode::Return).any().Inputs(12); + INST(9, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(7, 8); + INST(11, Opcode::Xor).I32().Inputs(6, 2); + INST(12, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(11); + INST(13, Opcode::Return).Any().Inputs(12); } } EXPECT_TRUE(GraphComparator().Compare(graph, graphOpt)); @@ -633,31 +633,31 @@ TEST_F(PeepholesTest, CompareAnyTypeAfterAnyTypeCheck) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(1, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(2, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 1); + INST(2, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 1); - INST(3, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE).Inputs(0); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(3); + INST(3, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE).Inputs(0); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(3); - INST(5, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_NULL_TYPE).Inputs(0); - INST(6, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(5); + INST(5, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_NULL_TYPE).Inputs(0); + INST(6, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(5); - INST(7, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(7); + INST(7, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(7); - INST(9, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(9); + INST(9, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(9); - INST(11, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(11); + INST(11, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(12, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(11); INST(13, Opcode::SaveState).Inputs(0, 3, 5, 7, 9, 11).SrcVregs({0, 1, 2, 3, 4, 5}); - INST(14, Opcode::CallDynamic).any().InputsAutoType(4, 6, 8, 10, 12, 13); - INST(15, Opcode::Return).any().Inputs(14); + INST(14, Opcode::CallDynamic).Any().InputsAutoType(4, 6, 8, 10, 12, 13); + INST(15, Opcode::Return).Any().Inputs(14); } } @@ -668,24 +668,24 @@ TEST_F(PeepholesTest, CompareAnyTypeAfterAnyTypeCheck) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(16, 0); CONSTANT(17, 1); BASIC_BLOCK(2, -1) { INST(1, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(2, Opcode::AnyTypeCheck).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 1); + INST(2, Opcode::AnyTypeCheck).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0, 1); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); - INST(6, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(17); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); + INST(6, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); + INST(12, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(17); INST(13, Opcode::SaveState).Inputs(0, 16, 16, 16, 16, 17).SrcVregs({0, 1, 2, 3, 4, 5}); - INST(14, Opcode::CallDynamic).any().InputsAutoType(4, 6, 8, 10, 12, 13); - INST(15, Opcode::Return).any().Inputs(14); + INST(14, Opcode::CallDynamic).Any().InputsAutoType(4, 6, 8, 10, 12, 13); + INST(15, Opcode::Return).Any().Inputs(14); } } @@ -697,35 +697,35 @@ TEST_F(PeepholesTest, CompareAnyTypeAfterAnyTypeCheckSpecial) auto graph = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, -1) { INST(1, Opcode::SaveState).Inputs(0).SrcVregs({0}); INST(2, Opcode::AnyTypeCheck) - .any() + .Any() .AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE) .AllowedInputType(profiling::AnyInputType::SPECIAL) .Inputs(0, 1); - INST(3, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE).Inputs(0); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(3); + INST(3, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_UNDEFINED_TYPE).Inputs(0); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(3); - INST(5, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_NULL_TYPE).Inputs(0); - INST(6, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(5); + INST(5, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_NULL_TYPE).Inputs(0); + INST(6, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(5); - INST(7, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(7); + INST(7, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(7); - INST(9, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(9); + INST(9, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(9); - INST(11, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(11); + INST(11, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(12, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(11); INST(13, Opcode::SaveState).Inputs(0, 3, 5, 7, 9, 11).SrcVregs({0, 1, 2, 3, 4, 5}); - INST(14, Opcode::CallDynamic).any().InputsAutoType(4, 6, 8, 10, 12, 13); - INST(15, Opcode::Return).any().Inputs(14); + INST(14, Opcode::CallDynamic).Any().InputsAutoType(4, 6, 8, 10, 12, 13); + INST(15, Opcode::Return).Any().Inputs(14); } } @@ -736,34 +736,34 @@ TEST_F(PeepholesTest, CompareAnyTypeAfterAnyTypeCheckSpecial) auto graphOpt = CreateGraphDynStubWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); CONSTANT(16, 0); BASIC_BLOCK(2, -1) { INST(1, Opcode::SaveState).Inputs(0).SrcVregs({0}); INST(2, Opcode::AnyTypeCheck) - .any() + .Any() .AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE) .AllowedInputType(profiling::AnyInputType::SPECIAL) .Inputs(0, 1); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); - INST(5, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_NULL_TYPE).Inputs(0); - INST(6, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(5); + INST(5, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_NULL_TYPE).Inputs(0); + INST(6, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(5); - INST(7, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(8, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(7); + INST(7, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(8, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(7); - INST(9, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(9); + INST(9, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(9); - INST(12, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); + INST(12, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(16); INST(13, Opcode::SaveState).Inputs(0, 16, 5, 7, 9, 16).SrcVregs({0, 1, 2, 3, 4, 5}); - INST(14, Opcode::CallDynamic).any().InputsAutoType(4, 6, 8, 10, 12, 13); - INST(15, Opcode::Return).any().Inputs(14); + INST(14, Opcode::CallDynamic).Any().InputsAutoType(4, 6, 8, 10, 12, 13); + INST(15, Opcode::Return).Any().Inputs(14); } } EXPECT_TRUE(GraphComparator().Compare(graph, graphOpt)); @@ -774,24 +774,24 @@ TEST_F(PeepholesTest, SubOverflowCheckDynCast) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { INST(3, Opcode::SaveState).Inputs(0, 1).SrcVregs({0, 1}); - INST(4, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(5, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(6, Opcode::AddOverflowCheck).i32().Inputs(4, 5, 3); - INST(7, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); + INST(4, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(5, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(6, Opcode::AddOverflowCheck).I32().Inputs(4, 5, 3); + INST(7, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); INST(8, Opcode::CastAnyTypeValue) - .f64() + .F64() .AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE) .AllowedInputType(profiling::AnyInputType::INTEGER) .Inputs(7); - INST(9, Opcode::Cast).i32().Inputs(8); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(9); - INST(11, Opcode::Return).any().Inputs(10); + INST(9, Opcode::Cast).I32().Inputs(8); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(9); + INST(11, Opcode::Return).Any().Inputs(10); } } ASSERT_TRUE(graph->RunPass()); @@ -800,16 +800,16 @@ TEST_F(PeepholesTest, SubOverflowCheckDynCast) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); - PARAMETER(1, 1).any(); + PARAMETER(0, 0).Any(); + PARAMETER(1, 1).Any(); BASIC_BLOCK(2, -1) { - INST(4, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(5, Opcode::CastAnyTypeValue).i32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(6, Opcode::Add).i32().Inputs(4, 5); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); - INST(11, Opcode::Return).any().Inputs(10); + INST(4, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(5, Opcode::CastAnyTypeValue).I32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(6, Opcode::Add).I32().Inputs(4, 5); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(6); + INST(11, Opcode::Return).Any().Inputs(10); } } EXPECT_TRUE(GraphComparator().Compare(graph, graphOpt)); diff --git a/tests/compiler/phi_type_resolving_ecma_test.cpp b/tests/compiler/phi_type_resolving_ecma_test.cpp index 98a4eece4..17cce912a 100644 --- a/tests/compiler/phi_type_resolving_ecma_test.cpp +++ b/tests/compiler/phi_type_resolving_ecma_test.cpp @@ -30,23 +30,23 @@ TEST_F(PhiTypeResolvingTest, ResolvePhi) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - CONSTANT(0, 0).i64(); - CONSTANT(1, 1).i64(); - PARAMETER(2, 0).any(); + CONSTANT(0, 0).I64(); + CONSTANT(1, 1).I64(); + PARAMETER(2, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(3, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(6, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); + INST(3, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(6, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 4) {} BASIC_BLOCK(4, -1) { - INST(8, Opcode::Phi).any().Inputs(3, 4); - INST(9, Opcode::Return).any().Inputs(8); + INST(8, Opcode::Phi).Any().Inputs(3, 4); + INST(9, Opcode::Return).Any().Inputs(8); } } ASSERT_TRUE(graph->RunPass()); @@ -56,22 +56,22 @@ TEST_F(PhiTypeResolvingTest, ResolvePhi) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - CONSTANT(0, 0).i64(); - CONSTANT(1, 1).i64(); - PARAMETER(2, 0).any(); + CONSTANT(0, 0).I64(); + CONSTANT(1, 1).I64(); + PARAMETER(2, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(6, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); + INST(6, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 4) {} BASIC_BLOCK(4, -1) { - INST(8, Opcode::Phi).i32().Inputs(0, 1); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(8); - INST(9, Opcode::Return).any().Inputs(10); + INST(8, Opcode::Phi).I32().Inputs(0, 1); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(8); + INST(9, Opcode::Return).Any().Inputs(10); } } @@ -83,34 +83,34 @@ TEST_F(PhiTypeResolvingTest, Resolve2Phi) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - CONSTANT(0, 0).i64(); - CONSTANT(1, 1).i64(); - CONSTANT(21, 1).i64(); - PARAMETER(2, 0).any(); - PARAMETER(22, 1).any(); + CONSTANT(0, 0).I64(); + CONSTANT(1, 1).I64(); + CONSTANT(21, 1).I64(); + PARAMETER(2, 0).Any(); + PARAMETER(22, 1).Any(); BASIC_BLOCK(2, 3, 4) { - INST(3, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); - INST(10, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(21); - INST(6, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); + INST(3, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(1); + INST(10, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(21); + INST(6, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 4) {} BASIC_BLOCK(4, 5, 6) { - INST(13, Opcode::Phi).any().Inputs(3, 4); - INST(11, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(22); + INST(13, Opcode::Phi).Any().Inputs(3, 4); + INST(11, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(22); INST(12, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(11); } BASIC_BLOCK(6, 5) {} BASIC_BLOCK(5, -1) { - INST(8, Opcode::Phi).any().Inputs(13, 10); - INST(9, Opcode::Return).any().Inputs(8); + INST(8, Opcode::Phi).Any().Inputs(13, 10); + INST(9, Opcode::Return).Any().Inputs(8); } } ASSERT_TRUE(graph->RunPass()); @@ -120,32 +120,32 @@ TEST_F(PhiTypeResolvingTest, Resolve2Phi) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - CONSTANT(0, 0).i64(); - CONSTANT(1, 1).i64(); - CONSTANT(21, 1).i64(); - PARAMETER(2, 0).any(); - PARAMETER(22, 1).any(); + CONSTANT(0, 0).I64(); + CONSTANT(1, 1).I64(); + CONSTANT(21, 1).I64(); + PARAMETER(2, 0).Any(); + PARAMETER(22, 1).Any(); BASIC_BLOCK(2, 3, 4) { - INST(6, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); + INST(6, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 4) {} BASIC_BLOCK(4, 5, 6) { - INST(13, Opcode::Phi).i32().Inputs(0, 1); - INST(11, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(22); + INST(13, Opcode::Phi).I32().Inputs(0, 1); + INST(11, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(22); INST(12, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(11); } BASIC_BLOCK(6, 5) {} BASIC_BLOCK(5, -1) { - INST(8, Opcode::Phi).i32().Inputs(13, 21); - INST(25, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(8); - INST(9, Opcode::Return).any().Inputs(25); + INST(8, Opcode::Phi).I32().Inputs(13, 21); + INST(25, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(8); + INST(9, Opcode::Return).Any().Inputs(25); } } @@ -157,23 +157,23 @@ TEST_F(PhiTypeResolvingTest, ResolvePhiNotApply) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - CONSTANT(0, 0).i64(); - CONSTANT(1, 1.1).f64(); - PARAMETER(2, 0).any(); + CONSTANT(0, 0).I64(); + CONSTANT(1, 1.1).F64(); + PARAMETER(2, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(3, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); - INST(6, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); + INST(3, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); + INST(6, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 4) {} BASIC_BLOCK(4, -1) { - INST(8, Opcode::Phi).any().Inputs(3, 4); - INST(9, Opcode::Return).any().Inputs(8); + INST(8, Opcode::Phi).Any().Inputs(3, 4); + INST(9, Opcode::Return).Any().Inputs(8); } } auto graphOpt = GraphCloner(graph, graph->GetAllocator(), graph->GetLocalAllocator()).CloneGraph(); @@ -190,24 +190,24 @@ TEST_F(PhiTypeResolvingTest, ResolvePhiUserNotAnyType) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - CONSTANT(0, 0).f64(); - CONSTANT(1, 1).f64(); - PARAMETER(2, 0).any(); + CONSTANT(0, 0).F64(); + CONSTANT(1, 1).F64(); + PARAMETER(2, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(3, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); - INST(4, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); - INST(6, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); + INST(3, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(0); + INST(4, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(1); + INST(6, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 4) {} BASIC_BLOCK(4, -1) { - INST(8, Opcode::Phi).any().Inputs(3, 4); - INST(9, Opcode::CompareAnyType).AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).b().Inputs(8); - INST(10, Opcode::Return).b().Inputs(9); + INST(8, Opcode::Phi).Any().Inputs(3, 4); + INST(9, Opcode::CompareAnyType).AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).B().Inputs(8); + INST(10, Opcode::Return).B().Inputs(9); } } ASSERT_TRUE(graph->RunPass()); @@ -217,23 +217,23 @@ TEST_F(PhiTypeResolvingTest, ResolvePhiUserNotAnyType) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - CONSTANT(0, 0).f64(); - CONSTANT(1, 1).f64(); - PARAMETER(2, 0).any(); + CONSTANT(0, 0).F64(); + CONSTANT(1, 1).F64(); + PARAMETER(2, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(6, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); + INST(6, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(2); INST(7, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_NE).Imm(0).Inputs(6); } BASIC_BLOCK(3, 4) {} BASIC_BLOCK(4, -1) { - INST(8, Opcode::Phi).f64().Inputs(0, 1); - INST(11, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(8); - INST(9, Opcode::CompareAnyType).AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).b().Inputs(11); - INST(10, Opcode::Return).b().Inputs(9); + INST(8, Opcode::Phi).F64().Inputs(0, 1); + INST(11, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_DOUBLE_TYPE).Inputs(8); + INST(9, Opcode::CompareAnyType).AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).B().Inputs(11); + INST(10, Opcode::Return).B().Inputs(9); } } diff --git a/tests/compiler/vn_test_ecma.cpp b/tests/compiler/vn_test_ecma.cpp index 38e5800e6..b20abff5e 100644 --- a/tests/compiler/vn_test_ecma.cpp +++ b/tests/compiler/vn_test_ecma.cpp @@ -30,24 +30,24 @@ TEST_F(VNTest, CompareAnyTypeVNTrue) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { CONSTANT(4, 42); - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, -1) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(7, Opcode::Return).s32().Inputs(6); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(7, Opcode::Return).S32().Inputs(6); } } @@ -58,23 +58,23 @@ TEST_F(VNTest, CompareAnyTypeVNTrue) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { CONSTANT(4, 42); - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, -1) { - INST(7, Opcode::Return).s32().Inputs(2); + INST(7, Opcode::Return).S32().Inputs(2); } } @@ -86,24 +86,24 @@ TEST_F(VNTest, CompareAnyTypeVNFalse) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { CONSTANT(4, 42); - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, -1) { - INST(6, Opcode::CompareAnyType).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(7, Opcode::Return).s32().Inputs(6); + INST(6, Opcode::CompareAnyType).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(7, Opcode::Return).S32().Inputs(6); } } @@ -121,24 +121,24 @@ TEST_F(VNTest, CastAnyTypeVNTrue) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(2, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { CONSTANT(4, 42); - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, -1) { - INST(6, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(7, Opcode::Return).s32().Inputs(6); + INST(6, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(7, Opcode::Return).S32().Inputs(6); } } @@ -149,23 +149,23 @@ TEST_F(VNTest, CastAnyTypeVNTrue) auto graphOpt = CreateGraphDynWithDefaultRuntime(); GRAPH(graphOpt) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(2, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { CONSTANT(4, 42); - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, -1) { - INST(7, Opcode::Return).s32().Inputs(2); + INST(7, Opcode::Return).S32().Inputs(2); } } @@ -177,24 +177,24 @@ TEST_F(VNTest, CastAnyTypeVNFalse) auto graph = CreateGraphDynWithDefaultRuntime(); GRAPH(graph) { - PARAMETER(0, 0).any(); + PARAMETER(0, 0).Any(); BASIC_BLOCK(2, 3, 4) { - INST(2, Opcode::CastAnyTypeValue).b().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(2, Opcode::CastAnyTypeValue).B().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); INST(3, Opcode::IfImm).SrcType(DataType::BOOL).CC(CC_EQ).Imm(0).Inputs(2); } BASIC_BLOCK(3, -1) { CONSTANT(4, 42); - INST(5, Opcode::Return).s32().Inputs(4); + INST(5, Opcode::Return).S32().Inputs(4); } BASIC_BLOCK(4, -1) { - INST(6, Opcode::CastAnyTypeValue).s32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(7, Opcode::Return).s32().Inputs(6); + INST(6, Opcode::CastAnyTypeValue).S32().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(7, Opcode::Return).S32().Inputs(6); } } @@ -215,12 +215,12 @@ TEST_F(VNTest, CastValueToAnyType) CONSTANT(0, 0); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(2, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); - INST(3, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(3, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); INST(4, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(5, Opcode::CallStatic).s32().InputsAutoType(1, 2, 3, 4); - INST(6, Opcode::Return).s32().Inputs(5); + INST(5, Opcode::CallStatic).S32().InputsAutoType(1, 2, 3, 4); + INST(6, Opcode::Return).S32().Inputs(5); } } @@ -234,11 +234,11 @@ TEST_F(VNTest, CastValueToAnyType) CONSTANT(0, 0); BASIC_BLOCK(2, -1) { - INST(1, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); - INST(2, Opcode::CastValueToAnyType).any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); + INST(1, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_INT_TYPE).Inputs(0); + INST(2, Opcode::CastValueToAnyType).Any().AnyType(AnyBaseType::ECMASCRIPT_BOOLEAN_TYPE).Inputs(0); INST(4, Opcode::SaveState).Inputs(0).SrcVregs({0}); - INST(5, Opcode::CallStatic).s32().InputsAutoType(1, 2, 1, 4); - INST(6, Opcode::Return).s32().Inputs(5); + INST(5, Opcode::CallStatic).S32().InputsAutoType(1, 2, 1, 4); + INST(6, Opcode::Return).S32().Inputs(5); } } -- Gitee