From 7870ce0690bec347137ecf66dc0dfb8af27ab708 Mon Sep 17 00:00:00 2001 From: Nuno Cruces Date: Tue, 18 Feb 2025 16:36:22 +0000 Subject: [PATCH] wazero v1.9.0. --- .github/workflows/test.yml | 2 ++ embed/bcw2/go.mod | 4 ++-- go.mod | 6 +++--- go.sum | 4 ++-- gormlite/go.mod | 4 ++-- internal/testcfg/testcfg.go | 8 +------- internal/util/compiler.go | 27 --------------------------- sqlite.go | 6 +----- 8 files changed, 13 insertions(+), 48 deletions(-) delete mode 100644 internal/util/compiler.go diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 70e57e6..a561d46 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -7,12 +7,14 @@ on: - '**.go' - '**.mod' - '**.wasm' + - '**.yml' pull_request: branches: [ 'main' ] paths: - '**.go' - '**.mod' - '**.wasm' + - '**.yml' workflow_dispatch: jobs: diff --git a/embed/bcw2/go.mod b/embed/bcw2/go.mod index ab59b3d..c9296e2 100644 --- a/embed/bcw2/go.mod +++ b/embed/bcw2/go.mod @@ -1,8 +1,8 @@ module github.com/ncruces/go-sqlite3/embed/bcw2 -go 1.22 +go 1.22.0 -toolchain go1.23.0 +toolchain go1.24.0 require github.com/ncruces/go-sqlite3 v0.23.0 diff --git a/go.mod b/go.mod index 98bbc0c..3583f40 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ module github.com/ncruces/go-sqlite3 -go 1.22 +go 1.22.0 -toolchain go1.23.0 +toolchain go1.24.0 require ( github.com/ncruces/julianday v1.0.0 github.com/ncruces/sort v0.1.5 - github.com/tetratelabs/wazero v1.8.2 + github.com/tetratelabs/wazero v1.9.0 golang.org/x/crypto v0.33.0 golang.org/x/sys v0.30.0 ) diff --git a/go.sum b/go.sum index 0765ac8..05d1e0e 100644 --- a/go.sum +++ b/go.sum @@ -8,8 +8,8 @@ github.com/ncruces/sort v0.1.5 h1:fiFWXXAqKI8QckPf/6hu/bGFwcEPrirIOFaJqWujs4k= github.com/ncruces/sort v0.1.5/go.mod h1:obJToO4rYr6VWP0Uw5FYymgYGt3Br4RXcs/JdKaXAPk= github.com/psanford/httpreadat v0.1.0 h1:VleW1HS2zO7/4c7c7zNl33fO6oYACSagjJIyMIwZLUE= github.com/psanford/httpreadat v0.1.0/go.mod h1:Zg7P+TlBm3bYbyHTKv/EdtSJZn3qwbPwpfZ/I9GKCRE= -github.com/tetratelabs/wazero v1.8.2 h1:yIgLR/b2bN31bjxwXHD8a3d+BogigR952csSDdLYEv4= -github.com/tetratelabs/wazero v1.8.2/go.mod h1:yAI0XTsMBhREkM/YDAK/zNou3GoiAce1P6+rp/wQhjs= +github.com/tetratelabs/wazero v1.9.0 h1:IcZ56OuxrtaEz8UYNRHBrUa9bYeX9oVY93KspZZBf/I= +github.com/tetratelabs/wazero v1.9.0/go.mod h1:TSbcXCfFP0L2FGkRPxHphadXPjo1T6W+CseNNY7EkjM= golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus= golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M= golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w= diff --git a/gormlite/go.mod b/gormlite/go.mod index 9d2bdc1..22d710b 100644 --- a/gormlite/go.mod +++ b/gormlite/go.mod @@ -1,8 +1,8 @@ module github.com/ncruces/go-sqlite3/gormlite -go 1.22 +go 1.22.0 -toolchain go1.23.0 +toolchain go1.24.0 require ( github.com/ncruces/go-sqlite3 v0.23.0 diff --git a/internal/testcfg/testcfg.go b/internal/testcfg/testcfg.go index 8235896..b7ffc97 100644 --- a/internal/testcfg/testcfg.go +++ b/internal/testcfg/testcfg.go @@ -7,18 +7,12 @@ import ( "github.com/tetratelabs/wazero" "github.com/ncruces/go-sqlite3" - "github.com/ncruces/go-sqlite3/internal/util" ) // notest func init() { - if util.CompilerSupported() { - sqlite3.RuntimeConfig = wazero.NewRuntimeConfigCompiler() - } else { - sqlite3.RuntimeConfig = wazero.NewRuntimeConfigInterpreter() - } - sqlite3.RuntimeConfig = sqlite3.RuntimeConfig.WithMemoryLimitPages(512) + sqlite3.RuntimeConfig = wazero.NewRuntimeConfig().WithMemoryLimitPages(512) if os.Getenv("CI") != "" { path := filepath.Join(os.TempDir(), "wazero") if err := os.MkdirAll(path, 0777); err == nil { diff --git a/internal/util/compiler.go b/internal/util/compiler.go deleted file mode 100644 index aeefcce..0000000 --- a/internal/util/compiler.go +++ /dev/null @@ -1,27 +0,0 @@ -package util - -import ( - "runtime" - - "golang.org/x/sys/cpu" -) - -func CompilerSupported() bool { - switch runtime.GOOS { - case "linux", "android", - "windows", "darwin", - "freebsd", "netbsd", "dragonfly", - "solaris", "illumos": - break - default: - return false - } - switch runtime.GOARCH { - case "amd64": - return cpu.X86.HasSSE41 - case "arm64": - return true - default: - return false - } -} diff --git a/sqlite.go b/sqlite.go index 8203603..5b0497b 100644 --- a/sqlite.go +++ b/sqlite.go @@ -47,11 +47,7 @@ func compileSQLite() { ctx := context.Background() cfg := RuntimeConfig if cfg == nil { - if util.CompilerSupported() { - cfg = wazero.NewRuntimeConfigCompiler() - } else { - cfg = wazero.NewRuntimeConfigInterpreter() - } + cfg = wazero.NewRuntimeConfig() if bits.UintSize < 64 { cfg = cfg.WithMemoryLimitPages(512) // 32MB } else {