mirror of
https://github.com/golang/go.git
synced 2025-05-23 08:21:24 +00:00
This replaces the src.Pos LineHist-based position tracking with the syntax.Pos implementation and updates all uses. The LineHist table is not used anymore - the respective code is still there but should be removed eventually. CL forthcoming. Passes toolstash -cmp when comparing to the master repo (with the exception of a couple of swapped assembly instructions, likely due to different instruction scheduling because the line-based sorting has changed; though this is won't affect correctness). The sizes of various important compiler data structures have increased significantly (see the various sizes_test.go files); this is probably the reason for an increase of compilation times (to be addressed). Here are the results of compilebench -count 5, run on a "quiet" machine (no apps running besides a terminal): name old time/op new time/op delta Template 256ms ± 1% 280ms ±15% +9.54% (p=0.008 n=5+5) Unicode 132ms ± 1% 132ms ± 1% ~ (p=0.690 n=5+5) GoTypes 891ms ± 1% 917ms ± 2% +2.88% (p=0.008 n=5+5) Compiler 3.84s ± 2% 3.99s ± 2% +3.95% (p=0.016 n=5+5) MakeBash 47.1s ± 1% 47.2s ± 2% ~ (p=0.841 n=5+5) name old user-ns/op new user-ns/op delta Template 309M ± 1% 326M ± 2% +5.18% (p=0.008 n=5+5) Unicode 165M ± 1% 168M ± 4% ~ (p=0.421 n=5+5) GoTypes 1.14G ± 2% 1.18G ± 1% +3.47% (p=0.008 n=5+5) Compiler 5.00G ± 1% 5.16G ± 1% +3.12% (p=0.008 n=5+5) Change-Id: I241c4246cdff627d7ecb95cac23060b38f9775ec Reviewed-on: https://go-review.googlesource.com/34273 Run-TryBot: Robert Griesemer <gri@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Matthew Dempsky <mdempsky@google.com>
230 lines
5.4 KiB
Go
230 lines
5.4 KiB
Go
// Copyright 2016 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package syntax
|
|
|
|
import (
|
|
"bytes"
|
|
"cmd/internal/src"
|
|
"flag"
|
|
"fmt"
|
|
"io/ioutil"
|
|
"path/filepath"
|
|
"runtime"
|
|
"strings"
|
|
"sync"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
var fast = flag.Bool("fast", false, "parse package files in parallel")
|
|
var src_ = flag.String("src", "parser.go", "source file to parse")
|
|
var verify = flag.Bool("verify", false, "verify idempotent printing")
|
|
|
|
func TestParse(t *testing.T) {
|
|
_, err := ParseFile(*src_, nil, nil, 0)
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
func TestStdLib(t *testing.T) {
|
|
if testing.Short() {
|
|
t.Skip("skipping test in short mode")
|
|
}
|
|
|
|
var m1 runtime.MemStats
|
|
runtime.ReadMemStats(&m1)
|
|
start := time.Now()
|
|
|
|
type parseResult struct {
|
|
filename string
|
|
lines uint
|
|
}
|
|
|
|
results := make(chan parseResult)
|
|
go func() {
|
|
defer close(results)
|
|
for _, dir := range []string{
|
|
runtime.GOROOT(),
|
|
} {
|
|
walkDirs(t, dir, func(filename string) {
|
|
if debug {
|
|
fmt.Printf("parsing %s\n", filename)
|
|
}
|
|
ast, err := ParseFile(filename, nil, nil, 0)
|
|
if err != nil {
|
|
t.Error(err)
|
|
return
|
|
}
|
|
if *verify {
|
|
verifyPrint(filename, ast)
|
|
}
|
|
results <- parseResult{filename, ast.Lines}
|
|
})
|
|
}
|
|
}()
|
|
|
|
var count, lines uint
|
|
for res := range results {
|
|
count++
|
|
lines += res.lines
|
|
if testing.Verbose() {
|
|
fmt.Printf("%5d %s (%d lines)\n", count, res.filename, res.lines)
|
|
}
|
|
}
|
|
|
|
dt := time.Since(start)
|
|
var m2 runtime.MemStats
|
|
runtime.ReadMemStats(&m2)
|
|
dm := float64(m2.TotalAlloc-m1.TotalAlloc) / 1e6
|
|
|
|
fmt.Printf("parsed %d lines (%d files) in %v (%d lines/s)\n", lines, count, dt, int64(float64(lines)/dt.Seconds()))
|
|
fmt.Printf("allocated %.3fMb (%.3fMb/s)\n", dm, dm/dt.Seconds())
|
|
}
|
|
|
|
func walkDirs(t *testing.T, dir string, action func(string)) {
|
|
fis, err := ioutil.ReadDir(dir)
|
|
if err != nil {
|
|
t.Error(err)
|
|
return
|
|
}
|
|
|
|
var files, dirs []string
|
|
for _, fi := range fis {
|
|
if fi.Mode().IsRegular() {
|
|
if strings.HasSuffix(fi.Name(), ".go") {
|
|
path := filepath.Join(dir, fi.Name())
|
|
files = append(files, path)
|
|
}
|
|
} else if fi.IsDir() && fi.Name() != "testdata" {
|
|
path := filepath.Join(dir, fi.Name())
|
|
if !strings.HasSuffix(path, "/test") {
|
|
dirs = append(dirs, path)
|
|
}
|
|
}
|
|
}
|
|
|
|
if *fast {
|
|
var wg sync.WaitGroup
|
|
wg.Add(len(files))
|
|
for _, filename := range files {
|
|
go func(filename string) {
|
|
defer wg.Done()
|
|
action(filename)
|
|
}(filename)
|
|
}
|
|
wg.Wait()
|
|
} else {
|
|
for _, filename := range files {
|
|
action(filename)
|
|
}
|
|
}
|
|
|
|
for _, dir := range dirs {
|
|
walkDirs(t, dir, action)
|
|
}
|
|
}
|
|
|
|
func verifyPrint(filename string, ast1 *File) {
|
|
var buf1 bytes.Buffer
|
|
_, err := Fprint(&buf1, ast1, true)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
ast2, err := ParseBytes(src.NewFileBase(filename, filename), buf1.Bytes(), nil, nil, 0)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
var buf2 bytes.Buffer
|
|
_, err = Fprint(&buf2, ast2, true)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
|
|
if bytes.Compare(buf1.Bytes(), buf2.Bytes()) != 0 {
|
|
fmt.Printf("--- %s ---\n", filename)
|
|
fmt.Printf("%s\n", buf1.Bytes())
|
|
fmt.Println()
|
|
|
|
fmt.Printf("--- %s ---\n", filename)
|
|
fmt.Printf("%s\n", buf2.Bytes())
|
|
fmt.Println()
|
|
panic("not equal")
|
|
}
|
|
}
|
|
|
|
func TestIssue17697(t *testing.T) {
|
|
_, err := ParseBytes(nil, nil, nil, nil, 0) // return with parser error, don't panic
|
|
if err == nil {
|
|
t.Errorf("no error reported")
|
|
}
|
|
}
|
|
|
|
func TestParseFile(t *testing.T) {
|
|
_, err := ParseFile("", nil, nil, 0)
|
|
if err == nil {
|
|
t.Error("missing io error")
|
|
}
|
|
|
|
var first error
|
|
_, err = ParseFile("", func(err error) {
|
|
if first == nil {
|
|
first = err
|
|
}
|
|
}, nil, 0)
|
|
if err == nil || first == nil {
|
|
t.Error("missing io error")
|
|
}
|
|
if err != first {
|
|
t.Errorf("got %v; want first error %v", err, first)
|
|
}
|
|
}
|
|
|
|
func TestLineDirectives(t *testing.T) {
|
|
for _, test := range []struct {
|
|
src, msg string
|
|
filename string
|
|
line, col uint
|
|
}{
|
|
// test validity of //line directive
|
|
{`//line :`, "invalid line number: ", "", 1, 8},
|
|
{`//line :x`, "invalid line number: x", "", 1, 8},
|
|
{`//line foo :`, "invalid line number: ", "", 1, 12},
|
|
{`//line foo:123abc`, "invalid line number: 123abc", "", 1, 11},
|
|
{`/**///line foo:x`, "invalid line number: x", "", 1, 15},
|
|
{`//line foo:0`, "invalid line number: 0", "", 1, 11},
|
|
{fmt.Sprintf(`//line foo:%d`, lineMax+1), fmt.Sprintf("invalid line number: %d", lineMax+1), "", 1, 11},
|
|
|
|
// test effect of //line directive on (relative) position information
|
|
{"//line foo:123\n foo", "syntax error: package statement must be first", "foo", 123, 3},
|
|
{"//line foo:123\n//line bar:345\nfoo", "syntax error: package statement must be first", "bar", 345, 0},
|
|
} {
|
|
_, err := ParseBytes(nil, []byte(test.src), nil, nil, 0)
|
|
if err == nil {
|
|
t.Errorf("%s: no error reported", test.src)
|
|
continue
|
|
}
|
|
perr, ok := err.(Error)
|
|
if !ok {
|
|
t.Errorf("%s: got %v; want parser error", test.src, err)
|
|
continue
|
|
}
|
|
if msg := perr.Msg; msg != test.msg {
|
|
t.Errorf("%s: got msg = %q; want %q", test.src, msg, test.msg)
|
|
}
|
|
if filename := perr.Pos.RelFilename(); filename != test.filename {
|
|
t.Errorf("%s: got filename = %q; want %q", test.src, filename, test.filename)
|
|
}
|
|
if line := perr.Pos.RelLine(); line != test.line {
|
|
t.Errorf("%s: got line = %d; want %d", test.src, line, test.line)
|
|
}
|
|
if col := perr.Pos.Col(); col != test.col {
|
|
t.Errorf("%s: got col = %d; want %d", test.src, col, test.col)
|
|
}
|
|
}
|
|
}
|