From 2a4307fbe6438e1a94a03f7c9f0d456be5f288a5 Mon Sep 17 00:00:00 2001 From: Ilya Gozman Date: Fri, 5 Sep 2025 21:43:21 +0300 Subject: [PATCH] Disable external inline in AOT by default Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/ICWO0T Signed-off-by: Ilya Gozman --- static_core/compiler/compiler.yaml | 2 +- .../branch_elimination_protect_returninlined.ets | 4 ++-- .../tests/checked/escape_analysis_check_phi.ets | 2 +- .../plugins/ets/tests/checked/escape_phi.ets | 2 +- .../tests/checked/ets_escompat_map_intrinsics.ets | 2 +- .../checked/external_inlining/ext_inlining_1.ets | 2 +- .../checked/external_inlining/ext_inlining_2.ets | 2 +- .../checked/external_inlining/ext_inlining_3.ets | 14 +++++++------- .../checked/external_inlining/ext_inlining_4.ets | 10 +++++----- .../checked/external_inlining/ext_inlining_5.ets | 2 +- .../checked/external_inlining/ext_inlining_6.ets | 4 ++-- .../checked/inlining_test/inline_external_test.ets | 2 +- .../tests/checked/inline-external-constructor.pa | 2 +- static_core/tests/checked/inline.pa | 6 +++--- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/static_core/compiler/compiler.yaml b/static_core/compiler/compiler.yaml index 4b07b00d5a..9a710f6341 100644 --- a/static_core/compiler/compiler.yaml +++ b/static_core/compiler/compiler.yaml @@ -465,7 +465,7 @@ options: - name: compiler-inline-external-methods-aot type: bool - default: true + default: false description: Enable inlining external methods in AOT mode tags: [perf] diff --git a/static_core/plugins/ets/tests/checked/branch_elimination_protect_returninlined.ets b/static_core/plugins/ets/tests/checked/branch_elimination_protect_returninlined.ets index df746165b7..a1b3942f6a 100644 --- a/static_core/plugins/ets/tests/checked/branch_elimination_protect_returninlined.ets +++ b/static_core/plugins/ets/tests/checked/branch_elimination_protect_returninlined.ets @@ -15,7 +15,7 @@ //! CHECKER Block with ReturnInlined inst with an infinite loop is preserved //! SKIP_IF @architecture == "arm32" -//! RUN_PAOC options: "--compiler-regex=.*inlined_inf_loop" +//! RUN_PAOC options: "--compiler-inline-external-methods-aot=true --compiler-regex=.*inlined_inf_loop" //! METHOD "branch_elimination_protect_returninlined.ETSGLOBAL::inlined_inf_loop" //! PASS_AFTER "Inline" //! INST /Call.*Inlined.*inf_loop/ @@ -163,7 +163,7 @@ function complex_inlined_inf_loop(): int { //! CHECKER Check proper elimination of block with Throw and ReturnInlined instructions //! SKIP_IF @architecture == "arm32" -//! RUN_PAOC options: "--compiler-regex=.*test_eliminate_throw" +//! RUN_PAOC options: "--compiler-inline-external-methods-aot=true --compiler-regex=.*test_eliminate_throw" //! METHOD "branch_elimination_protect_returninlined.ETSGLOBAL::test_eliminate_throw" //! PASS_AFTER "Inline" //! INST /Call.*Inlined.*eliminate_throw/ diff --git a/static_core/plugins/ets/tests/checked/escape_analysis_check_phi.ets b/static_core/plugins/ets/tests/checked/escape_analysis_check_phi.ets index b07ba25e64..a79f13913d 100755 --- a/static_core/plugins/ets/tests/checked/escape_analysis_check_phi.ets +++ b/static_core/plugins/ets/tests/checked/escape_analysis_check_phi.ets @@ -15,7 +15,7 @@ //! CHECKER AOT: EscapeAnalysis Phi aliasing regression //! SKIP_IF @architecture == "arm32" -//! RUN_PAOC options: "--compiler-regex='.*test.*'", entry: "escape_analysis_check_phi.ETSGLOBAL::main" +//! RUN_PAOC options: "--compiler-inline-external-methods-aot=true --compiler-regex='.*test.*'", entry: "escape_analysis_check_phi.ETSGLOBAL::main" //! METHOD "escape_analysis_check_phi.ETSGLOBAL::test" //! PASS_BEFORE "EscapeAnalysis" //! INST_COUNT "Phi", 2 diff --git a/static_core/plugins/ets/tests/checked/escape_phi.ets b/static_core/plugins/ets/tests/checked/escape_phi.ets index 5769f9be9c..81217a6deb 100644 --- a/static_core/plugins/ets/tests/checked/escape_phi.ets +++ b/static_core/plugins/ets/tests/checked/escape_phi.ets @@ -48,7 +48,7 @@ function __noinline__getLength(flag: boolean): int { //! CHECKER AOT Escape eliminate phi with objects //! SKIP_IF @architecture == "arm32" -//! RUN_PAOC options: "--compiler-regex='.*test.*'" +//! RUN_PAOC options: "--compiler-inline-external-methods-aot=true --compiler-regex='.*test.*'" //! METHOD "ETSGLOBAL::test_simple_phi1" //! PASS_BEFORE "Escape" //! INST_COUNT /NewObject/, 2 diff --git a/static_core/plugins/ets/tests/checked/ets_escompat_map_intrinsics.ets b/static_core/plugins/ets/tests/checked/ets_escompat_map_intrinsics.ets index 5b57f38f72..94ce6e30be 100644 --- a/static_core/plugins/ets/tests/checked/ets_escompat_map_intrinsics.ets +++ b/static_core/plugins/ets/tests/checked/ets_escompat_map_intrinsics.ets @@ -76,7 +76,7 @@ class MyMap extends Map { //! CHECKER AOT PGO: Map overrided intrinsics //! SKIP_IF @architecture == "arm32" //! RUN_PGO_PROF entry: "ets_escompat_map_intrinsics.ETSGLOBAL::test_map_bool_double_overrided1" -//! RUN_PGO_PAOC options: "--compiler-regex='.*(test_map|MapHas|MapGet|MapDelete)_.*'" +//! RUN_PGO_PAOC options: "--compiler-inline-external-methods-aot=true --compiler-regex='.*(test_map|MapHas|MapGet|MapDelete)_.*'" //! METHOD "ets_escompat_map_intrinsics.ETSGLOBAL::__noinline__MapHas_bool_double" //! PASS_AFTER "Inline" //! INST "Intrinsic.MapHas" diff --git a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_1.ets b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_1.ets index 10b549a567..36ef50e4fa 100644 --- a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_1.ets +++ b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_1.ets @@ -16,7 +16,7 @@ import { get_sum_element } from "./ext_funcs.ets"; //! CHECKER Check external inlining with depth 1 and one panda file -//! RUN_PAOC options: "--panda-files=../../ext_inlining_1.checked/ext_funcs.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_1.ETSGLOBAL::main" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_1.checked/ext_funcs.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_1.ETSGLOBAL::main" //! EVENT /Inline,ext_funcs.ETSGLOBAL::get_sum_element,ext_funcs.ETSGLOBAL::add,.*,STATIC,SUCCESS/ //! EVENT_NEXT /Inline,ext_inlining_1.ETSGLOBAL::main,ext_funcs.ETSGLOBAL::get_sum_element,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_1.checked/ext_funcs.abc", entry: "ext_inlining_1.ETSGLOBAL::main" diff --git a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_2.ets b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_2.ets index e3a3d1f70f..eaa3e249b5 100644 --- a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_2.ets +++ b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_2.ets @@ -16,7 +16,7 @@ import { get_element } from "./ext_funcs_1.ets"; //! CHECKER Check external inlining with depth 1 and two panda files -//! RUN_PAOC options: "--panda-files=../../ext_inlining_2.checked/ext_funcs.abc:../../ext_inlining_2.checked/ext_funcs_1.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_2.ETSGLOBAL::main" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_2.checked/ext_funcs.abc:../../ext_inlining_2.checked/ext_funcs_1.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_2.ETSGLOBAL::main" //! EVENT /Inline,ext_funcs_1.ETSGLOBAL::get_element,ext_funcs.ETSGLOBAL::add,.*,STATIC,SUCCESS/ //! EVENT_NEXT /Inline,ext_inlining_2.ETSGLOBAL::main,ext_funcs_1.ETSGLOBAL::get_element,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_2.checked/ext_funcs.abc:../../ext_inlining_2.checked/ext_funcs_1.abc", entry: "ext_inlining_2.ETSGLOBAL::main" diff --git a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_3.ets b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_3.ets index 9d32298370..ded300fa36 100644 --- a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_3.ets +++ b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_3.ets @@ -22,7 +22,7 @@ import { stringify } from "./ext_funcs_2.ets"; import { safe_div } from "./ext_funcs_2.ets"; //! CHECKER Check external inlining without side effects -//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_3.ETSGLOBAL::main_1" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_3.ETSGLOBAL::main_1" //! EVENT /Inline,ext_inlining_3.ETSGLOBAL::main_1,ext_funcs_2.ETSGLOBAL::add,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc", entry: "ext_inlining_3.ETSGLOBAL::main_1" @@ -41,7 +41,7 @@ function main_1(): int { } //! CHECKER Check external inlining function with runtime call from std core -//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_3.ETSGLOBAL::main_2" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_3.ETSGLOBAL::main_2" //! EVENT /Inline,ext_inlining_3.ETSGLOBAL::main_2,ext_funcs_2.ETSGLOBAL::add_with_log,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc", entry: "ext_inlining_3.ETSGLOBAL::main_2" @@ -60,7 +60,7 @@ function main_2(): int { } //! CHECKER Check inlining of external function with runtime call of managed func -//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_3.ETSGLOBAL::main_3" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_3.ETSGLOBAL::main_3" //! EVENT /Inline,ext_inlining_3.ETSGLOBAL::main_3,ext_funcs_2.ETSGLOBAL::rand_plus,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc", entry: "ext_inlining_3.ETSGLOBAL::main_3" @@ -77,7 +77,7 @@ function main_3(): int { } //! CHECKER Check external inlining with possible ArrayIndexOutOfBounds -//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_3.ETSGLOBAL::main_4" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_3.ETSGLOBAL::main_4" //! EVENT /Inline,ext_inlining_3.ETSGLOBAL::main_4,ext_funcs_2.ETSGLOBAL::get_arr_element,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc", entry: "ext_inlining_3.ETSGLOBAL::main_4" @@ -88,7 +88,7 @@ function main_4(): int { } //! CHECKER Check external inlining with heap allocation -//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_3.ETSGLOBAL::main_5" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_3.ETSGLOBAL::main_5" //! EVENT /Inline,ext_inlining_3.ETSGLOBAL::main_5,ext_funcs_2.ETSGLOBAL::make_array,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc", entry: "ext_inlining_3.ETSGLOBAL::main_5" @@ -98,7 +98,7 @@ function main_5(): int { } //! CHECKER Check external inlining with virtual call -//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_3.ETSGLOBAL::main_6" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_3.ETSGLOBAL::main_6" //! EVENT /Inline,ext_inlining_3.ETSGLOBAL::main_6,ext_funcs_2.ETSGLOBAL::stringify,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc", entry: "ext_inlining_3.ETSGLOBAL::main_6" @@ -113,7 +113,7 @@ function main_6(): int { } //! CHECKER Check external inlining with possible ZeroDivision -//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_3.ETSGLOBAL::main_7" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_3.ETSGLOBAL::main_7" //! EVENT /Inline,ext_inlining_3.ETSGLOBAL::main_7,ext_funcs_2.ETSGLOBAL::safe_div,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_3.checked/ext_funcs_2.abc", entry: "ext_inlining_3.ETSGLOBAL::main_7" diff --git a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_4.ets b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_4.ets index e2c93f3669..b5259d1231 100644 --- a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_4.ets +++ b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_4.ets @@ -19,7 +19,7 @@ import { maybe_throw } from "./ext_funcs_3.ets"; import { sum_array } from "./ext_funcs_3.ets"; //! CHECKER Check deep external inlining -//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_4.ETSGLOBAL::main_0" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_4.ETSGLOBAL::main_0" //! EVENT /Inline,ext_funcs_3.ETSGLOBAL::B,ext_funcs_3.ETSGLOBAL::C,.*,STATIC,SUCCESS/ //! EVENT /Inline,ext_funcs_3.ETSGLOBAL::A,ext_funcs_3.ETSGLOBAL::B,.*,STATIC,SUCCESS/ //! EVENT /Inline,ext_inlining_4.ETSGLOBAL::main_0,ext_funcs_3.ETSGLOBAL::A,.*,STATIC,SUCCESS/ @@ -34,7 +34,7 @@ function main_0(): int { } //! CHECKER Check inline external method and inline internal method inside (no exception) -//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_4.ETSGLOBAL::main_1" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_4.ETSGLOBAL::main_1" //! EVENT /Inline,ext_funcs_3.ETSGLOBAL::risky,ext_funcs_3.ETSGLOBAL::maybe_throw,.*,STATIC,SUCCESS/ //! EVENT /Inline,ext_inlining_4.ETSGLOBAL::main_1,ext_funcs_3.ETSGLOBAL::risky,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc", entry: "ext_inlining_4.ETSGLOBAL::main_1" @@ -49,7 +49,7 @@ function main_1(): int { } //! CHECKER Check inline external method and inline internal method inside (exception) -//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_4.ETSGLOBAL::main_2" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_4.ETSGLOBAL::main_2" //! EVENT /Inline,ext_funcs_3.ETSGLOBAL::risky,ext_funcs_3.ETSGLOBAL::maybe_throw,.*,STATIC,SUCCESS/ //! EVENT /Inline,ext_inlining_4.ETSGLOBAL::main_2,ext_funcs_3.ETSGLOBAL::risky,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc", entry: "ext_inlining_4.ETSGLOBAL::main_2" @@ -67,7 +67,7 @@ function main_2(): int { } //! CHECKER Check exception inside of external inlined method -//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_4.ETSGLOBAL::main_3" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_4.ETSGLOBAL::main_3" //! EVENT /Inline,ext_inlining_4.ETSGLOBAL::main_3,ext_funcs_3.ETSGLOBAL::maybe_throw,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc", entry: "ext_inlining_4.ETSGLOBAL::main_3" //! EVENT /Exception,ext_funcs_3.ETSGLOBAL::maybe_throw,.*,THROW/ @@ -90,7 +90,7 @@ function main_3(): int { } //! CHECKER Check deoptimization inside of external inlined method -//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_4.ETSGLOBAL::main_4" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_4.ETSGLOBAL::main_4" //! EVENT /Inline,ext_inlining_4.ETSGLOBAL::main_4,ext_funcs_3.ETSGLOBAL::sum_array,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_4.checked/ext_funcs_3.abc", entry: "ext_inlining_4.ETSGLOBAL::main_4" //! EVENT /DeoptimizationReason,ext_funcs_3.ETSGLOBAL::sum_array,BOUNDS_CHECK_WITH_DEOPT/ diff --git a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_5.ets b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_5.ets index ffde836757..98aec9ca19 100644 --- a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_5.ets +++ b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_5.ets @@ -16,7 +16,7 @@ import { middle } from "./ext_funcs_4_1.ets"; //! CHECKER Check external inlining with deoptimization -//! RUN_PAOC options: "--panda-files=../../ext_inlining_5.checked/ext_funcs_4.abc:../../ext_inlining_5.checked/ext_funcs_4_1.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_5.ETSGLOBAL::main_1" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_5.checked/ext_funcs_4.abc:../../ext_inlining_5.checked/ext_funcs_4_1.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_5.ETSGLOBAL::main_1" //! EVENT /Inline,ext_funcs_4_1.ETSGLOBAL::middle,ext_funcs_4.ETSGLOBAL::risky_array,.*,STATIC,SUCCESS/ //! EVENT /Inline,ext_inlining_5.ETSGLOBAL::main_1,ext_funcs_4_1.ETSGLOBAL::middle,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_5.checked/ext_funcs_4.abc:../../ext_inlining_5.checked/ext_funcs_4_1.abc", entry: "ext_inlining_5.ETSGLOBAL::main_1" diff --git a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_6.ets b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_6.ets index b571978480..4151fff81e 100644 --- a/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_6.ets +++ b/static_core/plugins/ets/tests/checked/external_inlining/ext_inlining_6.ets @@ -17,7 +17,7 @@ import { top } from "./ext_funcs_5.ets"; import { top2 } from "./ext_funcs_5.ets"; //! CHECKER Check external inlining with 3 files -//! RUN_PAOC options: "--panda-files=../../ext_inlining_6.checked/ext_funcs_5.abc:../../ext_inlining_6.checked/ext_funcs_4.abc:../../ext_inlining_6.checked/ext_funcs_4_1.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_6.ETSGLOBAL::main_1" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_6.checked/ext_funcs_5.abc:../../ext_inlining_6.checked/ext_funcs_4.abc:../../ext_inlining_6.checked/ext_funcs_4_1.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_6.ETSGLOBAL::main_1" //! EVENT /Inline,ext_funcs_5.ETSGLOBAL::top,ext_funcs_4_1.ETSGLOBAL::compute,.*,STATIC,SUCCESS/ //! EVENT /Inline,ext_inlining_6.ETSGLOBAL::main_1,ext_funcs_5.ETSGLOBAL::top,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_6.checked/ext_funcs_5.abc:../../ext_inlining_6.checked/ext_funcs_4.abc:../../ext_inlining_6.checked/ext_funcs_4_1.abc", entry: "ext_inlining_6.ETSGLOBAL::main_1" @@ -32,7 +32,7 @@ function main_1(): int { } //! CHECKER Check external inlining with 3 files 2 -//! RUN_PAOC options: "--panda-files=../../ext_inlining_6.checked/ext_funcs_5.abc:../../ext_inlining_6.checked/ext_funcs_4.abc:../../ext_inlining_6.checked/ext_funcs_4_1.abc --log-level=debug --log-components=compiler --compiler-log=inlining", entry: "ext_inlining_6.ETSGLOBAL::main_2" +//! RUN_PAOC options: "--panda-files=../../ext_inlining_6.checked/ext_funcs_5.abc:../../ext_inlining_6.checked/ext_funcs_4.abc:../../ext_inlining_6.checked/ext_funcs_4_1.abc --compiler-inline-external-methods-aot=true", entry: "ext_inlining_6.ETSGLOBAL::main_2" //! EVENT /Inline,ext_funcs_5.ETSGLOBAL::top2,ext_funcs_4_1.ETSGLOBAL::compute2,.*,STATIC,SUCCESS/ //! EVENT /Inline,ext_inlining_6.ETSGLOBAL::main_2,ext_funcs_5.ETSGLOBAL::top2,.*,STATIC,SUCCESS/ //! RUN options: "--panda-files=../../ext_inlining_6.checked/ext_funcs_5.abc:../../ext_inlining_6.checked/ext_funcs_4.abc:../../ext_inlining_6.checked/ext_funcs_4_1.abc", entry: "ext_inlining_6.ETSGLOBAL::main_2" diff --git a/static_core/plugins/ets/tests/checked/inlining_test/inline_external_test.ets b/static_core/plugins/ets/tests/checked/inlining_test/inline_external_test.ets index 197be83d42..3a0ca5f37c 100644 --- a/static_core/plugins/ets/tests/checked/inlining_test/inline_external_test.ets +++ b/static_core/plugins/ets/tests/checked/inlining_test/inline_external_test.ets @@ -14,7 +14,7 @@ */ //! CHECKER Check retrieving external method info during deoptimization -//! RUN_PAOC options: "--panda-files=../../inline_external_test.checked/external_file_1.abc:../../inline_external_test.checked/external_file_2.abc:../../inline_external_test.checked/external_file_3.abc --paoc-use-cha=true" +//! RUN_PAOC options: "--panda-files=../../inline_external_test.checked/external_file_1.abc:../../inline_external_test.checked/external_file_2.abc:../../inline_external_test.checked/external_file_3.abc --paoc-use-cha=true --compiler-inline-external-methods-aot=true" //! METHOD "inline_external_test.ETSGLOBAL::main" //! PASS_AFTER "IrBuilder" //! INST /CallStatic.*B::array_test/ diff --git a/static_core/tests/checked/inline-external-constructor.pa b/static_core/tests/checked/inline-external-constructor.pa index 95d09889d1..ebb8ca38c2 100644 --- a/static_core/tests/checked/inline-external-constructor.pa +++ b/static_core/tests/checked/inline-external-constructor.pa @@ -14,7 +14,7 @@ #! CHECKER ark_aot inlines external constructor #! SKIP_IF @architecture == "arm32" -#! RUN_PAOC options: "" +#! RUN_PAOC options: "--compiler-inline-external-methods-aot=true" #! EVENT /Inline,_GLOBAL::bar,Test::.ctor,.*STATIC,SUCCESS/ .record Test diff --git a/static_core/tests/checked/inline.pa b/static_core/tests/checked/inline.pa index fcac378b8c..1299dbb353 100644 --- a/static_core/tests/checked/inline.pa +++ b/static_core/tests/checked/inline.pa @@ -306,7 +306,7 @@ exit: } #! CHECKER Inline external files in AOT mode -#! RUN_PAOC options: "--panda-files=../../inline_external.checked/test.abc --paoc-use-cha=true --compiler-regex=Test4.*" +#! RUN_PAOC options: "--panda-files=../../inline_external.checked/test.abc --paoc-use-cha=true --compiler-inline-external-methods-aot=true --compiler-regex=Test4.*" #! METHOD "Test4::func_A_getConst_static__noinline__" #! PASS_AFTER "IrBuilder" #! INST /CallStatic.*A::getConst/ @@ -403,7 +403,7 @@ exit: #! RUN options: "--panda-files=../../inline_external.checked/test.abc", entry: "Test4::main" #! CHECKER Inline external files in LLVM AOT mode -#! RUN_LLVM options: "--panda-files=../../inline_external.checked/test.abc --paoc-use-cha=true --compiler-regex=Test4.*" +#! RUN_LLVM options: "--panda-files=../../inline_external.checked/test.abc --paoc-use-cha=true --compiler-inline-external-methods-aot=true --compiler-regex=Test4.*" #! METHOD "Test4::func_A_getConst_static__noinline__" #! PASS_AFTER "IrBuilder" #! INST /CallStatic.*A::getConst/ @@ -498,7 +498,7 @@ exit: #! RUN options: "--panda-files=../../inline_external.checked/test.abc", entry: "Test4::main" #! CHECKER CallVirtual for external method is replaced with CallStatic -#! RUN_PAOC options: "--panda-files=../../inline_external.checked/test.abc --paoc-use-cha=true \ +#! RUN_PAOC options: "--panda-files=../../inline_external.checked/test.abc --paoc-use-cha=true --compiler-inline-external-methods-aot=true \ #! --compiler-regex=Test4.* --compiler-inlining-max-insts=0 --compiler-inlining-always-inline-bc-size=0" #! METHOD "Test4::func_A_complexMethod__noinline__" #! PASS_AFTER "IrBuilder" -- Gitee