Skip to content

Commit

Permalink
Rollup merge of rust-lang#128363 - Oneirical:not-to-be-undertestimate…
Browse files Browse the repository at this point in the history
…d, r=jieyouxu

Migrate `pdb-buildinfo-cl-cmd` and `pgo-indirect-call-promotion` `run-make` tests to rmake

Part of rust-lang#121876 and the associated [Google Summer of Code project](https://blog.rust-lang.org/2024/05/01/gsoc-2024-selected-projects.html).

Please try:

try-job: x86_64-msvc
try-job: x86_64-mingw
try-job: i686-msvc
try-job: i686-mingw
try-job: x86_64-gnu-llvm-17
try-job: aarch64-apple
  • Loading branch information
tgross35 committed Aug 7, 2024
2 parents 0665f3c + 840a661 commit ffdc8ec
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 42 deletions.
1 change: 1 addition & 0 deletions src/tools/compiletest/src/command-list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,7 @@ const KNOWN_DIRECTIVE_NAMES: &[&str] = &[
"only-watchos",
"only-windows",
"only-windows-gnu",
"only-windows-msvc",
"only-x86",
"only-x86_64",
"only-x86_64-fortanix-unknown-sgx",
Expand Down
2 changes: 0 additions & 2 deletions src/tools/tidy/src/allowed_run_make_makefiles.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ run-make/macos-deployment-target/Makefile
run-make/min-global-align/Makefile
run-make/native-link-modifier-bundle/Makefile
run-make/no-alloc-shim/Makefile
run-make/pdb-buildinfo-cl-cmd/Makefile
run-make/pgo-gen-lto/Makefile
run-make/pgo-indirect-call-promotion/Makefile
run-make/raw-dylib-alt-calling-convention/Makefile
run-make/raw-dylib-c/Makefile
run-make/redundant-libs/Makefile
Expand Down
16 changes: 0 additions & 16 deletions tests/run-make/pdb-buildinfo-cl-cmd/Makefile

This file was deleted.

39 changes: 39 additions & 0 deletions tests/run-make/pdb-buildinfo-cl-cmd/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
// Check if the pdb file contains the following information in the LF_BUILDINFO:
// 1. full path to the compiler (cl)
// 2. the commandline args to compile it (cmd)
// This is because these used to be missing in #96475.
// See https://github.com/rust-lang/rust/pull/113492

//@ only-windows-msvc
// Reason: pdb files are unique to this architecture

use run_make_support::{assert_contains, bstr, env_var, rfs, rustc};

fn main() {
rustc()
.input("main.rs")
.arg("-g")
.crate_name("my_crate_name")
.crate_type("bin")
.metadata("dc9ef878b0a48666")
.run();
let tests = [
&env_var("RUSTC"),
r#""main.rs""#,
r#""-g""#,
r#""--crate-name""#,
r#""my_crate_name""#,
r#""--crate-type""#,
r#""bin""#,
r#""-Cmetadata=dc9ef878b0a48666""#,
];
for test in tests {
assert_pdb_contains(test);
}
}

fn assert_pdb_contains(needle: &str) {
let needle = needle.as_bytes();
use bstr::ByteSlice;
assert!(&rfs::read("my_crate_name.pdb").find(needle).is_some());
}
1 change: 0 additions & 1 deletion tests/run-make/pdb-buildinfo-cl-cmd/stringlist.txt

This file was deleted.

23 changes: 0 additions & 23 deletions tests/run-make/pgo-indirect-call-promotion/Makefile

This file was deleted.

33 changes: 33 additions & 0 deletions tests/run-make/pgo-indirect-call-promotion/rmake.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// This test checks that indirect call promotion is performed. The test
// programs calls the same function a thousand times through a function pointer.
// Only PGO data provides the information that it actually always is the same
// function. We verify that the indirect call promotion pass inserts a check
// whether it can make a direct call instead of the indirect call.
// See https://github.com/rust-lang/rust/pull/66631

//@ needs-profiler-support
// Reason: llvm_profdata is used
//@ ignore-cross-compile
// Reason: the compiled binary is executed

use run_make_support::{llvm_filecheck, llvm_profdata, rfs, run, rustc};

fn main() {
// We don't compile `opaque` with either optimizations or instrumentation.
rustc().input("opaque.rs").run();
// Compile the test program with instrumentation
rfs::create_dir("prof_data_dir");
rustc().input("interesting.rs").profile_generate("prof_data_dir").opt().codegen_units(1).run();
rustc().input("main.rs").profile_generate("prof_data_dir").opt().run();
// The argument below generates to the expected branch weights
run("main");
llvm_profdata().merge().output("prof_data_dir/merged.profdata").input("prof_data_dir").run();
rustc()
.input("interesting.rs")
.profile_use("prof_data_dir/merged.profdata")
.opt()
.codegen_units(1)
.emit("llvm-ir")
.run();
llvm_filecheck().patterns("filecheck-patterns.txt").stdin(rfs::read("interesting.ll")).run();
}

0 comments on commit ffdc8ec

Please sign in to comment.