ci: merges spectests into normal make test (#2273)
Previously, only specification tests are run separately from the rest of the tests just to run in a separate GHA workflow (named spectest) to have a badge to brag. This used to unnecessarily use CI resources, and no need to do so anymore. Signed-off-by: Takeshi Yoneda <t.y.mathetake@gmail.com>
This commit is contained in:
Takeshi Yoneda
GitHub
92
.github/workflows/spectest.yaml
vendored
92
.github/workflows/spectest.yaml
vendored
@@ -1,92 +0,0 @@
|
||||
name: WebAssembly Core Specification Test
|
||||
on:
|
||||
pull_request:
|
||||
branches: [main]
|
||||
paths-ignore: # ignore docs as they are built with Netlify.
|
||||
- '**/*.md'
|
||||
- 'site/**'
|
||||
- 'netlify.toml'
|
||||
push:
|
||||
branches: [main]
|
||||
paths-ignore: # ignore docs as they are built with Netlify.
|
||||
- '**/*.md'
|
||||
- 'site/**'
|
||||
- 'netlify.toml'
|
||||
|
||||
defaults:
|
||||
run: # use bash for all operating systems unless overridden
|
||||
shell: bash
|
||||
|
||||
concurrency:
|
||||
# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#example-using-concurrency-to-cancel-any-in-progress-job-or-run
|
||||
group: ${{ github.ref }}-${{ github.workflow }}-${{ github.actor }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
test_amd64:
|
||||
name: ${{ matrix.spec-version }} - linux/amd64, Go-${{ matrix.go-version }}
|
||||
runs-on: ubuntu-22.04
|
||||
strategy:
|
||||
fail-fast: false # don't fail fast as sometimes failures are arch/OS specific
|
||||
matrix: # Use versions consistent with wazero's Go support policy.
|
||||
go-version:
|
||||
- "1.22" # Current Go version
|
||||
- "1.20" # Floor Go version of wazero (current - 2)
|
||||
spec-version:
|
||||
- "v1"
|
||||
- "v2"
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: ${{ matrix.go-version }}
|
||||
|
||||
- run: make spectest.${{ matrix.spec-version }}
|
||||
|
||||
test_scratch:
|
||||
name: ${{ matrix.spec-version }} / ${{ matrix.arch }}, Go-${{ matrix.go-version }}
|
||||
runs-on: ubuntu-22.04
|
||||
strategy:
|
||||
fail-fast: false # don't fail fast as sometimes failures are arch/OS specific
|
||||
matrix: # Use versions consistent with wazero's Go support policy.
|
||||
go-version:
|
||||
- "1.22" # Current Go version
|
||||
- "1.20" # Floor Go version of wazero (current - 2)
|
||||
arch:
|
||||
- "arm64"
|
||||
- "riscv64"
|
||||
spec-version:
|
||||
- "v1"
|
||||
- "v2"
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
|
||||
- uses: actions/setup-go@v4
|
||||
with:
|
||||
go-version: ${{ matrix.go-version }}
|
||||
|
||||
- name: Build test binaries
|
||||
run: go list -f '{{.Dir}}' ./... | grep 'spectest/${{ matrix.spec-version }}' | xargs -Ipkg go test pkg -c -o spectest.test
|
||||
env:
|
||||
GOARCH: ${{ matrix.arch }}
|
||||
CGO_ENABLED: 0
|
||||
|
||||
- name: Set up QEMU
|
||||
if: ${{ matrix.arch != 'amd64' }}
|
||||
uses: docker/setup-qemu-action@v2
|
||||
with: # Avoid docker.io rate-limits; built with internal-images.yml
|
||||
image: ghcr.io/tetratelabs/wazero/internal-binfmt
|
||||
platforms: ${{ matrix.arch }}
|
||||
|
||||
- name: Build scratch container
|
||||
run: |
|
||||
echo 'FROM scratch' >> Dockerfile
|
||||
echo 'CMD ["/test"]' >> Dockerfile
|
||||
docker buildx build -t wazero:test --platform linux/${{ matrix.arch }} .
|
||||
|
||||
- name: Run built test binaries
|
||||
# Note: This mounts /tmp to allow t.TempDir() in tests.
|
||||
run: docker run --platform linux/${{ matrix.arch }} -v $(pwd)/spectest.test:/test --tmpfs /tmp --rm -t wazero:test
|
||||
13
Makefile
13
Makefile
@@ -167,7 +167,7 @@ build.spectest.threads:
|
||||
|
||||
.PHONY: test
|
||||
test:
|
||||
@go test $(go_test_options) $$(go list ./... | grep -vE '$(spectest_v1_dir)|$(spectest_v2_dir)')
|
||||
@go test $(go_test_options) ./...
|
||||
@cd internal/version/testdata && go test $(go_test_options) ./...
|
||||
@cd internal/integration_test/fuzz/wazerolib && CGO_ENABLED=0 WASM_BINARY_PATH=testdata/test.wasm go test ./...
|
||||
|
||||
@@ -178,17 +178,6 @@ coverage: ## Generate test coverage
|
||||
@go test -coverprofile=coverage.txt -covermode=atomic --coverpkg=$(coverpkg) $(main_packages)
|
||||
@go tool cover -func coverage.txt
|
||||
|
||||
.PHONY: spectest
|
||||
spectest:
|
||||
@$(MAKE) spectest.v1
|
||||
@$(MAKE) spectest.v2
|
||||
|
||||
spectest.v1:
|
||||
@go test $(go_test_options) $$(go list ./... | grep $(spectest_v1_dir))
|
||||
|
||||
spectest.v2:
|
||||
@go test $(go_test_options) $$(go list ./... | grep $(spectest_v2_dir))
|
||||
|
||||
golangci_lint_path := $(shell go env GOPATH)/bin/golangci-lint
|
||||
|
||||
$(golangci_lint_path):
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# wazero: the zero dependency WebAssembly runtime for Go developers
|
||||
|
||||
[](https://github.com/tetratelabs/wazero/actions/workflows/spectest.yaml) [](https://pkg.go.dev/github.com/tetratelabs/wazero) [](https://opensource.org/licenses/Apache-2.0)
|
||||
[](https://pkg.go.dev/github.com/tetratelabs/wazero) [](https://opensource.org/licenses/Apache-2.0)
|
||||
|
||||
WebAssembly is a way to safely run code compiled in other languages. Runtimes
|
||||
execute WebAssembly Modules (Wasm), which are most often binaries with a `.wasm`
|
||||
|
||||
@@ -3901,14 +3901,9 @@ func (ce *callEngine) callNativeFunc(ctx context.Context, m *wasm.ModuleInstance
|
||||
case operationKindV128Dot:
|
||||
x2Hi, x2Lo := ce.popValue(), ce.popValue()
|
||||
x1Hi, x1Lo := ce.popValue(), ce.popValue()
|
||||
ce.pushValue(
|
||||
uint64(uint32(int32(int16(x1Lo>>0))*int32(int16(x2Lo>>0))+int32(int16(x1Lo>>16))*int32(int16(x2Lo>>16)))) |
|
||||
(uint64(uint32(int32(int16(x1Lo>>32))*int32(int16(x2Lo>>32))+int32(int16(x1Lo>>48))*int32(int16(x2Lo>>48)))) << 32),
|
||||
)
|
||||
ce.pushValue(
|
||||
uint64(uint32(int32(int16(x1Hi>>0))*int32(int16(x2Hi>>0))+int32(int16(x1Hi>>16))*int32(int16(x2Hi>>16)))) |
|
||||
(uint64(uint32(int32(int16(x1Hi>>32))*int32(int16(x2Hi>>32))+int32(int16(x1Hi>>48))*int32(int16(x2Hi>>48)))) << 32),
|
||||
)
|
||||
lo, hi := v128Dot(x1Hi, x1Lo, x2Hi, x2Lo)
|
||||
ce.pushValue(lo)
|
||||
ce.pushValue(hi)
|
||||
frame.pc++
|
||||
case operationKindV128ITruncSatFromF:
|
||||
hi, lo := ce.popValue(), ce.popValue()
|
||||
@@ -4584,3 +4579,18 @@ func (ce *callEngine) callGoFuncWithStack(ctx context.Context, m *wasm.ModuleIns
|
||||
ce.stack = ce.stack[0 : len(ce.stack)-shrinkLen]
|
||||
}
|
||||
}
|
||||
|
||||
// v128Dot performs a dot product of two 64-bit vectors.
|
||||
// Note: for some reason (which I suspect is due to a bug in Go compiler's regalloc),
|
||||
// inlining this function causes a bug which happens **only when** we run with -race AND arm64 AND Go 1.22.
|
||||
func v128Dot(x1Hi, x1Lo, x2Hi, x2Lo uint64) (uint64, uint64) {
|
||||
r1 := int32(int16(x1Lo>>0)) * int32(int16(x2Lo>>0))
|
||||
r2 := int32(int16(x1Lo>>16)) * int32(int16(x2Lo>>16))
|
||||
r3 := int32(int16(x1Lo>>32)) * int32(int16(x2Lo>>32))
|
||||
r4 := int32(int16(x1Lo>>48)) * int32(int16(x2Lo>>48))
|
||||
r5 := int32(int16(x1Hi>>0)) * int32(int16(x2Hi>>0))
|
||||
r6 := int32(int16(x1Hi>>16)) * int32(int16(x2Hi>>16))
|
||||
r7 := int32(int16(x1Hi>>32)) * int32(int16(x2Hi>>32))
|
||||
r8 := int32(int16(x1Hi>>48)) * int32(int16(x2Hi>>48))
|
||||
return uint64(uint32(r1+r2)) | (uint64(uint32(r3+r4)) << 32), uint64(uint32(r5+r6)) | (uint64(uint32(r7+r8)) << 32)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user