main (test): integrate test corpus runner

This allows us to test a large corpus of external packages against the compiler.
2022-01-10 17:58:34 -05:00 · 2022-01-10 17:58:34 -05:00 · 8aa223aed9
--- a/9
+++ b/9
@ -295,6 +295,15 @@ tinygo-bench-wasi:
 tinygo-bench-wasi-fast:
 	$(TINYGO) test -target wasi -bench . $(TEST_PACKAGES_WASI)

+# Test external packages in a large corpus.
+test-corpus:
+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags byollvm -run TestCorpus . -corpus=testdata/corpus.yaml
+test-corpus-fast:
+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags byollvm -run TestCorpus -short . -corpus=testdata/corpus.yaml
+test-corpus-wasi: wasi-libc
+	CGO_CPPFLAGS="$(CGO_CPPFLAGS)" CGO_CXXFLAGS="$(CGO_CXXFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" $(GO) test $(GOTESTFLAGS) -timeout=1h -buildmode exe -tags byollvm -run TestCorpus . -corpus=testdata/corpus.yaml -target=wasi
+
+
 .PHONY: smoketest
 smoketest:
 	$(TINYGO) version
--- a/compileopts/options.go
+++ b/compileopts/options.go
@ -44,6 +44,7 @@ type Options struct {
 	Programmer      string
 	OpenOCDCommands []string
 	LLVMFeatures    string
+	Directory       string
 }

 // Verify performs a validation on the given options, raising an error if options are not valid.
--- a/corpus_test.go
+++ b/corpus_test.go
@ -0,0 +1,177 @@
+package main
+
+import (
+	"flag"
+	"os"
+	"os/exec"
+	"strings"
+	"sync"
+	"testing"
+
+	yaml "gopkg.in/yaml.v2"
+)
+
+/*
+This contains code from https://github.com/dgryski/tinygo-test-corpus
+
+The MIT License (MIT)
+
+Copyright (c) 2020 Damian Gryski <damian@gryski.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+*/
+
+var corpus = flag.String("corpus", "", "path to test corpus")
+
+func TestCorpus(t *testing.T) {
+	t.Parallel()
+	if *corpus == "" {
+		t.Skip()
+	}
+
+	var target string
+	if *testTarget != "" {
+		target = *testTarget
+	}
+
+	repos, err := loadRepos(*corpus)
+	if err != nil {
+		t.Fatalf("loading corpus: %v", err)
+	}
+
+	for _, repo := range repos {
+		repo := repo
+		name := repo.Repo
+		if repo.Tags != "" {
+			name += "(" + strings.ReplaceAll(repo.Tags, " ", "-") + ")"
+		}
+		if repo.Version != "" {
+			name += "@" + repo.Version
+		}
+		t.Run(name, func(t *testing.T) {
+			t.Parallel()
+
+			if target == "wasi" && repo.SkipWASI {
+				t.Skip("skip wasi")
+			}
+			if repo.Slow && testing.Short() {
+				t.Skip("slow test")
+			}
+
+			var wg sync.WaitGroup
+			defer wg.Wait()
+			out := ioLogger(t, &wg)
+			defer out.Close()
+
+			dir := t.TempDir()
+			cmd := exec.Command("go", "mod", "init", "github.com/tinygo/tinygo-corpus-test")
+			cmd.Dir = dir
+			cmd.Stdout, cmd.Stderr = out, out
+			err := cmd.Run()
+			if err != nil {
+				t.Errorf("failed to init: %s", err.Error())
+				return
+			}
+
+			var ver string
+			if repo.Version != "" {
+				ver = "@" + repo.Version
+			}
+			cmd = exec.Command("go", "get", "-t", "-d", repo.Repo+"/..."+ver)
+			cmd.Dir = dir
+			cmd.Stdout, cmd.Stderr = out, out
+			err = cmd.Run()
+			if err != nil {
+				t.Errorf("failed to get: %s", err.Error())
+				return
+			}
+
+			doTest := func(t *testing.T, path string) {
+				var wg sync.WaitGroup
+				defer wg.Wait()
+				out := ioLogger(t, &wg)
+				defer out.Close()
+
+				opts := optionsFromTarget(target, sema)
+				opts.Directory = dir
+				opts.Tags = repo.Tags
+
+				passed, err := Test(path, out, out, &opts, false, testing.Verbose(), false, "", "", "", "")
+				if err != nil {
+					t.Errorf("test error: %v", err)
+				}
+				if !passed {
+					t.Error("test failed")
+				}
+			}
+			if len(repo.Subdirs) == 0 {
+				doTest(t, repo.Repo)
+				return
+			}
+
+			for _, dir := range repo.Subdirs {
+				dir := dir
+				t.Run(dir.Pkg, func(t *testing.T) {
+					t.Parallel()
+
+					if target == "wasi" && dir.SkipWASI {
+						t.Skip("skip wasi")
+					}
+					if dir.Slow && testing.Short() {
+						t.Skip("slow test")
+					}
+
+					doTest(t, repo.Repo+"/"+dir.Pkg)
+				})
+			}
+		})
+	}
+}
+
+type T struct {
+	Repo     string
+	Tags     string
+	Subdirs  []Subdir
+	SkipWASI bool
+	Slow     bool
+	Version  string
+}
+
+type Subdir struct {
+	Pkg      string
+	SkipWASI bool
+	Slow     bool
+}
+
+func loadRepos(f string) ([]T, error) {
+
+	yf, err := os.ReadFile(f)
+	if err != nil {
+		return nil, err
+	}
+
+	var repos []T
+	err = yaml.Unmarshal(yf, &repos)
+	if err != nil {
+		return nil, err
+	}
+
+	return repos, nil
+}
--- a/go.mod
+++ b/go.mod
@ -14,5 +14,6 @@ require (
 	go.bug.st/serial v1.1.3
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9
 	golang.org/x/tools v0.1.6-0.20210813165731-45389f592fe9
+	gopkg.in/yaml.v2 v2.4.0
 	tinygo.org/x/go-llvm v0.0.0-20220121152956-4fa2ab2718f3
 )
