LLVM and SPIRV-LLVM-Translator pulldown (WW45)

LLVM: llvm/llvm-project@41dba9e
SPIRV-LLVM-Translator: KhronosGroup/SPIRV-LLVM-Translator@a33d3af

Author: bb-sycl

.github/workflows/sycl_post_commit.yml

@@ -14,6 +14,7 @@ on:
     - .github/workflows/sycl_windows_build_and_test.yml
     - .github/workflows/sycl_macos_build_and_test.yml
 
+
 jobs:
   # This job generates matrix of tests for LLVM Test Suite
   test_matrix:

bolt/CMakeLists.txt

@@ -55,6 +55,7 @@ if (BOLT_ENABLE_RUNTIME)
                -DCMAKE_BUILD_TYPE=Release
                -DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}
                -DCMAKE_INSTALL_PREFIX=${LLVM_BINARY_DIR}
+               -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
     BUILD_ALWAYS True
     )
   install(CODE "execute_process\(COMMAND \${CMAKE_COMMAND} -DCMAKE_INSTALL_PREFIX=\${CMAKE_INSTALL_PREFIX} -P ${CMAKE_CURRENT_BINARY_DIR}/bolt_rt-bins/cmake_install.cmake \)"
@@ -87,3 +88,6 @@ option(BOLT_INCLUDE_DOCS "Generate build targets for the BOLT docs."
 if (BOLT_INCLUDE_DOCS)
   add_subdirectory(docs)
 endif()
+
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/include/bolt/RuntimeLibs/RuntimeLibraryVariables.inc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/include/bolt/RuntimeLibs/RuntimeLibraryVariables.inc @ONLY)

bolt/include/bolt/RuntimeLibs/RuntimeLibraryVariables.inc.in

@@ -0,0 +1,17 @@
+//===-- RuntimeLibraryVariables.inc.in - bolt build variables -*- C++ -*---===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+//
+// This file is configured by the build system to define the runtime library
+// location.
+//
+// The variant of this file not ending with .in has been autogenerated by the
+// LLVM build. Do not edit!
+//
+//===----------------------------------------------------------------------===//
+
+#define LLVM_LIBDIR_SUFFIX "@LLVM_LIBDIR_SUFFIX@"

bolt/lib/Rewrite/RewriteInstance.cpp

@@ -599,10 +599,19 @@ void RewriteInstance::parsePseudoProbe() {
     errs() << "BOLT-WARNING: fail in building GUID2FuncDescMap\n";
     return;
   }
+
+  MCPseudoProbeDecoder::Uint64Set GuidFilter;
+  MCPseudoProbeDecoder::Uint64Map FuncStartAddrs;
+  for (const BinaryFunction *F : BC->getAllBinaryFunctions()) {
+    for (const MCSymbol *Sym : F->getSymbols()) {
+      FuncStartAddrs[Function::getGUID(NameResolver::restore(Sym->getName()))] =
+          F->getAddress();
+    }
+  }
   Contents = PseudoProbeSection->getContents();
   if (!BC->ProbeDecoder.buildAddress2ProbeMap(
-          reinterpret_cast<const uint8_t *>(Contents.data()),
-          Contents.size())) {
+          reinterpret_cast<const uint8_t *>(Contents.data()), Contents.size(),
+          GuidFilter, FuncStartAddrs)) {
     BC->ProbeDecoder.getAddress2ProbesMap().clear();
     errs() << "BOLT-WARNING: fail in building Address2ProbeMap\n";
     return;
@@ -3426,6 +3435,8 @@ void RewriteInstance::encodePseudoProbes() {
   // Address of the first probe is absolute.
   // Other probes' address are represented by delta
   auto EmitDecodedPseudoProbe = [&](MCDecodedPseudoProbe *&CurProbe) {
+    assert(!isSentinelProbe(CurProbe->getAttributes()) &&
+           "Sentinel probes should not be emitted");
     EmitULEB128IntValue(CurProbe->getIndex());
     uint8_t PackedType = CurProbe->getType() | (CurProbe->getAttributes() << 4);
     uint8_t Flag =
@@ -3530,9 +3541,17 @@ void RewriteInstance::encodePseudoProbes() {
         reinterpret_cast<const uint8_t *>(DescContents.data()),
         DescContents.size());
     StringRef ProbeContents = PseudoProbeSection->getOutputContents();
+    MCPseudoProbeDecoder::Uint64Set GuidFilter;
+    MCPseudoProbeDecoder::Uint64Map FuncStartAddrs;
+    for (const BinaryFunction *F : BC->getAllBinaryFunctions()) {
+      const uint64_t Addr =
+          F->isEmitted() ? F->getOutputAddress() : F->getAddress();
+      FuncStartAddrs[Function::getGUID(
+          NameResolver::restore(F->getOneName()))] = Addr;
+    }
     DummyDecoder.buildAddress2ProbeMap(
         reinterpret_cast<const uint8_t *>(ProbeContents.data()),
-        ProbeContents.size());
+        ProbeContents.size(), GuidFilter, FuncStartAddrs);
     DummyDecoder.printProbesForAllAddresses(outs());
   }
 }

