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

!9730 回退解决mac编译问题

Browse Source 
Merge pull request !9730 from oh_ci/cherry-pick-1728870066
This commit is contained in:
oh_ci 2024-10-14 03:12:49 +00:00 committed by Gitee
commit a38f6ff11b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
41 changed files with 406 additions and 579 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
BUILD.gn
View File

@ -1046,7 +1046,6 @@ config("include_llvm") {
} }
} }
} }
cflags_cc = [ "-DARK_GC_SUPPORT" ]
} }
if (is_mingw) { if (is_mingw) {
@ -1108,7 +1107,8 @@ libark_jsruntime_common_set("libark_jsruntime_set") {
} }
libark_jsruntime_common_set("libark_jsruntime_arm_set") { libark_jsruntime_common_set("libark_jsruntime_arm_set") {
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }
@ -1119,7 +1119,8 @@ libark_jsruntime_intl_common_set("libark_js_intl_set") {
} }
libark_jsruntime_intl_common_set("libark_js_intl_arm_set") { libark_jsruntime_intl_common_set("libark_js_intl_arm_set") {
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }
@ -1222,7 +1223,8 @@ ohos_source_set("libark_jsruntime_test_set") {
ohos_source_set("libark_jsruntime_static") { ohos_source_set("libark_jsruntime_static") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }
@ -1265,7 +1267,8 @@ ohos_source_set("libark_jsruntime_static") {
ohos_shared_library("libark_jsruntime") { ohos_shared_library("libark_jsruntime") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }

180
ecmascript/compiler/BUILD.gn
View File

@ -17,6 +17,53 @@ if (defined(timeout)) {
} else { } else {
_timeout_ = 1200 _timeout_ = 1200
} }
config("include_llvm") {
if (compile_llvm_online) {
include_dirs = [
"//third_party/third_party_llvm-project/build/include",
"//third_party/third_party_llvm-project/llvm/include/",
]
} else {
if (is_mingw) {
include_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_windows/llvm/include",
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_windows/build/include",
]
} else if (is_mac) {
if (host_cpu == "arm64") {
include_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_darwin_arm64/llvm/include",
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_darwin_arm64/build/include",
]
} else {
include_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_darwin_x64/llvm/include",
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_darwin_x64/build/include",
]
}
} else {
if (host_cpu == "arm64" && host_os == "linux") {
include_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_linux_aarch64/llvm/include",
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_linux_aarch64/build/include",
]
} else {
if (current_cpu == "arm64") {
include_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_aarch64/llvm/include",
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_aarch64/build/include",
]
} else {
include_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts/llvm/include",
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts/build/include",
]
}
}
}
}
cflags_cc = [ "-DARK_GC_SUPPORT" ]
}
config("include_maple") { config("include_maple") {
include_dirs = [ include_dirs = [
@ -178,7 +225,103 @@ config("libark_jsoptimizer_set_config") {
cflags_c = [ "-DIS_RELEASE_VERSION" ] cflags_c = [ "-DIS_RELEASE_VERSION" ]
cflags_cc = [ "-DIS_RELEASE_VERSION" ] cflags_cc = [ "-DIS_RELEASE_VERSION" ]
} }
libs = []
if (compile_llvm_online) {
lib_dirs = [ "//third_party/third_party_llvm-project/build/lib" ]
} else {
if (is_mingw) {
lib_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_windows/build/lib",
"//prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/x86_64-w64-mingw32",
]
} else if (is_mac) {
if (host_cpu == "arm64") {
lib_dirs = [ "//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_darwin_arm64/build/lib" ]
} else {
lib_dirs = [ "//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_darwin_x64/build/lib" ]
}
} else {
if (host_cpu == "arm64" && host_os == "linux") {
lib_dirs = [ "//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_linux_aarch64/build/lib" ]
} else {
if (current_cpu == "arm64") {
lib_dirs = [ "//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_aarch64/build/lib" ]
} else {
lib_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts/build/lib",
]
}
}
}
}
libs = [
"LLVMTarget",
"LLVMObject",
"LLVMMC",
"LLVMSupport",
"LLVMCore",
"LLVMExecutionEngine",
"LLVMInterpreter",
"LLVMMCJIT",
"LLVMExegesis",
"LLVMRuntimeDyld",
"LLVMInstCombine",
"LLVMAnalysis",
"LLVMScalarOpts",
"LLVMBinaryFormat",
"LLVMDebugInfoDWARF",
"LLVMRemarks",
"LLVMTextAPI",
"LLVMScalarOpts",
"LLVMTransformUtils",
"LLVMBitReader",
"LLVMAsmPrinter",
"LLVMProfileData",
"LLVMBitstreamReader",
"LLVMSelectionDAG",
"LLVMGlobalISel",
"LLVMLTO",
"LLVMCFGuard",
"LLVMVectorize",
"LLVMDemangle",
"LLVMipo",
"LLVMInstrumentation",
"LLVMDebugInfoCodeView",
"LLVMAggressiveInstCombine",
"LLVMAsmParser",
"LLVMMCParser",
"LLVMMIRParser",
"LLVMMCDisassembler",
"LLVMCodeGen",
"LLVMTransformUtils",
"LLVMIRReader",
"LLVMAArch64Utils",
"LLVMAArch64CodeGen",
"LLVMAArch64Info",
"LLVMAArch64Desc",
"LLVMAArch64Disassembler",
"LLVMAArch64AsmParser",
"LLVMFrontendOpenMP",
"LLVMBitWriter",
]
if (!is_mac && !is_ios) {
libs += [ "LLVMParts" ]
}
# Only support compiling aarch64 target at device-side(arm64 platform).
# So these os-related libs of x86 are not needed on arm64 platform.
if (is_mac || current_cpu != "arm64") {
libs += [
"LLVMX86AsmParser",
"LLVMX86CodeGen",
"LLVMX86Desc",
"LLVMX86Disassembler",
"LLVMX86Info",
]
}
if (is_mingw) { if (is_mingw) {
libs += [ libs += [
"kernel32", "kernel32",
@ -203,7 +346,7 @@ ohos_source_set("libark_jsoptimizer_set") {
sources += [ "$js_root/ecmascript/platform/unix/code_sign.cpp" ] sources += [ "$js_root/ecmascript/platform/unix/code_sign.cpp" ]
} }
public_configs = [ public_configs = [
"$js_root:include_llvm", ":include_llvm",
"$js_root:ark_jsruntime_compiler_config", "$js_root:ark_jsruntime_compiler_config",
"$js_root:ark_jsruntime_public_config", "$js_root:ark_jsruntime_public_config",
":libark_jsoptimizer_set_config", ":libark_jsoptimizer_set_config",
@ -216,7 +359,6 @@ ohos_source_set("libark_jsoptimizer_set") {
} else { } else {
deps += [ "$ark_root/libpandafile:arkfile_header_deps" ] deps += [ "$ark_root/libpandafile:arkfile_header_deps" ]
} }
deps += [ "${LLVM_LIB_ROOT}:libark_llvmcodegen_set" ]
# hiviewdfx libraries # hiviewdfx libraries
external_deps += hiviewdfx_ext_deps external_deps += hiviewdfx_ext_deps
@ -233,14 +375,6 @@ config("enable_maple_config") {
ohos_source_set("libark_jsoptimizer_set_with_maple") { ohos_source_set("libark_jsoptimizer_set_with_maple") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
sources = libark_jsoptimizer_sources sources = libark_jsoptimizer_sources
if (enable_local_code_sign) { if (enable_local_code_sign) {
sources += [ "$js_root/ecmascript/platform/unix/ohos/code_sign.cpp" ] sources += [ "$js_root/ecmascript/platform/unix/ohos/code_sign.cpp" ]
@ -257,7 +391,7 @@ ohos_source_set("libark_jsoptimizer_set_with_maple") {
"codegen/maple/litecg_ir_builder.cpp", "codegen/maple/litecg_ir_builder.cpp",
] ]
public_configs = [ public_configs = [
"$js_root:include_llvm", ":include_llvm",
":include_maple", ":include_maple",
"$js_root:ark_jsruntime_compiler_config", "$js_root:ark_jsruntime_compiler_config",
"$js_root:ark_jsruntime_public_config", "$js_root:ark_jsruntime_public_config",
@ -281,11 +415,6 @@ ohos_source_set("libark_jsoptimizer_set_with_maple") {
} }
deps = [] deps = []
if (is_ohos) {
deps += [ "${LLVM_LIB_ROOT}:libark_llvmcodegen" ]
} else {
deps += [ "${LLVM_LIB_ROOT}:libark_llvmcodegen_set" ]
}
if (!is_arkui_x) { if (!is_arkui_x) {
external_deps += [ "runtime_core:arkfile_header_deps" ] external_deps += [ "runtime_core:arkfile_header_deps" ]
} else { } else {
@ -301,7 +430,8 @@ ohos_source_set("libark_jsoptimizer_set_with_maple") {
ohos_source_set("libark_stub_set") { ohos_source_set("libark_stub_set") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }
@ -331,14 +461,11 @@ ohos_source_set("libark_mock_stub_set") {
ohos_shared_library("libark_jsoptimizer") { ohos_shared_library("libark_jsoptimizer") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
ubsan = true ubsan = true
} }
branch_protector_ret = "pac_ret"
} }
deps = [ deps = [
":libark_jsoptimizer_set_with_maple", ":libark_jsoptimizer_set_with_maple",
@ -379,7 +506,7 @@ ohos_executable("ark_stub_compiler") {
include_dirs = [ "$target_gen_dir" ] include_dirs = [ "$target_gen_dir" ]
configs = [ configs = [
"$js_root:include_llvm", ":include_llvm",
"$js_root:ark_jsruntime_compiler_config", "$js_root:ark_jsruntime_compiler_config",
"$js_root:ark_jsruntime_public_config", "$js_root:ark_jsruntime_public_config",
] ]
@ -423,14 +550,15 @@ ohos_executable("ark_stub_compiler") {
} }
ohos_executable("ark_aot_compiler") { ohos_executable("ark_aot_compiler") {
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }
} }
sources = [ "aot_compiler.cpp" ] sources = [ "aot_compiler.cpp" ]
configs = [ configs = [
"$js_root:include_llvm", ":include_llvm",
":include_maple", ":include_maple",
"$js_root:ark_jsruntime_compiler_config", "$js_root:ark_jsruntime_compiler_config",
"$js_root:ark_jsruntime_public_config", "$js_root:ark_jsruntime_public_config",

4
ecmascript/compiler/assembler/assembler.h
View File

@ -199,7 +199,7 @@ public:
buffer_.EmitU16(v); buffer_.EmitU16(v);
} }
ARK_INLINE void EmitU32(uint32_t v) void EmitU32(uint32_t v)
{ {
buffer_.EmitU32(v); buffer_.EmitU32(v);
#ifdef JIT_ENABLE_CODE_SIGN #ifdef JIT_ENABLE_CODE_SIGN
@ -228,7 +228,7 @@ public:
buffer_.PutU8(offset, static_cast<int8_t>(data)); buffer_.PutU8(offset, static_cast<int8_t>(data));
} }
ARK_INLINE void PutI32(size_t offset, int32_t data) void PutI32(size_t offset, int32_t data)
{ {
buffer_.PutU32(offset, static_cast<int32_t>(data)); buffer_.PutU32(offset, static_cast<int32_t>(data));
#ifdef JIT_ENABLE_CODE_SIGN #ifdef JIT_ENABLE_CODE_SIGN

10
ecmascript/compiler/baseline/baseline_compiler.cpp
View File

@ -16,7 +16,6 @@
#include "ecmascript/compiler/baseline/baseline_compiler.h" #include "ecmascript/compiler/baseline/baseline_compiler.h"
#include "ecmascript/compiler/bytecode_info_collector.h" #include "ecmascript/compiler/bytecode_info_collector.h"
#include "ecmascript/js_function.h" #include "ecmascript/js_function.h"
#include "ecmascript/compiler/jit_compiler.h"
#ifdef JIT_ENABLE_CODE_SIGN #ifdef JIT_ENABLE_CODE_SIGN
#include "jit_buffer_integrity.h" #include "jit_buffer_integrity.h"
#include "ecmascript/compiler/jit_signcode.h" #include "ecmascript/compiler/jit_signcode.h"
@ -107,7 +106,7 @@ void BaselineCompiler::SetPfHeaderAddr(const JSPandaFile *jsPandaFile)
pfHeaderAddr = pandaFile->GetBase(); pfHeaderAddr = pandaFile->GetBase();
} }
static ARK_INLINE void SetupCodeSigner([[maybe_unused]] EcmaVM *vm) static void SetupCodeSigner([[maybe_unused]] EcmaVM *vm)
{ {
#ifdef JIT_ENABLE_CODE_SIGN #ifdef JIT_ENABLE_CODE_SIGN
bool enableCodeSign = !vm->GetJSOptions().GetDisableCodeSign(); bool enableCodeSign = !vm->GetJSOptions().GetDisableCodeSign();
@ -177,7 +176,7 @@ void BaselineCompiler::Compile(const JSPandaFile *jsPandaFile, const MethodLiter
} }
} }
bool BaselineCompiler::CollectMemoryCodeInfos(MachineCodeDesc &codeDesc) void BaselineCompiler::CollectMemoryCodeInfos(MachineCodeDesc &codeDesc)
{ {
codeDesc.codeAddr = reinterpret_cast<uint64_t>(GetBaselineAssembler().GetBuffer()); codeDesc.codeAddr = reinterpret_cast<uint64_t>(GetBaselineAssembler().GetBuffer());
codeDesc.codeSize = GetBaselineAssembler().GetBufferSize(); codeDesc.codeSize = GetBaselineAssembler().GetBufferSize();
@ -193,11 +192,6 @@ bool BaselineCompiler::CollectMemoryCodeInfos(MachineCodeDesc &codeDesc)
codeDesc.codeSigner = reinterpret_cast<uintptr_t>(singleton->GetCodeSigner()); codeDesc.codeSigner = reinterpret_cast<uintptr_t>(singleton->GetCodeSigner());
} }
#endif #endif
if (Jit::GetInstance()->IsEnableJitFort() && Jit::GetInstance()->IsEnableAsyncCopyToFort() &&
JitCompiler::AllocFromFortAndCopy(*compilationEnv, codeDesc) == false) {
return false;
}
return true;
} }
void BaselineCompiler::GetJumpToOffsets(const uint8_t *start, const uint8_t *end, void BaselineCompiler::GetJumpToOffsets(const uint8_t *start, const uint8_t *end,

8
ecmascript/compiler/baseline/baseline_compiler.h
View File

@ -21,7 +21,6 @@
#include "ecmascript/mem/machine_code.h" #include "ecmascript/mem/machine_code.h"
#include "ecmascript/compiler/baseline/baseline_assembler.h" #include "ecmascript/compiler/baseline/baseline_assembler.h"
#include "ecmascript/compiler/ecma_opcode_des.h" #include "ecmascript/compiler/ecma_opcode_des.h"
#include "ecmascript/compiler/jit_compilation_env.h"
namespace panda::ecmascript::kungfu { namespace panda::ecmascript::kungfu {
@ -60,8 +59,8 @@ private:
class BaselineCompiler { class BaselineCompiler {
public: public:
explicit BaselineCompiler(EcmaVM *inputVM, CompilationEnv *inputEnv) explicit BaselineCompiler(EcmaVM *inputVM)
: vm(inputVM), compilationEnv(inputEnv), baselineAssembler(vm->GetJSOptions().GetTargetTriple()) {} : vm(inputVM), baselineAssembler(vm->GetJSOptions().GetTargetTriple()) {}
~BaselineCompiler() ~BaselineCompiler()
{ {
@ -81,14 +80,13 @@ public:
return baselineAssembler; return baselineAssembler;
} }
bool CollectMemoryCodeInfos(MachineCodeDesc &codeDesc); void CollectMemoryCodeInfos(MachineCodeDesc &codeDesc);
void SetPfHeaderAddr(const JSPandaFile *jsPandaFile); void SetPfHeaderAddr(const JSPandaFile *jsPandaFile);
void GetJumpToOffsets(const uint8_t *start, const uint8_t *end, std::unordered_set<size_t> &jumpToOffsets) const; void GetJumpToOffsets(const uint8_t *start, const uint8_t *end, std::unordered_set<size_t> &jumpToOffsets) const;
private: private:
EcmaVM *vm = nullptr; EcmaVM *vm = nullptr;
CompilationEnv *compilationEnv = nullptr;
BaselineAssembler baselineAssembler; BaselineAssembler baselineAssembler;
size_t bytecodeOffset = 0; size_t bytecodeOffset = 0;
std::unordered_map<size_t, JumpLabel*> jumpMap; std::unordered_map<size_t, JumpLabel*> jumpMap;

154
ecmascript/compiler/codegen/llvm/lib/BUILD.gn
View File

@ -1,154 +0,0 @@
# Copyright (c) 2024 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.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
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
import("//arkcompiler/ets_runtime/js_runtime_config.gni")
config("libark_llvmcodegen_set_config") {
if (compile_llvm_online) {
lib_dirs = [ "//third_party/third_party_llvm-project/build/lib" ]
} else {
if (is_mingw) {
lib_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_windows/build/lib",
"//prebuilts/mingw-w64/ohos/linux-x86_64/clang-mingw/x86_64-w64-mingw32",
]
} else if (is_mac) {
if (host_cpu == "arm64") {
lib_dirs = [ "//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_darwin_arm64/build/lib" ]
} else {
lib_dirs = [ "//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_darwin_x64/build/lib" ]
}
} else {
if (host_cpu == "arm64" && host_os == "linux") {
lib_dirs = [ "//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_linux_aarch64/build/lib" ]
} else {
if (current_cpu == "arm64") {
lib_dirs = [ "//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts_aarch64/build/lib" ]
} else {
lib_dirs = [
"//prebuilts/ark_tools/ark_js_prebuilts/llvm_prebuilts/build/lib",
]
}
}
}
}
libs = [
"LLVMTarget",
"LLVMObject",
"LLVMMC",
"LLVMSupport",
"LLVMCore",
"LLVMExecutionEngine",
"LLVMInterpreter",
"LLVMMCJIT",
"LLVMExegesis",
"LLVMRuntimeDyld",
"LLVMInstCombine",
"LLVMAnalysis",
"LLVMScalarOpts",
"LLVMBinaryFormat",
"LLVMDebugInfoDWARF",
"LLVMRemarks",
"LLVMTextAPI",
"LLVMScalarOpts",
"LLVMTransformUtils",
"LLVMBitReader",
"LLVMAsmPrinter",
"LLVMProfileData",
"LLVMBitstreamReader",
"LLVMSelectionDAG",
"LLVMGlobalISel",
"LLVMLTO",
"LLVMCFGuard",
"LLVMVectorize",
"LLVMDemangle",
"LLVMipo",
"LLVMInstrumentation",
"LLVMDebugInfoCodeView",
"LLVMAggressiveInstCombine",
"LLVMAsmParser",
"LLVMMCParser",
"LLVMMIRParser",
"LLVMMCDisassembler",
"LLVMCodeGen",
"LLVMTransformUtils",
"LLVMIRReader",
"LLVMAArch64Utils",
"LLVMAArch64CodeGen",
"LLVMAArch64Info",
"LLVMAArch64Desc",
"LLVMAArch64Disassembler",
"LLVMAArch64AsmParser",
"LLVMFrontendOpenMP",
"LLVMBitWriter",
]
if (!is_mac && !is_ios) {
libs += [ "LLVMParts" ]
}
# Only support compiling aarch64 target at device-side(arm64 platform).
# So these os-related libs of x86 are not needed on arm64 platform.
if (is_mac || current_cpu != "arm64") {
libs += [
"LLVMX86AsmParser",
"LLVMX86CodeGen",
"LLVMX86Desc",
"LLVMX86Disassembler",
"LLVMX86Info",
]
}
}
ohos_source_set("libark_llvmcodegen_set") {
stack_protector_ret = false
public_configs = [
"$js_root:include_llvm",
"$js_root:ark_jsruntime_public_config",
":libark_llvmcodegen_set_config",
]
sources = [ "llvm_interface.cpp" ]
part_name = "ets_runtime"
subsystem_name = "arkcompiler"
}
ohos_shared_library("libark_llvmcodegen") {
stack_protector_ret = false
deps = [ ":libark_llvmcodegen_set" ]
_used_symbols = [
"LLVMGetInlineAsm",
"LLVMPassManagerBuilderCreate",
"LLVMCreateSimpleMCJITMemoryManager",
"LLVMLinkInMCJIT",
"LLVMVerifyModule",
"LLVMCreateDisasm",
"LLVMCreateRewriteStatepointsForGCLegacyPass",
"LLVMLinkAllBuiltinGCs",
"LLVMInitializeAArch64Target",
"LLVMInitializeAArch64AsmParser",
"LLVMInitializeAArch64Disassembler",
"LLVMInitializeAArch64AsmPrinter",
]
ldflags = []
foreach(symbol, _used_symbols) {
ldflags += [ "-Wl,-u," + symbol ]
}
install_enable = true
if (!is_mingw && !is_mac) {
output_extension = "so"
}
part_name = "ets_runtime"
subsystem_name = "arkcompiler"
}

45
ecmascript/compiler/codegen/llvm/lib/llvm_interface.cpp
View File

@ -1,45 +0,0 @@
/*
* Copyright (c) 2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.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
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "llvm_interface.h"
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wshadow"
#pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#include "llvm/Transforms/Scalar.h"
#if defined(PANDA_TARGET_MACOS)
#include "llvm/CodeGen/BuiltinGCs.h"
#else
#include "llvm/IR/BuiltinGCs.h"
#endif
llvm::ModulePass *LLVMCreateRewriteStatepointsForGCLegacyPass()
{
return llvm::createRewriteStatepointsForGCLegacyPass();
}
void LLVMLinkAllBuiltinGCs(void)
{
llvm::linkAllBuiltinGCs();
}

41
ecmascript/compiler/codegen/llvm/lib/llvm_interface.h
View File

@ -1,41 +0,0 @@
/*
* Copyright (c) 2024 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.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
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ECMASCRIPT_COMPILER_LLVM_INTERFACE_H
#define ECMASCRIPT_COMPILER_LLVM_INTERFACE_H
#if defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wshadow"
#pragma clang diagnostic ignored "-Wunused-parameter"
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#elif defined(__GNUC__)
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wunused-parameter"
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
#include "llvm-c/Types.h"
#include "llvm/Pass.h"
LLVM_C_EXTERN_C_BEGIN
llvm::ModulePass *LLVMCreateRewriteStatepointsForGCLegacyPass();
void LLVMLinkAllBuiltinGCs(void);
LLVM_C_EXTERN_C_END
#endif // ECMASCRIPT_COMPILER_LLVM_IR_BUILDER_H

13
ecmascript/compiler/codegen/llvm/llvm_codegen.cpp
View File

@ -39,6 +39,11 @@
#include "llvm-c/DisassemblerTypes.h" #include "llvm-c/DisassemblerTypes.h"
#include "llvm-c/Target.h" #include "llvm-c/Target.h"
#include "llvm-c/Transforms/PassManagerBuilder.h" #include "llvm-c/Transforms/PassManagerBuilder.h"
#if defined(PANDA_TARGET_MACOS)
#include "llvm/CodeGen/BuiltinGCs.h"
#else
#include "llvm/IR/BuiltinGCs.h"
#endif
#include "llvm/DebugInfo/DWARF/DWARFContext.h" #include "llvm/DebugInfo/DWARF/DWARFContext.h"
#include "llvm/DebugInfo/DIContext.h" #include "llvm/DebugInfo/DIContext.h"
#include "llvm/ExecutionEngine/ExecutionEngine.h" #include "llvm/ExecutionEngine/ExecutionEngine.h"
@ -46,7 +51,7 @@
#include "llvm/ExecutionEngine/MCJIT.h" #include "llvm/ExecutionEngine/MCJIT.h"
#include "llvm/IR/LegacyPassManager.h" #include "llvm/IR/LegacyPassManager.h"
#include "llvm/IR/Verifier.h" #include "llvm/IR/Verifier.h"
#include "lib/llvm_interface.h" #include "llvm/Transforms/Scalar.h"
#include "ecmascript/compiler/aot_file/aot_file_info.h" #include "ecmascript/compiler/aot_file/aot_file_info.h"
#include "ecmascript/compiler/call_signature.h" #include "ecmascript/compiler/call_signature.h"
@ -429,7 +434,7 @@ void LLVMAssembler::BuildAndRunPasses()
// add pass into pass managers // add pass into pass managers
LLVMPassManagerBuilderPopulateFunctionPassManager(pmBuilder, funcPass); LLVMPassManagerBuilderPopulateFunctionPassManager(pmBuilder, funcPass);
llvm::unwrap(modPass)->add(LLVMCreateRewriteStatepointsForGCLegacyPass()); // rs4gc pass added llvm::unwrap(modPass)->add(llvm::createRewriteStatepointsForGCLegacyPass()); // rs4gc pass added
LLVMPassManagerBuilderPopulateModulePassManager(pmBuilder, modPass1); LLVMPassManagerBuilderPopulateModulePassManager(pmBuilder, modPass1);
LLVMRunPassManager(modPass, module_); LLVMRunPassManager(modPass, module_);
@ -458,7 +463,7 @@ void LLVMAssembler::BuildAndRunPassesFastMode()
// add pass into pass managers // add pass into pass managers
LLVMPassManagerBuilderPopulateFunctionPassManager(pmBuilder, funcPass); LLVMPassManagerBuilderPopulateFunctionPassManager(pmBuilder, funcPass);
llvm::unwrap(modPass)->add(LLVMCreateRewriteStatepointsForGCLegacyPass()); // rs4gc pass added llvm::unwrap(modPass)->add(llvm::createRewriteStatepointsForGCLegacyPass()); // rs4gc pass added
LLVMInitializeFunctionPassManager(funcPass); LLVMInitializeFunctionPassManager(funcPass);
for (LLVMValueRef fn = LLVMGetFirstFunction(module_); fn; fn = LLVMGetNextFunction(fn)) { for (LLVMValueRef fn = LLVMGetFirstFunction(module_); fn; fn = LLVMGetNextFunction(fn)) {
@ -553,7 +558,7 @@ void LLVMAssembler::Initialize(LOptions option)
UNREACHABLE(); UNREACHABLE();
} }
LLVMLinkAllBuiltinGCs(); llvm::linkAllBuiltinGCs();
LLVMInitializeMCJITCompilerOptions(&options_, sizeof(options_)); LLVMInitializeMCJITCompilerOptions(&options_, sizeof(options_));
options_.OptLevel = option.optLevel; options_.OptLevel = option.optLevel;
// NOTE: Just ensure that this field still exists for PIC option // NOTE: Just ensure that this field still exists for PIC option

64
ecmascript/compiler/codegen/maple/maple_be/BUILD.gn
View File

@ -173,14 +173,6 @@ src_libcg = [
ohos_source_set("libcglowerer") { ohos_source_set("libcglowerer") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libcglowerer sources = src_libcglowerer
include_dirs = include_directories include_dirs = include_directories
@ -191,14 +183,6 @@ ohos_source_set("libcglowerer") {
ohos_static_library("libmplbe") { ohos_static_library("libmplbe") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libmplbe sources = src_libmplbe
deps = deps_libmplbe deps = deps_libmplbe
@ -211,14 +195,6 @@ ohos_static_library("libmplbe") {
ohos_source_set("libcgaarch64") { ohos_source_set("libcgaarch64") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libcgaarch64 sources = src_libcgaarch64
include_dirs = include_directories include_dirs = include_directories
@ -237,14 +213,6 @@ ohos_source_set("libcgaarch64") {
ohos_source_set("libcgx8664") { ohos_source_set("libcgx8664") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libcgx8664 sources = src_libcgx8664
include_dirs = include_directories include_dirs = include_directories
@ -255,14 +223,6 @@ ohos_source_set("libcgx8664") {
ohos_source_set("libcgx86phases") { ohos_source_set("libcgx86phases") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libcgx86phases sources = src_libcgx86phases
include_dirs = include_directories include_dirs = include_directories
@ -273,14 +233,6 @@ ohos_source_set("libcgx86phases") {
ohos_static_library("libcgark") { ohos_static_library("libcgark") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libcgark sources = src_libcgark
include_dirs = include_directories include_dirs = include_directories
@ -291,14 +243,6 @@ ohos_static_library("libcgark") {
ohos_source_set("libcgphases") { ohos_source_set("libcgphases") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libcgphases sources = src_libcgphases
include_dirs = include_directories include_dirs = include_directories
@ -309,14 +253,6 @@ ohos_source_set("libcgphases") {
ohos_static_library("libcg") { ohos_static_library("libcg") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libcg sources = src_libcg
include_dirs = include_directories include_dirs = include_directories

3
ecmascript/compiler/codegen/maple/maple_be/include/be/lower.h
View File

@ -135,6 +135,9 @@ public:
BlockNode *LowerReturn(NaryStmtNode &retNode); BlockNode *LowerReturn(NaryStmtNode &retNode);
void LowerEntry(MIRFunction &func); void LowerEntry(MIRFunction &func);
StmtNode *LowerCall(CallNode &call, StmtNode *&stmt, BlockNode &block, MIRType *retty = nullptr,
bool uselvar = false);
void CleanupBranches(MIRFunction &func) const; void CleanupBranches(MIRFunction &func) const;
void LowerTypePtr(BaseNode &expr) const; void LowerTypePtr(BaseNode &expr) const;

10
ecmascript/compiler/codegen/maple/maple_be/include/cg/obj_emit.h
View File

@ -193,7 +193,7 @@ public:
exceptStartOffset = offset; exceptStartOffset = offset;
} }
ALWAYS_INLINE void AppendLocalFixups(LocalFixup &fixup) void AppendLocalFixups(LocalFixup &fixup)
{ {
localFixups.push_back(&fixup); localFixups.push_back(&fixup);
#ifdef JIT_ENABLE_CODE_SIGN #ifdef JIT_ENABLE_CODE_SIGN
@ -203,7 +203,7 @@ public:
#endif #endif
} }
ALWAYS_INLINE void AppendGlobalFixups(Fixup &fixup) void AppendGlobalFixups(Fixup &fixup)
{ {
globalFixups.push_back(&fixup); globalFixups.push_back(&fixup);
#ifdef JIT_ENABLE_CODE_SIGN #ifdef JIT_ENABLE_CODE_SIGN
@ -257,7 +257,7 @@ public:
return textData.size(); return textData.size();
} }
ALWAYS_INLINE void AppendTextData(const void *data, uint32 byteSize) void AppendTextData(const void *data, uint32 byteSize)
{ {
auto pdata = reinterpret_cast<const uint8 *>(data); // data:0xa9be7c1d pdata:1d 7c be a9 auto pdata = reinterpret_cast<const uint8 *>(data); // data:0xa9be7c1d pdata:1d 7c be a9
(void)textData.insert(textData.end(), pdata, pdata + byteSize); (void)textData.insert(textData.end(), pdata, pdata + byteSize);
@ -271,7 +271,7 @@ public:
#endif #endif
} }
ALWAYS_INLINE void AppendTextData(uint64 data, uint32 byteSize) void AppendTextData(uint64 data, uint32 byteSize)
{ {
for (size_t i = 0; i < byteSize; i++) { for (size_t i = 0; i < byteSize; i++) {
textData.push_back(static_cast<uint8>(data >> (i << k8BitShift))); textData.push_back(static_cast<uint8>(data >> (i << k8BitShift)));
@ -302,7 +302,7 @@ public:
return value; return value;
} }
ALWAYS_INLINE void SwapTextData(const void *value, size_t index, size_t byteSize) void SwapTextData(const void *value, size_t index, size_t byteSize)
{ {
errno_t res = memcpy_s(textData.data() + index, byteSize, value, byteSize); errno_t res = memcpy_s(textData.data() + index, byteSize, value, byteSize);
CHECK_FATAL(res == EOK, "call memcpy_s failed"); CHECK_FATAL(res == EOK, "call memcpy_s failed");

44
ecmascript/compiler/codegen/maple/maple_be/src/be/lower.cpp
View File

@ -159,12 +159,7 @@ void CGLowerer::LowerCallStmt(StmtNode &stmt, StmtNode *&nextStmt, BlockNode &ne
} }
if (newStmt->GetOpCode() == OP_call || newStmt->GetOpCode() == OP_icall || newStmt->GetOpCode() == OP_icallproto) { if (newStmt->GetOpCode() == OP_call || newStmt->GetOpCode() == OP_icall || newStmt->GetOpCode() == OP_icallproto) {
auto &callNode = static_cast<NaryStmtNode&>(*newStmt); newStmt = LowerCall(static_cast<CallNode &>(*newStmt), nextStmt, newBlk, retty, uselvar);
for (size_t i = 0; i < callNode.GetNopndSize(); ++i) {
BaseNode *newOpnd = LowerExpr(callNode, *callNode.GetNopndAt(i), newBlk);
callNode.SetOpnd(newOpnd, i);
}
newStmt = &callNode;
} }
newStmt->SetSrcPos(stmt.GetSrcPos()); newStmt->SetSrcPos(stmt.GetSrcPos());
newBlk.AddStatement(newStmt); newBlk.AddStatement(newStmt);
@ -526,6 +521,43 @@ BlockNode *CGLowerer::LowerBlock(BlockNode &block)
return newBlk; return newBlk;
} }
StmtNode *CGLowerer::LowerCall(CallNode &callNode, StmtNode *&nextStmt, BlockNode &newBlk, MIRType *retTy, bool uselvar)
{
/*
* nextStmt in-out
* call $foo(constval u32 128)
* dassign %jlt (dread agg %%retval)
*/
for (size_t i = 0; i < callNode.GetNopndSize(); ++i) {
BaseNode *newOpnd = LowerExpr(callNode, *callNode.GetNopndAt(i), newBlk);
callNode.SetOpnd(newOpnd, i);
}
DassignNode *dassignNode = nullptr;
if ((nextStmt != nullptr) && (nextStmt->GetOpCode() == OP_dassign)) {
dassignNode = static_cast<DassignNode *>(nextStmt);
}
/* if nextStmt is not a dassign stmt, return */
if (dassignNode == nullptr) {
return &callNode;
}
if (!uselvar && retTy && beCommon.GetTypeSize(retTy->GetTypeIndex().GetIdx()) <= k16ByteSize) {
/* return structure fitting in one or two regs. */
return &callNode;
}
if (callNode.op == OP_icall || callNode.op == OP_icallproto) {
if (retTy == nullptr) {
return &callNode;
}
}
return &callNode;
}
void CGLowerer::LowerTypePtr(BaseNode &node) const void CGLowerer::LowerTypePtr(BaseNode &node) const
{ {
if ((node.GetPrimType() == PTY_ptr) || (node.GetPrimType() == PTY_ref)) { if ((node.GetPrimType() == PTY_ptr) || (node.GetPrimType() == PTY_ref)) {

46
ecmascript/compiler/codegen/maple/maple_be/src/cg/aarch64/aarch64_cgfunc.cpp
View File

@ -2773,18 +2773,27 @@ Operand *AArch64CGFunc::SelectRetype(TypeCvtNode &node, Operand &opnd0)
if (LIsPrimitivePointer(fromType) && LIsPrimitivePointer(toType)) { if (LIsPrimitivePointer(fromType) && LIsPrimitivePointer(toType)) {
return &LoadIntoRegister(opnd0, toType); return &LoadIntoRegister(opnd0, toType);
} }
// if source operand is in memory, Operand::OperandType opnd0Type = opnd0.GetKind();
// simply read it as a value of 'toType 'into the dest operand and return RegOperand *resOpnd = &CreateRegisterOperandOfType(toType);
if (opnd0.IsMemoryAccessOperand()) { if (IsPrimitiveInteger(fromType) || IsPrimitiveFloat(fromType)) {
return &SelectCopy(opnd0, toType, toType);
}
bool isFromInt = IsPrimitiveInteger(fromType); bool isFromInt = IsPrimitiveInteger(fromType);
bool is64Bits = GetPrimTypeBitSize(fromType) == k64BitSize; bool is64Bits = GetPrimTypeBitSize(fromType) == k64BitSize;
PrimType itype =
isFromInt ? ((GetPrimTypeBitSize(fromType) == k64BitSize) ? (IsSignedInteger(fromType) ? PTY_i64 : PTY_u64)
: (IsSignedInteger(fromType) ? PTY_i32 : PTY_u32))
: (is64Bits ? PTY_f64 : PTY_f32);
/*
* if source operand is in memory,
* simply read it as a value of 'toType 'into the dest operand
* and return
*/
if (opnd0Type == Operand::kOpdMem) {
resOpnd = &SelectCopy(opnd0, toType, toType);
return resOpnd;
}
/* according to aarch64 encoding format, convert int to float expression */
bool isImm = false; bool isImm = false;
Operand *newOpnd0 = &opnd0;
if (opnd0.IsImmediate()) {
// according to aarch64 encoding format, convert int to float expression
ImmOperand *imm = static_cast<ImmOperand *>(&opnd0); ImmOperand *imm = static_cast<ImmOperand *>(&opnd0);
uint64 val = static_cast<uint64>(imm->GetValue()); uint64 val = static_cast<uint64>(imm->GetValue());
uint64 canRepreset = is64Bits ? (val & 0xffffffffffff) : (val & 0x7ffff); uint64 canRepreset = is64Bits ? (val & 0xffffffffffff) : (val & 0x7ffff);
@ -2792,30 +2801,31 @@ Operand *AArch64CGFunc::SelectRetype(TypeCvtNode &node, Operand &opnd0)
uint32 val2 = is64Bits ? (val >> 54) & 0xff : (val >> 25) & 0x1f; uint32 val2 = is64Bits ? (val >> 54) & 0xff : (val >> 25) & 0x1f;
bool isSame = is64Bits ? ((val2 == 0) || (val2 == 0xff)) : ((val2 == 0) || (val2 == 0x1f)); bool isSame = is64Bits ? ((val2 == 0) || (val2 == 0xff)) : ((val2 == 0) || (val2 == 0x1f));
canRepreset = (canRepreset == 0) && ((val1 & 0x1) ^ ((val1 & 0x2) >> 1)) && isSame; canRepreset = (canRepreset == 0) && ((val1 & 0x1) ^ ((val1 & 0x2) >> 1)) && isSame;
Operand *newOpnd0 = &opnd0;
if (IsPrimitiveInteger(fromType) && IsPrimitiveFloat(toType) && canRepreset) { if (IsPrimitiveInteger(fromType) && IsPrimitiveFloat(toType) && canRepreset) {
uint64 temp1 = is64Bits ? (val >> 63) << 7 : (val >> 31) << 7; uint64 temp1 = is64Bits ? (val >> 63) << 7 : (val >> 31) << 7;
uint64 temp2 = is64Bits ? val >> 48 : val >> 19; uint64 temp2 = is64Bits ? val >> 48 : val >> 19;
int64 imm8 = (temp2 & 0x7f) | temp1; int64 imm8 = (temp2 & 0x7f) | temp1;
newOpnd0 = &CreateImmOperand(imm8, k8BitSize, false, kNotVary, true); newOpnd0 = &CreateImmOperand(imm8, k8BitSize, false, kNotVary, true);
isImm = true; isImm = true;
} } else {
}
if (!isImm) {
bool isSigned = IsSignedInteger(fromType);
PrimType itype = isFromInt ? (is64Bits ? (isSigned ? PTY_i64 : PTY_u64) : (isSigned ? PTY_i32 : PTY_u32))
: (is64Bits ? PTY_f64 : PTY_f32);
newOpnd0 = &LoadIntoRegister(opnd0, itype); newOpnd0 = &LoadIntoRegister(opnd0, itype);
} }
if ((IsPrimitiveFloat(fromType) && IsPrimitiveInteger(toType)) || if ((IsPrimitiveFloat(fromType) && IsPrimitiveInteger(toType)) ||
(IsPrimitiveFloat(toType) && IsPrimitiveInteger(fromType))) { (IsPrimitiveFloat(toType) && IsPrimitiveInteger(fromType))) {
MOperator mopFmov = isImm ? (is64Bits ? MOP_xdfmovri : MOP_wsfmovri) MOperator mopFmov = isImm ? (is64Bits ? MOP_xdfmovri : MOP_wsfmovri)
: (isFromInt ? (is64Bits ? MOP_xvmovdr : MOP_xvmovsr) : (isFromInt
? (is64Bits ? MOP_xvmovdr : MOP_xvmovsr)
: (is64Bits ? MOP_xvmovrd : MOP_xvmovrs)); : (is64Bits ? MOP_xvmovrd : MOP_xvmovrs));
RegOperand *resOpnd = &CreateRegisterOperandOfType(toType);
GetCurBB()->AppendInsn(GetInsnBuilder()->BuildInsn(mopFmov, *resOpnd, *newOpnd0)); GetCurBB()->AppendInsn(GetInsnBuilder()->BuildInsn(mopFmov, *resOpnd, *newOpnd0));
return resOpnd; return resOpnd;
} } else {
return newOpnd0; return newOpnd0;
}
} else {
CHECK_FATAL(false, "NYI retype");
}
return nullptr;
} }
void AArch64CGFunc::SelectCvtFloat2Float(Operand &resOpnd, Operand &srcOpnd, PrimType fromType, PrimType toType) void AArch64CGFunc::SelectCvtFloat2Float(Operand &resOpnd, Operand &srcOpnd, PrimType fromType, PrimType toType)

18
ecmascript/compiler/codegen/maple/maple_be/src/cg/aarch64/aarch64_peep.cpp
View File

@ -1044,17 +1044,12 @@ bool FmovRegPattern::CheckCondition(Insn &insn)
if (nextInsn == nullptr) { if (nextInsn == nullptr) {
return false; return false;
} }
prevInsn = insn.GetPreviousMachineInsn(); if (&insn == insn.GetBB()->GetFirstMachineInsn()) {
if (prevInsn == nullptr) {
return false; return false;
} }
auto &curSrcOpnd = insn.GetOperand(kInsnSecondOpnd); prevInsn = insn.GetPrev();
auto &prevSrcOpnd = prevInsn->GetOperand(kInsnSecondOpnd); auto &curSrcRegOpnd = static_cast<RegOperand &>(insn.GetOperand(kInsnSecondOpnd));
if (!curSrcOpnd.IsRegister() || !prevSrcOpnd.IsRegister()) { auto &prevSrcRegOpnd = static_cast<RegOperand &>(prevInsn->GetOperand(kInsnSecondOpnd));
return false;
}
auto &curSrcRegOpnd = static_cast<RegOperand&>(curSrcOpnd);
auto &prevSrcRegOpnd = static_cast<RegOperand&>(prevSrcOpnd);
/* same src freg */ /* same src freg */
if (curSrcRegOpnd.GetRegisterNumber() != prevSrcRegOpnd.GetRegisterNumber()) { if (curSrcRegOpnd.GetRegisterNumber() != prevSrcRegOpnd.GetRegisterNumber()) {
return false; return false;
@ -1889,12 +1884,13 @@ void AndCbzBranchesToTstAArch64::Run(BB &bb, Insn &insn)
/* build tst insn */ /* build tst insn */
Operand &andOpnd3 = insn.GetOperand(kInsnThirdOpnd); Operand &andOpnd3 = insn.GetOperand(kInsnThirdOpnd);
auto &andRegOp2 = static_cast<RegOperand &>(insn.GetOperand(kInsnSecondOpnd)); auto &andRegOp2 = static_cast<RegOperand &>(insn.GetOperand(kInsnSecondOpnd));
auto &andRegOp3 = static_cast<RegOperand &>(insn.GetOperand(kInsnThirdOpnd));
MOperator newTstOp = MOP_undef; MOperator newTstOp = MOP_undef;
if (andOpnd3.IsRegister()) { if (andOpnd3.IsRegister()) {
newTstOp = (andRegOp2.GetSize() <= k32BitSize && andOpnd3.GetSize() <= k32BitSize) ? MOP_wtstrr : MOP_xtstrr; newTstOp = (andRegOp2.GetSize() <= k32BitSize && andRegOp3.GetSize() <= k32BitSize) ? MOP_wtstrr : MOP_xtstrr;
} else { } else {
newTstOp = newTstOp =
(andRegOp2.GetSize() <= k32BitSize && andOpnd3.GetSize() <= k32BitSize) ? MOP_wtstri32 : MOP_xtstri64; (andRegOp2.GetSize() <= k32BitSize && andRegOp3.GetSize() <= k32BitSize) ? MOP_wtstri32 : MOP_xtstri64;
} }
Operand &rflag = static_cast<AArch64CGFunc *>(&cgFunc)->GetOrCreateRflag(); Operand &rflag = static_cast<AArch64CGFunc *>(&cgFunc)->GetOrCreateRflag();
Insn &newInsnTst = cgFunc.GetInsnBuilder()->BuildInsn(newTstOp, rflag, andRegOp2, andOpnd3); Insn &newInsnTst = cgFunc.GetInsnBuilder()->BuildInsn(newTstOp, rflag, andRegOp2, andOpnd3);

2
ecmascript/compiler/codegen/maple/maple_be/src/litecg/lmir_builder.cpp
View File

@ -120,7 +120,7 @@ void LMIRBuilder::SetCallStmtDeoptBundleInfo(Stmt &callNode,
deoptInfos.insert(std::pair<int32_t, MapleValue>(itr.first, MapleValue(std::get<MIRConst*>(value.data)))); deoptInfos.insert(std::pair<int32_t, MapleValue>(itr.first, MapleValue(std::get<MIRConst*>(value.data))));
} }
} }
if (callNode.GetOpCode() == OP_call || callNode.GetOpCode() == OP_callassigned) { if (callNode.GetOpCode() == OP_call) {
static_cast<CallNode &>(callNode).SetDeoptBundleInfo(deoptInfos); static_cast<CallNode &>(callNode).SetDeoptBundleInfo(deoptInfos);
} else { } else {
static_cast<IcallNode &>(callNode).SetDeoptBundleInfo(deoptInfos); static_cast<IcallNode &>(callNode).SetDeoptBundleInfo(deoptInfos);

8
ecmascript/compiler/codegen/maple/maple_driver/BUILD.gn
View File

@ -30,14 +30,6 @@ ohos_static_library("libmaple_driver") {
ohos_static_library("libdriver_option") { ohos_static_library("libdriver_option") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
include_dirs = [ include_dirs = [

8
ecmascript/compiler/codegen/maple/maple_ir/BUILD.gn
View File

@ -45,14 +45,6 @@ src_libmplir = [
ohos_static_library("libmplir") { ohos_static_library("libmplir") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libmplir sources = src_libmplir
include_dirs = include_directories include_dirs = include_directories

4
ecmascript/compiler/codegen/maple/maple_ir/include/mir_config.h
View File

@ -133,9 +133,5 @@ constexpr int kMirMaxLineSize = 3072; // a max of 3K characters per line initia
#define HAVE_STRTOD 1 // strtod in current libc #define HAVE_STRTOD 1 // strtod in current libc
#define HAVE_MALLOC 0 // no malloc/free in current libc #define HAVE_MALLOC 0 // no malloc/free in current libc
#endif // MIR_FEATURE_FULL #endif // MIR_FEATURE_FULL
#ifndef ALWAYS_INLINE
#define ALWAYS_INLINE __attribute__((always_inline))
#endif
} // namespace maple } // namespace maple
#endif // MAPLE_IR_INCLUDE_MIR_CONFIG_H #endif // MAPLE_IR_INCLUDE_MIR_CONFIG_H

8
ecmascript/compiler/codegen/maple/maple_me/BUILD.gn
View File

@ -33,14 +33,6 @@ src_libmplme = [ "src/me_option.cpp" ]
ohos_static_library("libmplme") { ohos_static_library("libmplme") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libmplme sources = src_libmplme
include_dirs = include_directories include_dirs = include_directories

8
ecmascript/compiler/codegen/maple/maple_phase/BUILD.gn
View File

@ -39,14 +39,6 @@ src_libmplphase = [
ohos_static_library("libmplphase") { ohos_static_library("libmplphase") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libmplphase sources = src_libmplphase
include_dirs = include_libmplphase include_dirs = include_libmplphase

8
ecmascript/compiler/codegen/maple/maple_util/BUILD.gn
View File

@ -36,14 +36,6 @@ include_libcommandline = [ "${MAPLEALL_ROOT}/maple_util/include" ]
ohos_static_library("libmplutil") { ohos_static_library("libmplutil") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libmplutil sources = src_libmplutil
include_dirs = include_libmplutil include_dirs = include_libmplutil

8
ecmascript/compiler/codegen/maple/mempool/BUILD.gn
View File

@ -26,14 +26,6 @@ include_directories = [
ohos_static_library("libmempool") { ohos_static_library("libmempool") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libmempool sources = src_libmempool
include_dirs = include_directories include_dirs = include_directories

8
ecmascript/compiler/codegen/maple/mpl2mpl/BUILD.gn
View File

@ -29,14 +29,6 @@ src_libmpl2mpl = [ "src/constantfold.cpp" ]
ohos_static_library("libmpl2mpl") { ohos_static_library("libmpl2mpl") {
stack_protector_ret = false stack_protector_ret = false
if (enable_sanitize) {
sanitize = {
cfi = true
cfi_cross_dso = true
debug = false
}
branch_protector_ret = "pac_ret"
}
configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ] configs = [ "${MAPLEALL_ROOT}:mapleallcompilecfg" ]
sources = src_libmpl2mpl sources = src_libmpl2mpl
include_dirs = include_directories include_dirs = include_directories

13
ecmascript/compiler/file_generators.cpp
View File

@ -34,9 +34,6 @@
#include "ecmascript/compiler/jit_signcode.h" #include "ecmascript/compiler/jit_signcode.h"
#endif #endif
#endif #endif
#include "ecmascript/jit/jit.h"
#include "ecmascript/jit/jit_task.h"
#include "ecmascript/compiler/jit_compiler.h"
namespace panda::ecmascript::kungfu { namespace panda::ecmascript::kungfu {
void Module::CollectStackMapDes(ModuleSectionDes& des) const void Module::CollectStackMapDes(ModuleSectionDes& des) const
@ -701,11 +698,11 @@ void AOTFileGenerator::SaveEmptyAOTFile(const std::string& filename, const std::
LOG_COMPILER(ERROR) << "create empty AOT file: " << realPath << " due to illegal AP file"; LOG_COMPILER(ERROR) << "create empty AOT file: " << realPath << " due to illegal AP file";
} }
bool AOTFileGenerator::GetMemoryCodeInfos(MachineCodeDesc &machineCodeDesc) void AOTFileGenerator::GetMemoryCodeInfos(MachineCodeDesc &machineCodeDesc)
{ {
if (aotInfo_.GetTotalCodeSize() == 0) { if (aotInfo_.GetTotalCodeSize() == 0) {
LOG_COMPILER(WARN) << "error: code size of generated an file is empty!"; LOG_COMPILER(WARN) << "error: code size of generated an file is empty!";
return false; return;
} }
if (log_->OutputASM()) { if (log_->OutputASM()) {
@ -758,12 +755,6 @@ bool AOTFileGenerator::GetMemoryCodeInfos(MachineCodeDesc &machineCodeDesc)
machineCodeDesc.stackMapOrOffsetTableAddr = stackMapPtr; machineCodeDesc.stackMapOrOffsetTableAddr = stackMapPtr;
machineCodeDesc.stackMapOrOffsetTableSize = stackMapSize; machineCodeDesc.stackMapOrOffsetTableSize = stackMapSize;
machineCodeDesc.codeType = MachineCodeType::FAST_JIT_CODE; machineCodeDesc.codeType = MachineCodeType::FAST_JIT_CODE;
if (Jit::GetInstance()->IsEnableJitFort() && Jit::GetInstance()->IsEnableAsyncCopyToFort() &&
JitCompiler::AllocFromFortAndCopy(*compilationEnv_, machineCodeDesc) == false) {
return false;
}
return true;
} }
void AOTFileGenerator::JitCreateLitecgModule() void AOTFileGenerator::JitCreateLitecgModule()

3
ecmascript/compiler/file_generators.h
View File

@ -215,9 +215,10 @@ public:
curCompileFileName_ = fileName.c_str(); curCompileFileName_ = fileName.c_str();
} }
bool GetMemoryCodeInfos(MachineCodeDesc &machineCodeDesc); void GetMemoryCodeInfos(MachineCodeDesc &machineCodeDesc);
void JitCreateLitecgModule(); void JitCreateLitecgModule();
bool isAArch64() const; bool isAArch64() const;
private: private:
// collect aot component info // collect aot component info
void CollectCodeInfo(Module *module, uint32_t moduleIdx); void CollectCodeInfo(Module *module, uint32_t moduleIdx);

81
ecmascript/compiler/jit_compiler.cpp
View File

@ -117,8 +117,8 @@ JitCompilerTask *JitCompilerTask::CreateJitCompilerTask(JitTask *jitTask)
bool JitCompilerTask::Compile() bool JitCompilerTask::Compile()
{ {
if (compilerTier_ == CompilerTier::BASELINE) { if (compilerTier_ == CompilerTier::BASELINE) {
auto baselineCompiler = new (std::nothrow) BaselineCompiler(jitCompilationEnv_->GetHostThread()->GetEcmaVM(), auto baselineCompiler =
jitCompilationEnv_.get()); new (std::nothrow) BaselineCompiler(jitCompilationEnv_->GetHostThread()->GetEcmaVM());
if (baselineCompiler == nullptr) { if (baselineCompiler == nullptr) {
return false; return false;
} }
@ -165,82 +165,13 @@ bool JitCompilerTask::Finalize(JitTask *jitTask)
return false; return false;
} }
if (compilerTier_ == CompilerTier::BASELINE) { if (compilerTier_ == CompilerTier::BASELINE) {
return baselineCompiler_->CollectMemoryCodeInfos(jitTask->GetMachineCodeDesc()); baselineCompiler_->CollectMemoryCodeInfos(jitTask->GetMachineCodeDesc());
return true;
} }
jitCodeGenerator_->JitCreateLitecgModule(); jitCodeGenerator_->JitCreateLitecgModule();
bool result = true; passManager_->RunCg();
result &= passManager_->RunCg(); jitCodeGenerator_->GetMemoryCodeInfos(jitTask->GetMachineCodeDesc());
result &= jitCodeGenerator_->GetMemoryCodeInfos(jitTask->GetMachineCodeDesc());
ReleaseJitPassManager(); ReleaseJitPassManager();
return result;
}
static ARK_INLINE bool CopyCodeToFort(MachineCodeDesc &desc)
{
uint8_t *pText = reinterpret_cast<uint8_t*>(desc.instructionsAddr);
if (desc.rodataSizeBeforeTextAlign != 0) {
pText += desc.rodataSizeBeforeTextAlign;
}
#ifdef JIT_ENABLE_CODE_SIGN
if ((uintptr_t)desc.codeSigner == 0) {
if (memcpy_s(pText, desc.codeSizeAlign, reinterpret_cast<uint8_t*>(desc.codeAddr), desc.codeSize) != EOK) {
LOG_JIT(ERROR) << "memcpy failed in CopyToCache";
return false;
}
} else {
LOG_JIT(DEBUG) << "Copy: "
<< std::hex << (uintptr_t)pText << " <- "
<< std::hex << (uintptr_t)desc.codeAddr << " size: " << desc.codeSize;
LOG_JIT(DEBUG) << " codeSigner = " << std::hex << (uintptr_t)desc.codeSigner;
OHOS::Security::CodeSign::JitCodeSignerBase *signer =
reinterpret_cast<OHOS::Security::CodeSign::JitCodeSignerBase*>(desc.codeSigner);
int err = OHOS::Security::CodeSign::CopyToJitCode(
signer, pText, reinterpret_cast<void *>(desc.codeAddr), desc.codeSize);
if (err != EOK) {
LOG_JIT(ERROR) << " CopyToJitCode failed, err: " << err;
return false;
} else {
LOG_JIT(DEBUG) << " CopyToJitCode success!!";
}
delete reinterpret_cast<OHOS::Security::CodeSign::JitCodeSignerBase*>(desc.codeSigner);
}
#else
if (memcpy_s(pText, desc.codeSizeAlign, reinterpret_cast<uint8_t*>(desc.codeAddr), desc.codeSize) != EOK) {
LOG_JIT(ERROR) << "memcpy failed in CopyToCache";
return false;
}
#endif
return true;
}
ARK_INLINE bool JitCompiler::AllocFromFortAndCopy(CompilationEnv &compilationEnv, MachineCodeDesc &desc)
{
ASSERT(compilationEnv.IsJitCompiler());
JSThread *hostThread = static_cast<JitCompilationEnv&>(compilationEnv).GetHostThread();
Jit::JitGCLockHolder lock(hostThread);
size_t size = JitTask::ComputePayLoadSize(desc);
const Heap *heap = hostThread->GetEcmaVM()->GetHeap();
if (desc.isHugeObj) {
Region *region = heap->GetHugeMachineCodeSpace()->AllocateFort(
size + MachineCode::SIZE, hostThread, &desc);
if (!region || !desc.instructionsAddr) {
return false;
}
desc.hugeObjRegion = ToUintPtr(region);
} else {
uintptr_t mem = heap->GetMachineCodeSpace()->JitFortAllocate(&desc);
if (mem == ToUintPtr(nullptr)) {
return false;
}
desc.instructionsAddr = mem;
}
if (!CopyCodeToFort(desc)) {
return false;
}
return true; return true;
} }

2
ecmascript/compiler/jit_compiler.h
View File

@ -127,7 +127,6 @@ public:
} }
void UpdatePassOptions(CompilationEnv *env); void UpdatePassOptions(CompilationEnv *env);
static ARK_INLINE bool AllocFromFortAndCopy(CompilationEnv &compilationEnv, MachineCodeDesc &desc);
private: private:
JitCompilationOptions jitOptions_; JitCompilationOptions jitOptions_;
CompilerLog log_; CompilerLog log_;
@ -135,6 +134,5 @@ private:
PGOProfilerDecoder profilerDecoder_; PGOProfilerDecoder profilerDecoder_;
PassOptions passOptions_; PassOptions passOptions_;
}; };
} // namespace panda::ecmascript::kungfu } // namespace panda::ecmascript::kungfu
#endif // ECMASCRIPT_COMPILER_JIT_COMPILER_H #endif // ECMASCRIPT_COMPILER_JIT_COMPILER_H

3
ecmascript/dfx/hprof/BUILD.gn
View File

@ -14,7 +14,8 @@
import("//arkcompiler/ets_runtime/js_runtime_config.gni") import("//arkcompiler/ets_runtime/js_runtime_config.gni")
ohos_executable("ark_js_heap_snapshot_tool") { ohos_executable("ark_js_heap_snapshot_tool") {
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }

4
ecmascript/jit/jit.h
View File

@ -59,11 +59,11 @@ public:
void SetEnableOrDisable(const JSRuntimeOptions &options, bool isEnableFastJit, bool isEnableBaselineJit); void SetEnableOrDisable(const JSRuntimeOptions &options, bool isEnableFastJit, bool isEnableBaselineJit);
bool PUBLIC_API IsEnableFastJit() const; bool PUBLIC_API IsEnableFastJit() const;
bool PUBLIC_API IsEnableBaselineJit() const; bool PUBLIC_API IsEnableBaselineJit() const;
bool PUBLIC_API IsEnableJitFort() const; bool IsEnableJitFort() const;
void SetEnableJitFort(bool isEnableJitFort); void SetEnableJitFort(bool isEnableJitFort);
bool IsDisableCodeSign() const; bool IsDisableCodeSign() const;
void SetDisableCodeSign(bool isEnableCodeSign); void SetDisableCodeSign(bool isEnableCodeSign);
bool PUBLIC_API IsEnableAsyncCopyToFort() const; bool IsEnableAsyncCopyToFort() const;
void SetEnableAsyncCopyToFort(bool isEnableiAsyncCopyToFort); void SetEnableAsyncCopyToFort(bool isEnableiAsyncCopyToFort);
void Initialize(); void Initialize();

79
ecmascript/jit/jit_task.cpp
View File

@ -16,6 +16,9 @@
#include "ecmascript/jit/jit_task.h" #include "ecmascript/jit/jit_task.h"
#include "ecmascript/jspandafile/program_object.h" #include "ecmascript/jspandafile/program_object.h"
#include "ecmascript/ohos/jit_tools.h" #include "ecmascript/ohos/jit_tools.h"
#ifdef JIT_ENABLE_CODE_SIGN
#include "jit_buffer_integrity.h"
#endif
namespace panda::ecmascript { namespace panda::ecmascript {
@ -154,7 +157,7 @@ static void ComputeAlignedSizes(MachineCodeDesc &desc)
} }
} }
size_t JitTask::ComputePayLoadSize(MachineCodeDesc &codeDesc) static size_t ComputePayLoadSize(MachineCodeDesc &codeDesc)
{ {
ComputeAlignedSizes(codeDesc); ComputeAlignedSizes(codeDesc);
if (codeDesc.codeType == MachineCodeType::BASELINE_CODE) { if (codeDesc.codeType == MachineCodeType::BASELINE_CODE) {
@ -389,6 +392,75 @@ void JitTask::WaitFinish()
} }
} }
bool JitTask::AsyncTask::CopyCodeToFort()
{
MachineCodeDesc &desc = jitTask_->GetMachineCodeDesc();
uint8_t *pText = reinterpret_cast<uint8_t*>(desc.instructionsAddr);
if (desc.rodataSizeBeforeTextAlign != 0) {
pText += desc.rodataSizeBeforeTextAlign;
}
#ifdef JIT_ENABLE_CODE_SIGN
if ((uintptr_t)desc.codeSigner == 0) {
if (memcpy_s(pText, desc.codeSizeAlign, reinterpret_cast<uint8_t*>(desc.codeAddr), desc.codeSize) != EOK) {
LOG_JIT(ERROR) << "memcpy failed in CopyToCache";
return false;
}
} else {
LOG_JIT(DEBUG) << "Copy: "
<< std::hex << (uintptr_t)pText << " <- "
<< std::hex << (uintptr_t)desc.codeAddr << " size: " << desc.codeSize;
LOG_JIT(DEBUG) << " codeSigner = " << std::hex << (uintptr_t)desc.codeSigner;
OHOS::Security::CodeSign::JitCodeSignerBase *signer =
reinterpret_cast<OHOS::Security::CodeSign::JitCodeSignerBase*>(desc.codeSigner);
int err = OHOS::Security::CodeSign::CopyToJitCode(
signer, pText, reinterpret_cast<void *>(desc.codeAddr), desc.codeSize);
if (err != EOK) {
LOG_JIT(ERROR) << " CopyToJitCode failed, err: " << err;
return false;
} else {
LOG_JIT(DEBUG) << " CopyToJitCode success!!";
}
delete reinterpret_cast<OHOS::Security::CodeSign::JitCodeSignerBase*>(desc.codeSigner);
}
#else
if (memcpy_s(pText, desc.codeSizeAlign, reinterpret_cast<uint8_t*>(desc.codeAddr), desc.codeSize) != EOK) {
LOG_JIT(ERROR) << "memcpy failed in CopyToCache";
return false;
}
#endif
return true;
}
bool JitTask::AsyncTask::AllocFromFortAndCopy()
{
Jit::JitGCLockHolder lock(jitTask_->GetHostThread());
MachineCodeDesc &desc = jitTask_->GetMachineCodeDesc();
size_t size = ComputePayLoadSize(desc);
const Heap *heap = jitTask_->GetHostThread()->GetEcmaVM()->GetHeap();
if (desc.isHugeObj) {
Region *region = heap->GetHugeMachineCodeSpace()->AllocateFort(
size + MachineCode::SIZE, heap->GetJSThread(), &desc);
if (!region || !desc.instructionsAddr) {
return false;
}
desc.hugeObjRegion = ToUintPtr(region);
} else {
uintptr_t mem = heap->GetMachineCodeSpace()->JitFortAllocate(&desc);
if (mem == ToUintPtr(nullptr)) {
LOG_JIT(DEBUG) << "JitTask: AsyncTask JitFort allocate returned null";
return false;
}
desc.instructionsAddr = mem;
}
if (!CopyCodeToFort()) {
return false;
}
return true;
}
bool JitTask::AsyncTask::Run([[maybe_unused]] uint32_t threadIndex) bool JitTask::AsyncTask::Run([[maybe_unused]] uint32_t threadIndex)
{ {
if (IsTerminate() || !jitTask_->GetHostThread()->GetEcmaVM()->IsInitialized()) { if (IsTerminate() || !jitTask_->GetHostThread()->GetEcmaVM()->IsInitialized()) {
@ -416,6 +488,11 @@ bool JitTask::AsyncTask::Run([[maybe_unused]] uint32_t threadIndex)
} }
if (jitTask_->IsAsyncTask()) { if (jitTask_->IsAsyncTask()) {
if (Jit::GetInstance()->IsEnableJitFort() &&
Jit::GetInstance()->IsEnableAsyncCopyToFort() &&
AllocFromFortAndCopy() == false) {
return false;
}
jitTask_->jit_->RequestInstallCode(jitTask_); jitTask_->jit_->RequestInstallCode(jitTask_);
} }
int compilerTime = scope.TotalSpentTimeInMicroseconds(); int compilerTime = scope.TotalSpentTimeInMicroseconds();

5
ecmascript/jit/jit_task.h
View File

@ -231,7 +231,6 @@ public:
{ {
return mainThreadCompileTime_; return mainThreadCompileTime_;
} }
static size_t PUBLIC_API ComputePayLoadSize(MachineCodeDesc &codeDesc);
class AsyncTask : public Task { class AsyncTask : public Task {
public: public:
@ -265,7 +264,11 @@ public:
{ {
jitTask_->ReleaseSustainingJSHandle(); jitTask_->ReleaseSustainingJSHandle();
} }
bool AllocFromFortAndCopy();
private: private:
ARK_INLINE bool CopyCodeToFort();
std::shared_ptr<JitTask> jitTask_ { nullptr }; std::shared_ptr<JitTask> jitTask_ { nullptr };
class AsyncTaskRunScope { class AsyncTaskRunScope {

3
ecmascript/js_vm/BUILD.gn
View File

@ -24,7 +24,8 @@ if (ark_standalone_build) {
} }
ohos_executable("ark_js_vm") { ohos_executable("ark_js_vm") {
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }

32
ecmascript/mem/machine_code.cpp
View File

@ -19,8 +19,14 @@
#if ECMASCRIPT_ENABLE_CAST_CHECK #if ECMASCRIPT_ENABLE_CAST_CHECK
#include "ecmascript/js_tagged_value-inl.h" #include "ecmascript/js_tagged_value-inl.h"
#endif #endif
#ifdef JIT_ENABLE_CODE_SIGN
#include "jit_buffer_integrity.h"
#endif
namespace panda::ecmascript { namespace panda::ecmascript {
#ifdef JIT_ENABLE_CODE_SIGN
using namespace OHOS::Security::CodeSign;
#endif
static bool SetPageProtect(uint8_t *textStart, size_t dataSize) static bool SetPageProtect(uint8_t *textStart, size_t dataSize)
{ {
@ -34,9 +40,31 @@ static bool SetPageProtect(uint8_t *textStart, size_t dataSize)
return true; return true;
} }
static int MachineCodeCopyToCache([[maybe_unused]] const MachineCodeDesc &desc, [[maybe_unused]] uint8_t *pText) ARK_INLINE static int MachineCodeCopyToCache(const MachineCodeDesc &desc, uint8_t *pText)
{ {
#ifndef JIT_ENABLE_CODE_SIGN #ifdef JIT_ENABLE_CODE_SIGN
if ((uintptr_t)desc.codeSigner == 0) {
if (memcpy_s(pText, desc.codeSizeAlign, reinterpret_cast<uint8_t*>(desc.codeAddr), desc.codeSize) != EOK) {
LOG_JIT(ERROR) << "memcpy failed in CopyToCache";
return false;
}
} else {
LOG_JIT(DEBUG) << "Copy: "
<< std::hex << (uintptr_t)pText << " <- "
<< std::hex << (uintptr_t)desc.codeAddr << " size: " << desc.codeSize;
LOG_JIT(DEBUG) << " codeSigner = " << std::hex << (uintptr_t)desc.codeSigner;
JitCodeSignerBase *signer =
reinterpret_cast<JitCodeSignerBase*>(desc.codeSigner);
int err = CopyToJitCode(signer, pText, reinterpret_cast<void*>(desc.codeAddr), desc.codeSize);
if (err != EOK) {
LOG_JIT(ERROR) << " CopyToJitCode failed, err: " << err;
return false;
} else {
LOG_JIT(DEBUG) << " CopyToJitCode success!!";
}
delete reinterpret_cast<JitCodeSignerBase*>(desc.codeSigner);
}
#else
if (memcpy_s(pText, desc.codeSizeAlign, reinterpret_cast<uint8_t*>(desc.codeAddr), desc.codeSize) != EOK) { if (memcpy_s(pText, desc.codeSizeAlign, reinterpret_cast<uint8_t*>(desc.codeAddr), desc.codeSize) != EOK) {
LOG_JIT(ERROR) << "memcpy failed in CopyToCache"; LOG_JIT(ERROR) << "memcpy failed in CopyToCache";
return false; return false;

2
ecmascript/mem/space.h
View File

@ -320,7 +320,7 @@ public:
uintptr_t Allocate(size_t objectSize, JSThread *thread, void *desc, uintptr_t Allocate(size_t objectSize, JSThread *thread, void *desc,
AllocateEventType allocType = AllocateEventType::NORMAL); AllocateEventType allocType = AllocateEventType::NORMAL);
uintptr_t Allocate(size_t objectSize, JSThread *thread); uintptr_t Allocate(size_t objectSize, JSThread *thread);
Region *PUBLIC_API AllocateFort(size_t objectSize, JSThread *thread, void *desc); Region *AllocateFort(size_t objectSize, JSThread *thread, void *desc);
}; };
} // namespace panda::ecmascript } // namespace panda::ecmascript

2
ecmascript/mem/sparse_space.h
View File

@ -278,7 +278,7 @@ public:
uintptr_t Allocate(size_t size, bool allowGC = true); uintptr_t Allocate(size_t size, bool allowGC = true);
uintptr_t Allocate(size_t size, MachineCodeDesc *desc, bool allowGC = true); uintptr_t Allocate(size_t size, MachineCodeDesc *desc, bool allowGC = true);
inline void RecordLiveJitCode(MachineCode *obj); inline void RecordLiveJitCode(MachineCode *obj);
uintptr_t PUBLIC_API JitFortAllocate(MachineCodeDesc *desc); uintptr_t JitFortAllocate(MachineCodeDesc *desc);
inline bool IsSweeping() inline bool IsSweeping()
{ {

3
ecmascript/pgo_profiler/prof_dump/BUILD.gn
View File

@ -14,7 +14,8 @@
import("//arkcompiler/ets_runtime/js_runtime_config.gni") import("//arkcompiler/ets_runtime/js_runtime_config.gni")
ohos_executable("profdump") { ohos_executable("profdump") {
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }

3
ecmascript/quick_fix/BUILD.gn
View File

@ -14,7 +14,8 @@
import("//arkcompiler/ets_runtime/js_runtime_config.gni") import("//arkcompiler/ets_runtime/js_runtime_config.gni")
ohos_executable("quick_fix") { ohos_executable("quick_fix") {
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }

4
js_runtime_config.gni
View File

@ -54,7 +54,6 @@ if (target_cpu == "arm64") {
} }
MAPLEALL_ROOT = "//arkcompiler/ets_runtime/ecmascript/compiler/codegen/maple" MAPLEALL_ROOT = "//arkcompiler/ets_runtime/ecmascript/compiler/codegen/maple"
MAPLEALL_THIRD_PARTY_ROOT = "//third_party" MAPLEALL_THIRD_PARTY_ROOT = "//third_party"
LLVM_LIB_ROOT = "//arkcompiler/ets_runtime/ecmascript/compiler/codegen/llvm/lib"
if (!ark_standalone_build) { if (!ark_standalone_build) {
build_root = "//build" build_root = "//build"
@ -159,9 +158,6 @@ if (enable_hisysevent) {
hiviewdfx_ext_deps += [ "hisysevent:libhisysevent" ] hiviewdfx_ext_deps += [ "hisysevent:libhisysevent" ]
} }
enable_sanitize = is_ohos && is_standard_system && !ark_standalone_build &&
current_toolchain != host_toolchain
enable_target_compilation = enable_target_compilation =
!ark_standalone_build && !is_mac && !(defined(is_arkui_x) && is_arkui_x) && !ark_standalone_build && !is_mac && !(defined(is_arkui_x) && is_arkui_x) &&
(current_cpu == "arm64" && host_cpu != "arm64") (current_cpu == "arm64" && host_cpu != "arm64")

8
libark_jsruntime.map
View File

@ -225,14 +225,6 @@
panda::ecmascript::JITProfiler::ProfileBytecode*; panda::ecmascript::JITProfiler::ProfileBytecode*;
panda::ecmascript::JitThread::GetHostThread*; panda::ecmascript::JitThread::GetHostThread*;
panda::ecmascript::Jit::TimeScope::~TimeScope*; panda::ecmascript::Jit::TimeScope::~TimeScope*;
panda::ecmascript::Jit::GetInstance*;
panda::ecmascript::Jit::IsEnableJitFort*;
panda::ecmascript::Jit::IsEnableAsyncCopyToFort*;
panda::ecmascript::Jit::IsEnableFastJit*;
panda::ecmascript::Jit::IsEnableBaselineJit*;
panda::ecmascript::JitTask::ComputePayLoadSize*;
panda::ecmascript::HugeMachineCodeSpace::AllocateFort*;
panda::ecmascript::MachineCodeSpace::JitFortAllocate*;
panda::ecmascript::JitFort::IsResourceAvailable*; panda::ecmascript::JitFort::IsResourceAvailable*;
panda::ecmascript::Heap::AddGCListener*; panda::ecmascript::Heap::AddGCListener*;
panda::ecmascript::Heap::RemoveGCListener*; panda::ecmascript::Heap::RemoveGCListener*;

3
tools/ap_file_viewer/native/BUILD.gn
View File

@ -20,7 +20,8 @@ ohos_shared_library("profDumpJson") {
} }
ohos_static_library("profDumpJsonStatic") { ohos_static_library("profDumpJsonStatic") {
if (enable_sanitize) { if (is_ohos && is_standard_system && current_toolchain != host_toolchain &&
!ark_standalone_build) {
sanitize = { sanitize = {
ubsan = true ubsan = true
} }