This is an archive of the discontinued LLVM Phabricator instance.

Differential D159094

[BOLT][test] Fix cross-compilation tests after D151920
ClosedPublic

Authored by Elvina on Aug 29 2023, 7:12 AM.

Details

Reviewers
Amir
yota9
rafauler
maksfb
Commits
rG6678f602c243: [BOLT][test] Fix cross-compilation tests after D151920
Summary

Fix tests that are failing in cross-compilation after D151920
(https://lab.llvm.org/buildbot/#/builders/221/builds/17715):

  • instrumentation-ind-call, basic-instrumentation: add -mno-outline-atomics flag to runtime lib
  • bolt-address-translation-internal-call, internal-call-instrument: add %cflags
  • meta-merge-fdata: restrict to x86_64

Diff Detail

Event Timeline

Elvina created this revision.Aug 29 2023, 7:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 29 2023, 7:12 AM
Herald added a subscriber: ayermolo. · View Herald Transcript
Elvina requested review of this revision.Aug 29 2023, 7:12 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 29 2023, 7:12 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Elvina updated this revision to Diff 554323.Aug 29 2023, 7:21 AM
Elvina updated this revision to Diff 554326.Aug 29 2023, 7:25 AM
Harbormaster completed remote builds in B255521: Diff 554326.Aug 29 2023, 7:58 AM
Elvina updated this revision to Diff 554491.Aug 29 2023, 2:17 PM
Elvina edited the summary of this revision. (Show Details)

Trying another approach, with UNSUPPORTED target

Herald added a subscriber: kristof.beyls. · View Herald TranscriptAug 29 2023, 2:17 PM
Elvina mentioned this in D151920: [BOLT] Instrumentation: Fix tests.Aug 29 2023, 3:05 PM
maksfb added a comment.Aug 29 2023, 5:25 PM

@Elvina, could you please try %cflags change for the two test cases instead of disabling them?

bolt/test/X86/bolt-address-translation-internal-call.test
13
bolt/test/X86/internal-call-instrument.s
9
Harbormaster completed remote builds in B255626: Diff 554491.Aug 29 2023, 6:12 PM
Elvina updated this revision to Diff 554803.Aug 30 2023, 12:45 PM

added %cflags to bolt-address-translation-internal-call.test

Elvina added a comment.Aug 30 2023, 12:49 PM
In D159094#4626791, @maksfb wrote:

@Elvina, could you please try %cflags change for the two test cases instead of disabling them?

Thanks for the suggestion! I added it to the bolt-address-translation-internal-call.test, but for internal-call-instrument.s I need to modify test further, because instrumentation asks for DT_FINI entry. Will try to do it asap :)

Harbormaster completed remote builds in B255853: Diff 554803.Aug 30 2023, 1:23 PM
Elvina updated this revision to Diff 555179.Aug 31 2023, 3:22 PM

added fix for instrumentation-ind-call.c and basic-instrumentation.test

Harbormaster completed remote builds in B256119: Diff 555179.Aug 31 2023, 3:23 PM
Elvina updated this revision to Diff 555196.Aug 31 2023, 4:32 PM

rebase

Harbormaster completed remote builds in B256133: Diff 555196.Aug 31 2023, 4:38 PM
Amir added a comment.Aug 31 2023, 5:02 PM

Please update the title and summary.

bolt/test/X86/instrumentation-eh_frame_hdr.cpp
4–6
bolt/test/X86/internal-call-instrument.s
3–5
Elvina updated this revision to Diff 555466.Sep 1 2023, 12:45 PM
Elvina marked 3 inline comments as done.
Harbormaster completed remote builds in B256323: Diff 555466.Sep 1 2023, 12:51 PM
Elvina updated this revision to Diff 555502.Sep 1 2023, 1:56 PM

Fixed internal-call-instrument.s test

Harbormaster completed remote builds in B256352: Diff 555502.Sep 1 2023, 2:02 PM
Elvina retitled this revision from Temporarily move failed test to runtime to Fix failed tests.Sep 1 2023, 2:05 PM
Elvina edited the summary of this revision. (Show Details)
Herald added a subscriber: pengfei. · View Herald TranscriptSep 1 2023, 2:05 PM
Elvina added a comment.Sep 1 2023, 2:06 PM

@Amir I disabled meta-merge-fdata.test for aarch64, as we need to correctly handle .plt.got for this case. I'll add separate patch for this soon

Elvina added a comment.Sep 6 2023, 12:45 PM

@Amir gentle ping

Amir added a comment.Sep 6 2023, 12:56 PM

@Elvina – please update the title and summary. Looks good otherwise.

