Allow runtime switching between trans backends #45684

bjorn3 · 2017-11-01T13:31:24Z

The driver callback after_llvm has been removed as it doesnt work with multiple backends.

eddyb · 2017-11-01T13:43:25Z

cc @alexcrichton @rust-lang/compiler I'm not sure a flag is the right thing to use here.
Long-term, do we expect/want to have -C backend=cranelift/llvm/etc. or different drivers?

bjorn3 · 2017-11-01T14:00:37Z

Most of the driver is the same for each backend. We could pass different compiler callbacks to rustc_driver for each backend.

alexcrichton · 2017-11-01T15:21:13Z

This seems to add -Z trans but never uses it? How can this be implemented unless we use trait objects?

bjorn3 · 2017-11-01T15:41:49Z

-Z trans is used at https://github.com/bjorn3/rust/blob/67f54e64464ae444de565cc48dc83c7abe6fd55e/src/librustc_driver/lib.rs#L244

eddyb · 2017-11-01T21:13:30Z

@bjorn3 We use "custom drivers" to refer to different binaries using rustc_driver, not replacements for rustc_driver.

bjorn3 · 2017-11-02T18:45:49Z

src/librustc_trans_utils/trans_crate.rs

    type OngoingCrateTranslation;
-    type TranslatedCrate;


Now with less object unsafe associated types 🎊

carols10cents · 2017-11-06T14:14:13Z

What's the status of this PR @bjorn3 @alexcrichton @eddyb? I'm having a tough time telling :)

eddyb · 2017-11-06T14:16:20Z

I'm not sure what we should do here. Nominating for discussion in the next compiler meeting.

bjorn3 · 2017-11-07T18:05:15Z

src/librustc_trans/lib.rs

@@ -157,10 +157,6 @@ impl LlvmTransCrate {
 }

 impl rustc_trans_utils::trans_crate::TransCrate for LlvmTransCrate {
-    type MetadataLoader = metadata::LlvmMetadataLoader;
-    type OngoingCrateTranslation = back::write::OngoingCrateTranslation;
-    type TranslatedCrate = CrateTranslation;


Now with less object unsafe associated types 🎊

Edit: now completely object safe

eddyb · 2017-11-09T22:05:44Z

@bjorn3 Out of curiosity, do you have some specific motivation/need behind this PR, or is it intended as a general refactoring towards supporting multiple backends?

bjorn3 · 2017-11-10T07:11:29Z

Mainly refactoring, but when this is merged I want to try to add basic cranelift support.

eddyb · 2017-11-10T08:19:57Z

I'd suggest more coordination between you, @sunfishcode and me, and the compiler team in general. Just to avoid stepping on eachother's toes, as we are all interested in this goal :).

eddyb · 2017-11-12T05:22:55Z

r? @nikomatsakis

bjorn3 · 2017-11-12T09:35:32Z

src/test/run-make/llvm-phase/test.rs

@@ -1,87 +0,0 @@
-// Copyright 2016 The Rust Project Developers. See the COPYRIGHT


Removed as it requires the now removed after_llvm callback.

nikomatsakis

So, eddyb kicked this to me, but I actually don't know that I'm the right person to do a detailed review here. I mean I could, but I think that @eddyb and perhaps @michaelwoerister have stronger opinions about how this should be internally architected. @bjorn3 can you and @eddyb sync up at some point and talk it over?

nikomatsakis · 2017-11-13T17:17:42Z

src/librustc_driver/driver.rs

-
-        sess.abort_if_errors();
-    }
+    // FIXME: Check if the compilation options are supported for the selected backend.


This seems like an important thing to get right before we land, no? Although I guess it's only a warning, not an error, but I wouldn't want to silently be accepting bad things.

bors · 2017-11-15T10:34:45Z

