From d4dbad53ca080d767798ee4267999868d7f2c22d Mon Sep 17 00:00:00 2001 From: Bryan Mills Date: Tue, 12 Apr 2022 02:53:29 +0000 Subject: [PATCH] Revert "cmd/compile/internal: fix test error on loong64" This reverts CL 367043. Reason for revert: auto-submitted prematurely, breaking tests on most builders. Change-Id: I6da319fb042b629bcd6f549be638497a357e7d28 Reviewed-on: https://go-review.googlesource.com/c/go/+/399795 Run-TryBot: Bryan Mills Auto-Submit: Bryan Mills Reviewed-by: Dmitri Shuralyov TryBot-Result: Gopher Robot --- src/cmd/compile/internal/logopt/logopt_test.go | 2 +- src/cmd/compile/internal/test/inl_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cmd/compile/internal/logopt/logopt_test.go b/src/cmd/compile/internal/logopt/logopt_test.go index 411319f9e9..8d07a49cc0 100644 --- a/src/cmd/compile/internal/logopt/logopt_test.go +++ b/src/cmd/compile/internal/logopt/logopt_test.go @@ -155,7 +155,7 @@ func s15a8(x *[15]int64) [15]int64 { arches := []string{runtime.GOARCH} goos0 := runtime.GOOS if runtime.GOARCH == "amd64" { // Test many things with "linux" (wasm will get "js") - arches = []string{"arm", "arm64", "386", "amd64", "mips", "mips64", "loong64", "ppc64le", "riscv64", "s390x", "wasm"} + arches = []string{"arm", "arm64", "386", "amd64", "mips", "mips64", "ppc64le", "riscv64", "s390x", "wasm"} goos0 = "linux" } diff --git a/src/cmd/compile/internal/test/inl_test.go b/src/cmd/compile/internal/test/inl_test.go index 9e93cdd0c5..b10d37a17c 100644 --- a/src/cmd/compile/internal/test/inl_test.go +++ b/src/cmd/compile/internal/test/inl_test.go @@ -163,10 +163,10 @@ func TestIntendedInlining(t *testing.T) { }, } - if runtime.GOARCH != "386" && runtime.GOARCH != "loong64" && runtime.GOARCH != "mips64" && runtime.GOARCH != "mips64le" && runtime.GOARCH != "riscv64" { + if runtime.GOARCH != "386" && runtime.GOARCH != "mips64" && runtime.GOARCH != "mips64le" && runtime.GOARCH != "riscv64" { // nextFreeFast calls sys.Ctz64, which on 386 is implemented in asm and is not inlinable. // We currently don't have midstack inlining so nextFreeFast is also not inlinable on 386. - // On loong64, mips64x and riscv64, Ctz64 is not intrinsified and causes nextFreeFast too expensive + // On mips64x and riscv64, Ctz64 is not intrinsified and causes nextFreeFast too expensive // to inline (Issue 22239). want["runtime"] = append(want["runtime"], "nextFreeFast") } -- 2.50.0