Skip to content

Commit

Permalink
Unrolled build for rust-lang#127237
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127237 - GuillaumeGomez:improve-run-make-llvm-ident, r=Kobzol

Improve code of `run-make/llvm-ident`

Follow-up of rust-lang#126941.

r? `@Kobzol`
  • Loading branch information
rust-timer authored Jul 8, 2024
2 parents 32e6926 + aa1c24a commit d2a7159
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions tests/run-make/llvm-ident/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
//@ ignore-cross-compile

use run_make_support::llvm::llvm_bin_dir;
use run_make_support::{cmd, env_var, llvm_filecheck, read_dir, rustc, source_root};

use std::ffi::OsStr;
use run_make_support::{
cmd, env_var, has_extension, llvm_filecheck, rustc, shallow_find_files, source_root,
};

fn main() {
// `-Ccodegen-units=16 -Copt-level=2` is used here to trigger thin LTO
Expand All @@ -22,20 +22,14 @@ fn main() {

// `llvm-dis` is used here since `--emit=llvm-ir` does not emit LLVM IR
// for temporary outputs.
let mut files = Vec::new();
read_dir(".", |path| {
if path.is_file() && path.extension().is_some_and(|ext| ext == OsStr::new("bc")) {
files.push(path.to_path_buf());
}
});
let files = shallow_find_files(".", |path| has_extension(path, "bc"));
cmd(llvm_bin_dir().join("llvm-dis")).args(files).run();

// Check LLVM IR files (including temporary outputs) have `!llvm.ident`
// named metadata, reusing the related codegen test.
let llvm_ident_path = source_root().join("tests/codegen/llvm-ident.rs");
read_dir(".", |path| {
if path.is_file() && path.extension().is_some_and(|ext| ext == OsStr::new("ll")) {
llvm_filecheck().input_file(path).arg(&llvm_ident_path).run();
}
});
let files = shallow_find_files(".", |path| has_extension(path, "ll"));
for file in files {
llvm_filecheck().input_file(file).arg(&llvm_ident_path).run();
}
}

0 comments on commit d2a7159

Please sign in to comment.