Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[JSC] Use SlowPathFrameTracer and fix most of wasm GC operations #8561

Merged
merged 1 commit into from
Jan 12, 2023
Merged

[JSC] Use SlowPathFrameTracer and fix most of wasm GC operations #8561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions Source/JavaScriptCore/wasm/WasmInstance.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,11 +223,6 @@ class Instance : public ThreadSafeRefCountedAndCanMakeThreadSafeWeakPtr<Instance
static constexpr size_t offsetOfTablePtr(unsigned numImportFunctions, unsigned i) { return offsetOfTail() + sizeof(ImportFunctionInfo) * numImportFunctions + sizeof(Table*) * i; }
static constexpr size_t offsetOfGlobalPtr(unsigned numImportFunctions, unsigned numTables, unsigned i) { return roundUpToMultipleOf<sizeof(Global::Value)>(offsetOfTail() + sizeof(ImportFunctionInfo) * numImportFunctions + sizeof(Table*) * numTables) + sizeof(Global::Value) * i; }

void storeTopCallFrame(void* callFrame)
{
vm().topCallFrame = bitwise_cast<CallFrame*>(callFrame);
}

const Tag& tag(unsigned i) const { return *m_tags[i]; }
void setTag(unsigned, Ref<const Tag>&&);

Expand Down
18 changes: 18 additions & 0 deletions Source/JavaScriptCore/wasm/WasmOperations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,11 +747,17 @@ JSC_DEFINE_JIT_OPERATION(operationWasmRefFunc, EncodedJSValue, (Instance* instan

JSC_DEFINE_JIT_OPERATION(operationWasmStructNew, EncodedJSValue, (Instance* instance, uint32_t typeIndex, bool useDefault, uint64_t* arguments))
{
CallFrame* callFrame = DECLARE_WASM_CALL_FRAME(instance);
VM& vm = instance->vm();
NativeCallFrameTracer tracer(vm, callFrame);
return structNew(instance, typeIndex, useDefault, arguments);
}

JSC_DEFINE_JIT_OPERATION(operationWasmStructNewEmpty, EncodedJSValue, (Instance* instance, uint32_t typeIndex))
{
CallFrame* callFrame = DECLARE_WASM_CALL_FRAME(instance);
VM& vm = instance->vm();
NativeCallFrameTracer tracer(vm, callFrame);
JSWebAssemblyInstance* jsInstance = instance->owner<JSWebAssemblyInstance>();
JSGlobalObject* globalObject = jsInstance->globalObject();
return JSValue::encode(JSWebAssemblyStruct::tryCreate(globalObject, globalObject->webAssemblyStructStructure(), jsInstance, typeIndex));
Expand All @@ -764,6 +770,9 @@ JSC_DEFINE_JIT_OPERATION(operationWasmStructGet, EncodedJSValue, (EncodedJSValue

JSC_DEFINE_JIT_OPERATION(operationWasmStructSet, void, (Instance* instance, EncodedJSValue encodedStructReference, uint32_t fieldIndex, EncodedJSValue argument))
{
CallFrame* callFrame = DECLARE_WASM_CALL_FRAME(instance);
VM& vm = instance->vm();
NativeCallFrameTracer tracer(vm, callFrame);
return structSet(instance, encodedStructReference, fieldIndex, argument);
}

Expand Down Expand Up @@ -916,16 +925,25 @@ JSC_DEFINE_JIT_OPERATION(operationWasmRetrieveAndClearExceptionIfCatchable, void

JSC_DEFINE_JIT_OPERATION(operationWasmArrayNew, EncodedJSValue, (Instance* instance, uint32_t typeIndex, uint32_t size, EncodedJSValue encValue))
{
CallFrame* callFrame = DECLARE_WASM_CALL_FRAME(instance);
VM& vm = instance->vm();
NativeCallFrameTracer tracer(vm, callFrame);
return arrayNew(instance, typeIndex, size, encValue);
}

JSC_DEFINE_JIT_OPERATION(operationWasmArrayGet, EncodedJSValue, (Instance* instance, uint32_t typeIndex, EncodedJSValue arrayValue, uint32_t index))
{
CallFrame* callFrame = DECLARE_WASM_CALL_FRAME(instance);
VM& vm = instance->vm();
NativeCallFrameTracer tracer(vm, callFrame);
return arrayGet(instance, typeIndex, arrayValue, index);
}

JSC_DEFINE_JIT_OPERATION(operationWasmArraySet, void, (Instance* instance, uint32_t typeIndex, EncodedJSValue arrayValue, uint32_t index, EncodedJSValue value))
{
CallFrame* callFrame = DECLARE_WASM_CALL_FRAME(instance);
VM& vm = instance->vm();
NativeCallFrameTracer tracer(vm, callFrame);
return arraySet(instance, typeIndex, arrayValue, index, value);
}

Expand Down
19 changes: 15 additions & 4 deletions Source/JavaScriptCore/wasm/WasmSlowPaths.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#if ENABLE(WEBASSEMBLY)

#include "BytecodeStructs.h"
#include "FrameTracers.h"
#include "JITExceptions.h"
#include "JSWebAssemblyArray.h"
#include "JSWebAssemblyException.h"
Expand Down Expand Up @@ -416,6 +417,8 @@ WASM_SLOW_PATH_DECL(array_new)

WASM_SLOW_PATH_DECL(array_get)
{
SlowPathFrameTracer tracer(instance->vm(), callFrame);

auto instruction = pc->as<WasmArrayGet>();
EncodedJSValue arrayref = READ(instruction.m_arrayref).encodedJSValue();
if (JSValue::decode(arrayref).isNull())
Expand All @@ -442,6 +445,8 @@ WASM_SLOW_PATH_DECL(array_get)

WASM_SLOW_PATH_DECL(array_set)
{
SlowPathFrameTracer tracer(instance->vm(), callFrame);

auto instruction = pc->as<WasmArraySet>();
EncodedJSValue arrayref = READ(instruction.m_arrayref).encodedJSValue();
if (JSValue::decode(arrayref).isNull())
Expand All @@ -461,6 +466,8 @@ WASM_SLOW_PATH_DECL(array_set)

WASM_SLOW_PATH_DECL(struct_new)
{
SlowPathFrameTracer tracer(instance->vm(), callFrame);

auto instruction = pc->as<WasmStructNew>();
ASSERT(instruction.m_typeIndex < instance->module().moduleInformation().typeCount());

Expand All @@ -478,6 +485,8 @@ WASM_SLOW_PATH_DECL(struct_get)

WASM_SLOW_PATH_DECL(struct_set)
{
SlowPathFrameTracer tracer(instance->vm(), callFrame);

auto instruction = pc->as<WasmStructSet>();
auto structReference = READ(instruction.m_structReference).encodedJSValue();
auto value = READ(instruction.m_value).encodedJSValue();
Expand Down Expand Up @@ -537,7 +546,7 @@ WASM_SLOW_PATH_DECL(table_grow)

WASM_SLOW_PATH_DECL(grow_memory)
{
instance->storeTopCallFrame(callFrame);
SlowPathFrameTracer tracer(instance->vm(), callFrame);

auto instruction = pc->as<WasmGrowMemory>();
int32_t delta = READ(instruction.m_delta).unboxedInt32();
Expand Down Expand Up @@ -655,6 +664,8 @@ static size_t jsrSize()

WASM_SLOW_PATH_DECL(call_builtin)
{
SlowPathFrameTracer tracer(instance->vm(), callFrame);

auto instruction = pc->as<WasmCallBuiltin>();
Register* stackBottom = callFrame->registers() - instruction.m_stackOffset;
Register* stackStart = stackBottom + CallFrame::headerSizeInRegisters + /* indirect call target */ 1;
Expand Down Expand Up @@ -791,7 +802,7 @@ WASM_SLOW_PATH_DECL(memory_atomic_notify)

WASM_SLOW_PATH_DECL(throw)
{
instance->storeTopCallFrame(callFrame);
SlowPathFrameTracer tracer(instance->vm(), callFrame);

JSWebAssemblyInstance* jsInstance = instance->owner<JSWebAssemblyInstance>();
JSGlobalObject* globalObject = jsInstance->globalObject();
Expand Down Expand Up @@ -826,7 +837,7 @@ WASM_SLOW_PATH_DECL(throw)

WASM_SLOW_PATH_DECL(rethrow)
{
instance->storeTopCallFrame(callFrame);
SlowPathFrameTracer tracer(instance->vm(), callFrame);

JSWebAssemblyInstance* jsInstance = instance->owner<JSWebAssemblyInstance>();
JSGlobalObject* globalObject = jsInstance->globalObject();
Expand Down Expand Up @@ -1103,7 +1114,7 @@ WASM_SLOW_PATH_DECL(i64_trunc_sat_f64_s)
extern "C" SlowPathReturnType slow_path_wasm_throw_exception(CallFrame* callFrame, const WasmInstruction* pc, Wasm::Instance* instance, Wasm::ExceptionType exceptionType)
{
UNUSED_PARAM(pc);
instance->storeTopCallFrame(callFrame);
SlowPathFrameTracer tracer(instance->vm(), callFrame);
WASM_RETURN_TWO(Wasm::throwWasmToJSException(callFrame, exceptionType, instance), nullptr);
}

Expand Down