This is an archive of the discontinued LLVM Phabricator instance.

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

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

Details

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
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
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

@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
12
bolt/test/X86/internal-call-instrument.s
9
Elvina updated this revision to Diff 554803.Aug 30 2023, 12:45 PM

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

@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 :)

Elvina updated this revision to Diff 555179.Aug 31 2023, 3:22 PM

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

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–5
bolt/test/X86/internal-call-instrument.s
3–4
Elvina updated this revision to Diff 555466.Sep 1 2023, 12:45 PM
Elvina marked 3 inline comments as done.
Elvina updated this revision to Diff 555502.Sep 1 2023, 1:56 PM

Fixed internal-call-instrument.s test

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)
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

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
Elvina added a comment.Sep 6 2023, 1:22 PM

@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)

This revision was automatically updated to reflect the committed changes.
Elvina added a comment.Sep 7 2023, 2:07 PM

@Amir Thanks for the review and for your help!