cmd/compile: use testConfig consistently in SSA tests

Change-Id: Iae41e14ee55eb4068fcb2189a77b345a7c5468b4
Reviewed-on: https://go-review.googlesource.com/38333
Run-TryBot: Josh Bleecher Snyder <josharian@gmail.com>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/ssa/dom_test.go b/src/cmd/compile/internal/ssa/dom_test.go
index 787c429e412bc0462093f62502cf30e34bc91e99..91758f24db9bd8dabbb20d3cef8461ea1b6ff54b 100644 (file)
--- a/src/cmd/compile/internal/ssa/dom_test.go
+++ b/src/cmd/compile/internal/ssa/dom_test.go
@@ -160,7 +160,7 @@ func genMaxPredValue(size int) []bloc {
 var domBenchRes []*Block
 
 func benchmarkDominators(b *testing.B, size int, bg blockGen) {
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(b)
        fun := Fun(c, DummyFrontend{b}, "entry", bg(size)...)
 
        CheckFunc(fun.f)

diff --git a/src/cmd/compile/internal/ssa/fuse_test.go b/src/cmd/compile/internal/ssa/fuse_test.go
index 803cde50f29c978abf087af94f6015bafb80d5e0..ec340ee7c5818ac022e27a665192ab75c2fae48a 100644 (file)
--- a/src/cmd/compile/internal/ssa/fuse_test.go
+++ b/src/cmd/compile/internal/ssa/fuse_test.go
@@ -8,7 +8,7 @@ import (
 
 func TestFuseEliminatesOneBranch(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -36,7 +36,7 @@ func TestFuseEliminatesOneBranch(t *testing.T) {
 
 func TestFuseEliminatesBothBranches(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -69,7 +69,7 @@ func TestFuseEliminatesBothBranches(t *testing.T) {
 
 func TestFuseHandlesPhis(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -102,7 +102,7 @@ func TestFuseHandlesPhis(t *testing.T) {
 }
 
 func TestFuseEliminatesEmptyBlocks(t *testing.T) {
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),

diff --git a/src/cmd/compile/internal/ssa/lca_test.go b/src/cmd/compile/internal/ssa/lca_test.go
index 196978451e7cf892e192a69569899daba25b4fe0..74128ae6e149264c9b7f2edd9571936c9269dfc5 100644 (file)
--- a/src/cmd/compile/internal/ssa/lca_test.go
+++ b/src/cmd/compile/internal/ssa/lca_test.go
@@ -22,7 +22,7 @@ func lcaEqual(f *Func, lca1, lca2 lca) bool {
 }
 
 func testLCAgen(t *testing.T, bg blockGen, size int) {
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry", bg(size)...)
        CheckFunc(fun.f)
        if size == 4 {

diff --git a/src/cmd/compile/internal/ssa/nilcheck_test.go b/src/cmd/compile/internal/ssa/nilcheck_test.go
index ae78266b825edac457fce7171fce466073bbe013..0c9daf000895652ef8a3f0aa23cfe2a491a2b606 100644 (file)
--- a/src/cmd/compile/internal/ssa/nilcheck_test.go
+++ b/src/cmd/compile/internal/ssa/nilcheck_test.go
@@ -40,7 +40,7 @@ func benchmarkNilCheckDeep(b *testing.B, depth int) {
                Bloc("exit", Exit("mem")),
        )
 
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(b)
        fun := Fun(c, DummyFrontend{b}, "entry", blocs...)
 
        CheckFunc(fun.f)
@@ -64,7 +64,7 @@ func isNilCheck(b *Block) bool {
 // TestNilcheckSimple verifies that a second repeated nilcheck is removed.
 func TestNilcheckSimple(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -101,7 +101,7 @@ func TestNilcheckSimple(t *testing.T) {
 // on the order of the dominees.
 func TestNilcheckDomOrder(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -137,7 +137,7 @@ func TestNilcheckDomOrder(t *testing.T) {
 // TestNilcheckAddr verifies that nilchecks of OpAddr constructed values are removed.
 func TestNilcheckAddr(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -170,7 +170,7 @@ func TestNilcheckAddr(t *testing.T) {
 // TestNilcheckAddPtr verifies that nilchecks of OpAddPtr constructed values are removed.
 func TestNilcheckAddPtr(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -205,7 +205,7 @@ func TestNilcheckAddPtr(t *testing.T) {
 // non-nil are removed.
 func TestNilcheckPhi(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -249,7 +249,7 @@ func TestNilcheckPhi(t *testing.T) {
 // are removed, but checks of different pointers are not.
 func TestNilcheckKeepRemove(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -297,7 +297,7 @@ func TestNilcheckKeepRemove(t *testing.T) {
 // block are *not* removed.
 func TestNilcheckInFalseBranch(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -348,7 +348,7 @@ func TestNilcheckInFalseBranch(t *testing.T) {
 // wil remove the generated nil check.
 func TestNilcheckUser(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),
@@ -387,7 +387,7 @@ func TestNilcheckUser(t *testing.T) {
 // TestNilcheckBug reproduces a bug in nilcheckelim found by compiling math/big
 func TestNilcheckBug(t *testing.T) {
        ptrType := &TypeImpl{Size_: 8, Ptr: true, Name: "testptr"} // dummy for testing
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(t)
        fun := Fun(c, DummyFrontend{t}, "entry",
                Bloc("entry",
                        Valu("mem", OpInitMem, TypeMem, 0, nil),

diff --git a/src/cmd/compile/internal/ssa/passbm_test.go b/src/cmd/compile/internal/ssa/passbm_test.go
index c431f89ea50ebc39bd3830179c109ba108c5a312..f628a028063336fd16c7de370861aad8864017d3 100644 (file)
--- a/src/cmd/compile/internal/ssa/passbm_test.go
+++ b/src/cmd/compile/internal/ssa/passbm_test.go
@@ -33,7 +33,7 @@ func BenchmarkMultiPassBlock(b *testing.B) { benchFnBlock(b, multi, genFunction)
 // benchFnPass runs passFunc b.N times across a single function.
 func benchFnPass(b *testing.B, fn passFunc, size int, bg blockGen) {
        b.ReportAllocs()
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(b)
        fun := Fun(c, DummyFrontend{b}, "entry", bg(size)...)
        CheckFunc(fun.f)
        b.ResetTimer()
@@ -48,7 +48,7 @@ func benchFnPass(b *testing.B, fn passFunc, size int, bg blockGen) {
 // benchFnPass runs passFunc across a function with b.N blocks.
 func benchFnBlock(b *testing.B, fn passFunc, bg blockGen) {
        b.ReportAllocs()
-       c := NewConfig("amd64", nil, true)
+       c := testConfig(b)
        fun := Fun(c, DummyFrontend{b}, "entry", bg(b.N)...)
        CheckFunc(fun.f)
        b.ResetTimer()