--- a/go.sum
+++ b/go.sum
@ -77,7 +77,8 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 tinygo.org/x/go-llvm v0.0.0-20220121152956-4fa2ab2718f3 h1:vQSFy0kNQegAfL/F6iyWQa4bF941Xc1gyJUkGy2m448=
 tinygo.org/x/go-llvm v0.0.0-20220121152956-4fa2ab2718f3/go.mod h1:GFbusT2VTA4I+l4j80b17KFK+6whv69Wtny5U+T8RR0=
--- a/loader/list.go
+++ b/loader/list.go
@ -28,5 +28,8 @@ func List(config *compileopts.Config, extraArgs, pkgs []string) (*exec.Cmd, erro
 	}
 	cmd := exec.Command(filepath.Join(goenv.Get("GOROOT"), "bin", "go"), args...)
 	cmd.Env = append(os.Environ(), "GOROOT="+goroot, "GOOS="+config.GOOS(), "GOARCH="+config.GOARCH(), "CGO_ENABLED="+cgoEnabled)
+	if config.Options.Directory != "" {
+		cmd.Dir = config.Options.Directory
+	}
 	return cmd, nil
 }
--- a/loader/loader.go
+++ b/loader/loader.go
@ -94,10 +94,15 @@ func Load(config *compileopts.Config, inputPkgs []string, clangHeaders string, t
 	if err != nil {
 		return nil, err
 	}
-	wd, err := os.Getwd()
+	var wd string
+	if config.Options.Directory != "" {
+		wd = config.Options.Directory
+	} else {
+		wd, err = os.Getwd()
 		if err != nil {
 			return nil, err
 		}
+	}
 	p := &Program{
 		config:       config,
 		clangHeaders: clangHeaders,
--- a/testdata/corpus.yaml
+++ b/testdata/corpus.yaml
@ -0,0 +1,273 @@
+# This contains code from https://github.com/dgryski/tinygo-test-corpus
+
+# The MIT License (MIT)
+
+# Copyright (c) 2020 Damian Gryski <damian@gryski.com>
+
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+- repo: github.com/dgryski/go-bloomindex
+  tags: purego noasm
+- repo: github.com/dgryski/go-arc
+- repo: github.com/dgryski/go-camellia
+- repo: github.com/dgryski/go-change
+- repo: github.com/dgryski/go-chaskey
+  tags: appengine purego noasm
+  skipwasi: true # siphash has build tag issues
+- repo: github.com/dgryski/go-clefia
+- repo: github.com/dgryski/go-clockpro
+- repo: github.com/dgryski/go-cobs
+- repo: github.com/dgryski/go-cuckoof
+  tags: pureno noasm
+- repo: github.com/dgryski/go-discreterand
+- repo: github.com/dgryski/go-expirecache
+- repo: github.com/dgryski/go-factor
+- repo: github.com/dgryski/go-farm
+  tags: purego noasm
+- repo: github.com/dgryski/go-fuzzstr
+- repo: github.com/dgryski/go-hollow
+- repo: github.com/dgryski/go-idea
+- repo: github.com/dgryski/go-interp
+  skipwasi: true # too slow on wasi
+  slow: true
+- repo: github.com/dgryski/go-intpat
+- repo: github.com/dgryski/go-jump
+- repo: github.com/dgryski/go-kcipher2
+- repo: github.com/dgryski/go-ketama
+- repo: github.com/dgryski/go-krcrypt
+- repo: github.com/dgryski/go-linebreak
+- repo: github.com/dgryski/go-linlog
+- repo: github.com/dgryski/go-maglev
+  tags: appengine # for dchest/siphash
+  skipwasi: true
+- repo: github.com/dgryski/go-marvin32
+  tags: purego
+- repo: github.com/dgryski/go-md5crypt
+- repo: github.com/dgryski/go-metro
+  tags: purego noasm
+- repo: github.com/dgryski/go-misty1
+- repo: github.com/dgryski/go-mph
+  tags: purego noasm
+- repo: github.com/dgryski/go-mpchash
+  tags: appengine # for dchest/siphash
+  skipwasi: true
+- repo: github.com/dgryski/go-neeva
+- repo: github.com/dgryski/go-nibz
+- repo: github.com/dgryski/go-nibblesort
+- repo: github.com/dgryski/go-pcgr
+- repo: github.com/dgryski/go-present
+- repo: github.com/dgryski/go-quicklz
+  skipwasi: true # not 32-bit compliant
+- repo: github.com/dgryski/go-radixsort
+- repo: github.com/dgryski/go-rbo
+- repo: github.com/dgryski/go-rc5
+- repo: github.com/dgryski/go-rc6
+- repo: github.com/dgryski/go-s4lru
+- repo: github.com/dgryski/go-sequitur
+- repo: github.com/dgryski/go-sip13
+  tags: purego noasm
+- repo: github.com/dgryski/go-skinny
+- repo: github.com/dgryski/go-skip32
+- repo: github.com/dgryski/go-skipjack
+- repo: github.com/dgryski/go-sparx
+- repo: github.com/dgryski/go-spooky
+- repo: github.com/dgryski/go-spritz
+- repo: github.com/dgryski/go-timewindow
+- repo: github.com/dgryski/go-tinymap
+- repo: github.com/dgryski/go-trigram
+- repo: github.com/dgryski/go-twine
+- repo: github.com/dgryski/go-xoroshiro
+- repo: github.com/dgryski/go-xoshiro
+- repo: github.com/dgryski/go-zlatlong
+- repo: github.com/dgryski/go-postings
+  tags: purego noasm
+- repo: golang.org/x/crypto
+  tags: purego noasm
+  subdirs:
+  - pkg: argon2
+  - pkg: bcrypt
+  - pkg: blake2b
+  - pkg: blake2s
+  - pkg: blowfish
+  - pkg: bn256
+  - pkg: cast5
+  - pkg: chacha20poly1305
+  - pkg: curve25519
+  - pkg: ed25519
+  - pkg: hkdf
+  - pkg: internal/subtle
+  - pkg: md4
+  - pkg: nacl/auth
+  - pkg: nacl/box
+  - pkg: nacl/secretbox
+  - pkg: nacl/sign
+  - pkg: openpgp/armor
+  - pkg: openpgp/elgamal
+  - pkg: openpgp/s2k
+  - pkg: pbkdf2
+  - pkg: pkcs12/internal/rc2
+  - pkg: ripemd160
+  - pkg: salsa20
+  - pkg: scrypt
+  - pkg: ssh/internal/bcrypt_pbkdf
+  - pkg: tea
+  - pkg: twofish
+  - pkg: xtea
+    # chacha20 -- panic: chacha20: SetCounter attempted to rollback counter
+    # cryptobyte -- panic: unimplemented: reflect.OverflowInt()
+    # salsa20/salsa -- panic: runtime error: index out of range
+    # sha3 -- panic: unimplemented: (reflect.Type).NumMethod()
+- repo: github.com/google/shlex
+- repo: github.com/google/btree
+- repo: github.com/google/der-ascii
+  subdirs:
+  - pkg: cmd/ascii2der
+  - pkg: cmd/der2ascii
+  - pkg: internal
+- repo: github.com/google/hilbert
+- repo: github.com/google/go-intervals
+  subdirs:
+    - pkg: intervalset
+    - pkg: timespanset
+      skipwasi: true # needs timezone stuff
+- repo: github.com/google/okay
+- repo: golang.org/x/text
+  subdirs:
+  - pkg: encoding
+  - pkg: encoding/charmap
+  - pkg: encoding/htmlindex
+  - pkg: encoding/ianaindex
+  - pkg: encoding/japanese
+  - pkg: encoding/korean
+  - pkg: encoding/simplifiedchinese
+  - pkg: encoding/traditionalchinese
+  - pkg: encoding/unicode
+  - pkg: encoding/unicode/utf32
+  - pkg: internal/format
+  - pkg: internal/ucd
+  - pkg: internal/tag
+  - pkg: search
+  - pkg: unicode/rangetable
+  - pkg: message/catalog
+    # 'collate/build', # -- panic: (reflect.Value).Interface: unexported
+    # 'feature/plural', # TestSelect, TestOrdinal, TestCardinal fail
+    # 'internal/catmsg', # TestCodec fails
+    # 'internal/gen/bitfield', # panic: unimplemented: (reflect.Type).Name()
+    # 'number', # fails due to printf %T formatting
+- repo: golang.org/x/image
+  tags: noasm
+  subdirs:
+  # - bmp: needs  _time.startTimer
+  - pkg: ccitt
+  - pkg: colornames
+  - pkg: draw
+  - pkg: font
+  - pkg: font/basicfont
+  - pkg: font/opentype
+  - pkg: font/plan9font
+  - pkg: math/fixed
+  - pkg: riff
+  - pkg: webp
+  - pkg: tiff
+- repo: github.com/golang/geo
+  subdirs:
+  - pkg: r1
+  - pkg: r2
+  - pkg: r3
+  - pkg: s1
+    #  's2' -- reflect.DeepEqual() -> MapKeys
+- repo: github.com/golang/groupcache
+  subdirs:
+  - pkg: consistenthash
+  - pkg: lru
+- repo: github.com/armon/go-radix
+- repo: github.com/armon/circbuf
+- repo: github.com/VividCortex/gohistogram
+- repo: github.com/cespare/xxhash
+  tags: appengine
+- repo: gonum.org/v1/gonum
+  tags: noasm
+- repo: gonum.org/v1/gonum
+  tags: noasm appengine
+  subdirs:
+  - pkg: blas/blas32
+  - pkg: blas/cblas64
+  - pkg: blas/cblas128
+  - pkg: cmplxs/cscalar
+  - pkg: dsp/window
+  - pkg: floats/scalar
+  - pkg: integrate
+  - pkg: integrate/quad
+  - pkg: internal/cmplx64
+  - pkg: internal/testrand
+  - pkg: lapack/gonum
+    skipwasi: true # takes too long
+    slow: true
+  - pkg: mathext
+  - pkg: mathext/prng
+  - pkg: optimize/convex/lp
+    skipwasi: true # takes too long
+  - pkg: optimize/functions
+  - pkg: spatial/r2
+  - pkg: spatial/r3
+  - pkg: stat/distmat
+  - pkg: stat/mds
+  - pkg: stat/spatial
+  - pkg: stat/distmv
+    skipwasi: true # takes too long
+    slow: true
+  - pkg: stat/samplemv
+    skipwasi: true # takes too long
+            # 'blas/blas64', # -- TestDasum panic: blas: n < 0
+            # 'blas/gonum', # -- panic: blas: n < 0
+            # 'cmplxs', # -- TestAdd panic: cmplxs: slice lengths do not match
+            # 'diff/fd', # -- panic: fd: slice length mismatch
+            # 'floats', # -- panic: floats: destination slice length does not match input
+            # 'graph', # ld.lld-11:  -- error: undefined symbol: reflect.mapiterkey (among other reflect errors)
+            # 'graph/topo', # -- Reflect: Same as above
+            # 'internal/math32', # -- /usr/local/go/src/testing/quick/quick.go:273:11: fType.NumOut undefined (type reflect.Type has no field or method NumOut)
+            # 'interp', # -- panic: interp: input slices have different lengths
+            # 'mat', # -- panic: mat: row index out of range
+            # 'num/dual', # -- TestFormat unexpected result for fmt.Sprintf("%#v", T{Real:1.1, Emag:2.1}): got:"T{Real:1.1, Emag:2.1}", want:"dual.Number{Real:1.1, Emag:2.1}"    unexpected result for fmt.Sprintf("%#v", T{Real:-1.1, Emag:-2.1}): got:"T{Real:-1.1, Emag:-2.1}", want:"dual.Number{Real:-1.1, Emag:-2.1}"
+            # 'num/dualcmplx', # -- TestFormat (similar to above)
+            # 'num/dualquat', # -- TestFormat (similar to above)
+            # 'num/hyperdual', # -- TestFormat (similar to above)
+            # 'num/quat', # -- TestFormat (similar to above)
+            # 'optimize', # // ld.lld-11: error: undefined symbol: golang.org/x/tools/container/intsets.havePOPCNT error: failed to link ...
+            # 'spatial/barneshut', # -- panic: unimplemented: (reflect.Value).MapKeys()
+            # 'spatial/kdtree', # -- panic: unimplemented: (reflect.Value).MapKeys()
+            # 'spatial/vptree', # -- panic: unimplemented: (reflect.Value).MapKeys()
+            # 'stat', # -- panic: stat: slice length mismatch
+            # 'stat/card', # -- /usr/local/go/src/encoding/gob/decode.go:562:21: MakeMapWithSize not declared by package reflect
+            # 'stat/distuv', # -- panic: distuv: cannot compute Mode for Beta != 0\
+            # 'stat/sampleuv', # -- TestWeightedTimeSeeded requires t.Skip(), otherwise passes
+            # 'unit', # -- All Format tests fail. Similar to `num` subpackages.
+
+- repo: github.com/cloudflare/bm
+- repo: github.com/cloudflare/bn256
+  tags: generic
+# "cloudflare/ahocorasick" -- interp timeout building regexps in test
+# - repo: github.com/google/open-location-code # unfortunately, Go discards the test files
+#   version: master
+#   skipwasi: true # needs file access
+#   subdirs:
+#   - pkg: go
+- repo: github.com/chewxy/math32
+  tags: noasm
+  version: master