Elvina retitled this revision from Fix failed tests to [BOLT][test] Fix failed tests.Sep 6 2023, 1:18 PM
Herald added a subscriber: treapster. · View Herald TranscriptSep 6 2023, 1:18 PM
Elvina added a comment.Sep 6 2023, 1:22 PM
In D159094#4640029, @Amir wrote:

@Elvina – please update the title and summary. Looks good otherwise.

Sorry, I forgot about adding [BOLT] to the title, updated now.

Amir added a comment.Sep 6 2023, 9:23 PM

Can you please also tidy up the summary using 50-72 rule?

Elvina edited the summary of this revision. (Show Details)Sep 7 2023, 6:03 AM
Amir accepted this revision.Sep 7 2023, 10:29 AM
Amir retitled this revision from [BOLT][test] Fix failed tests to [BOLT][test] Fix cross-compilation tests after D151920.
Amir edited the summary of this revision. (Show Details)
This revision is now accepted and ready to land.Sep 7 2023, 10:30 AM
Amir added a comment.Sep 7 2023, 10:31 AM

(Please make sure to amend your local commit before pushing - use arc land)

Closed by commit rG6678f602c243: [BOLT][test] Fix cross-compilation tests after D151920 (authored by Elvina). · Explain WhySep 7 2023, 2:06 PM
This revision was automatically updated to reflect the committed changes.
Elvina added a commit: rG6678f602c243: [BOLT][test] Fix cross-compilation tests after D151920.
Elvina added a comment.Sep 7 2023, 2:07 PM

@Amir Thanks for the review and for your help!

Revision Contents

Diff 554491

bolt/test/X86/asm-dump.c