bolt/lib/RuntimeLibs/RuntimeLibrary.cpp

@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "bolt/RuntimeLibs/RuntimeLibrary.h"
+#include "bolt/RuntimeLibs/RuntimeLibraryVariables.inc"
 #include "bolt/Utils/Utils.h"
 #include "llvm/BinaryFormat/Magic.h"
 #include "llvm/ExecutionEngine/RuntimeDyld.h"
@@ -28,12 +29,12 @@ std::string RuntimeLibrary::getLibPath(StringRef ToolPath,
                                        StringRef LibFileName) {
   StringRef Dir = llvm::sys::path::parent_path(ToolPath);
   SmallString<128> LibPath = llvm::sys::path::parent_path(Dir);
-  llvm::sys::path::append(LibPath, "lib");
+  llvm::sys::path::append(LibPath, "lib" LLVM_LIBDIR_SUFFIX);
   if (!llvm::sys::fs::exists(LibPath)) {
     // In some cases we install bolt binary into one level deeper in bin/,
     // we need to go back one more level to find lib directory.
     LibPath = llvm::sys::path::parent_path(llvm::sys::path::parent_path(Dir));
-    llvm::sys::path::append(LibPath, "lib");
+    llvm::sys::path::append(LibPath, "lib" LLVM_LIBDIR_SUFFIX);
   }
   llvm::sys::path::append(LibPath, LibFileName);
   if (!llvm::sys::fs::exists(LibPath)) {

bolt/runtime/CMakeLists.txt

@@ -15,10 +15,12 @@ add_library(bolt_rt_instr STATIC
   instr.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/config.h
   )
+set_target_properties(bolt_rt_instr PROPERTIES LIBRARY_OUTPUT_DIRECTORY "lib${LLVM_LIBDIR_SUFFIX}")
 add_library(bolt_rt_hugify STATIC
   hugify.cpp
   ${CMAKE_CURRENT_BINARY_DIR}/config.h
   )
+set_target_properties(bolt_rt_hugify PROPERTIES LIBRARY_OUTPUT_DIRECTORY "lib${LLVM_LIBDIR_SUFFIX}")
 
 set(BOLT_RT_FLAGS
   -ffreestanding
@@ -33,17 +35,18 @@ target_include_directories(bolt_rt_instr PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 target_compile_options(bolt_rt_hugify PRIVATE ${BOLT_RT_FLAGS})
 target_include_directories(bolt_rt_hugify PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
-install(TARGETS bolt_rt_instr DESTINATION "${CMAKE_INSTALL_LIBDIR}")
-install(TARGETS bolt_rt_hugify DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+install(TARGETS bolt_rt_instr DESTINATION "lib${LLVM_LIBDIR_SUFFIX}")
+install(TARGETS bolt_rt_hugify DESTINATION "lib${LLVM_LIBDIR_SUFFIX}")
 
 if (CMAKE_CXX_COMPILER_ID MATCHES ".*Clang.*")
   add_library(bolt_rt_instr_osx STATIC
     instr.cpp
     ${CMAKE_CURRENT_BINARY_DIR}/config.h
   )
+  set_target_properties(bolt_rt_instr_osx PROPERTIES LIBRARY_OUTPUT_DIRECTORY "lib${LLVM_LIBDIR_SUFFIX}")
   target_include_directories(bolt_rt_instr_osx PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
   target_compile_options(bolt_rt_instr_osx PRIVATE
     -target x86_64-apple-darwin19.6.0
     ${BOLT_RT_FLAGS})
-  install(TARGETS bolt_rt_instr_osx DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+  install(TARGETS bolt_rt_instr_osx DESTINATION "lib${LLVM_LIBDIR_SUFFIX}")
 endif()

bolt/test/AArch64/double_jump.cpp

@@ -3,7 +3,7 @@
 // RUN: %clang %cflags -O0 %s -o %t.exe
 // RUN: llvm-bolt %t.exe -o %t.bolt --peepholes=double-jumps | \
 // RUN:   FileCheck %s -check-prefix=CHECKBOLT
-// RUN: llvm-objdump -d %t.bolt | FileCheck %s
+// RUN: llvm-objdump --no-print-imm-hex -d %t.bolt | FileCheck %s
 
 // CHECKBOLT: BOLT-INFO: Peephole: 1 double jumps patched.
 

bolt/test/pseudoprobe-decoding-inline.test

@@ -0,0 +1,117 @@
+# REQUIRES: system-linux
+# RUN: llvm-bolt  %S/../../llvm/test/tools/llvm-profgen/Inputs/inline-cs-pseudoprobe.perfbin --print-pseudo-probes=all -o %t.bolt 2>&1 | FileCheck %s
+
+CHECK: Report of decoding input pseudo probe binaries
+
+CHECK-NEXT: Pseudo Probe Desc:
+CHECK-NEXT: GUID: 6699318081062747564 Name: foo
+CHECK-NEXT: Hash: 563088904013236
+CHECK-NEXT: GUID: 15822663052811949562 Name: main
+CHECK-NEXT: Hash: 281479271677951
+CHECK-NEXT: GUID: 16434608426314478903 Name: bar
+CHECK-NEXT: Hash: 72617220756
+
+CHECK:  [Probe]: FUNC: bar Index: 1  Type: Block
+CHECK:  [Probe]: FUNC: bar Index: 4  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 1  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 5  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 6  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 3  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 4  Type: Block
+CHECK:  [Probe]: FUNC: bar Index: 1  Type: Block  Inlined: @ foo:8
+CHECK:  [Probe]: FUNC: bar Index: 4  Type: Block  Inlined: @ foo:8
+CHECK:  [Probe]: FUNC: foo Index: 6  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 7  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 9  Type: DirectCall
+CHECK:  [Probe]: FUNC: main Index: 1  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 1  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 5  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 6  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 3  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 4  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: bar Index: 1  Type: Block  Inlined: @ main:2 @ foo:8
+CHECK:  [Probe]: FUNC: bar Index: 4  Type: Block  Inlined: @ main:2 @ foo:8
+CHECK:  [Probe]: FUNC: foo Index: 6  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 7  Type: Block  Inlined: @ main:2
+CHECK:  [Probe]: FUNC: foo Index: 9  Type: DirectCall  Inlined: @ main:2
+
+CHECK: Pseudo Probe Address Conversion results:
+
+CHECK: Address: 0x201750 FUNC: bar Index: 1  Type: Block
+CHECK: Address: 0x201750 FUNC: bar Index: 4  Type: Block
+CHECK: Address: 0x201770 FUNC: foo Index: 1  Type: Block
+CHECK: Address: 0x201770 FUNC: foo Index: 2  Type: Block
+CHECK: Address: 0x20177d FUNC: foo Index: 5  Type: Block
+CHECK: Address: 0x20177d FUNC: foo Index: 6  Type: Block
+CHECK: Address: 0x20177d FUNC: foo Index: 2  Type: Block
+CHECK: Address: 0x20178b FUNC: foo Index: 3  Type: Block
+CHECK: Address: 0x2017aa FUNC: foo Index: 4  Type: Block
+CHECK: Address: 0x2017aa FUNC: bar Index: 1  Type: Block  Inlined: @ foo:8
+CHECK: Address: 0x2017aa FUNC: bar Index: 4  Type: Block  Inlined: @ foo:8
+CHECK: Address: 0x2017aa FUNC: foo Index: 6  Type: Block
+CHECK: Address: 0x2017aa FUNC: foo Index: 2  Type: Block
+CHECK: Address: 0x2017d7 FUNC: foo Index: 7  Type: Block
+CHECK: Address: 0x2017e2 FUNC: foo Index: 9  Type: DirectCall
+CHECK: Address: 0x2017f0 FUNC: main Index: 1  Type: Block
+CHECK: Address: 0x2017f0 FUNC: foo Index: 1  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x2017f0 FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x2017fd FUNC: foo Index: 5  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x2017fd FUNC: foo Index: 6  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x2017fd FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x20180b FUNC: foo Index: 3  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x20182a FUNC: foo Index: 4  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x20182a FUNC: bar Index: 1  Type: Block  Inlined: @ main:2 @ foo:8
+CHECK: Address: 0x20182a FUNC: bar Index: 4  Type: Block  Inlined: @ main:2 @ foo:8
+CHECK: Address: 0x20182a FUNC: foo Index: 6  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x20182a FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x201857 FUNC: foo Index: 7  Type: Block  Inlined: @ main:2
+CHECK: Address: 0x201862 FUNC: foo Index: 9  Type: DirectCall  Inlined: @ main:2
+
+CHECK: 			Address:  2103120
+CHECK-NEXT:  [Probe]: FUNC: bar Index: 1  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: bar Index: 4  Type: Block
+CHECK-NEXT: Address:  2103152
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 1  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK-NEXT: Address:  2103165
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 5  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 6  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK-NEXT: Address:  2103179
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 3  Type: Block
+CHECK-NEXT: Address:  2103210
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 4  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 6  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: bar Index: 1  Type: Block  Inlined: @ foo:8
+CHECK-NEXT:  [Probe]: FUNC: bar Index: 4  Type: Block  Inlined: @ foo:8
+CHECK-NEXT: Address:  2103255
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 7  Type: Block
+CHECK-NEXT: Address:  2103266
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 9  Type: DirectCall
+CHECK-NEXT: Address:  2103280
+CHECK-NEXT:  [Probe]: FUNC: main Index: 1  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 1  Type: Block  Inlined: @ main:2
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK-NEXT: Address:  2103293
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 5  Type: Block  Inlined: @ main:2
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 6  Type: Block  Inlined: @ main:2
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK-NEXT: Address:  2103307
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 3  Type: Block  Inlined: @ main:2
+CHECK-NEXT: Address:  2103338
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 4  Type: Block  Inlined: @ main:2
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 6  Type: Block  Inlined: @ main:2
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block  Inlined: @ main:2
+CHECK-NEXT:  [Probe]: FUNC: bar Index: 1  Type: Block  Inlined: @ main:2 @ foo:8
+CHECK-NEXT:  [Probe]: FUNC: bar Index: 4  Type: Block  Inlined: @ main:2 @ foo:8
+CHECK-NEXT: Address:  2103383
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 7  Type: Block  Inlined: @ main:2
+CHECK-NEXT: Address:  2103394
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 9  Type: DirectCall  Inlined: @ main:2

bolt/test/pseudoprobe-decoding-noinline.test

@@ -0,0 +1,74 @@
+# REQUIRES: system-linux
+# RUN: llvm-bolt  %S/../../llvm/test/tools/llvm-profgen/Inputs/noinline-cs-pseudoprobe.perfbin --print-pseudo-probes=all -o %t.bolt 2>&1 | FileCheck %s
+
+;; Report of decoding input pseudo probe binaries
+
+; CHECK: GUID: 6699318081062747564 Name: foo
+; CHECK: Hash: 563088904013236
+; CHECK: GUID: 15822663052811949562 Name: main
+; CHECK: Hash: 281479271677951
+; CHECK: GUID: 16434608426314478903 Name: bar
+; CHECK: Hash: 72617220756
+
+CHECK:  [Probe]: FUNC: bar Index: 1  Type: Block
+CHECK:  [Probe]: FUNC: bar Index: 4  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 1  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 5  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 6  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 3  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 4  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 8  Type: DirectCall
+CHECK:  [Probe]: FUNC: foo Index: 6  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 7  Type: Block
+CHECK:  [Probe]: FUNC: foo Index: 9  Type: DirectCall
+CHECK:  [Probe]: FUNC: main Index: 1  Type: Block
+CHECK:  [Probe]: FUNC: main Index: 2  Type: DirectCall
+
+CHECK: Pseudo Probe Address Conversion results:
+
+CHECK: Address: 0x201760 FUNC: bar Index: 1  Type: Block
+CHECK: Address: 0x201760 FUNC: bar Index: 4  Type: Block
+CHECK: Address: 0x201780 FUNC: foo Index: 1  Type: Block
+CHECK: Address: 0x201780 FUNC: foo Index: 2  Type: Block
+CHECK: Address: 0x20178d FUNC: foo Index: 5  Type: Block
+CHECK: Address: 0x20178d FUNC: foo Index: 6  Type: Block
+CHECK: Address: 0x20178d FUNC: foo Index: 2  Type: Block
+CHECK: Address: 0x20179b FUNC: foo Index: 3  Type: Block
+CHECK: Address: 0x2017ba FUNC: foo Index: 4  Type: Block
+CHECK: Address: 0x2017bc FUNC: foo Index: 8  Type: DirectCall
+CHECK: Address: 0x2017ba FUNC: foo Index: 6  Type: Block
+CHECK: Address: 0x2017ba FUNC: foo Index: 2  Type: Block
+CHECK: Address: 0x2017ce FUNC: foo Index: 7  Type: Block
+CHECK: Address: 0x2017d5 FUNC: foo Index: 9  Type: DirectCall
+CHECK: Address: 0x2017f0 FUNC: main Index: 1  Type: Block
+CHECK: Address: 0x2017f4 FUNC: main Index: 2  Type: DirectCall
+
+CHECK: 			Address:  2103136
+CHECK-NEXT:  [Probe]: FUNC: bar Index: 1  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: bar Index: 4  Type: Block
+CHECK-NEXT: Address:  2103168
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 1  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK-NEXT: Address:  2103181
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 5  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 6  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK-NEXT: Address:  2103195
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 3  Type: Block
+CHECK-NEXT: Address:  2103226
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 4  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 6  Type: Block
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 2  Type: Block
+CHECK-NEXT: Address:  2103228
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 8  Type: DirectCall
+CHECK-NEXT: Address:  2103246
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 7  Type: Block
+CHECK-NEXT: Address:  2103253
+CHECK-NEXT:  [Probe]: FUNC: foo Index: 9  Type: DirectCall
+CHECK-NEXT: Address:  2103280
+CHECK-NEXT:  [Probe]: FUNC: main Index: 1  Type: Block
+CHECK-NEXT: Address:  2103284
+CHECK-NEXT:  [Probe]: FUNC: main Index: 2  Type: DirectCall

bolt/test/runtime/AArch64/adrrelaxationpass.s

@@ -7,7 +7,7 @@
 # RUN:   %s -o %t.o
 # RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
 # RUN: llvm-bolt %t.exe -o %t.bolt --adr-relaxation=true
-# RUN: llvm-objdump -d --disassemble-symbols=main %t.bolt | FileCheck %s
+# RUN: llvm-objdump --no-print-imm-hex -d --disassemble-symbols=main %t.bolt | FileCheck %s
 # RUN: %t.bolt
 
   .data