Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable optimizer #401

Merged
merged 2 commits into from
Jan 29, 2021
Merged

Enable optimizer #401

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9aff95
Enable optimizer
khyperia Jan 29, 2021
31249b2
Fix tests
khyperia Jan 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions crates/rustc_codegen_spirv/src/link.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use rustc_errors::FatalError;
use rustc_middle::bug;
use rustc_middle::dep_graph::WorkProduct;
use rustc_middle::middle::dependency_format::Linkage;
use rustc_session::config::{CrateType, Lto, OutputFilenames, OutputType};
use rustc_session::config::{CrateType, DebugInfo, Lto, OptLevel, OutputFilenames, OutputType};
use rustc_session::output::{check_file_is_writeable, invalid_output_for_target, out_filename};
use rustc_session::utils::NativeLibKind;
use rustc_session::Session;
Expand Down Expand Up @@ -124,7 +124,8 @@ fn link_exe(

let spv_binary = do_link(sess, &objects, &rlibs, legalize);

let spv_binary = if env::var("SPIRV_OPT").is_ok() {
let spv_binary = if sess.opts.optimize != OptLevel::No || sess.opts.debuginfo == DebugInfo::None
{
let _timer = sess.timer("link_spirv_opt");
do_spirv_opt(sess, spv_binary, out_filename)
} else {
Expand Down Expand Up @@ -157,10 +158,21 @@ fn do_spirv_opt(sess: &Session, spv_binary: Vec<u32>, filename: &Path) -> Vec<u3

let mut optimizer = opt::create(None);

optimizer
.register_size_passes()
.register_pass(opt::Passes::EliminateDeadConstant)
.register_pass(opt::Passes::StripDebugInfo);
match sess.opts.optimize {
OptLevel::No => {}
OptLevel::Less | OptLevel::Default | OptLevel::Aggressive => {
optimizer.register_performance_passes();
}
OptLevel::Size | OptLevel::SizeMin => {
optimizer.register_size_passes();
}
}

if sess.opts.debuginfo == DebugInfo::None {
optimizer
.register_pass(opt::Passes::EliminateDeadConstant)
.register_pass(opt::Passes::StripDebugInfo);
}

let result = optimizer.optimize(
&spv_binary,
Expand Down