Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Revert "cmd/asm: align an instruction or a function's address"

Browse source 
This reverts CL 212767.

Reason for revert: new test is persistently failing on freebsd-arm64-dmgk builder.

Change-Id: Ifd1227628e0e747688ddb4dc580170b2a103a89e
Reviewed-on: https://go-review.googlesource.com/c/go/+/226597
Run-TryBot: Bryan C. Mills <bcmills@google.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Bryan C. Mills 2020-03-31 15:35:28 +00:00
parent a3d8c210ad
commit 5970480c68
15 changed files with 25 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

101
src/cmd/link/link_test.go
View file

@ -3,7 +3,6 @@ package main
import (
"bufio"
"bytes"
"cmd/internal/objabi"
"debug/macho"
"internal/testenv"
"io/ioutil"
@ -448,103 +447,3 @@ func TestStrictDup(t *testing.T) {
t.Errorf("unexpected output:\n%s", out)
}
}
const testFuncAlignSrc = `
package main
import (
"fmt"
"reflect"
)
func alignFunc()
func alignPc()
func main() {
addr1 := reflect.ValueOf(alignFunc).Pointer()
addr2 := reflect.ValueOf(alignPc).Pointer()
switch {
case (addr1 % 2048) != 0 && (addr2 % 512) != 0:
fmt.Printf("expected 2048 bytes alignment, got %v; expected 512 bytes alignment, got %v\n", addr1, addr2)
case (addr2 % 512) != 0:
fmt.Printf("expected 512 bytes alignment, got %v\n", addr2)
case (addr1 % 2048) != 0:
fmt.Printf("expected 2048 bytes alignment, got %v\n", addr1)
default:
fmt.Printf("PASS")
}
}
`
const testFuncAlignAsmSrc = `
#include "textflag.h"
TEXT ·alignFunc(SB),NOSPLIT|ALIGN2048, $0-0
MOVD $1, R0
MOVD $2, R1
RET
TEXT ·alignPc(SB),NOSPLIT, $0-0
MOVD $2, R0
PCALIGN $512
MOVD $3, R1
RET
`
// TestFuncAlign verifies that the address of a function can be aligned
// with a specfic value on arm64.
func TestFuncAlign(t *testing.T) {
if objabi.GOARCH != "arm64" {
t.Skipf("Skipping FuncAlign test on %s", objabi.GOARCH)
}
testenv.MustHaveGoBuild(t)
tmpdir, err := ioutil.TempDir("", "TestFuncAlign")
if err != nil {
t.Fatal(err)
}
defer os.RemoveAll(tmpdir)
src := filepath.Join(tmpdir, "falign.go")
err = ioutil.WriteFile(src, []byte(testFuncAlignSrc), 0666)
if err != nil {
t.Fatal(err)
}
src = filepath.Join(tmpdir, "falign.s")
err = ioutil.WriteFile(src, []byte(testFuncAlignAsmSrc), 0666)
if err != nil {
t.Fatal(err)
}
// Build and run with old object file format.
cmd := exec.Command(testenv.GoToolPath(t), "build", "-o", "falign")
cmd.Env = append(os.Environ(), "GOARCH=arm64", "GOOS=linux")
cmd.Dir = tmpdir
out, err := cmd.CombinedOutput()
if err != nil {
t.Errorf("build failed: %v", err)
}
cmd = exec.Command(tmpdir + "/falign")
out, err = cmd.CombinedOutput()
if err != nil {
t.Errorf("failed to run with err %v, output: %s", err, out)
}
if string(out) != "PASS" {
t.Errorf("unexpected output: %s\n", out)
}
// Build and run with new object file format.
cmd = exec.Command(testenv.GoToolPath(t), "build", "-o", "falign", "-gcflags=all=-newobj", "-asmflags=all=-newobj", "-ldflags=-newobj")
cmd.Env = append(os.Environ(), "GOARCH=arm64", "GOOS=linux")
cmd.Dir = tmpdir
out, err = cmd.CombinedOutput()
if err != nil {
t.Errorf("build with newobj failed: %v", err)
}
cmd = exec.Command(tmpdir + "/falign")
out, err = cmd.CombinedOutput()
if err != nil {
t.Errorf("failed to run with -newobj, err: %v, output: %s", err, out)
}
if string(out) != "PASS" {
t.Errorf("unexpected output with -newobj: %s\n", out)
}
}