From 845a95b1ae0f80d2b30ab6277e31b6d6164f0a90 Mon Sep 17 00:00:00 2001 From: Xiaodong Liu Date: Thu, 25 Nov 2021 14:20:39 +0800 Subject: [PATCH] cmd/compile/internal: fix test error on loong64 For TestLogOpt test case, add loong64 support to test the host architecture and os. The Ctz64 is not intrinsified on loong64 for TestIntendedInlining. Contributors to the loong64 port are: Weining Lu Lei Wang Lingqin Gong Xiaolin Zhao Meidan Li Xiaojuan Zhai Qiyuan Pu Guoqi Chen This port has been updated to Go 1.15.6: https://github.com/loongson/go Updates #46229 Change-Id: I42280e89a337dbfde55a01a134820f8ae94f6b47 Reviewed-on: https://go-review.googlesource.com/c/go/+/400237 Reviewed-by: David Chase Auto-Submit: Ian Lance Taylor TryBot-Result: Gopher Robot Reviewed-by: Ian Lance Taylor Run-TryBot: Ian Lance Taylor --- 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 8d07a49cc0fd6..411319f9e9eff 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", "ppc64le", "riscv64", "s390x", "wasm"} + arches = []string{"arm", "arm64", "386", "amd64", "mips", "mips64", "loong64", "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 0e52a572ab321..3fd45f21e7f66 100644 --- a/src/cmd/compile/internal/test/inl_test.go +++ b/src/cmd/compile/internal/test/inl_test.go @@ -218,10 +218,10 @@ func TestIntendedInlining(t *testing.T) { }, } - if runtime.GOARCH != "386" && runtime.GOARCH != "mips64" && runtime.GOARCH != "mips64le" && runtime.GOARCH != "riscv64" { + if runtime.GOARCH != "386" && runtime.GOARCH != "loong64" && 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 mips64x and riscv64, Ctz64 is not intrinsified and causes nextFreeFast too expensive + // On loong64, mips64x and riscv64, Ctz64 is not intrinsified and causes nextFreeFast too expensive // to inline (Issue 22239). want["runtime"] = append(want["runtime"], "nextFreeFast") }