create helper stdin fn

Author: Oneirical

src/tools/run-make-support/src/llvm.rs

@@ -34,7 +34,7 @@ crate::impl_common_helpers!(LlvmReadobj);
 pub fn llvm_bin_dir() -> PathBuf {
     let llvm_bin_dir = env::var("LLVM_BIN_DIR")
     .expect("`LLVM_BIN_DIR` not specified, but this is required to find `llvm-readobj`");
-    PathBuf::from(llvm_bin_dir);
+    PathBuf::from(llvm_bin_dir)
 }
 
 impl LlvmReadobj {

src/tools/run-make-support/src/run.rs

@@ -37,6 +37,27 @@ fn run_common(name: &str) -> (Command, Output) {
     (cmd, output)
 }
 
+/// Run a command taking in standard input from a file, and passing an argument
+/// referring to a different file.
+pub fn stdin_command<P: AsRef<Path>>(command: &str, stdin: P, argument: P) {
+    let file = File::open(stdin).unwrap();
+    let reader = BufReader::new(file);
+
+    let mut child = Command::new(command)
+       .stdin(std::process::Stdio::piped())
+       .stdout(std::process::Stdio::piped())
+       .stderr(std::process::Stdio::piped())
+       .arg(argument)
+       .spawn()
+       .unwrap();
+    
+    let mut child_stdin = child.stdin.take().unwrap();
+    child_stdin.write_all(reader.bytes().collect::<Vec<_>>().as_slice()).unwrap();
+    child_stdin.flush().unwrap();
+
+    child.wait_with_output().unwrap();
+}
+
 /// Run a built binary and make sure it succeeds.
 #[track_caller]
 pub fn run(name: &str) -> Output {

tests/run-make/pgo-branch-weights/rmake.rs

@@ -14,61 +14,51 @@
 //@ ignore-windows-gnu
 //@ ignore-cross-compile
 
-use run_make_support::{llvm_profdata, rustc, rustdoc, target, tmp_dir};
+use run_make_support::{llvm_profdata, rustc, rustdoc, stdin_command, target, tmp_dir};
 use std::io::{self, Write};
 use std::process::Command;
 
 fn main() {
     // For some very small programs GNU ld seems to not properly handle
     // instrumentation sections correctly. Neither Gold nor LLD have that
     // problem.
-    let common_flags = if cfg!(target_os = "linux") && target().contains("x86") {
-        "-Clink-args=-fuse-ld=gold"
-    } else {
-        ""
-    };
+    let link_args = (cfg!(target_os = "linux") && target().contains("x86")).then_some("-Clink-args=-fuse-ld=gold");
+    
     let path_prof_data_dir = tmp_dir().join("prof_data_dir");
     let path_merged_profdata = path_prof_data_dir.join("merged.profdata");
-    rustc().arg(common_flags).input("opaque.rs").run();
+    let invoc = rustc().input("opaque.rs");
+    if let Some(link_args) = link_args {
+        invoc.arg(link_args);
+    }
+    invoc.run();
     fs::create_dir_all(&path_prof_data_dir);
-    rustc().arg(common_flags)
-        .input("interesting.rs")
+    let invoc = rustc().input("interesting.rs")
         .profile_generate(&path_prof_data_dir)
         .opt()
-        .codegen_units(1)
-        .run();
-    rustc().arg(common_flags)
-        .input("main.rs")
+        .codegen_units(1);
+    if let Some(link_args) = link_args {
+        invoc.arg(link_args);
+    }
+    invoc.run();
+    let invoc = rustc().input("main.rs")
         .profile_generate(&path_prof_data_dir)
-        .opt()
-        .run();
+        .opt();
+    if let Some(link_args) = link_args {
+        invoc.arg(link_args);
+    }
+    invoc.run();
     run("main");
     llvm_profdata().merge().output(&path_merged_profdata).input(path_prof_data_dir).command_output();
-    rustc().arg(common_flags)
-        .input("interesting.rs")
+    let invoc = rustc().input("interesting.rs")
         .profile_use(path_merged_profdata)
         .opt()
         .codegen_units(1)
-        .emit("llvm-ir")
-        .run();
-
-    // FIXME This part below is a rough attempt
+        .emit("llvm-ir");
+    if let Some(link_args) = link_args {
+        invoc.arg(link_args);
+    }
+    invoc.run();
 
     let interesting_ll = tmp_dir().join("interesting.ll");
-    let file_interesting_ll = File::open(interesting_ll)?;
-    let reader = BufReader::new(file_interesting_ll);
-
-    let mut child = Command::new("llvm-filecheck")
-       .stdin(std::process::Stdio::piped())
-       .stdout(std::process::Stdio::piped())
-       .stderr(std::process::Stdio::piped())
-       .arg("filecheck-patterns.txt")
-       .spawn()
-       .unwrap();
-    
-    let mut child_stdin = child.stdin.take().unwrap();
-    child_stdin.write_all(reader.bytes().collect::<Vec<_>>().as_slice()).unwrap();
-    child_stdin.flush().unwrap();
-
-    let output = child.wait_with_output().unwrap();
+    stdin_command("llvm-filecheck", interesting_ll, "filecheck-patterns.txt");
 }