/** /**
* Test for asm-dump functionality. * Test for asm-dump functionality.
* *
* REQUIRES: x86_64-linux,bolt-runtime * REQUIRES: x86_64-linux,bolt-runtime
* UNSUPPORTED: target=aarch64{{.*}}
* *
* Compile the source * Compile the source
* RUN: %clang -fPIC %s -o %t.exe -Wl,-q * RUN: %clang -fPIC %s -o %t.exe -Wl,-q
* *
* Profile collection: instrument the binary * Profile collection: instrument the binary
* RUN: llvm-bolt %t.exe --instrument --instrumentation-file=%t.fdata -o \ * RUN: llvm-bolt %t.exe --instrument --instrumentation-file=%t.fdata -o \
* RUN: %t.instr * RUN: %t.instr
* *
▲ Show 20 Lines • Show All 69 Lines • Show Last 20 Lines

bolt/test/X86/bolt-address-translation-internal-call.test

# This checks for an issue with internal calls and BAT (BOLT address # This checks for an issue with internal calls and BAT (BOLT address
# translation). BAT needs to map every output block back to an input # translation). BAT needs to map every output block back to an input
# block, but passes that introduce new blocks (such as validate # block, but passes that introduce new blocks (such as validate
# internal calls) might create new blocks without a mapping to an # internal calls) might create new blocks without a mapping to an
# input block. # input block.
# REQUIRES: x86_64-linux,bolt-runtime # REQUIRES: x86_64-linux,bolt-runtime
# UNSUPPORTED: target=aarch64{{.*}}
# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o # RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o
# Delete our BB symbols so BOLT doesn't mark them as entry points # Delete our BB symbols so BOLT doesn't mark them as entry points
# RUN: llvm-strip --strip-unneeded %t.o # RUN: llvm-strip --strip-unneeded %t.o
# RUN: %clang %t.o -o %t.exe -Wl,-q # RUN: %clang %t.o -o %t.exe -Wl,-q
maksfbUnsubmitted
Done
ReplyInline Actions
# RUN: llvm-strip --strip-unneeded %t.o
- # RUN: %clang %t.o -o %t.exe -Wl,-q
+ # RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
# RUN: llvm-bolt --enable-bat %t.exe --relocs -o %t.out | FileCheck %s
maksfb:
# RUN: llvm-bolt --enable-bat %t.exe --relocs -o %t.out | FileCheck %s # RUN: llvm-bolt --enable-bat %t.exe --relocs -o %t.out | FileCheck %s
# CHECK: BOLT-INFO: Wrote {{.*}} BAT maps # CHECK: BOLT-INFO: Wrote {{.*}} BAT maps
# RUN: llvm-bat-dump %t.out --dump-all | \ # RUN: llvm-bat-dump %t.out --dump-all | \
# RUN: FileCheck %s --check-prefix=CHECK-BAT-DUMP # RUN: FileCheck %s --check-prefix=CHECK-BAT-DUMP
# CHECK-BAT-DUMP: BAT tables for {{.*}} functions # CHECK-BAT-DUMP: BAT tables for {{.*}} functions
Show All 32 Lines

bolt/test/X86/instrumentation-eh_frame_hdr.cpp

// This test checks that .eh_frame_hdr address is in bounds of the last LOAD // This test checks that .eh_frame_hdr address is in bounds of the last LOAD
// end address i.e. the section address is smaller then the LOAD end address. // end address i.e. the section address is smaller then the LOAD end address.
// REQUIRES: system-linux,bolt-runtime // REQUIRES: system-linux,bolt-runtime
// UNSUPPORTED: target=aarch64{{.*}}
AmirUnsubmitted
Done
ReplyInline Actions
// end address i.e. the section address is smaller then the LOAD end address.
- // REQUIRES: system-linux,bolt-runtime
- // UNSUPPORTED: target=aarch64{{.*}}
+ // REQUIRES: system-linux,bolt-runtime,target=x86_64{{.*}}
// RUN: %clangxx %cxxflags -static -Wl,-q %s -o %t.exe -Wl,--entry=_start
Amir:
// RUN: %clangxx %cxxflags -static -Wl,-q %s -o %t.exe -Wl,--entry=_start // RUN: %clangxx %cxxflags -static -Wl,-q %s -o %t.exe -Wl,--entry=_start
// RUN: llvm-bolt %t.exe -o %t.instr -instrument \ // RUN: llvm-bolt %t.exe -o %t.instr -instrument \
// RUN: --instrumentation-file=%t.fdata -instrumentation-sleep-time=1 // RUN: --instrumentation-file=%t.fdata -instrumentation-sleep-time=1
// RUN: (llvm-readelf -SW %t.instr | grep -v bolt; llvm-readelf -lW %t.instr | \ // RUN: (llvm-readelf -SW %t.instr | grep -v bolt; llvm-readelf -lW %t.instr | \
// RUN: grep LOAD | tail -n 1) | FileCheck %s // RUN: grep LOAD | tail -n 1) | FileCheck %s
// CHECK: {{.*}} .eh_frame_hdr PROGBITS [[#%x, EH_ADDR:]] // CHECK: {{.*}} .eh_frame_hdr PROGBITS [[#%x, EH_ADDR:]]
// CHECK: LOAD 0x[[#%x, LD_OFFSET:]] 0x[[#%x, LD_VADDR:]] 0x[[#%x, LD_FSIZE:]] // CHECK: LOAD 0x[[#%x, LD_OFFSET:]] 0x[[#%x, LD_VADDR:]] 0x[[#%x, LD_FSIZE:]]
Show All 27 Lines

bolt/test/X86/internal-call-instrument.s

# This reproduces a bug with instrumentation crashes on internal call # This reproduces a bug with instrumentation crashes on internal call
# REQUIRES: x86_64-linux,bolt-runtime # REQUIRES: x86_64-linux,bolt-runtime
# UNSUPPORTED: target=aarch64{{.*}}
AmirUnsubmitted
Done
ReplyInline Actions
# This reproduces a bug with instrumentation crashes on internal call
- # REQUIRES: x86_64-linux,bolt-runtime
- # UNSUPPORTED: target=aarch64{{.*}}
+ # REQUIRES: x86_64-linux,bolt-runtime,target=x86_64{{.*}}
# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o
Amir:
# RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o # RUN: llvm-mc -filetype=obj -triple x86_64-unknown-unknown %s -o %t.o
# Delete our BB symbols so BOLT doesn't mark them as entry points # Delete our BB symbols so BOLT doesn't mark them as entry points
# RUN: llvm-strip --strip-unneeded %t.o # RUN: llvm-strip --strip-unneeded %t.o
# RUN: %clang %t.o -o %t.exe -Wl,-q # RUN: %clang %t.o -o %t.exe -Wl,-q
maksfbUnsubmitted
Not Done
ReplyInline Actions
# RUN: llvm-strip --strip-unneeded %t.o
- # RUN: %clang %t.o -o %t.exe -Wl,-q
+ # RUN: %clang %cflags %t.o -o %t.exe -Wl,-q
# RUN: llvm-bolt --instrument %t.exe --relocs -o %t.out
maksfb:
# RUN: llvm-bolt --instrument %t.exe --relocs -o %t.out # RUN: llvm-bolt --instrument %t.exe --relocs -o %t.out
.text .text
.globl main .globl main
.type main, %function .type main, %function
.p2align 4 .p2align 4
main: main:
Show All 27 Lines