Prepare for LLVM 10 upgrade #67900

nikic · 2020-01-05T16:01:40Z

Split off from #67759, this just adds the necessary compatibility bits and updates codegen tests, without performing the actual LLVM upgrade.

r? @alexcrichton

nagisa

This PR removes debug info tests for LLVM 5/6, but this PR does not explicitly appear to remove any code that would otherwise break those tests (even though LLVM 6 is no longer supported AFAIK)?

Either way r=me once we flesh out the data layout string story.

nagisa · 2020-01-05T23:10:48Z

src/librustc_codegen_llvm/context.rs

@@ -156,6 +172,13 @@ pub unsafe fn create_module(
    if llvm_util::get_major_version() < 9 {
        target_data_layout = strip_function_ptr_alignment(target_data_layout);
    }
+    if sess.target.target.arch == "x86" || sess.target.target.arch == "x86_64" {


We should do either one or the other, not both, if either one at all. i.e. we ought to pick whether our target data layouts strings are llvm10 (which IMO they should be) or something else. Then we don’t need code that can both "upgrade" and "downgrade" the string.

There's three parts here:

Data layout in our own target definitions: I agree that we should update those to use the LLVM 10 data layouts.

Downgrade support: If we use LLVM 10 data layout, then we must have downgrade support, otherwise older LLVM versions cannot be used anymore.

Upgrade support: Upgrade support is needed if we want to keep 3rd party target definitions (for x86 based targets) working. If we're okay with breaking these and have no stability guarantees in this area, then we can drop the upgrade support.

I don’t believe we have any stability guarantees for external target files. Going in that direction would necessitate removing at least some fields from target specs and data layout would be one of those fields -- we dont want to be on the hook for ensuring stability of LLVM's interfaces.

With that in mind I'd be happy with this if we only kept the downgrade code.

I've dropped the upgrade code and updated all the in-tree targets ... hopefully without typos ;)

nikic · 2020-01-06T11:35:12Z

This PR removes debug info tests for LLVM 5/6, but this PR does not explicitly appear to remove any code that would otherwise break those tests (even though LLVM 6 is no longer supported AFAIK)?

Right, these tests should have been dropped when LLVM 6 support was dropped (I can't find the relevant PR, because searching for LLVM in PRs is impossible...) The tests fail under LLVM 10 because LLVM 10 is not included in the ignore line, but it seemed to make little sense to extend the ignore if there aren't any non-ignored versions left anymore...

alexcrichton · 2020-01-06T17:42:35Z

Oh wow that's a good number of changes! I feel the same way as @nagisa, so I defer to ...

r? @nagisa

The integer versions are deprecated

This is similar to the autoupdate LLVM performs internally.

These are no longer relevant, as our minimum supported version is LLVM 7.

InstrProfData.inc has been moved to include/

Only keep the downgrade code

nagisa · 2020-01-08T01:40:40Z

@bors r+ rollup=never

bors · 2020-01-08T01:40:41Z

📌 Commit c9e996f has been approved by nagisa

bors · 2020-01-13T04:01:11Z

⌛ Testing commit c9e996f with merge e82febc...

@alexcrichton

Prepare for LLVM 10 upgrade Split off from #67759, this just adds the necessary compatibility bits and updates codegen tests, without performing the actual LLVM upgrade. r? @alexcrichton

bors · 2020-01-13T07:18:40Z

☀️ Test successful - checks-azure
Approved by: nagisa
Pushing e82febc to master...

@ghost

Update to LLVM 10 LLVM 10 is going to be branched soon, so it's a good time to start finding all those tasty new miscompiles and performance regressions ;) Status: * Preparation split off into #67900. * Optimization regressions: * [x] https://bugs.llvm.org/show_bug.cgi?id=44419 => https://reviews.llvm.org/D72048 has landed. * [x] https://bugs.llvm.org/show_bug.cgi?id=44423 => https://reviews.llvm.org/D72060 has landed. * [ ] https://reviews.llvm.org/D72169 submitted. * [ ] https://bugs.llvm.org/show_bug.cgi?id=44461 reported. https://reviews.llvm.org/D72420 submitted, but unlikely eligible for LLVM 10. * Compile-time regressions: * [x] GlobalOpt regression identified. ~~fhahn proposed https://reviews.llvm.org/D72214.~~ fhahn has [reverted](llvm/llvm-project@192cce1) the patch. * [ ] Even with the revert, there are [large regressions](https://perf.rust-lang.org/compare.html?start=760ce94c69ca510d44087291c311296f6d9ccdf5&end=4e84f97d76e694bb9f59039f5bdeb6d8bca46d14). * Assertion failures: * [x] https://bugs.llvm.org/show_bug.cgi?id=44600 => https://reviews.llvm.org/D73135, https://reviews.llvm.org/D73854 and https://reviews.llvm.org/D73908 have landed and been cherry-picked to the 10.x branch. r? @ghost

@ghost

Update to LLVM 10 LLVM 10 is going to be branched soon, so it's a good time to start finding all those tasty new miscompiles and performance regressions ;) Status: * Preparation split off into #67900. * Optimization regressions: * [x] https://bugs.llvm.org/show_bug.cgi?id=44419 => https://reviews.llvm.org/D72048 has landed. * [x] https://bugs.llvm.org/show_bug.cgi?id=44423 => https://reviews.llvm.org/D72060 has landed. * [ ] https://reviews.llvm.org/D72169 submitted. * [ ] https://bugs.llvm.org/show_bug.cgi?id=44461 reported. https://reviews.llvm.org/D72420 submitted, but unlikely eligible for LLVM 10. * Compile-time regressions: * [x] GlobalOpt regression identified. ~~fhahn proposed https://reviews.llvm.org/D72214.~~ fhahn has [reverted](llvm/llvm-project@192cce1) the patch. * [ ] Even with the revert, there are [large regressions](https://perf.rust-lang.org/compare.html?start=760ce94c69ca510d44087291c311296f6d9ccdf5&end=4e84f97d76e694bb9f59039f5bdeb6d8bca46d14). * Assertion failures / infinite loops: * [x] https://bugs.llvm.org/show_bug.cgi?id=44600 => https://reviews.llvm.org/D73135, https://reviews.llvm.org/D73854 and https://reviews.llvm.org/D73908 have landed and been cherry-picked to the 10.x branch. * [x] https://bugs.llvm.org/show_bug.cgi?id=44835 => https://reviews.llvm.org/D74278 has landed and been cherry-picked. r? @ghost

@ghost

Update to LLVM 10 LLVM 10 is going to be branched soon, so it's a good time to start finding all those tasty new miscompiles and performance regressions ;) Status: * Preparation split off into #67900. * Optimization regressions: * [x] https://bugs.llvm.org/show_bug.cgi?id=44419 => https://reviews.llvm.org/D72048 has landed. * [x] https://bugs.llvm.org/show_bug.cgi?id=44423 => https://reviews.llvm.org/D72060 has landed. * [ ] https://reviews.llvm.org/D72169 submitted. * [ ] https://bugs.llvm.org/show_bug.cgi?id=44461 reported. https://reviews.llvm.org/D72420 submitted, but unlikely eligible for LLVM 10. * Compile-time regressions: * [x] GlobalOpt regression identified. ~~fhahn proposed https://reviews.llvm.org/D72214.~~ fhahn has [reverted](llvm/llvm-project@192cce1) the patch. * [ ] Even with the revert, there are [large regressions](https://perf.rust-lang.org/compare.html?start=760ce94c69ca510d44087291c311296f6d9ccdf5&end=4e84f97d76e694bb9f59039f5bdeb6d8bca46d14). * Assertion failures / infinite loops: * [x] https://bugs.llvm.org/show_bug.cgi?id=44600 => https://reviews.llvm.org/D73135, https://reviews.llvm.org/D73854 and https://reviews.llvm.org/D73908 have landed and been cherry-picked to the 10.x branch. * [x] https://bugs.llvm.org/show_bug.cgi?id=44835 => https://reviews.llvm.org/D74278 has landed and been cherry-picked. r? @ghost

Update to LLVM 10 LLVM 10 is going to be branched soon, so it's a good time to start finding all those tasty new miscompiles and performance regressions ;) Status: * Preparation split off into rust-lang#67900. * Optimization regressions: * [x] https://bugs.llvm.org/show_bug.cgi?id=44419 => https://reviews.llvm.org/D72048 has landed. * [x] https://bugs.llvm.org/show_bug.cgi?id=44423 => https://reviews.llvm.org/D72060 has landed. * [x] https://reviews.llvm.org/D72169 submitted. * [ ] https://bugs.llvm.org/show_bug.cgi?id=44461 reported. https://reviews.llvm.org/D72420 submitted, but unlikely eligible for LLVM 10. * Compile-time regressions: * [x] GlobalOpt regression identified. ~~fhahn proposed https://reviews.llvm.org/D72214.~~ fhahn has [reverted](llvm/llvm-project@192cce1) the patch. * [ ] Even with the revert, there are [large regressions](https://perf.rust-lang.org/compare.html?start=760ce94c69ca510d44087291c311296f6d9ccdf5&end=4e84f97d76e694bb9f59039f5bdeb6d8bca46d14). * Assertion failures / infinite loops: * [x] https://bugs.llvm.org/show_bug.cgi?id=44600 => https://reviews.llvm.org/D73135, https://reviews.llvm.org/D73854 and https://reviews.llvm.org/D73908 have landed and been cherry-picked to the 10.x branch. * [x] https://bugs.llvm.org/show_bug.cgi?id=44835 => https://reviews.llvm.org/D74278 has landed and been cherry-picked.

…es, r=Amanieu Enable ARM TME (Transactional Memory Extensions) Enables ARM TME coming up with LLVM 10. Related ARM TME intrinsics are included by the merge of rust-lang#67900. Enables: rust-lang/stdarch#855

In a recent change, 8b19922, adjustments were made to the data layout we pass to LLVM. Unfortunately, the illumos target was missed in this change. See also: rust-lang#67900

update data layout for illumos x86 In a recent change, 8b19922, adjustments were made to the data layout we pass to LLVM. Unfortunately, the illumos target was missed in this change. See also: rust-lang#67900

rust-highfive assigned alexcrichton Jan 5, 2020

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 5, 2020

nikic mentioned this pull request Jan 5, 2020

Update to LLVM 10 #67759

Merged

8 tasks

nagisa reviewed Jan 5, 2020

View reviewed changes

rust-highfive assigned nagisa and unassigned alexcrichton Jan 6, 2020

nikic added 18 commits January 7, 2020 21:28

Explicitly include InitializePasses.h

2fd4e76

CodeGenFileType moved outside TargetMachine

3ec3aa7

Handle removal of llvm::make_unique()

30ec68a

Update thinLTOInternalizeAndPromoteInIndex() usage

8010f40

Don't handle removed FlagBlockByrefStruct

f77f338

Pass isDefined parameter to createGlobalVariableExpression()

aa9d02e

Handle switch to Expected<StringRef> for section name

6d59017

Switch to using MaybeAlign APIs

c3ab84b

The integer versions are deprecated

Auto-upgrade data layouts for X86 address spaces

31aeccc

This is similar to the autoupdate LLVM performs internally.

Update bool-cmp.rs codegen

3d8f454

Update codegen tests with unnamed arguments

e365bc7

Handle extra attributes in repeat-trusted-len.rs test

f2ad997

Account for pointer type suffix in prefetch test

00daf2d

Remove legacy debuginfo tests

b27b1d8

These are no longer relevant, as our minimum supported version is LLVM 7.

Add include path when compiling profiler runtime

3db0015

InstrProfData.inc has been moved to include/

Handle changed InstrProfilingRuntime path

c6a7751

Update data layouts to include new X86 address spaces

8b19922

Remove support for datalayout upgrade

c9e996f

Only keep the downgrade code

nikic force-pushed the prepare-llvm-10 branch from c508b96 to c9e996f Compare January 7, 2020 20:29

nagisa closed this Jan 8, 2020

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 8, 2020

nagisa reopened this Jan 8, 2020

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 13, 2020

bors merged commit c9e996f into rust-lang:master Jan 13, 2020

MabezDev mentioned this pull request Jan 17, 2020

Incorrect version? espressif/llvm-project#10

Closed

vertexclique mentioned this pull request May 21, 2020

Enable ARM TME (Transactional Memory Extensions) #72438

Merged

jclulow mentioned this pull request May 28, 2020

update data layout for illumos x86 #72695

Merged

mkroening mentioned this pull request May 20, 2021

Outdated data layout hermit-os/loader#17

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prepare for LLVM 10 upgrade #67900

Prepare for LLVM 10 upgrade #67900

nikic commented Jan 5, 2020

nagisa left a comment

nagisa Jan 5, 2020

nikic Jan 6, 2020

nagisa Jan 6, 2020

nikic Jan 7, 2020

nikic commented Jan 6, 2020

alexcrichton commented Jan 6, 2020

nagisa commented Jan 8, 2020

bors commented Jan 8, 2020

bors commented Jan 13, 2020

bors commented Jan 13, 2020

Prepare for LLVM 10 upgrade #67900

Prepare for LLVM 10 upgrade #67900

Conversation

nikic commented Jan 5, 2020

nagisa left a comment

Choose a reason for hiding this comment

nagisa Jan 5, 2020

Choose a reason for hiding this comment

nikic Jan 6, 2020

Choose a reason for hiding this comment

nagisa Jan 6, 2020

Choose a reason for hiding this comment

nikic Jan 7, 2020

Choose a reason for hiding this comment

nikic commented Jan 6, 2020

alexcrichton commented Jan 6, 2020

nagisa commented Jan 8, 2020

bors commented Jan 8, 2020

bors commented Jan 13, 2020

bors commented Jan 13, 2020