From a73460b7c53315a6fc0c62b1f02680a0c5c4a8e4 Mon Sep 17 00:00:00 2001 From: Andrey Efremov Date: Tue, 16 Jan 2024 21:50:30 +0300 Subject: [PATCH] Fix plugin files for pipeline in GN build Also refactor usage of plugin options in templates Issue: https://gitee.com/openharmony/arkcompiler_runtime_core/issues/I8X0RQ?from=project-issue Testing: build, internal pipeline Change-Id: Ibfadf3a72a7470e340953a572e2a8afa53706f7e Signed-off-by: Andrey Efremov --- compiler/CMakeLists.txt | 3 +-- ...ugin_create_pipeline.h => ecma_create_pipeline.inl} | 0 ...ipeline_includes.h => ecma_pipeline_includes.inl.h} | 0 ecmascript_plugin_options.yaml | 1 + subproject_sources.gn | 10 ++++++++++ 5 files changed, 12 insertions(+), 2 deletions(-) rename compiler/plugin_files/{plugin_create_pipeline.h => ecma_create_pipeline.inl} (100%) rename compiler/plugin_files/{plugin_create_pipeline_includes.h => ecma_pipeline_includes.inl.h} (100%) diff --git a/compiler/CMakeLists.txt b/compiler/CMakeLists.txt index 52d756aa2..9aa50a4f3 100644 --- a/compiler/CMakeLists.txt +++ b/compiler/CMakeLists.txt @@ -47,7 +47,6 @@ panda_target_include_directories(arkcompiler PUBLIC add_inst_templates(${CMAKE_CURRENT_SOURCE_DIR}/optimizer/ir_builder/ecmascript_inst_templates.yaml) -add_merge_plugin(PLUGIN_NAME "create_pipeline.h" INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/plugin_files/plugin_create_pipeline.h") -add_merge_plugin(PLUGIN_NAME "create_pipeline_includes.h" INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/plugin_files/plugin_create_pipeline_includes.h") +add_merge_plugin(PLUGIN_NAME "create_pipeline.inl" INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/plugin_files/ecma_create_pipeline.inl") add_compiler_options(${CMAKE_CURRENT_SOURCE_DIR}/ecma_compiler.yaml) diff --git a/compiler/plugin_files/plugin_create_pipeline.h b/compiler/plugin_files/ecma_create_pipeline.inl similarity index 100% rename from compiler/plugin_files/plugin_create_pipeline.h rename to compiler/plugin_files/ecma_create_pipeline.inl diff --git a/compiler/plugin_files/plugin_create_pipeline_includes.h b/compiler/plugin_files/ecma_pipeline_includes.inl.h similarity index 100% rename from compiler/plugin_files/plugin_create_pipeline_includes.h rename to compiler/plugin_files/ecma_pipeline_includes.inl.h diff --git a/ecmascript_plugin_options.yaml b/ecmascript_plugin_options.yaml index 6d917f86a..52a1b51b7 100644 --- a/ecmascript_plugin_options.yaml +++ b/ecmascript_plugin_options.yaml @@ -37,6 +37,7 @@ function_codegen_epilogue: GenerateEcmascriptEnvInEpilogue load_object_dynamic_codegen: GenerateLoadObjectDynamic store_object_dynamic_codegen: GenerateStoreObjectDynamic + pipeline_includes: plugins/ecmascript/compiler/plugin_files/ecma_pipeline_includes.inl.h compiler_base_types: header_path_implementation_codegen: plugins/ecmascript/compiler/optimizer/code_generator/compiler_base_types.h func_compare_implementation_codegen: panda::compiler::ecmascript::CompareAnyTypeGen diff --git a/subproject_sources.gn b/subproject_sources.gn index e3e263e63..d6fe3f1e3 100644 --- a/subproject_sources.gn +++ b/subproject_sources.gn @@ -45,6 +45,16 @@ irtoc_plugins = [ "irtoc_scripts/interpreter_main_loop.irt", ] +create_pipeline = "compiler/plugin_files/ecma_create_pipeline.inl" +read_profile = "runtime/profiling/plugin_read_profile.h" +destroy_profile = "runtime/profiling/plugin_destroy_profile.h" +find_method_in_profile = "runtime/profiling/plugin_find_method_in_profile.h" +dump_profile = "runtime/profiling/plugin_dump_profile.h" +clear_profile = "runtime/profiling/plugin_clear_profile.h" +profiling_includes = "runtime/profiling/plugin_profiling_includes.h" +profiling_includes_disasm = "runtime/profiling/plugin_profiling_includes_disasm.h" +get_profiling_any_type = "runtime/profiling/plugin_get_profiling_any_type.h" + arkruntime_header_sub_deps = [ "$_plugin_dir:ecma_builtins_gen_builtins_declaration_gen_h", "$_plugin_dir:ecma_builtins_gen_builtins_ids_gen_inl", -- Gitee