From 100e8b88c8ea95982c857562f564443d2b2d5831 Mon Sep 17 00:00:00 2001
From: shupiaoyang <shupiaoyang1@huawei.com>
Date: Wed, 30 Jul 2025 16:53:33 +0800
Subject: [PATCH] bugfix: enable AI optimization for AArch64 targets

---
 src/cmd/compile/internal/gc/main.go | 2 +-
 src/cmd/go/main.go                  | 2 +-
 src/internal/buildcfg/cfg.go        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/cmd/compile/internal/gc/main.go b/src/cmd/compile/internal/gc/main.go
index 99a1501e5..95fbc3e25 100644
--- a/src/cmd/compile/internal/gc/main.go
+++ b/src/cmd/compile/internal/gc/main.go
@@ -264,7 +264,7 @@ func Main(archInit func(*ssagen.ArchInfo)) {
 			log.Fatalf("%s: PGO error: %v", base.Flag.PgoProfile, err)
 		}
 	} else if base.Flag.CfgoProfile != "" {
-		result := os.Getenv("KP_AI_OPT")
+		result := os.Getenv("AI_OPT")
 		if result == "1" {
 			base.ENABLE_CFGO = true
 			var err error
diff --git a/src/cmd/go/main.go b/src/cmd/go/main.go
index c8f8894dd..13eb7acdb 100644
--- a/src/cmd/go/main.go
+++ b/src/cmd/go/main.go
@@ -94,7 +94,7 @@ var _ = go11tag
 
 func main() {
 	optimizeDecision := GetOptimizeDecision()
-	os.Setenv("KP_AI_OPT", strconv.Itoa(optimizeDecision))
+	os.Setenv("AI_OPT", strconv.Itoa(optimizeDecision))
 	log.SetFlags(0)
 	handleChdirFlag()
 	toolchain.Select()
diff --git a/src/internal/buildcfg/cfg.go b/src/internal/buildcfg/cfg.go
index e7469a1a9..19293cd79 100644
--- a/src/internal/buildcfg/cfg.go
+++ b/src/internal/buildcfg/cfg.go
@@ -127,7 +127,7 @@ func ParseGoarm64(v string) (g Goarm64Features, e error) {
 		}
 
 		if strings.HasSuffix(v, kpAtomicOpt) {
-			if os.Getenv("KP_AI_OPT") == "1" {
+			if os.Getenv("AI_OPT") == "1" {
 				g.KPAtomicOpt = true
 			}
 			v = v[:len(v)-len(kpAtomicOpt)]
@@ -139,7 +139,7 @@ func ParseGoarm64(v string) (g Goarm64Features, e error) {
 
 	switch v {
 	case "v8.0", "v8.1", "v8.2", "v8.3", "v8.4", "v8.5", "v8.6", "v8.7", "v8.8", "v8.9",
-	    "v9.0", "v9.1", "v9.2", "v9.4", "v9.5":
+		"v9.0", "v9.1", "v9.2", "v9.4", "v9.5":
 		g.Version = v
 	default:
 		e = fmt.Errorf("invalid GOARM64: must start with v8.{0-9} or v9.{0-5} and may optionally end in %q and/or %q",
-- 
Gitee