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

wazevo: cleans up debug options (#1867)

Browse Source 
Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>
This commit is contained in:
Takeshi Yoneda
2023-12-13 07:19:21 -08:00
committed by GitHub
parent cf426e7aa9
commit 5d1d15fb9f
5 changed files with 8 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/engine/wazevo/backend/compiler.go
View File

@@ -15,16 +15,11 @@ func NewCompiler(ctx context.Context, mach Machine, builder ssa.Builder) Compile
return newCompiler(ctx, mach, builder)
}
func newCompiler(ctx context.Context, mach Machine, builder ssa.Builder) *compiler {
registerSetDebug := false
if wazevoapi.RegAllocValidationEnabled {
registerSetDebug = wazevoapi.IsHighRegisterPressure(ctx)
}
func newCompiler(_ context.Context, mach Machine, builder ssa.Builder) *compiler {
c := &compiler{
mach: mach, ssaBuilder: builder,
nextVRegID: regalloc.VRegIDNonReservedBegin,
regAlloc: regalloc.NewAllocator(mach.RegisterInfo(registerSetDebug)),
regAlloc: regalloc.NewAllocator(mach.RegisterInfo()),
}
mach.SetCompiler(c)
return c

20
internal/engine/wazevo/backend/isa/arm64/machine_regalloc.go
View File

@@ -320,25 +320,7 @@ func (r *regAllocBlockImpl) BlockParams(regs *[]regalloc.VReg) []regalloc.VReg {
func (r *regAllocBlockImpl) Entry() bool { return r.sb.EntryBlock() }
// RegisterInfo implements backend.Machine.
func (m *machine) RegisterInfo(debug bool) *regalloc.RegisterInfo {
if debug {
regInfoDebug := &regalloc.RegisterInfo{}
regInfoDebug.CalleeSavedRegisters = regInfo.CalleeSavedRegisters
regInfoDebug.CallerSavedRegisters = regInfo.CallerSavedRegisters
regInfoDebug.RealRegToVReg = regInfo.RealRegToVReg
regInfoDebug.RealRegName = regInfo.RealRegName
regInfoDebug.RealRegType = regInfo.RealRegType
regInfoDebug.AllocatableRegisters[regalloc.RegTypeFloat] = []regalloc.RealReg{
v18, // One callee saved.
v7, v6, v5, v4, v3, v2, v1, v0, // Allocatable sets == Argument registers.
}
regInfoDebug.AllocatableRegisters[regalloc.RegTypeInt] = []regalloc.RealReg{
x29, x30, // Caller saved, and special ones. But they should be able to get allocated.
x19, // One callee saved.
x7, x6, x5, x4, x3, x2, x1, x0, // Argument registers (all caller saved).
}
return regInfoDebug
}
func (m *machine) RegisterInfo() *regalloc.RegisterInfo {
return regInfo
}

4
internal/engine/wazevo/backend/machine.go
View File

@@ -14,9 +14,7 @@ type (
// RegisterInfo returns the set of registers that can be used for register allocation.
// This is only called once, and the result is shared across all compilations.
//
// If debug is true, this returns the register set for debugging purpose.
RegisterInfo(debug bool) *regalloc.RegisterInfo
RegisterInfo() *regalloc.RegisterInfo
// InitializeABI initializes the FunctionABI for the given signature.
InitializeABI(sig *ssa.Signature)

2
internal/engine/wazevo/backend/machine_test.go
View File

@@ -56,7 +56,7 @@ func (m mockMachine) ResolveRelativeAddresses() {}
func (m mockMachine) Function() (f regalloc.Function) { return }
// RegisterInfo implements Machine.RegisterInfo.
func (m mockMachine) RegisterInfo(bool) *regalloc.RegisterInfo {
func (m mockMachine) RegisterInfo() *regalloc.RegisterInfo {
if m.rinfo != nil {
return m.rinfo
}

9
internal/engine/wazevo/wazevoapi/debug_options.go
View File

@@ -41,18 +41,15 @@ const (
)
// ----- Validations -----
// These consts must be enabled by default until we reach the point where we can disable them (e.g. multiple days of fuzzing passes).
const (
RegAllocValidationEnabled = true
SSAValidationEnabled = true
// SSAValidationEnabled enables the SSA validation. This is disabled by default since the operation is expensive.
SSAValidationEnabled = false
)
// ----- Stack Guard Check -----
// These consts must be enabled by default until we reach the point where we can disable them (e.g. multiple days of fuzzing passes).
const (
// StackGuardCheckEnabled enables the stack guard check to ensure that our stack bounds check works correctly.
StackGuardCheckEnabled = true
StackGuardCheckEnabled = false
StackGuardCheckGuardPageSize = 8096
)