☔ The latest upstream changes (presumably #45944) made this pull request unmergeable. Please resolve the merge conflicts.

eddyb · 2017-11-15T15:02:52Z

src/librustc_trans_utils/trans_crate.rs

@@ -226,7 +226,7 @@ impl TransCrate for MetadataOnlyTransCrate {
        };
    }
    fn provide_extern(&self, providers: &mut Providers) {
-        self.provide_local(providers)
+        self.provide(providers)


You shouldn't need to do anything here, this is redundant.

You mean i should remove this line?

nikomatsakis · 2017-11-15T16:58:00Z

r? @eddyb -- I'm kicking this back to @eddyb =)

bjorn3 · 2018-01-20T10:56:16Z

Fixed ICE

eddyb · 2018-01-20T10:57:16Z

@bors r+

bors · 2018-01-20T10:57:17Z

📌 Commit a4854e8 has been approved by eddyb

bors · 2018-01-20T11:02:02Z

⌛ Testing commit a4854e8 with merge 9aa40b0...

@eddyb

Allow runtime switching between trans backends The driver callback after_llvm has been removed as it doesnt work with multiple backends. r? @eddyb

bors · 2018-01-20T12:28:10Z

💔 Test failed - status-travis

eddyb · 2018-01-20T16:30:57Z

@bors r+

bors · 2018-01-20T16:30:57Z

📌 Commit a30232f has been approved by eddyb

bors · 2018-01-20T17:52:01Z

⌛ Testing commit a30232f with merge 3153d4a27cf582356da0bb5a2190c7bebd150372...

bors · 2018-01-20T20:52:28Z

💔 Test failed - status-travis

shepmaster · 2018-01-21T01:30:59Z

The job exceeded the maximum time limit for jobs, and has been terminated.

@bors retry

bors · 2018-01-21T09:17:32Z

⌛ Testing commit a30232f with merge 9368a1e...

@eddyb

Allow runtime switching between trans backends The driver callback after_llvm has been removed as it doesnt work with multiple backends. r? @eddyb

bors · 2018-01-21T12:05:44Z

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing 9368a1e to master...

@nrc

Tested on commit rust-lang/rust@9368a1e. 💔 rls on windows: test-pass → build-fail (cc @nrc). 💔 rls on linux: test-pass → build-fail (cc @nrc).

rustc: Load the `rustc_trans` crate at runtime Building on the work of #45684 this commit updates the compiler to unconditionally load the `rustc_trans` crate at runtime instead of linking to it at compile time. The end goal of this work is to implement #46819 where rustc will have multiple backends available to it to load. This commit starts off by removing the `extern crate rustc_trans` from the driver. This involved moving some miscellaneous functionality into the `TransCrate` trait and also required an implementation of how to locate and load the trans backend. This ended up being a little tricky because the sysroot isn't always the right location (for example `--sysroot` arguments) so some extra code was added as well to probe a directory relative to the current dll (the rustc_driver dll). Rustbuild has been updated accordingly as well to have a separate compilation invocation for the `rustc_trans` crate and assembly it accordingly into the sysroot. Finally, the distribution logic for the `rustc` package was also updated to slurp up the trans backends folder. A number of assorted fallout changes were included here as well to ensure tests pass and such, and they should all be commented inline.

rust-highfive assigned eddyb Nov 1, 2017

bjorn3 mentioned this pull request Nov 1, 2017

[driver breaking] Rename rustc_trans to rustc_codegen_llvm and allow runtime switching between trans backends #45677

Closed

kennytm added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Nov 1, 2017

bjorn3 commented Nov 2, 2017

View reviewed changes

eddyb added the I-nominated label Nov 6, 2017

bjorn3 commented Nov 7, 2017

View reviewed changes

bjorn3 force-pushed the runtime_choose_trans2 branch from eae208e to fd38507 Compare November 11, 2017 16:51

rust-highfive assigned nikomatsakis and unassigned eddyb Nov 12, 2017

bjorn3 commented Nov 12, 2017

View reviewed changes

nikomatsakis reviewed Nov 14, 2017

View reviewed changes

bjorn3 force-pushed the runtime_choose_trans2 branch from 831a965 to b3a986a Compare November 15, 2017 14:30

eddyb reviewed Nov 15, 2017

View reviewed changes

rust-highfive assigned eddyb and unassigned nikomatsakis Nov 15, 2017

nikomatsakis removed the I-nominated label Nov 16, 2017

bors added a commit that referenced this pull request Jan 20, 2018

Auto merge of #45684 - bjorn3:runtime_choose_trans2, r=eddyb

9aa40b0

Allow runtime switching between trans backends The driver callback after_llvm has been removed as it doesnt work with multiple backends. r? @eddyb

Remove the 'extern "C"' in the right place

a30232f

bjorn3 force-pushed the runtime_choose_trans2 branch from fb976fb to a30232f Compare January 20, 2018 16:27

bors added a commit that referenced this pull request Jan 21, 2018

Auto merge of #45684 - bjorn3:runtime_choose_trans2, r=eddyb

9368a1e

Allow runtime switching between trans backends The driver callback after_llvm has been removed as it doesnt work with multiple backends. r? @eddyb

bors merged commit a30232f into rust-lang:master Jan 21, 2018

This was referenced Jan 21, 2018

rustc: Lower link args to @-files on Windows more #47507

Merged

rustc: Add -C lto=val option #47521

Merged

Implement RFC 1946 - intra-rustdoc links #47046

Merged

WIP: Parallelize passes using rayon #46564

Closed

bjorn3 deleted the runtime_choose_trans2 branch January 21, 2018 13:00

topecongiro mentioned this pull request Jan 22, 2018

Rustup to rustc 1.25.0-nightly (97520ccb1 2018-01-21) rust-dev-tools/rls-rustc#5

Merged

alexcrichton mentioned this pull request Jan 23, 2018

rustc: Load the rustc_trans crate at runtime #47671

Merged

XAMPPRocky mentioned this pull request Oct 14, 2020

Tracking Issue for -Z codegen-backend #77933

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow runtime switching between trans backends #45684

Allow runtime switching between trans backends #45684

bjorn3 commented Nov 1, 2017

eddyb commented Nov 1, 2017 •

edited

Loading

bjorn3 commented Nov 1, 2017

alexcrichton commented Nov 1, 2017

bjorn3 commented Nov 1, 2017

eddyb commented Nov 1, 2017

bjorn3 Nov 2, 2017

carols10cents commented Nov 6, 2017

eddyb commented Nov 6, 2017

bjorn3 Nov 7, 2017

eddyb commented Nov 9, 2017

bjorn3 commented Nov 10, 2017 •

edited by eddyb

Loading

eddyb commented Nov 10, 2017

eddyb commented Nov 12, 2017

bjorn3 Nov 12, 2017

nikomatsakis left a comment

nikomatsakis Nov 13, 2017

bors commented Nov 15, 2017

eddyb Nov 15, 2017

bjorn3 Nov 15, 2017

eddyb Nov 15, 2017

nikomatsakis commented Nov 15, 2017

bjorn3 commented Jan 20, 2018

eddyb commented Jan 20, 2018

bors commented Jan 20, 2018

bors commented Jan 20, 2018

bors commented Jan 20, 2018

eddyb commented Jan 20, 2018

bors commented Jan 20, 2018

bors commented Jan 20, 2018

bors commented Jan 20, 2018

shepmaster commented Jan 21, 2018

bors commented Jan 21, 2018

bors commented Jan 21, 2018

		@@ -1,87 +0,0 @@
		// Copyright 2016 The Rust Project Developers. See the COPYRIGHT

Allow runtime switching between trans backends #45684

Allow runtime switching between trans backends #45684

Conversation

bjorn3 commented Nov 1, 2017

eddyb commented Nov 1, 2017 • edited Loading

bjorn3 commented Nov 1, 2017

alexcrichton commented Nov 1, 2017

bjorn3 commented Nov 1, 2017

eddyb commented Nov 1, 2017

bjorn3 Nov 2, 2017

Choose a reason for hiding this comment

carols10cents commented Nov 6, 2017

eddyb commented Nov 6, 2017

bjorn3 Nov 7, 2017

Choose a reason for hiding this comment

eddyb commented Nov 9, 2017

bjorn3 commented Nov 10, 2017 • edited by eddyb Loading

eddyb commented Nov 10, 2017

eddyb commented Nov 12, 2017

bjorn3 Nov 12, 2017

Choose a reason for hiding this comment

nikomatsakis left a comment

Choose a reason for hiding this comment

nikomatsakis Nov 13, 2017

Choose a reason for hiding this comment

bors commented Nov 15, 2017

eddyb Nov 15, 2017

Choose a reason for hiding this comment

bjorn3 Nov 15, 2017

Choose a reason for hiding this comment

eddyb Nov 15, 2017

Choose a reason for hiding this comment

nikomatsakis commented Nov 15, 2017

bjorn3 commented Jan 20, 2018

eddyb commented Jan 20, 2018

bors commented Jan 20, 2018

bors commented Jan 20, 2018

bors commented Jan 20, 2018

eddyb commented Jan 20, 2018

bors commented Jan 20, 2018

bors commented Jan 20, 2018

bors commented Jan 20, 2018

shepmaster commented Jan 21, 2018

bors commented Jan 21, 2018

bors commented Jan 21, 2018

eddyb commented Nov 1, 2017 •

edited

Loading

bjorn3 commented Nov 10, 2017 •

edited by eddyb

Loading