mleku/wazero
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

wazeroir: rm nullary Operations, move interpreterOp to UnionOperation (#1310)

Browse Source 
Signed-off-by: Edoardo Vacchi <evacchi@users.noreply.github.com>
This commit is contained in:
Edoardo Vacchi
2023-03-30 09:57:41 +02:00
committed by GitHub
parent 035c0ffaf4
commit 37135067b6
7 changed files with 708 additions and 822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

797
internal/engine/interpreter/interpreter.go
View File

File diff suppressed because it is too large Load Diff

46
internal/engine/interpreter/interpreter_test.go
View File

@@ -325,29 +325,29 @@ func TestInterpreter_NonTrappingFloatToIntConversion(t *testing.T) {
for i := 0; i < casenum; i++ {
i := i
t.Run(strconv.Itoa(i), func(t *testing.T) {
var body []*interpreterOp
var body []*wazeroir.UnionOperation
if in32bit {
body = append(body, &interpreterOp{
kind: wazeroir.OperationKindConstF32,
u1: uint64(math.Float32bits(tc.input32bit[i])),
body = append(body, &wazeroir.UnionOperation{
OpKind: wazeroir.OperationKindConstF32,
U1: uint64(math.Float32bits(tc.input32bit[i])),
})
} else {
body = append(body, &interpreterOp{
kind: wazeroir.OperationKindConstF64,
u1: uint64(math.Float64bits(tc.input64bit[i])),
body = append(body, &wazeroir.UnionOperation{
OpKind: wazeroir.OperationKindConstF64,
U1: uint64(math.Float64bits(tc.input64bit[i])),
})
}
body = append(body, &interpreterOp{
kind: wazeroir.OperationKindITruncFromF,
b1: byte(tc.inputType),
b2: byte(tc.outputType),
b3: true, // NonTrapping = true.
body = append(body, &wazeroir.UnionOperation{
OpKind: wazeroir.OperationKindITruncFromF,
B1: byte(tc.inputType),
B2: byte(tc.outputType),
B3: true, // NonTrapping = true.
})
// Return from function.
body = append(body,
&interpreterOp{kind: wazeroir.OperationKindBr, u1: uint64(math.MaxUint64)},
&wazeroir.UnionOperation{OpKind: wazeroir.OperationKindBr, U1: uint64(math.MaxUint64)},
)
ce := &callEngine{}
@@ -416,10 +416,10 @@ func TestInterpreter_CallEngine_callNativeFunc_signExtend(t *testing.T) {
ce := &callEngine{}
f := &function{
moduleInstance: &wasm.ModuleInstance{Engine: &moduleEngine{}},
parent: &code{body: []*interpreterOp{
{kind: wazeroir.OperationKindConstI32, u1: uint64(uint32(tc.in))},
{kind: translateToIROperationKind(tc.opcode)},
{kind: wazeroir.OperationKindBr, u1: uint64(math.MaxUint64)},
parent: &code{body: []*wazeroir.UnionOperation{
{OpKind: wazeroir.OperationKindConstI32, U1: uint64(uint32(tc.in))},
{OpKind: translateToIROperationKind(tc.opcode)},
{OpKind: wazeroir.OperationKindBr, U1: uint64(math.MaxUint64)},
}},
}
ce.callNativeFunc(testCtx, &wasm.ModuleInstance{}, f)
@@ -470,10 +470,10 @@ func TestInterpreter_CallEngine_callNativeFunc_signExtend(t *testing.T) {
ce := &callEngine{}
f := &function{
moduleInstance: &wasm.ModuleInstance{Engine: &moduleEngine{}},
parent: &code{body: []*interpreterOp{
{kind: wazeroir.OperationKindConstI64, u1: uint64(tc.in)},
{kind: translateToIROperationKind(tc.opcode)},
{kind: wazeroir.OperationKindBr, u1: uint64(math.MaxUint64)},
parent: &code{body: []*wazeroir.UnionOperation{
{OpKind: wazeroir.OperationKindConstI64, U1: uint64(tc.in)},
{OpKind: translateToIROperationKind(tc.opcode)},
{OpKind: wazeroir.OperationKindBr, U1: uint64(math.MaxUint64)},
}},
}
ce.callNativeFunc(testCtx, &wasm.ModuleInstance{}, f)
@@ -543,8 +543,8 @@ func TestInterpreter_Compile(t *testing.T) {
func TestEngine_CachedcodesPerModule(t *testing.T) {
e := et.NewEngine(api.CoreFeaturesV1).(*engine)
exp := []*code{
{body: []*interpreterOp{}},
{body: []*interpreterOp{}},
{body: []*wazeroir.UnionOperation{}},
{body: []*wazeroir.UnionOperation{}},
}
m := &wasm.Module{}