[llvm] [BOLT][test] Fix tests for aarch64 buildbot (PR #97620)

[Amir Ayupov via llvm-commits]

https://github.com/aaupov updated https://github.com/llvm/llvm-project/pull/97620

>From f219d1421bfd44fab29d83d6594867dc1e5a08e9 Mon Sep 17 00:00:00 2001
From: Amir Ayupov <aaupov at fb.com>
Date: Wed, 3 Jul 2024 12:07:22 -0700
Subject: [PATCH 1/3] [BOLT][test] Fix tests for aarch64 buildbot

---
 bolt/test/X86/infer_no_exits.test          | 2 +-
 bolt/test/X86/jt-symbol-disambiguation-4.s | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bolt/test/X86/infer_no_exits.test b/bolt/test/X86/infer_no_exits.test
index b8a39d339e011..2004f61496cd8 100644
--- a/bolt/test/X86/infer_no_exits.test
+++ b/bolt/test/X86/infer_no_exits.test
@@ -8,4 +8,4 @@
 
 # PREAGG: B X:0 #main# 1 0
 
-# CHECK: BOLT-INFO: inferred profile for 1 (100.00% of profiled, 100.00% of stale) functions responsible for -nan% samples (0 out of 0)
+# CHECK: BOLT-INFO: inferred profile for 1 (100.00% of profiled, 100.00% of stale) functions responsible for {{.*}}
diff --git a/bolt/test/X86/jt-symbol-disambiguation-4.s b/bolt/test/X86/jt-symbol-disambiguation-4.s
index d3d3dcd807054..dc4a2f115b389 100644
--- a/bolt/test/X86/jt-symbol-disambiguation-4.s
+++ b/bolt/test/X86/jt-symbol-disambiguation-4.s
@@ -10,7 +10,7 @@
 # REQUIRES: system-linux
 
 # RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o
-# RUN: %clang -no-pie %t.o -o %t.exe -Wl,-q
+# RUN: %clang %cflags -no-pie %t.o -o %t.exe -Wl,-q
 # RUN: llvm-bolt --funcs=main,foo/1 %t.exe -o %t.exe.bolt --print-normalized \
 # RUN:   2>&1 | FileCheck %s
 

>From bc12347c916cf00a949f5e2bb8eba001ae75bed6 Mon Sep 17 00:00:00 2001
From: Amir Ayupov <aaupov at fb.com>
Date: Wed, 3 Jul 2024 12:10:33 -0700
Subject: [PATCH 2/3] adjust infer_no_exits

---
 bolt/test/X86/infer_no_exits.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bolt/test/X86/infer_no_exits.test b/bolt/test/X86/infer_no_exits.test
index 2004f61496cd8..3e208053a3c85 100644
--- a/bolt/test/X86/infer_no_exits.test
+++ b/bolt/test/X86/infer_no_exits.test
@@ -8,4 +8,4 @@
 
 # PREAGG: B X:0 #main# 1 0
 
-# CHECK: BOLT-INFO: inferred profile for 1 (100.00% of profiled, 100.00% of stale) functions responsible for {{.*}}
+# CHECK: BOLT-INFO: inferred profile for 1 (100.00% of profiled, 100.00% of stale) functions

>From 483f7b5b81ca06cca48339ac646da26b40a18ee6 Mon Sep 17 00:00:00 2001
From: Amir Aupov <amir.aupov at gmail.com>
Date: Mon, 8 Jul 2024 22:23:04 -0700
Subject: [PATCH 3/3] Address test failure

---
 bolt/test/X86/jt-symbol-disambiguation-4.s | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bolt/test/X86/jt-symbol-disambiguation-4.s b/bolt/test/X86/jt-symbol-disambiguation-4.s
index dc4a2f115b389..ba338a00d23d2 100644
--- a/bolt/test/X86/jt-symbol-disambiguation-4.s
+++ b/bolt/test/X86/jt-symbol-disambiguation-4.s
@@ -18,7 +18,7 @@
 	.globl	main
 	.type	main, at function
 main:
-# CHECK: Binary Function "main"
+# CHECK: Binary Function "main
 	pushq   %rbp
 	movq	%rsp, %rbp
 	movq	$-16, %rax